FreeCalypso > hg > fc-tourmaline

changeset 44:1821e301a65b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
R2D: new Tourmaline driver selection
author Mychaela Falconia <falcon@freecalypso.org>
date Sat, 17 Oct 2020 19:45:18 +0000
parents 01a8b04242af
children c905daaff834
files src/cs/drivers/drv_app/r2d/r2d_inits.c src/cs/drivers/drv_app/r2d/r2d_refresh.c
diffstat 2 files changed, 12 insertions(+), 99 deletions(-) [+]
line wrap: on
line diff
--- a/src/cs/drivers/drv_app/r2d/r2d_inits.c	Sat Oct 17 10:04:54 2020 +0000
+++ b/src/cs/drivers/drv_app/r2d/r2d_inits.c	Sat Oct 17 19:45:18 2020 +0000
@@ -88,56 +88,12 @@
 extern T_R2D_FONT_DESCRIPTION *r2d_g_font_configuration;
 
 
-#if (R2D_EMBEDDED_LCD == R2D_PC_COLOR_LCD)
-#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"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_PC_DSAMPLE)
-#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"
-  #endif
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_CUSTOMER_LCD)
-#include "r2d/lcds/Customer/r2d_task_init_i.c"
-#endif
+/* FreeCalypso Tourmaline: totally new approach */
 
-#if (R2D_EMBEDDED_LCD == R2D_HORIZONTAL_LCD)
-#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"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD)
-#include "r2d/lcds/ColorBoard/r2d_task_init_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE)
-  #ifdef CONFIG_TARGET_LUNA
-    #include "r2d/lcds/luna/r2d_task_init_i.c"
-  #else
-    #include "r2d/lcds/D_Sample/r2d_task_init_i.c"
-  #endif
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE)
-  #ifdef CONFIG_TARGET_LUNA
-    #include "r2d/lcds/luna/r2d_task_init_i.c"
-  #else
-    #include "r2d/lcds/BW_D_Sample/r2d_task_init_i.c"
-  #endif
+#ifdef CONFIG_TARGET_LUNA
+  #include "r2d/lcds/luna/r2d_task_init_i.c"
+#else
+  #error "R2D hw init selection: unsupported target"
 #endif
 
 UINT32 r2d_get_memory_bank_size()
--- a/src/cs/drivers/drv_app/r2d/r2d_refresh.c	Sat Oct 17 10:04:54 2020 +0000
+++ b/src/cs/drivers/drv_app/r2d/r2d_refresh.c	Sat Oct 17 19:45:18 2020 +0000
@@ -65,55 +65,12 @@
 	rvf_unlock_mutex(r2d_g_global_mutex);
 }
 
-#if (R2D_EMBEDDED_LCD == R2D_PC_COLOR_LCD)
-#include "lcds/ColorPC/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_PC_CSAMPLE)
-#include "lcds/PC_CSAMPLE/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_PC_DSAMPLE)
-#include "lcds/PC_DSAMPLE/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_SIMPLE_LCD) 
-#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"
-  #endif
-#endif
+/* FreeCalypso Tourmaline: totally new approach */
 
-#if (R2D_EMBEDDED_LCD == R2D_CUSTOMER_LCD) 
-#include "lcds/Customer/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_HORIZONTAL_LCD) 
-#include "lcds/Horizontal/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD) 
-#include "lcds/ColorBoard/r2d_task_i.c"
+#if defined(CONFIG_TARGET_LUNA) && (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE)
+  #include "lcds/luna/r2d_task_i.c"
+#elif defined(CONFIG_TARGET_LUNA) && (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE)
+  #include "lcds/luna/r2d_task_i_bw.c"
+#else
+  #error "R2D refresh selection: unsupported combination"
 #endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE)
-  #ifdef CONFIG_TARGET_LUNA
-    #include "lcds/luna/r2d_task_i.c"
-  #else
-    #include "lcds/D_Sample/r2d_task_i.c"
-  #endif
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE)
-  #ifdef CONFIG_TARGET_LUNA
-    #include "lcds/luna/r2d_task_i_bw.c"
-  #else
-    #include "lcds/BW_D_Sample/r2d_task_i.c"
-  #endif
-#endif
-