FreeCalypso > hg > fc-magnetite

changeset 423:627d8ab425df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
starting to compile TCS3 version of BMI, drowning in errors
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 21 Jan 2018 03:59:57 +0000
parents 5fbcfd465de0
children 8587eb7bd2d5
files components/bmi-tcs3 src/ui3/bmi/mmiBlkLangDB.c src/ui3/bmi/mmiCall.c
diffstat 3 files changed, 177 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bmi-tcs3	Sun Jan 21 03:59:57 2018 +0000
@@ -0,0 +1,175 @@
+# Building bmi.lib from TCS3/LoCosto source
+
+CFLAGS="-me -mt -o -pw2 -x -mw"
+CPPFLAGS=
+
+make_version bmi
+cfile_plain bmi_version.c
+
+# Defines
+
+CPPFLAGS=-DMMI_HOMEZONE_ENABLED
+CPPFLAGS="$CPPFLAGS -DFF_MMI_SAT_ICON"
+CPPFLAGS="$CPPFLAGS -DFF_MMI_SMS_DYNAMIC"
+
+if [ "$GPRS" = 1 ]
+then
+	CPPFLAGS="$CPPFLAGS -DMMI_GPRS_ENABLED"
+fi
+
+CPPFLAGS="$CPPFLAGS -DMMI_EM_ENABLED"
+CPPFLAGS="$CPPFLAGS -DNO_ASCIIZ"
+
+if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
+then
+	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	CPPFLAGS="$CPPFLAGS -DLSCREEN"
+fi
+
+CPPFLAGS="$CPPFLAGS -DINT_PHONEBOOK"
+CPPFLAGS="$CPPFLAGS -DNEW_EDITOR"
+CPPFLAGS="$CPPFLAGS -DTRGT_G23"
+CPPFLAGS="$CPPFLAGS -DAUS_CONDAT_TYPE_PORTING"
+CPPFLAGS="$CPPFLAGS -DCCDTABLES_EXTERN"
+CPPFLAGS="$CPPFLAGS -DOPTION_MULTITHREAD"
+CPPFLAGS="$CPPFLAGS -DNEW_FRAME"
+CPPFLAGS="$CPPFLAGS -DNEW_ENTITY"
+CPPFLAGS="$CPPFLAGS -D_TARGET_"
+CPPFLAGS="$CPPFLAGS -DSHARED_VSI"
+CPPFLAGS="$CPPFLAGS -DALR"
+CPPFLAGS="$CPPFLAGS -DFF_HOMEZONE"
+CPPFLAGS="$CPPFLAGS -DFF_MMI_SAT_ICON"
+CPPFLAGS="$CPPFLAGS -DFF_MMI_SMS_DYNAMIC"
+CPPFLAGS="$CPPFLAGS -DFF_CPHS"
+CPPFLAGS="$CPPFLAGS -D_TMS470"
+CPPFLAGS="$CPPFLAGS -DUART"
+CPPFLAGS="$CPPFLAGS -DFF_ATI"
+CPPFLAGS="$CPPFLAGS -DPHONEBOOK_EXTENSION"
+
+if [ "$GPRS" = 1 ]
+then
+	CPPFLAGS="$CPPFLAGS -DGPRS"
+fi
+
+CPPFLAGS="$CPPFLAGS -DFF_EM_MODE"
+CPPFLAGS="$CPPFLAGS -DMMI=2"
+CPPFLAGS="$CPPFLAGS -DMFW"
+CPPFLAGS="$CPPFLAGS -DAT_INTERPRETER"
+CPPFLAGS="$CPPFLAGS -DUSE_L1FD_FUNC_INTERFACE"
+
+if [ "$SRVC" != 0 ]
+then
+	CPPFLAGS="$CPPFLAGS -DFAX_AND_DATA"
+	if [ "$SRVC" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DFF_FAX"
+	fi
+	CPPFLAGS="$CPPFLAGS -DUSE_L2FD_FUNC_INTERFACE"
+fi
+
+CPPFLAGS="$CPPFLAGS -DSRVC=$SRVC"
+CPPFLAGS="$CPPFLAGS -DNWARN"
+CPPFLAGS="$CPPFLAGS -DSIM_TOOLKIT"
+
+# Includes
+
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
+CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
+CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui3/bmi"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui3/mfw"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/ksd"
+CPPFLAGS="$CPPFLAGS -I$SRC/ui3/atb"
+CPPFLAGS="$CPPFLAGS -I.."
+CPPFLAGS="$CPPFLAGS -I../config"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_app"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/abb"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/armio"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/clkm"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/conf"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/dma"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/dsp_dwnld"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/inth"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/memif"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/rhea"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/security"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/spi"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/timer"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/uart"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/drivers/drv_core/ulpd"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/system"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/layer1/include"
+CPPFLAGS="$CPPFLAGS -I$SRC/cs/services"
+
+# Source modules
+
+SRCDIR=$SRC/ui3/bmi
+
+cfile_str2ind $SRCDIR/mmiCall.c
+cfile_str2ind $SRCDIR/mmiResources.c
+cfile_str2ind $SRCDIR/mmiBlkLangDB.c
+cfile_str2ind $SRCDIR/mmiBlkManager.c
+cfile_str2ind $SRCDIR/mmiBlkResources.c
+cfile_str2ind $SRCDIR/mmiBookCallDetailsWindow.c
+cfile_str2ind $SRCDIR/mmiBookCallListWindow.c
+cfile_str2ind $SRCDIR/mmiBookController.c
+cfile_str2ind $SRCDIR/mmiBookDetailsWindow.c
+cfile_str2ind $SRCDIR/mmiBookMenuWindow.c
+cfile_str2ind $SRCDIR/mmiBookPhonebook.c
+cfile_str2ind $SRCDIR/mmiBookSDNWindow.c
+cfile_str2ind $SRCDIR/mmiBookSearchWindow.c
+cfile_str2ind $SRCDIR/mmiBookServices.c
+cfile_str2ind $SRCDIR/mmiBookShared.c
+cfile_str2ind $SRCDIR/mmiBookUtils.c
+cfile_str2ind $SRCDIR/mmiDialogs.c
+cfile_str2ind $SRCDIR/mmiDummy.c
+cfile_str2ind $SRCDIR/mmiIcons.c
+cfile_str2ind $SRCDIR/mmiIdle.c
+cfile_str2ind $SRCDIR/mmiLists.c
+cfile_str2ind $SRCDIR/mmiMain.c
+cfile_str2ind $SRCDIR/mmiMenu.c
+cfile_str2ind $SRCDIR/mmiMmi.c
+cfile_str2ind $SRCDIR/mmiNetwork.c
+cfile_str2ind $SRCDIR/mmiPins.c
+cfile_str2ind $SRCDIR/mmiServices.c
+cfile_str2ind $SRCDIR/mmiSettings.c
+cfile_str2ind $SRCDIR/mmiSmsBroadcast.c
+cfile_str2ind $SRCDIR/mmiSounds.c
+cfile_str2ind $SRCDIR/mmiSmsIdle.c
+cfile_str2ind $SRCDIR/mmiSmsMenu.c
+cfile_str2ind $SRCDIR/mmiSmsSend.c
+cfile_str2ind $SRCDIR/mmiSmsRead.c
+cfile_str2ind $SRCDIR/mmiSoftKeys.c
+cfile_str2ind $SRCDIR/mmiStart.c
+cfile_str2ind $SRCDIR/mmiTimeDate.c
+cfile_str2ind $SRCDIR/mmiUserData.c
+cfile_str2ind $SRCDIR/mmiSatCall.c
+cfile_str2ind $SRCDIR/mmiSatInfo.c
+cfile_str2ind $SRCDIR/mmiSatInput.c
+cfile_str2ind $SRCDIR/mmiSatMenu.c
+cfile_str2ind $SRCDIR/mmiSimToolkit.c
+cfile_str2ind $SRCDIR/mmiVoiceMemo.c
+cfile_str2ind $SRCDIR/mmiCalculatorMain.c
+cfile_str2ind $SRCDIR/mmiMelody_data.c
+cfile_str2ind $SRCDIR/mmiTimers.c
+cfile_str2ind $SRCDIR/mmiAoc.c
+cfile_str2ind $SRCDIR/mmiCPHS.c
+cfile_str2ind $SRCDIR/mmiBand.c
+cfile_str2ind $SRCDIR/mmiSatClassE.c
+
+if [ "$GPRS" = 1 ]
+then
+	cfile_str2ind $SRCDIR/mmiGprs.c
+fi
+
+cfile_str2ind $SRCDIR/mmiHomezone.c
+cfile_str2ind $SRCDIR/AUICalcEditor.c
+cfile_str2ind $SRCDIR/AUIEditor.c
+cfile_str2ind $SRCDIR/AUIPinEditor.c
+cfile_str2ind $SRCDIR/AUISymbol.c
+cfile_str2ind $SRCDIR/AUITextEntry.c
+cfile_str2ind $SRCDIR/mmiEm.c
--- a/src/ui3/bmi/mmiBlkLangDB.c	Sun Jan 21 03:36:15 2018 +0000
+++ b/src/ui3/bmi/mmiBlkLangDB.c	Sun Jan 21 03:59:57 2018 +0000
@@ -2330,7 +2330,7 @@
     { TxtBackground,	"Hintergrund"},	/* for selecting backgrounds*/
     { TxtProviderIcon,	"Netzwerk Icon"}, /*AP - 29-01-03 - Add to language table */    
     { TxtIdleScreen,	"Untaetiges Display Bild"},	
-	{ TxtMenuScreen,	"Haupt Men? /*SPR#2633 - DS - German string removed: "Main menu screen"*/ },	
+	{ TxtMenuScreen,	"Haupt Menü" /*SPR#2633 - DS - German string removed: "Main menu screen"*/ },	
 
 	{ TxtBgdSquares,	"Rechtecke"},
 	{ TxtBgdO2,			"O2"},
@@ -2833,7 +2833,7 @@
 #endif	
 	//Aug 22, 2005    REF: ENH 31154 xdeepadh
 	
-#ifdef (FF_MMI_FILE_VIEWER)
+#ifdef FF_MMI_FILE_VIEWER
 	{ TxtFileNotLoaded,"No Files loaded"},
 	{ TxtFileViewer, "FileViewer"}, 
 	{ TxtRename, "Rename"}, 
--- a/src/ui3/bmi/mmiCall.c	Sun Jan 21 03:36:15 2018 +0000
+++ b/src/ui3/bmi/mmiCall.c	Sun Jan 21 03:59:57 2018 +0000
@@ -1210,13 +1210,6 @@
 int callCmEvent(MfwEvt e, void *para)
 {
 
-/* a0393213 (WR - "currentRinger" was set but never used) */
-#ifndef FF_MIDI_RINGER 
-#ifndef FF_MMI_RINGTONE
-  UBYTE currentRinger;
-#endif
-#endif
-
   int i;
   SHORT       *cid;
   T_MFW_CM_DISCONNECT *dc;