1.1 --- a/pkg/landfall-examples/hw_info/common.h Fri Feb 16 23:11:25 2024 +0100
1.2 +++ b/pkg/landfall-examples/hw_info/common.h Sat Feb 17 23:04:12 2024 +0100
1.3 @@ -22,10 +22,10 @@
1.4
1.5 #pragma once
1.6
1.7 -#include <l4/re/c/dma_space.h>
1.8 +#include <l4/devices/clocks.h>
1.9 +#include <l4/devices/dma.h>
1.10 +#include <l4/devices/gpio.h>
1.11 #include <l4/sys/types.h>
1.12 -#include <l4/devices/clocks.h>
1.13 -#include <l4/devices/gpio.h>
1.14 #include <stdint.h>
1.15
1.16
1.17 @@ -168,7 +168,7 @@
1.18
1.19 /* MSC adapter functions. */
1.20
1.21 -void *msc_init(l4_addr_t msc_start, l4_addr_t start, l4_addr_t end);
1.22 +void *msc_init(l4_addr_t msc_start, l4_addr_t start, l4_addr_t end, void *cpm);
1.23
1.24 void *msc_get_channel(void *msc, uint8_t channel, l4_cap_idx_t irq, void *dma);
1.25
1.26 @@ -179,7 +179,7 @@
1.27 void msc_enable(void *msc_channel);
1.28
1.29 uint32_t msc_read_blocks(void *msc_channel, uint8_t card,
1.30 - l4re_dma_space_dma_addr_t paddr,
1.31 + struct dma_region *region,
1.32 uint32_t block_address, uint32_t block_count);
1.33
1.34
1.35 @@ -311,19 +311,6 @@
1.36
1.37
1.38
1.39 -/* DMA definitions. */
1.40 -
1.41 -struct dma_region
1.42 -{
1.43 - unsigned int size;
1.44 - unsigned int align;
1.45 - l4_addr_t vaddr;
1.46 - l4re_dma_space_dma_addr_t paddr;
1.47 - l4_cap_idx_t mem;
1.48 -};
1.49 -
1.50 -
1.51 -
1.52 /* GPIO definitions. */
1.53
1.54 struct gpio_port