diff --git a/firmware/export/config/erosqnative.h b/firmware/export/config/erosqnative.h index d542acdee3..cfba1b8ff2 100644 --- a/firmware/export/config/erosqnative.h +++ b/firmware/export/config/erosqnative.h @@ -55,7 +55,6 @@ #define HAVE_LCD_BITMAP #define HAVE_LCD_ENABLE #define HAVE_LCD_SHUTDOWN -#define LCD_X1000_FASTSLEEP //#define LCD_X1000_DMA_WAITFORFRAME #define HAVE_BACKLIGHT diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3k.h index f702ef510f..baf633be70 100644 --- a/firmware/export/config/fiiom3k.h +++ b/firmware/export/config/fiiom3k.h @@ -38,7 +38,6 @@ #define HAVE_LCD_COLOR #define HAVE_LCD_BITMAP #define HAVE_LCD_ENABLE -#define LCD_X1000_FASTSLEEP /* Backlight defines */ #define HAVE_BACKLIGHT diff --git a/firmware/export/config/shanlingq1.h b/firmware/export/config/shanlingq1.h index 2c7ac03273..289f090187 100644 --- a/firmware/export/config/shanlingq1.h +++ b/firmware/export/config/shanlingq1.h @@ -35,7 +35,6 @@ #define HAVE_LCD_COLOR #define HAVE_LCD_BITMAP #define HAVE_LCD_ENABLE -#define LCD_X1000_FASTSLEEP #define LCD_X1000_DMA_WAIT_FOR_FRAME /* Backlight defines */ diff --git a/firmware/target/mips/ingenic_x1000/lcd-x1000.c b/firmware/target/mips/ingenic_x1000/lcd-x1000.c index ff3ab80439..3ac97cd8ee 100644 --- a/firmware/target/mips/ingenic_x1000/lcd-x1000.c +++ b/firmware/target/mips/ingenic_x1000/lcd-x1000.c @@ -65,10 +65,8 @@ static fb_data shadowfb[LCD_HEIGHT*LCD_WIDTH] __attribute__((aligned(64))); /* Signals DMA copy to shadow FB is done */ static volatile int fbcopy_done; -#if defined(HAVE_LCD_SLEEP) || defined(LCD_X1000_FASTSLEEP) /* True if we're in sleep mode */ static bool lcd_sleeping = false; -#endif static bool lcd_on = false; /* Check if running with interrupts disabled (eg: panic screen) */ @@ -464,7 +462,7 @@ void lcd_shutdown(void) } #endif -#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) +#if defined(HAVE_LCD_ENABLE) bool lcd_active(void) { return lcd_on; @@ -481,18 +479,13 @@ void lcd_enable(bool en) #endif /* Deal with sleep mode */ -#if defined(HAVE_LCD_SLEEP) || defined(LCD_X1000_FASTSLEEP) -#if defined(LCD_X1000_FASTSLEEP) if(state && !en) { lcd_tgt_sleep(true); lcd_sleeping = true; - } else -#endif - if(!state && en && lcd_sleeping) { + } else if(!state && en && lcd_sleeping) { lcd_tgt_sleep(false); lcd_sleeping = false; } -#endif /* Handle turning the LCD back on */ if(!state && en) @@ -507,26 +500,6 @@ void lcd_enable(bool en) } #endif -#if defined(HAVE_LCD_SLEEP) -#if defined(LCD_X1000_FASTSLEEP) -# error "Do not define HAVE_LCD_SLEEP if target has LCD_X1000_FASTSLEEP" -#endif - -void lcd_awake(void) -{ - /* Nothing to do */ -} - -void lcd_sleep(void) -{ - if(!lcd_sleeping) { - lcd_enable(false); - lcd_tgt_sleep(true); - lcd_sleeping = true; - } -} -#endif - void lcd_update(void) { if(!lcd_wait_frame())