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 @@ #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 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 @@ #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 58f957b613..95cbd358d8 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) {