From 46cd8ea824bcb2dbc79b76964fd429262f50ddc9 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Mon, 5 May 2014 23:18:58 +0200 Subject: sansaview: cleanup backlight code Change-Id: I0a844931fa2f7f247c8c5e28673241f79902f9be --- .../arm/sandisk/sansa-view/backlight-target.h | 1 - .../target/arm/sandisk/sansa-view/backlight-view.c | 31 +++++++++++++++++----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/firmware/target/arm/sandisk/sansa-view/backlight-target.h b/firmware/target/arm/sandisk/sansa-view/backlight-target.h index a2282ba316..545ee93677 100644 --- a/firmware/target/arm/sandisk/sansa-view/backlight-target.h +++ b/firmware/target/arm/sandisk/sansa-view/backlight-target.h @@ -24,7 +24,6 @@ #include -#define _backlight_init() true void _backlight_on(void); void _backlight_off(void); diff --git a/firmware/target/arm/sandisk/sansa-view/backlight-view.c b/firmware/target/arm/sandisk/sansa-view/backlight-view.c index d227016c35..c065ec3f2a 100644 --- a/firmware/target/arm/sandisk/sansa-view/backlight-view.c +++ b/firmware/target/arm/sandisk/sansa-view/backlight-view.c @@ -25,6 +25,25 @@ #include "lcd.h" #include "backlight.h" +bool _backlight_init(void) +{ + GPIO_SET_BITWISE(GPIOD_ENABLE, 0x01); + GPIO_SET_BITWISE(GPIOD_OUTPUT_EN, 0x01); + GPIO_SET_BITWISE(GPIOA_ENABLE, 0x01); + GPIO_SET_BITWISE(GPIOA_OUTPUT_EN, 0x01); + GPIO_SET_BITWISE(GPIOA_ENABLE, 0x02); + GPIO_SET_BITWISE(GPIOA_OUTPUT_EN, 0x02); + GPIO_SET_BITWISE(GPIOR_ENABLE, 0x10); + GPIO_SET_BITWISE(GPIOR_ENABLE, 0x20); + GPIO_SET_BITWISE(GPIOR_ENABLE, 0x40); + GPIO_SET_BITWISE(GPIOR_ENABLE, 0x80); + GPIO_SET_BITWISE(GPIOA_OUTPUT_EN, 0x10); + GPIO_SET_BITWISE(GPIOA_OUTPUT_EN, 0x20); + GPIO_SET_BITWISE(GPIOA_OUTPUT_EN, 0x40); + GPIO_SET_BITWISE(GPIOA_OUTPUT_EN, 0x80); + return true; +} + void _backlight_set_brightness(int brightness) { (void)brightness; @@ -40,10 +59,10 @@ void _backlight_on(void) GPIO_SET_BITWISE(GPIOD_OUTPUT_VAL, 0x01); } -void _buttonlight_on(void) +void _buttonlight_off(void) { - /* GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x02); */ /* vertical buttonlight */ - GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ + GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x02); /* vertical buttonlight */ + GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ GPIO_CLEAR_BITWISE(GPIOR_OUTPUT_VAL, 0x80); /* scrollwheel bottom led */ GPIO_CLEAR_BITWISE(GPIOR_OUTPUT_VAL, 0x40); /* scrollwheel right led */ @@ -51,10 +70,10 @@ void _buttonlight_on(void) GPIO_CLEAR_BITWISE(GPIOR_OUTPUT_VAL, 0x10); /* scrollwheel left led */ } -void _buttonlight_off(void) +void _buttonlight_on(void) { - /* GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x02); */ /* vertical buttonlight */ - GPIO_CLEAR_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ + GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x02); /* vertical buttonlight */ + GPIO_SET_BITWISE(GPIOA_OUTPUT_VAL, 0x01); /* horizontal buttonlight */ GPIO_SET_BITWISE(GPIOR_OUTPUT_VAL, 0x80); /* scrollwheel bottom led */ GPIO_SET_BITWISE(GPIOR_OUTPUT_VAL, 0x40); /* scrollwheel right led */ -- cgit v1.2.3