From ed596cce754d7e437dbd93bf6885536aa407aa98 Mon Sep 17 00:00:00 2001 From: funman Date: Mon, 29 Mar 2010 12:54:07 +0000 Subject: [PATCH] as3543: name 0x1b & 0x1c registers git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25379 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/as3514.h | 4 ++++ .../arm/as3525/sansa-clipplus/backlight-clip.c | 8 ++++---- .../arm/as3525/sansa-clipv2/backlight-clipv2.c | 8 ++++---- .../arm/as3525/sansa-fuzev2/backlight-fuzev2.c | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index 39a99415b..c7353a2e9 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h @@ -51,6 +51,10 @@ extern void audiohw_set_lineout_vol(int vol_l, int vol_r); #define AS3514_AUDIOSET2 0x15 #define AS3514_AUDIOSET3 0x16 #define AS3517_USB_UTIL 0x17 /* only in as3517+ */ + +#define AS3543_BACKLIGHT 0x1b /* only in as3543 */ +#define AS3543_PMU_ENABLE 0x1c /* only in as3543 */ + #define AS3514_PLLMODE 0x1d #define AS3514_SYSTEM 0x20 diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c index 5f5662f78..3216fc546 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c +++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c @@ -27,8 +27,8 @@ void _backlight_on(void) { ascodec_write(0x25, ascodec_read(0x25) | 2); /* lcd power */ - ascodec_write(0x1c, 8|1); - ascodec_write(0x1b, 0x90); + ascodec_write(AS3543_PMU_ENABLE, 8|1); + ascodec_write(AS3543_BACKLIGHT, 0x90); lcd_enable(true); } @@ -36,6 +36,6 @@ void _backlight_off(void) { lcd_enable(false); ascodec_write(0x25, ascodec_read(0x25) & ~2); /* lcd power */ - ascodec_write(0x1c, 8|1); - ascodec_write(0x1b, 0x00); + ascodec_write(AS3543_PMU_ENABLE, 8|1); + ascodec_write(AS3543_BACKLIGHT, 0x00); } diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c index fad9e6acf..72ecf29a7 100644 --- a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c +++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c @@ -27,8 +27,8 @@ void _backlight_on(void) { ascodec_write(0x25, ascodec_read(0x25) | 2); /* lcd power */ - ascodec_write(0x1c, 8|1); - ascodec_write(0x1b, 0x90); + ascodec_write(AS3543_PMU_ENABLE, 8|1); + ascodec_write(AS3543_BACKLIGHT, 0x90); lcd_enable(true); } @@ -36,8 +36,8 @@ void _backlight_off(void) { lcd_enable(false); ascodec_write(0x25, ascodec_read(0x25) & ~2); /* lcd power */ - ascodec_write(0x1c, 8|1); - ascodec_write(0x1b, 0); + ascodec_write(AS3543_PMU_ENABLE, 8|1); + ascodec_write(AS3543_BACKLIGHT, 0); } void _buttonlight_on(void) diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c index 7e21460fe..f547111a7 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c +++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c @@ -30,8 +30,8 @@ int buttonlight_is_on = 0; void _backlight_set_brightness(int brightness) { - ascodec_write(0x1c, 8|2); // sub register - ascodec_write(0x1b, brightness * 10); + ascodec_write(AS3543_PMU_ENABLE, 8|2); // sub register + ascodec_write(AS3543_BACKLIGHT, brightness * 10); } bool _backlight_init(void) @@ -39,11 +39,11 @@ bool _backlight_init(void) GPIOB_DIR |= 1<<5; /* for buttonlight, stuff below seems to be needed for buttonlight as well*/ - ascodec_write(0x1c, 8|1); // sub register - ascodec_write(0x1b, 0x80); + ascodec_write(AS3543_PMU_ENABLE, 8|1); // sub register + ascodec_write(AS3543_BACKLIGHT, 0x80); - ascodec_write(0x1c, 8|2); // sub register - ascodec_write(0x1b, backlight_brightness * 10); + ascodec_write(AS3543_PMU_ENABLE, 8|2); // sub register + ascodec_write(AS3543_BACKLIGHT, backlight_brightness * 10); return true; } @@ -52,14 +52,14 @@ void _backlight_on(void) #ifdef HAVE_LCD_ENABLE lcd_enable(true); /* power on lcd + visible display */ #endif - ascodec_write(0x1c, 8|1); // sub register - ascodec_write(0x1b, 0x80); + ascodec_write(AS3543_PMU_ENABLE, 8|1); // sub register + ascodec_write(AS3543_BACKLIGHT, 0x80); } void _backlight_off(void) { - ascodec_write(0x1c, 8|1); // sub register - ascodec_write(0x1b, 0); + ascodec_write(AS3543_PMU_ENABLE, 8|1); // sub register + ascodec_write(AS3543_BACKLIGHT, 0); #ifdef HAVE_LCD_ENABLE lcd_enable(false); /* power off visible display */ #endif -- 2.11.4.GIT