[automotive] Update the legacy drivers to align with hardware

Author: engdoreis

examples/automotive/legacy/ksz8851.c

@@ -16,17 +16,13 @@
 #include "../../../third_party/sonata-system/sw/legacy/common/spi.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/timer.h"
 
-// Define our own GPIO_OUT as the version from `sonata-system` uses void
-// pointer arithmetic, which clang-tidy forbids.
-#define GPIO_OUT_ETH GPIO_FROM_BASE_ADDR((GPIO_BASE + GPIO_OUT_REG))
-
 enum
 {
 	// Ethernet IRQs
-	EthIntrIrq = 47,
-	// Ethernet GPIO Output Pins
-	EthCsPin  = 13,
-	EthRstPin = 14,
+	EthIntrIrq = 2,
+	// Ethernet chip-select
+	EthSpiCs  = 0,
+	EthSpiRst = 1,
 };
 
 static struct Netif *ethNetif;
@@ -47,11 +43,11 @@ static uint16_t ksz8851_reg_read(spi_t *spi, uint8_t reg)
 	bytes[0] = (0b00 << 6) | (be << 2) | (reg >> 6);
 	bytes[1] = (reg << 2) & 0b11110000;
 
-	set_output_bit(GPIO_OUT_ETH, EthCsPin, 0);
+	spi_set_cs(spi, EthSpiCs, 0);
 	spi_tx(spi, bytes, 2);
 	uint16_t val;
 	spi_rx(spi, (uint8_t *)&val, 2);
-	set_output_bit(GPIO_OUT_ETH, EthCsPin, 1);
+	spi_set_cs(spi, EthSpiCs, 1);
 	return val;
 }
 
@@ -62,11 +58,11 @@ static void ksz8851_reg_write(spi_t *spi, uint8_t reg, uint16_t val)
 	bytes[0] = (0b01 << 6) | (be << 2) | (reg >> 6);
 	bytes[1] = (reg << 2) & 0b11110000;
 
-	set_output_bit(GPIO_OUT_ETH, EthCsPin, 0);
+	spi_set_cs(spi, EthSpiCs, 0);
 	spi_tx(spi, bytes, 2);
 	spi_tx(spi, (uint8_t *)&val, 2);
 	spi_wait_idle(spi);
-	set_output_bit(GPIO_OUT_ETH, EthCsPin, 1);
+	spi_set_cs(spi, EthSpiCs, 1);
 }
 
 static void ksz8851_reg_set(spi_t *spi, uint8_t reg, uint16_t mask)
@@ -150,7 +146,7 @@ bool ksz8851_output(struct Netif *netif, struct Fbuf *buf)
 
 	// Start transmission.
 	uint8_t cmd = 0b11 << 6;
-	set_output_bit(GPIO_OUT_ETH, EthCsPin, 0);
+	spi_set_cs(spi, EthSpiCs, 0);
 	spi_tx(spi, &cmd, 1);
 
 	uint32_t header = 0x8000 | (buf->len << 16);
@@ -171,7 +167,7 @@ bool ksz8851_output(struct Netif *netif, struct Fbuf *buf)
 	}
 
 	spi_wait_idle(spi);
-	set_output_bit(GPIO_OUT_ETH, EthCsPin, 1);
+	spi_set_cs(spi, EthSpiCs, 1);
 
 	// Stop QMU DMA transfer operation
 	ksz8851_reg_clear(spi, ETH_RXQCR, StartDmaAccess);
@@ -210,9 +206,9 @@ bool ksz8851_init(struct Netif *netif, uint8_t hwaddr[6])
 		return false;
 
 	// Reset chip
-	set_output_bit(GPIO_OUT_ETH, EthRstPin, 0);
+	spi_set_cs(spi, EthSpiRst, 0);
 	timer_delay(150);
-	set_output_bit(GPIO_OUT_ETH, EthRstPin, 0x1);
+	spi_set_cs(spi, EthSpiRst, 1);
 
 	uint16_t cider = ksz8851_reg_read(spi, ETH_CIDER);
 #ifdef KSZ8851_DEBUG_PRINT

examples/automotive/legacy/lcd.c

@@ -8,6 +8,7 @@
 #include "../../../third_party/display_drivers/src/core/m3x6_16pt.h"
 #include "../../../third_party/display_drivers/src/st7735/lcd_st7735.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/gpio.h"
+#include "../../../third_party/sonata-system/sw/legacy/common/pwm.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/sonata_system.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/spi.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/timer.h"
@@ -34,17 +35,19 @@ static uint32_t spi_write(void *handle, uint8_t *data, size_t len)
 
 static uint32_t gpio_write(void *handle, bool cs, bool dc)
 {
-	set_output_bit(GPIO_OUT_LCD, LcdDcPin, dc);
-	set_output_bit(GPIO_OUT_LCD, LcdCsPin, cs);
+	spi_set_cs((spi_t *)handle, LcdDcPin, dc);
+	spi_set_cs((spi_t *)handle, LcdCsPin, cs);
 	return 0;
 }
 
