# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1521012125 0
# Node ID 4d7c2ccb5814ea61faf8087588345995ad6714cf
# Parent  fd1d9063ad409bbd40fffaa6065a03fa92bf5b6d
config mechanism: high-level UI config made separate from target display drivers

diff -r fd1d9063ad40 -r 4d7c2ccb5814 components/bmi
--- a/components/bmi	Tue Mar 13 18:15:14 2018 +0000
+++ b/components/bmi	Wed Mar 14 07:22:05 2018 +0000
@@ -20,14 +20,20 @@
 CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
 CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
 
-if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
-then
-	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
-	then
+case "$UI_CONFIG" in
+	bigcolor)
 		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
-	fi
-	CPPFLAGS="$CPPFLAGS -DLSCREEN"
-fi
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	bigbw)
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	84x48)
+		;;
+	*)
+		echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2
+		exit 1
+esac
 
 CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
 CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
diff -r fd1d9063ad40 -r 4d7c2ccb5814 components/bmi-tcs3
--- a/components/bmi-tcs3	Tue Mar 13 18:15:14 2018 +0000
+++ b/components/bmi-tcs3	Wed Mar 14 07:22:05 2018 +0000
@@ -20,14 +20,20 @@
 CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
 CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
 
-if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
-then
-	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
-	then
+case "$UI_CONFIG" in
+	bigcolor)
 		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
-	fi
-	CPPFLAGS="$CPPFLAGS -DLSCREEN"
-fi
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	bigbw)
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	84x48)
+		;;
+	*)
+		echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2
+		exit 1
+esac
 
 CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
 CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
diff -r fd1d9063ad40 -r 4d7c2ccb5814 components/gdi
--- a/components/gdi	Tue Mar 13 18:15:14 2018 +0000
+++ b/components/gdi	Wed Mar 14 07:22:05 2018 +0000
@@ -42,14 +42,20 @@
 CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
 CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
 
-if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
-then
-	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
-	then
+case "$UI_CONFIG" in
+	bigcolor)
 		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
-	fi
-	CPPFLAGS="$CPPFLAGS -DLSCREEN"
-fi
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	bigbw)
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	84x48)
+		;;
+	*)
+		echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2
+		exit 1
+esac
 
 CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
 CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
diff -r fd1d9063ad40 -r 4d7c2ccb5814 components/icn
--- a/components/icn	Tue Mar 13 18:15:14 2018 +0000
+++ b/components/icn	Wed Mar 14 07:22:05 2018 +0000
@@ -17,14 +17,20 @@
 CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
 CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
 
-if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
-then
-	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
-	then
+case "$UI_CONFIG" in
+	bigcolor)
 		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
-	fi
-	CPPFLAGS="$CPPFLAGS -DLSCREEN"
-fi
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	bigbw)
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	84x48)
+		;;
+	*)
+		echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2
+		exit 1
+esac
 
 CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
 CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
diff -r fd1d9063ad40 -r 4d7c2ccb5814 components/icn-tcs3
--- a/components/icn-tcs3	Tue Mar 13 18:15:14 2018 +0000
+++ b/components/icn-tcs3	Wed Mar 14 07:22:05 2018 +0000
@@ -17,14 +17,20 @@
 CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
 CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
 
-if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
-then
-	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
-	then
+case "$UI_CONFIG" in
+	bigcolor)
 		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
-	fi
-	CPPFLAGS="$CPPFLAGS -DLSCREEN"
-fi
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	bigbw)
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	84x48)
+		;;
+	*)
+		echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2
+		exit 1
+esac
 
 CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
 CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
diff -r fd1d9063ad40 -r 4d7c2ccb5814 components/mfw
--- a/components/mfw	Tue Mar 13 18:15:14 2018 +0000
+++ b/components/mfw	Wed Mar 14 07:22:05 2018 +0000
@@ -52,14 +52,20 @@
 CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
 CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
 
-if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
-then
-	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
-	then
+case "$UI_CONFIG" in
+	bigcolor)
 		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
-	fi
-	CPPFLAGS="$CPPFLAGS -DLSCREEN"
-fi
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	bigbw)
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	84x48)
+		;;
+	*)
+		echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2
+		exit 1
+esac
 
 CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
 CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
diff -r fd1d9063ad40 -r 4d7c2ccb5814 components/mfw-tcs3
--- a/components/mfw-tcs3	Tue Mar 13 18:15:14 2018 +0000
+++ b/components/mfw-tcs3	Wed Mar 14 07:22:05 2018 +0000
@@ -52,14 +52,20 @@
 CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
 CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
 
-if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
-then
-	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
-	then
+case "$UI_CONFIG" in
+	bigcolor)
 		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
-	fi
-	CPPFLAGS="$CPPFLAGS -DLSCREEN"
-fi
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	bigbw)
+		CPPFLAGS="$CPPFLAGS -DLSCREEN"
+		;;
+	84x48)
+		;;
+	*)
+		echo "Error: UI_CONFIG=$UI_CONFIG setting not understood" 1>&2
+		exit 1
+esac
 
 CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
 CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
diff -r fd1d9063ad40 -r 4d7c2ccb5814 configure.sh
--- a/configure.sh	Tue Mar 13 18:15:14 2018 +0000
+++ b/configure.sh	Wed Mar 14 07:22:05 2018 +0000
@@ -86,9 +86,21 @@
 		exit 1
 esac
 
-# configurable feature settings
+# UI config default based on target
+
+if [ "$TARGET" = c139 -o "$TARGET" = c11x ]
+then
+	UI_CONFIG=84x48
+else
+	UI_CONFIG=bigcolor
+fi
+
+# display driver configuration
 
 DSAMPLE_FULL_COLOR=1
+
+# miscellaneous configurable feature settings
+
 SERIAL_DYNAMIC_SWITCH=0
 
 # allow the user to override these defaults
@@ -193,7 +205,7 @@
 export AMR L1_DYN_DSP_DWNLD L1_VOICE_MEMO_AMR MELODY_E2 SPEECH_RECO
 export DISABLE_SLEEP
 export INIT_blob
-export DSAMPLE_FULL_COLOR
+export DSAMPLE_FULL_COLOR UI_CONFIG
 export SERIAL_DYNAMIC_SWITCH
 
 SUBDIR=