FreeCalypso > hg > fc-tourmaline

changeset 4:927e8b825ed1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove hard C-Sample emulation for C139
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 16 Oct 2020 06:42:08 +0000
parents 67bfe9f274f6
children 3bb135e72ac9
files src/condat/com/src/driver/display.c src/cs/drivers/drv_app/r2d/r2d_config.h src/cs/drivers/drv_app/r2d/r2d_pool_size.h
diffstat 3 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/condat/com/src/driver/display.c	Fri Oct 16 06:33:10 2020 +0000
+++ b/src/condat/com/src/driver/display.c	Fri Oct 16 06:42:08 2020 +0000
@@ -152,8 +152,7 @@
 *************************************************************************/
 #if (defined(_TARGET_))
 //#if (BOARD==33)
-/* C139: force C-Sample configuration */
-#if ((BOARD == 8) || (BOARD == 9) || defined(CONFIG_TARGET_C139))
+#if ((BOARD == 8) || (BOARD == 9))
 #define CSAMPLE
 #define CSAMPLE_NEWSTYLE
 #elif ((BOARD == 40) || (BOARD == 41))
--- a/src/cs/drivers/drv_app/r2d/r2d_config.h	Fri Oct 16 06:33:10 2020 +0000
+++ b/src/cs/drivers/drv_app/r2d/r2d_config.h	Fri Oct 16 06:42:08 2020 +0000
@@ -85,8 +85,7 @@
     #define R2D_REFRESH_PERIOD 40 // ms
     #define R2D_EMBEDDED_LCD R2D_BOARD_COLOR_LCD 
 #else
-    #if ((BOARD == 7) || (BOARD == 8) || (BOARD == 9) || \
-		defined(CONFIG_TARGET_C139))
+    #if ((BOARD == 7) || (BOARD == 8) || (BOARD == 9))
 	// C-Sample is equipped with Mirrored LCD
 	#define R2D_REFRESH_PERIOD 40 // ms
 	#define R2D_EMBEDDED_LCD R2D_MIRRORED_LCD 
--- a/src/cs/drivers/drv_app/r2d/r2d_pool_size.h	Fri Oct 16 06:33:10 2020 +0000
+++ b/src/cs/drivers/drv_app/r2d/r2d_pool_size.h	Fri Oct 16 06:42:08 2020 +0000
@@ -43,8 +43,7 @@
    #else
       #define R2D_MB1_SIZE   (3000)
    #endif
-#elif ((BOARD == 7) || (BOARD == 8) || (BOARD == 9) || \
-	defined(CONFIG_TARGET_C139))
+#elif ((BOARD == 7) || (BOARD == 8) || (BOARD == 9))
 /* #if ((R2D_EMBEDDED_LCD == R2D_MIRRORED_LCD) || (R2D_EMBEDDED_LCD == R2D_SIMPLE_LCD)) */
   #define R2D_MB1_SIZE   (2000) /* B or C-Sample with B&W LCD (default setting) */
 /* #elif (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD) */