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.tar.gz rockbox-b0eb3c7eb2dc4d99e171fff010e1849cbe8fadac.zip |
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 602f9de611..c5d9d51cf2 100644 --- a/firmware/target/arm/rk27xx/debug-rk27xx.c +++ b/firmware/target/arm/rk27xx/debug-rk27xx.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "adc.h" | 28 | #include "adc.h" |
29 | #include "font.h" | 29 | #include "font.h" |
30 | #include "storage.h" | 30 | #include "storage.h" |
31 | #include "lcd-target.h" | ||
31 | 32 | ||
32 | #ifdef RK27_GENERIC | 33 | #ifdef RK27_GENERIC |
33 | #define DEBUG_CANCEL BUTTON_VOL | 34 | #define DEBUG_CANCEL BUTTON_VOL |
@@ -42,6 +43,7 @@ | |||
42 | 43 | ||
43 | extern unsigned long sd_debug_time_rd; | 44 | extern unsigned long sd_debug_time_rd; |
44 | extern unsigned long sd_debug_time_wr; | 45 | extern unsigned long sd_debug_time_wr; |
46 | extern enum lcd_type_t lcd_type; | ||
45 | 47 | ||
46 | bool dbg_hw_info(void) | 48 | bool dbg_hw_info(void) |
47 | { | 49 | { |
@@ -62,6 +64,10 @@ bool dbg_hw_info(void) | |||
62 | _DEBUG_PRINTF("SCU_DIVCON1: 0x%0x", SCU_DIVCON1); | 64 | _DEBUG_PRINTF("SCU_DIVCON1: 0x%0x", SCU_DIVCON1); |
63 | _DEBUG_PRINTF("SCU_CLKCFG: 0x%0x", SCU_CLKCFG); | 65 | _DEBUG_PRINTF("SCU_CLKCFG: 0x%0x", SCU_CLKCFG); |
64 | _DEBUG_PRINTF("SCU_CHIPCFG: 0x%0x", SCU_CHIPCFG); | 66 | _DEBUG_PRINTF("SCU_CHIPCFG: 0x%0x", SCU_CHIPCFG); |
67 | |||
68 | #ifdef HM60X | ||
69 | _DEBUG_PRINTF("LCD type: %s", lcd_type == LCD_V1 ? "V1 (HX8340b)": "V2"); | ||
70 | #endif | ||
65 | line++; | 71 | line++; |
66 | _DEBUG_PRINTF("sd_debug_time_rd: %d", sd_debug_time_rd); | 72 | _DEBUG_PRINTF("sd_debug_time_rd: %d", sd_debug_time_rd); |
67 | _DEBUG_PRINTF("sd_debug_time_wr: %d", sd_debug_time_wr); | 73 | _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 7c2f194e4c..801db891b4 100644 --- a/firmware/target/arm/rk27xx/hm60x/lcd-target.h +++ b/firmware/target/arm/rk27xx/hm60x/lcd-target.h | |||
@@ -23,5 +23,10 @@ | |||
23 | #define LCD_TARGET_H | 23 | #define LCD_TARGET_H |
24 | 24 | ||
25 | #define LCD_DATABUS_WIDTH LCDIF_16BIT | 25 | #define LCD_DATABUS_WIDTH LCDIF_16BIT |
26 | enum lcd_type_t | ||
27 | { | ||
28 | LCD_V1, | ||
29 | LCD_v2 | ||
30 | }; | ||
26 | 31 | ||
27 | #endif | 32 | #endif |
diff --git a/firmware/target/arm/rk27xx/lcd-hifiman.c b/firmware/target/arm/rk27xx/lcd-hifiman.c index 58f957b613..95cbd358d8 100644 --- a/firmware/target/arm/rk27xx/lcd-hifiman.c +++ b/firmware/target/arm/rk27xx/lcd-hifiman.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "system.h" | 27 | #include "system.h" |
28 | #include "cpu.h" | 28 | #include "cpu.h" |
29 | #include "lcdif-rk27xx.h" | 29 | #include "lcdif-rk27xx.h" |
30 | #include "lcd-target.h" | ||
30 | 31 | ||
31 | static bool display_on = false; | 32 | static bool display_on = false; |
32 | 33 | ||
@@ -187,11 +188,7 @@ static void lcd_v1_update_rect(int x, int y, int width, int height) | |||
187 | 188 | ||
188 | #ifdef HM60X | 189 | #ifdef HM60X |
189 | 190 | ||
190 | enum lcd_type_t | 191 | enum lcd_type_t lcd_type; |
191 | { | ||
192 | LCD_V1, | ||
193 | LCD_v2 | ||
194 | } lcd_type; | ||
195 | 192 | ||
196 | static void identify_lcd(void) | 193 | static void identify_lcd(void) |
197 | { | 194 | { |