diff options
| author | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2013-03-25 16:04:48 +0400 |
|---|---|---|
| committer | Andrew Ryabinin <ryabinin.a.a@gmail.com> | 2013-03-25 16:32:58 +0400 |
| commit | b0eb3c7eb2dc4d99e171fff010e1849cbe8fadac (patch) | |
| tree | 3530c311af7475bfd9d63f76f029b3beb5c21090 | |
| parent | 575d00e3b7554fec83fdd9c105314c3085c11416 (diff) | |
| download | rockbox-b0eb3c7eb2dc4d99e171fff010e1849cbe8fadac.zip rockbox-b0eb3c7eb2dc4d99e171fff010e1849cbe8fadac.tar.gz rockbox-b0eb3c7eb2dc4d99e171fff010e1849cbe8fadac.tar.bz2 rockbox-b0eb3c7eb2dc4d99e171fff010e1849cbe8fadac.tar.xz | |
hm60x: Add lcd type information to debug info.
Change-Id: I09d30f9db6ac40cc92c22c637d560e4a3dcd50de
| -rw-r--r-- | firmware/target/arm/rk27xx/debug-rk27xx.c | 6 | ||||
| -rw-r--r-- | firmware/target/arm/rk27xx/hm60x/lcd-target.h | 5 | ||||
| -rw-r--r-- | firmware/target/arm/rk27xx/lcd-hifiman.c | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/firmware/target/arm/rk27xx/debug-rk27xx.c b/firmware/target/arm/rk27xx/debug-rk27xx.c index 602f9de..c5d9d51 100644 --- a/firmware/target/arm/rk27xx/debug-rk27xx.c +++ b/firmware/target/arm/rk27xx/debug-rk27xx.c @@ -28,6 +28,7 @@ #include "adc.h" #include "font.h" #include "storage.h" +#include "lcd-target.h" #ifdef RK27_GENERIC #define DEBUG_CANCEL BUTTON_VOL @@ -42,6 +43,7 @@ extern unsigned long sd_debug_time_rd; extern unsigned long sd_debug_time_wr; +extern enum lcd_type_t lcd_type; bool dbg_hw_info(void) { @@ -62,6 +64,10 @@ bool dbg_hw_info(void) _DEBUG_PRINTF("SCU_DIVCON1: 0x%0x", SCU_DIVCON1); _DEBUG_PRINTF("SCU_CLKCFG: 0x%0x", SCU_CLKCFG); _DEBUG_PRINTF("SCU_CHIPCFG: 0x%0x", SCU_CHIPCFG); + +#ifdef HM60X + _DEBUG_PRINTF("LCD type: %s", lcd_type == LCD_V1 ? "V1 (HX8340b)": "V2"); +#endif line++; _DEBUG_PRINTF("sd_debug_time_rd: %d", sd_debug_time_rd); _DEBUG_PRINTF("sd_debug_time_wr: %d", sd_debug_time_wr); diff --git a/firmware/target/arm/rk27xx/hm60x/lcd-target.h b/firmware/target/arm/rk27xx/hm60x/lcd-target.h index 7c2f194..801db89 100644 --- a/firmware/target/arm/rk27xx/hm60x/lcd-target.h +++ b/firmware/target/arm/rk27xx/hm60x/lcd-target.h @@ -23,5 +23,10 @@ #define LCD_TARGET_H #define LCD_DATABUS_WIDTH LCDIF_16BIT +enum lcd_type_t +{ + LCD_V1, + LCD_v2 +}; #endif diff --git a/firmware/target/arm/rk27xx/lcd-hifiman.c b/firmware/target/arm/rk27xx/lcd-hifiman.c index 58f957b..95cbd35 100644 --- a/firmware/target/arm/rk27xx/lcd-hifiman.c +++ b/firmware/target/arm/rk27xx/lcd-hifiman.c @@ -27,6 +27,7 @@ #include "system.h" #include "cpu.h" #include "lcdif-rk27xx.h" +#include "lcd-target.h" static bool display_on = false; @@ -187,11 +188,7 @@ static void lcd_v1_update_rect(int x, int y, int width, int height) #ifdef HM60X -enum lcd_type_t -{ - LCD_V1, - LCD_v2 -} lcd_type; +enum lcd_type_t lcd_type; static void identify_lcd(void) { |