-int lcd_init(spi_t *spi, St7735Context *lcd, LCD_Interface *interface)
+int lcd_init(spi_t         *spi,
+             pwm_t          backlight,
+             St7735Context *lcd,
+             LCD_Interface *interface)
 {
 	// Set the initial state of the LCD control pins
-	set_output_bit(GPIO_OUT_LCD, LcdDcPin, 0x0);
-	set_output_bit(GPIO_OUT_LCD, LcdBlPin, 0x1);
-	set_output_bit(GPIO_OUT_LCD, LcdCsPin, 0x0);
+	spi_set_cs(spi, LcdDcPin, 0x00);
+	spi_set_cs(spi, LcdCsPin, 0x00);
 
 	// Reset the LCD
 	set_output_bit(GPIO_OUT_LCD, LcdRstPin, 0x0);
@@ -68,6 +71,7 @@ int lcd_init(spi_t *spi, St7735Context *lcd, LCD_Interface *interface)
 
 	// Clean display with a white rectangle.
 	lcd_st7735_clean(lcd);
+	set_pwm(backlight, 1, 255);
 
 	return 0;
 }

examples/automotive/legacy/lcd.h

@@ -6,16 +6,16 @@
 #define LCD_H
 
 #include "../../../third_party/display_drivers/src/st7735/lcd_st7735.h"
+#include "../../../third_party/sonata-system/sw/legacy/common/pwm.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/spi.h"
 
 // Constants.
 enum
 {
 	// Pin out mapping.
 	LcdCsPin = 0,
-	LcdRstPin,
 	LcdDcPin,
-	LcdBlPin,
+	LcdRstPin,
 	LcdMosiPin,
 	LcdSclkPin,
 	// Spi clock rate.
@@ -31,6 +31,9 @@ enum
 	BGRColorWhite = 0xFFFFFF,
 };
 
-int lcd_init(spi_t *spi, St7735Context *lcd, LCD_Interface *interface);
+int lcd_init(spi_t         *spi,
+             pwm_t          backlight,
+             St7735Context *lcd,
+             LCD_Interface *interface);
 
 #endif // LCD_H

examples/automotive/legacy/send.c

@@ -13,6 +13,7 @@
 #include "../../../third_party/display_drivers/src/core/m3x6_16pt.h"
 #include "../../../third_party/display_drivers/src/st7735/lcd_st7735.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/gpio.h"
+#include "../../../third_party/sonata-system/sw/legacy/common/pwm.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/rv_plic.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/sonata_system.h"
 #include "../../../third_party/sonata-system/sw/legacy/common/spi.h"
@@ -191,7 +192,7 @@ void lcd_draw_img(uint32_t       x,
  */
 uint8_t read_joystick()
 {
-	return ((uint8_t)read_gpio(GPIO_IN_DBNC_AM)) & 0x1f;
+	return ((uint8_t)(read_gpio(GPIO_IN_DBNC_AM) >> 8u) & 0x1f);
 }
 
 /**
@@ -361,25 +362,30 @@ int main()
 	timer_init();
 	timer_enable(SYSCLK_FREQ / 1000);
 
+	pwm_t lcd_bl = PWM_FROM_ADDR_AND_INDEX(PWM_BASE, PWM_LCD);
+
 	// Initialise LCD display driver
 	LCD_Interface lcdInterface;
 	spi_t         lcdSpi;
 	spi_init(&lcdSpi, LCD_SPI, LcdSpiSpeedHz);
-	lcd_init(&lcdSpi, &lcd, &lcdInterface);
+	lcd_init(&lcdSpi, lcd_bl, &lcd, &lcdInterface);
 	lcd_clean(BACKGROUND_COLOUR);
 	const LCD_Point Centre = {lcd.parent.width / 2, lcd.parent.height / 2};
+	write_to_uart("%s:%d\n", __func__, __LINE__);
 
 	// Initialise Ethernet support for use via callback
 	rv_plic_init();
 	spi_t ethernetSpi;
-	spi_init(&ethernetSpi, ETH_SPI, /*speed=*/0);
+	spi_init(&ethernetSpi, ETH_SPI, 1 * 1000 * 1000);
 	ethernetInterface.spi = &ethernetSpi;
 	uint8_t macSource[6];
 	for (uint8_t i = 0; i < 6; i++)
 	{
 		macSource[i] = FixedDemoHeader.macSource[i];
 	}
+	write_to_uart("%s:%d\n", __func__, __LINE__);
 	ksz8851_init(&ethernetInterface, macSource);
+	write_to_uart("%s:%d\n", __func__, __LINE__);
 
 	// Wait until a good physical ethernet link to start the demo
 	if (!ksz8851_get_phy_status(&ethernetInterface))