[heartbleed] Move the backlight control to lcd_init function

Signed-off-by: Douglas Reis <doreis@lowrisc.org>

Author: engdoreis

examples/heartbleed/legacy/heartbleed.c

@@ -289,6 +289,7 @@ int main()
 	// Initialise UART drivers for debug logging
 	uart0 = UART_FROM_BASE_ADDR(UART0_BASE);
 	uart_init(uart0);
+	pwm_t lcd_bl = PWM_FROM_ADDR_AND_INDEX(PWM_BASE, PWM_LCD);
 
 	write_to_uart("\n\nInitialized UART driver\n");
 
@@ -301,13 +302,9 @@ int main()
 	spi_t         lcdSpi;
 	St7735Context lcd;
 	spi_init(&lcdSpi, LCD_SPI, LcdSpiSpeedHz);
-	lcd_init(&lcdSpi, &lcd, &lcdInterface);
+	lcd_init(&lcdSpi, lcd_bl, &lcd, &lcdInterface);
 	lcd_clean(&lcd, BACKGROUND_COLOR);
 
-	// Turn on LCD backlight via PWM
-	pwm_t lcd_bl = PWM_FROM_ADDR_AND_INDEX(PWM_BASE, PWM_LCD);
-	set_pwm(lcd_bl, 1, 255);
-
 	size_t req_len = 8;
 	while (true)
 	{

examples/heartbleed/legacy/lcd.c

@@ -9,6 +9,7 @@
 #include <lucida_console_12pt.h>
 #include <m3x6_16pt.h>
 #include <m5x7_16pt.h>
+#include <pwm.h>
 #include <sonata_system.h>
 #include <spi.h>
 #include <stdarg.h>
@@ -43,7 +44,10 @@ static uint32_t gpio_write(void *handle, bool cs, bool dc)
 	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
 	spi_set_cs(spi, LcdDcPin, 0x00);
@@ -70,6 +74,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/heartbleed/legacy/lcd.h

@@ -6,6 +6,7 @@
 #define _HEARTBLEED_LCD_H_
 
 #include <lcd_st7735.h>
+#include <pwm.h>
 #include <spi.h>
 
 #ifdef __cplusplus
@@ -49,10 +50,15 @@ extern "C"
 	 * @brief Initialise the LCD, starting and clearing the screen.
 	 *
 	 * @param spi contains an initialized SPI handle to use to write to the LCD.
+	 * @param backlight contains an initialized pwm handle to use to control the
+	 * LCD backlight.
 	 * @param lcd is an outparam to store the initialized LCD handle.
 	 * @param interface is an outparam storing the initialized LCD interface.
 	 */
-	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);
 
 	/**
 	 * @brief Formats and draws a string to the LCD display based upon the