# HG changeset patch # User Mychaela Falconia # Date 1539449782 0 # Node ID fdecfb3bd860ca118b99cb0fe123801b8cb0438b # Parent 97297555c71a05e56dafb4d5f1642603624c7401 .../drv_app/r2d/r2d_*.c: LCD include case fixes from Magnetite R2D is not used in Selenite, but we strive to keep the two source trees in sync as much as possible to reduce the diffs. diff -r 97297555c71a -r fdecfb3bd860 src/cs/drivers/drv_app/r2d/r2d_fonts.c --- a/src/cs/drivers/drv_app/r2d/r2d_fonts.c Sat Oct 13 16:32:07 2018 +0000 +++ b/src/cs/drivers/drv_app/r2d/r2d_fonts.c Sat Oct 13 16:56:22 2018 +0000 @@ -137,43 +137,42 @@ #endif #if (R2D_EMBEDDED_LCD == R2D_SIMPLE_LCD) -#include "lcds/simple/r2d_font_init_i.c" +#include "lcds/Simple/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_COLOR_LCD) -#include "lcds/colorpc/r2d_font_init_i.c" +#include "lcds/ColorPC/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_CSAMPLE) -#include "lcds/pc_csample/r2d_font_init_i.c" +#include "lcds/PC_CSAMPLE/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_DSAMPLE) -#include "lcds/pc_dsample/r2d_font_init_i.c" +#include "lcds/PC_DSAMPLE/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_MIRRORED_LCD) -#include "lcds/mirrored/r2d_font_init_i.c" +#include "lcds/Mirrored/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_CUSTOMER_LCD) -#include "lcds/customer/r2d_font_init_i.c" - +#include "lcds/Customer/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_HORIZONTAL_LCD) -#include "lcds/horizontal/r2d_font_init_i.c" +#include "lcds/Horizontal/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD) -#include "lcds/colorboard/r2d_font_init_i.c" +#include "lcds/ColorBoard/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE) -#include "lcds/d_sample/r2d_font_init_i.c" +#include "lcds/D_Sample/r2d_font_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE) -#include "lcds/bw_d_sample/r2d_font_init_i.c" +#include "lcds/BW_D_Sample/r2d_font_init_i.c" #endif diff -r 97297555c71a -r fdecfb3bd860 src/cs/drivers/drv_app/r2d/r2d_inits.c --- a/src/cs/drivers/drv_app/r2d/r2d_inits.c Sat Oct 13 16:32:07 2018 +0000 +++ b/src/cs/drivers/drv_app/r2d/r2d_inits.c Sat Oct 13 16:56:22 2018 +0000 @@ -89,47 +89,47 @@ #if (R2D_EMBEDDED_LCD == R2D_PC_COLOR_LCD) -#include "r2d/lcds/colorpc/r2d_task_init_i.c" +#include "r2d/lcds/ColorPC/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_CSAMPLE) -#include "r2d/lcds/pc_csample/r2d_task_init_i.c" +#include "r2d/lcds/PC_CSAMPLE/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_DSAMPLE) -#include "r2d/lcds/pc_dsample/r2d_task_init_i.c" +#include "r2d/lcds/PC_DSAMPLE/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_MIRRORED_LCD) #ifdef CONFIG_TARGET_C139 #include "r2d/lcds/c139/r2d_task_init_i.c" #else - #include "r2d/lcds/simple/r2d_task_init_i.c" + #include "r2d/lcds/Simple/r2d_task_init_i.c" #endif #endif #if (R2D_EMBEDDED_LCD == R2D_CUSTOMER_LCD) -#include "r2d/lcds/customer/r2d_task_init_i.c" +#include "r2d/lcds/Customer/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_HORIZONTAL_LCD) -#include "r2d/lcds/horizontal/r2d_task_init_i.c" +#include "r2d/lcds/Horizontal/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_SIMPLE_LCD) -#include "r2d/lcds/simple/r2d_task_init_i.c" +#include "r2d/lcds/Simple/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD) -#include "r2d/lcds/colorboard/r2d_task_init_i.c" +#include "r2d/lcds/ColorBoard/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE) -#include "r2d/lcds/d_sample/r2d_task_init_i.c" +#include "r2d/lcds/D_Sample/r2d_task_init_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE) -#include "r2d/lcds/bw_d_sample/r2d_task_init_i.c" +#include "r2d/lcds/BW_D_Sample/r2d_task_init_i.c" #endif UINT32 r2d_get_memory_bank_size() diff -r 97297555c71a -r fdecfb3bd860 src/cs/drivers/drv_app/r2d/r2d_lcds.c --- a/src/cs/drivers/drv_app/r2d/r2d_lcds.c Sat Oct 13 16:32:07 2018 +0000 +++ b/src/cs/drivers/drv_app/r2d/r2d_lcds.c Sat Oct 13 16:56:22 2018 +0000 @@ -44,42 +44,41 @@ // Include LCD dependent C code // #if (R2D_EMBEDDED_LCD == R2D_SIMPLE_LCD) - #include "lcds/simple/R2D_simple_lcd_i.c" + #include "lcds/Simple/R2D_simple_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_COLOR_LCD) - #include "lcds/colorpc/R2D_pc_color_lcd_i.c" + #include "lcds/ColorPC/R2D_pc_color_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_CSAMPLE) -#include "lcds/pc_csample/R2D_pc_csample_lcd_i.c" + #include "lcds/PC_CSAMPLE/R2D_pc_csample_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_DSAMPLE) -#include "lcds/pc_dsample/R2D_pc_dsample_lcd_i.c" + #include "lcds/PC_DSAMPLE/R2D_pc_dsample_lcd_i.c" #endif - #if (R2D_EMBEDDED_LCD == R2D_MIRRORED_LCD) - #include "lcds/simple/R2D_simple_lcd_i.c" + #include "lcds/Simple/R2D_simple_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_CUSTOMER_LCD) - #include "lcds/customer/R2D_customer_lcd_i.c" + #include "lcds/Customer/R2D_customer_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_HORIZONTAL_LCD) - #include "lcds/horizontal/R2D_horizontal_lcd_i.c" + #include "lcds/Horizontal/R2D_horizontal_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD) - #include "lcds/colorboard/R2D_board_color_lcd_i.c" + #include "lcds/ColorBoard/R2D_board_color_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE) -#include "lcds/d_sample/R2D_board_dsample_lcd_i.c" + #include "lcds/D_Sample/R2D_board_dsample_lcd_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE) -#include "lcds/bw_d_sample/R2D_board_bw_dsample_lcd_i.c" -#endif \ No newline at end of file + #include "lcds/BW_D_Sample/R2D_board_bw_dsample_lcd_i.c" +#endif diff -r 97297555c71a -r fdecfb3bd860 src/cs/drivers/drv_app/r2d/r2d_refresh.c --- a/src/cs/drivers/drv_app/r2d/r2d_refresh.c Sat Oct 13 16:32:07 2018 +0000 +++ b/src/cs/drivers/drv_app/r2d/r2d_refresh.c Sat Oct 13 16:56:22 2018 +0000 @@ -66,46 +66,46 @@ } #if (R2D_EMBEDDED_LCD == R2D_PC_COLOR_LCD) -#include "lcds/colorpc/r2d_task_i.c" +#include "lcds/ColorPC/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_CSAMPLE) -#include "lcds/pc_csample/r2d_task_i.c" +#include "lcds/PC_CSAMPLE/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_PC_DSAMPLE) -#include "lcds/pc_dsample/r2d_task_i.c" +#include "lcds/PC_DSAMPLE/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_SIMPLE_LCD) -#include "lcds/simple/r2d_task_i.c" +#include "lcds/Simple/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_MIRRORED_LCD) #ifdef CONFIG_TARGET_C139 #include "lcds/c139/r2d_task_i.c" #else - #include "lcds/simple/r2d_task_i.c" + #include "lcds/Simple/r2d_task_i.c" #endif #endif #if (R2D_EMBEDDED_LCD == R2D_CUSTOMER_LCD) -#include "lcds/customer/r2d_task_i.c" +#include "lcds/Customer/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_HORIZONTAL_LCD) -#include "lcds/horizontal/r2d_task_i.c" +#include "lcds/Horizontal/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD) -#include "lcds/colorboard/r2d_task_i.c" +#include "lcds/ColorBoard/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE) -#include "lcds/d_sample/r2d_task_i.c" +#include "lcds/D_Sample/r2d_task_i.c" #endif #if (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE) -#include "lcds/bw_d_sample/r2d_task_i.c" +#include "lcds/BW_D_Sample/r2d_task_i.c" #endif