1.1 --- a/pkg/devices/lib/spi/include/spi-jz4780.h Fri Jun 07 16:08:15 2024 +0200
1.2 +++ b/pkg/devices/lib/spi/include/spi-jz4780.h Fri Jun 07 16:12:32 2024 +0200
1.3 @@ -29,32 +29,13 @@
1.4
1.5 #ifdef __cplusplus
1.6
1.7 -#include <l4/devices/cpm-jz4780.h>
1.8 #include <l4/devices/dma-jz4780.h>
1.9 -#include <l4/devices/hw_mmio_register_block.h>
1.10 -#include <l4/devices/spi.h>
1.11 +#include <l4/devices/spi-common.h>
1.12
1.13 /* SPI peripheral channel. */
1.14
1.15 -class Spi_jz4780_channel : public Spi_channel_base
1.16 +class Spi_jz4780_channel : public Spi_channel
1.17 {
1.18 - Hw::Register_block<32> _regs;
1.19 -
1.20 - /* Initialisation parameters. */
1.21 -
1.22 - l4_addr_t _spi_start;
1.23 - enum Clock_identifiers _clock;
1.24 - Cpm_chip *_cpm;
1.25 - Dma_channel *_dma;
1.26 - enum Dma_jz4780_request_type _request_type;
1.27 - uint64_t _frequency;
1.28 -
1.29 - /* Common utilities. */
1.30 -
1.31 - void configure_transfer(uint8_t char_size);
1.32 -
1.33 - void wait_busy();
1.34 -
1.35 public:
1.36 explicit Spi_jz4780_channel(l4_addr_t spi_start, l4_addr_t start,
1.37 enum Clock_identifiers clock,
1.38 @@ -62,37 +43,21 @@
1.39 Dma_channel *dma,
1.40 enum Dma_jz4780_request_type request_type,
1.41 uint64_t frequency);
1.42 -
1.43 - /* Convenience operations. */
1.44 -
1.45 - virtual uint32_t send(uint32_t bytes, const uint8_t data[]);
1.46 -
1.47 - virtual uint32_t send_dc(uint32_t bytes, const uint8_t data[], const int dc[],
1.48 - uint8_t char_size, bool big_endian = true);
1.49 -
1.50 - uint32_t send_units(uint32_t bytes, const uint8_t data[], uint8_t unit_size,
1.51 - uint8_t char_size, bool big_endian = true);
1.52 -
1.53 - /* DMA operations. */
1.54 -
1.55 - uint32_t transfer(l4_addr_t vaddr, l4re_dma_space_dma_addr_t paddr,
1.56 - uint32_t count, uint8_t unit_size, uint8_t char_size,
1.57 - l4_addr_t desc_vaddr = 0,
1.58 - l4re_dma_space_dma_addr_t desc_paddr = 0);
1.59 };
1.60
1.61 /* SPI peripheral. */
1.62
1.63 -class Spi_jz4780_chip
1.64 +class Spi_jz4780_chip : public Spi_chip
1.65 {
1.66 -private:
1.67 - l4_addr_t _spi_start, _start, _end;
1.68 - Cpm_chip *_cpm;
1.69 +protected:
1.70 + unsigned int num_channels()
1.71 + { return 2; }
1.72 +
1.73 + Spi_channel *_get_channel(uint8_t channel, Dma_channel *dma,
1.74 + uint64_t frequency);
1.75
1.76 public:
1.77 explicit Spi_jz4780_chip(l4_addr_t spi_start, l4_addr_t start, l4_addr_t end, Cpm_chip *cpm);
1.78 -
1.79 - Spi_jz4780_channel *get_channel(uint8_t channel, Dma_channel *dma, uint64_t frequency);
1.80 };
1.81
1.82 #endif /* __cplusplus */