1.1 --- a/pkg/devices/lib/spi/include/spi-jz4780.h Tue Nov 07 19:20:32 2023 +0100
1.2 +++ b/pkg/devices/lib/spi/include/spi-jz4780.h Thu Nov 09 18:40:31 2023 +0100
1.3 @@ -32,10 +32,11 @@
1.4 #include <l4/devices/cpm-jz4780.h>
1.5 #include <l4/devices/dma-jz4780.h>
1.6 #include <l4/devices/hw_mmio_register_block.h>
1.7 +#include <l4/devices/spi.h>
1.8
1.9 /* SPI peripheral channel. */
1.10
1.11 -class Spi_jz4780_channel
1.12 +class Spi_jz4780_channel : public Spi_channel_base
1.13 {
1.14 Hw::Register_block<32> _regs;
1.15
1.16 @@ -48,8 +49,12 @@
1.17 enum Dma_jz4780_request_type _request_type;
1.18 uint64_t _frequency;
1.19
1.20 + /* Common utilities. */
1.21 +
1.22 void configure_transfer(uint8_t char_size);
1.23
1.24 + void wait_busy();
1.25 +
1.26 public:
1.27 explicit Spi_jz4780_channel(l4_addr_t spi_start, l4_addr_t start,
1.28 enum Clock_identifiers clock,
1.29 @@ -58,15 +63,19 @@
1.30 enum Dma_jz4780_request_type request_type,
1.31 uint64_t frequency);
1.32
1.33 + /* Convenience operations. */
1.34 +
1.35 + virtual uint32_t send(uint32_t bytes, const uint8_t data[]);
1.36 +
1.37 + virtual uint32_t send_dc(uint32_t bytes, const uint8_t data[], const int dc[]);
1.38 +
1.39 + uint32_t send_units(uint32_t bytes, const uint8_t data[], uint8_t unit_size,
1.40 + uint8_t char_size);
1.41 +
1.42 /* DMA operations. */
1.43
1.44 uint32_t transfer(l4re_dma_space_dma_addr_t paddr, uint32_t count,
1.45 uint8_t unit_size, uint8_t char_size);
1.46 -
1.47 - /* Convenience operations. */
1.48 -
1.49 - uint32_t send(uint32_t bytes, const uint8_t data[], uint8_t unit_size,
1.50 - uint8_t char_size);
1.51 };
1.52
1.53 /* SPI peripheral. */
1.54 @@ -96,8 +105,13 @@
1.55
1.56 void *jz4780_spi_get_channel(void *spi, uint8_t channel, void *dma, uint64_t frequency);
1.57
1.58 -uint32_t jz4780_spi_send(void *channel, uint32_t bytes, const uint8_t data[],
1.59 - uint8_t unit_size, uint8_t char_size);
1.60 +uint32_t jz4780_spi_send(void *channel, uint32_t bytes, const uint8_t data[]);
1.61 +
1.62 +uint32_t jz4780_spi_send_dc(void *channel, uint32_t bytes, const uint8_t data[],
1.63 + const int dc[]);
1.64 +
1.65 +uint32_t jz4780_spi_send_units(void *channel, uint32_t bytes, const uint8_t data[],
1.66 + uint8_t unit_size, uint8_t char_size);
1.67
1.68 uint32_t jz4780_spi_transfer(void *channel, l4re_dma_space_dma_addr_t paddr,
1.69 uint32_t count, uint8_t unit_size, uint8_t char_size);