1 files changed, 53 insertions, 21 deletions
diff --git a/gammu/emb/common/gsmstate.c b/gammu/emb/common/gsmstate.c
index b8f5f89..31e365d 100644
--- a/gammu/emb/common/gsmstate.c
+++ b/gammu/emb/common/gsmstate.c
@@ -188,2 +188,5 @@ GSM_Error GSM_RegisterAllPhoneModules(GSM_StateMachine *s)
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+        GSM_RegisterModule(s,&N650Phone);
+#endif
 #ifdef GSM_ENABLE_NOKIA6110
@@ -212,3 +215,2 @@ GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum)
                int     i;
-                char    Buffer[80];
@@ -252,14 +254,12 @@ GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum)
                        s->di.dl == DL_TEXTALLDATE || s->di.dl == DL_TEXTDATE || s->di.dl == DL_TEXTERRORDATE) {
-                        smprintf(s,"[Gammu            - version %s built %s %s]\n",VERSION,__TIME__,__DATE__);
+                        smprintf(s,"[Gammu            - %s built %s %s",VERSION,__TIME__,__DATE__);
-                        smprintf(s,"[Connection       - \"%s\"]\n",s->CurrentConfig->Connection);
+                        if (strlen(GetCompiler()) != 0) {
+                                smprintf(s," in %s",GetCompiler());
+                        }
+                        smprintf(s,"]\n[Connection       - \"%s\"]\n",s->CurrentConfig->Connection);
                        smprintf(s,"[Model type       - \"%s\"]\n",s->CurrentConfig->Model);
                        smprintf(s,"[Device           - \"%s\"]\n",s->CurrentConfig->Device);
+                        if (strlen(GetOS()) != 0) {
-                        Buffer[0] = 0;
+                                smprintf(s,"[Run on           - %s]\n",GetOS());
-                        if (strlen(GetOS()) != 0) sprintf(Buffer,"%s",GetOS());
-                        if (strlen(GetCompiler()) != 0) {
-                                if (Buffer[0] != 0) strcat(Buffer+strlen(Buffer),", ");
-                                strcat(Buffer+strlen(Buffer),GetCompiler());
                        }
-                        if (Buffer[0] != 0) smprintf(s,"[OS/compiler      - %s]\n",Buffer);
                }
@@ -556,2 +556,3 @@ static GSM_Error CheckReplyFunctions(GSM_StateMachine *s, GSM_Reply_Function *Re
                int                             i  = 0;
+        //int j;
@@ -570,4 +571,14 @@ static GSM_Error CheckReplyFunctions(GSM_StateMachine *s, GSM_Reply_Function *Re
                } else {
-                        if (strncmp(Reply[i].msgtype,msg->Buffer,strlen(Reply[i].msgtype))==0) {
+        //              printf("msg length %i %i\n",strlen(Reply[i].msgtype),msg->Length);
-                                execute=true;
+                        if ((int)strlen(Reply[i].msgtype)<msg->Length) {
+        //                      printf("Comparing \"%s\" and \"",Reply[i].msgtype);
+        //                      for (j=0;j<strlen(Reply[i].msgtype);j++) {
+        //                              if (msg->Buffer[j]!=13 && msg->Buffer[j]!=10) {
+        //                                      printf("%c",msg->Buffer[j]);
+        //                              }
+        //                      }
+        //                      printf("\"\n");
+                                if (strncmp(Reply[i].msgtype,msg->Buffer,strlen(Reply[i].msgtype))==0) {
+                                        execute=true;
+                                }
                        }
@@ -847,4 +858,7 @@ bool GSM_ReadConfig(INI_Section *cfg_info, GSM_Config *cfg, int num)
 static OnePhoneModel allmodels[] = {
+#ifdef GSM_ENABLE_NOKIA650
+        {"0650" ,"THF-12","",           {0}},
+#endif
 #ifdef GSM_ENABLE_NOKIA6510
-                {"1100", "RH-18" ,"",   {0}},
+                {"1100" ,"RH-18" ,"",   {0}},
                {"1100a","RH-38" ,"",   {0}},
@@ -856,7 +870,7 @@ static OnePhoneModel allmodels[] = {
 #ifdef GSM_ENABLE_NOKIA6510
-        {"3100" ,"RH-19" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},
+        {"3100" ,"RH-19" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme
-        {"3100b","RH-50" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},
+        {"3100b","RH-50" ,"",           {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme
                {"3108", "RH-6",  "Nokia 3108",{0}}, //does it have irda ?
-                {"3200", "RH-30" ,"Nokia 3200",{F_PBKTONEGAL,0}},
+                {"3200", "RH-30" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme
-                {"3200a","RH-31" ,"Nokia 3200",{F_PBKTONEGAL,0}},
+                {"3200a","RH-31" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme
 #endif
@@ -867,4 +881,4 @@ static OnePhoneModel allmodels[] = {
 #ifdef GSM_ENABLE_NOKIA6510
-        {"3300" ,"NEM-1" ,"Nokia 3300", {F_PBKTONEGAL,0}},
+        {"3300" ,"NEM-1" ,"Nokia 3300", {F_PBKTONEGAL,0}},//fixme
-        {"3300" ,"NEM-2" ,"Nokia 3300", {F_PBKTONEGAL,0}},
+        {"3300" ,"NEM-2" ,"Nokia 3300", {F_PBKTONEGAL,0}},//fixme
 #endif
@@ -900,2 +914,4 @@ static OnePhoneModel allmodels[] = {
        {"5100" ,"NPM-6X","Nokia 5100", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
+        {"5140" ,"NPL-4" ,"Nokia 5140", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKUSER,F_WAPMMSPROXY,0}},
+        {"5140" ,"NPL-5" ,"Nokia 5140", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKUSER,F_WAPMMSPROXY,0}},
 #endif
@@ -924,3 +940,3 @@ static OnePhoneModel allmodels[] = {
        {"6200" ,"NPL-3" ,"Nokia 6200", {F_PBKTONEGAL,0}},
-        {"6220" ,"RH-20" ,"Nokia 6220", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,0}},
+        {"6220" ,"RH-20" ,"Nokia 6220", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,F_NOTES,0}},
 #endif
@@ -931,3 +947,3 @@ static OnePhoneModel allmodels[] = {
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
-        {"6230" ,"RH-12" ,"Nokia 6230", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,0}},
+        {"6230" ,"RH-12" ,"Nokia 6230", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,F_NOTES,0}},
        {"6310" ,"NPE-4" ,"Nokia 6310", {F_TODO63,F_CAL65,F_NOMIDI,F_NOMMS,F_VOICETAGS,0}},
@@ -937,4 +953,7 @@ static OnePhoneModel allmodels[] = {
        {"6610" ,"NHL-4U","Nokia 6610", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
+        {"6610i","RM-37" ,"Nokia 6610i",{F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
        {"6800" ,"NSB-9" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},
        {"6800" ,"NHL-6" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},
+        {"6810" ,"RM-2"  ,"Nokia 6810", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess
+        {"6820" ,"NHL-9" ,"Nokia 6820", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess
 #endif
@@ -945,2 +964,3 @@ static OnePhoneModel allmodels[] = {
 #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA6510)
+        {"7200" ,"RH-23" ,"Nokia 7200", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,0}},//quess
        {"7210" ,"NHL-4" ,"Nokia 7210", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
@@ -977,4 +997,6 @@ static OnePhoneModel allmodels[] = {
                {"at"   ,         "at",                   "",                      {0}},
+        /* Siemens */
                {"M20"  ,         "M20",          "",                      {F_M20SMS,F_SLOWWRITE,0}},
                {"MC35" ,         "MC35",         "",                      {0}},
+                {"TC35" ,         "TC35",         "",                      {0}},
                {"S25",                   "S25",          "SIEMENS S25",           {0}},
@@ -993,2 +1015,11 @@ static OnePhoneModel allmodels[] = {
                {"S55" ,          "S55" ,         "",                      {0}},
+        /* Samsung */
+                {"S100" ,         "SGH-S100" ,    "",                      {0}},
+                {"S200" ,         "SGH-S200" ,    "",                      {0}},
+                {"S300" ,         "SGH-S300" ,    "",                      {0}},
+                {"S500" ,         "SGH-S500" ,    "",                      {0}},
+                {"V200" ,         "SGH-V200" ,    "",                      {0}},
+                {"T100" ,         "SGH-T100" ,    "",                      {0}},
+                {"E700" ,         "SGH-E700" ,    "",                      {0}},
+        /* Ericsson/Sony Ericsson */
                {"T28s",        "1101101-BVT28s","",                       {0}},
@@ -1006,2 +1037,3 @@ static OnePhoneModel allmodels[] = {
                {"P800",        "7130501-BVP800" ,"",                      {0}},
+        /* Other */
                {"iPAQ" ,         "iPAQ"  ,       "" ,                     {0}},

diff --git a/gammu/emb/common/gsmstate.c b/gammu/emb/common/gsmstate.c index b8f5f89..31e365d 100644 --- a/gammu/emb/common/gsmstate.c +++ b/gammu/emb/common/gsmstate.c
@@ -188,2 +188,5 @@ GSM_Error GSM_RegisterAllPhoneModules(GSM_StateMachine *s)
188	#endif	188	#endif
		189	#ifdef GSM_ENABLE_NOKIA650
		190	GSM_RegisterModule(s,&N650Phone);
		191	#endif
189	#ifdef GSM_ENABLE_NOKIA6110	192	#ifdef GSM_ENABLE_NOKIA6110
@@ -212,3 +215,2 @@ GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum)
212	int i;	215	int i;
213	char Buffer[80];
214		216
@@ -252,14 +254,12 @@ GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum)
252	s->di.dl == DL_TEXTALLDATE \|\| s->di.dl == DL_TEXTDATE \|\| s->di.dl == DL_TEXTERRORDATE) {	254	s->di.dl == DL_TEXTALLDATE \|\| s->di.dl == DL_TEXTDATE \|\| s->di.dl == DL_TEXTERRORDATE) {
253	smprintf(s,"[Gammu - version %s built %s %s]\n",VERSION,__TIME__,__DATE__);	255	smprintf(s,"[Gammu - %s built %s %s",VERSION,__TIME__,__DATE__);
254	smprintf(s,"[Connection - \"%s\"]\n",s->CurrentConfig->Connection);	256	if (strlen(GetCompiler()) != 0) {
		257	smprintf(s," in %s",GetCompiler());
		258	}
		259	smprintf(s,"]\n[Connection - \"%s\"]\n",s->CurrentConfig->Connection);
255	smprintf(s,"[Model type - \"%s\"]\n",s->CurrentConfig->Model);	260	smprintf(s,"[Model type - \"%s\"]\n",s->CurrentConfig->Model);
256	smprintf(s,"[Device - \"%s\"]\n",s->CurrentConfig->Device);	261	smprintf(s,"[Device - \"%s\"]\n",s->CurrentConfig->Device);
257		262	if (strlen(GetOS()) != 0) {
258	Buffer[0] = 0;	263	smprintf(s,"[Run on - %s]\n",GetOS());
259	if (strlen(GetOS()) != 0) sprintf(Buffer,"%s",GetOS());
260	if (strlen(GetCompiler()) != 0) {
261	if (Buffer[0] != 0) strcat(Buffer+strlen(Buffer),", ");
262	strcat(Buffer+strlen(Buffer),GetCompiler());
263	}	264	}
264	if (Buffer[0] != 0) smprintf(s,"[OS/compiler - %s]\n",Buffer);
265	}	265	}
@@ -556,2 +556,3 @@ static GSM_Error CheckReplyFunctions(GSM_StateMachine s, GSM_Reply_Function Re
556	int i = 0;	556	int i = 0;
		557	//int j;
557		558
@@ -570,4 +571,14 @@ static GSM_Error CheckReplyFunctions(GSM_StateMachine s, GSM_Reply_Function Re
570	} else {	571	} else {
571	if (strncmp(Reply[i].msgtype,msg->Buffer,strlen(Reply[i].msgtype))==0) {	572	// printf("msg length %i %i\n",strlen(Reply[i].msgtype),msg->Length);
572	execute=true;	573	if ((int)strlen(Reply[i].msgtype)<msg->Length) {
		574	// printf("Comparing \"%s\" and \"",Reply[i].msgtype);
		575	// for (j=0;j<strlen(Reply[i].msgtype);j++) {
		576	// if (msg->Buffer[j]!=13 && msg->Buffer[j]!=10) {
		577	// printf("%c",msg->Buffer[j]);
		578	// }
		579	// }
		580	// printf("\"\n");
		581	if (strncmp(Reply[i].msgtype,msg->Buffer,strlen(Reply[i].msgtype))==0) {
		582	execute=true;
		583	}
573	}	584	}
@@ -847,4 +858,7 @@ bool GSM_ReadConfig(INI_Section cfg_info, GSM_Config cfg, int num)
847	static OnePhoneModel allmodels[] = {	858	static OnePhoneModel allmodels[] = {
		859	#ifdef GSM_ENABLE_NOKIA650
		860	{"0650" ,"THF-12","", {0}},
		861	#endif
848	#ifdef GSM_ENABLE_NOKIA6510	862	#ifdef GSM_ENABLE_NOKIA6510
849	{"1100", "RH-18" ,"", {0}},	863	{"1100" ,"RH-18" ,"", {0}},
850	{"1100a","RH-38" ,"", {0}},	864	{"1100a","RH-38" ,"", {0}},
@@ -856,7 +870,7 @@ static OnePhoneModel allmodels[] = {
856	#ifdef GSM_ENABLE_NOKIA6510	870	#ifdef GSM_ENABLE_NOKIA6510
857	{"3100" ,"RH-19" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},	871	{"3100" ,"RH-19" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme
858	{"3100b","RH-50" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},	872	{"3100b","RH-50" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme
859	{"3108", "RH-6", "Nokia 3108",{0}}, //does it have irda ?	873	{"3108", "RH-6", "Nokia 3108",{0}}, //does it have irda ?
860	{"3200", "RH-30" ,"Nokia 3200",{F_PBKTONEGAL,0}},	874	{"3200", "RH-30" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme
861	{"3200a","RH-31" ,"Nokia 3200",{F_PBKTONEGAL,0}},	875	{"3200a","RH-31" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme
862	#endif	876	#endif
@@ -867,4 +881,4 @@ static OnePhoneModel allmodels[] = {
867	#ifdef GSM_ENABLE_NOKIA6510	881	#ifdef GSM_ENABLE_NOKIA6510
868	{"3300" ,"NEM-1" ,"Nokia 3300", {F_PBKTONEGAL,0}},	882	{"3300" ,"NEM-1" ,"Nokia 3300", {F_PBKTONEGAL,0}},//fixme
869	{"3300" ,"NEM-2" ,"Nokia 3300", {F_PBKTONEGAL,0}},	883	{"3300" ,"NEM-2" ,"Nokia 3300", {F_PBKTONEGAL,0}},//fixme
870	#endif	884	#endif
@@ -900,2 +914,4 @@ static OnePhoneModel allmodels[] = {
900	{"5100" ,"NPM-6X","Nokia 5100", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},	914	{"5100" ,"NPM-6X","Nokia 5100", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
		915	{"5140" ,"NPL-4" ,"Nokia 5140", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKUSER,F_WAPMMSPROXY,0}},
		916	{"5140" ,"NPL-5" ,"Nokia 5140", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKUSER,F_WAPMMSPROXY,0}},
901	#endif	917	#endif
@@ -924,3 +940,3 @@ static OnePhoneModel allmodels[] = {
924	{"6200" ,"NPL-3" ,"Nokia 6200", {F_PBKTONEGAL,0}},	940	{"6200" ,"NPL-3" ,"Nokia 6200", {F_PBKTONEGAL,0}},
925	{"6220" ,"RH-20" ,"Nokia 6220", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,0}},	941	{"6220" ,"RH-20" ,"Nokia 6220", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,F_NOTES,0}},
926	#endif	942	#endif
@@ -931,3 +947,3 @@ static OnePhoneModel allmodels[] = {
931	#if defined(GSM_ENABLE_ATGEN) \|\| defined(GSM_ENABLE_NOKIA6510)	947	#if defined(GSM_ENABLE_ATGEN) \|\| defined(GSM_ENABLE_NOKIA6510)
932	{"6230" ,"RH-12" ,"Nokia 6230", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,0}},	948	{"6230" ,"RH-12" ,"Nokia 6230", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,F_WAPMMSPROXY,F_NOTES,0}},
933	{"6310" ,"NPE-4" ,"Nokia 6310", {F_TODO63,F_CAL65,F_NOMIDI,F_NOMMS,F_VOICETAGS,0}},	949	{"6310" ,"NPE-4" ,"Nokia 6310", {F_TODO63,F_CAL65,F_NOMIDI,F_NOMMS,F_VOICETAGS,0}},
@@ -937,4 +953,7 @@ static OnePhoneModel allmodels[] = {
937	{"6610" ,"NHL-4U","Nokia 6610", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},	953	{"6610" ,"NHL-4U","Nokia 6610", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
		954	{"6610i","RM-37" ,"Nokia 6610i",{F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
938	{"6800" ,"NSB-9" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},	955	{"6800" ,"NSB-9" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},
939	{"6800" ,"NHL-6" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},	956	{"6800" ,"NHL-6" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},
		957	{"6810" ,"RM-2" ,"Nokia 6810", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess
		958	{"6820" ,"NHL-9" ,"Nokia 6820", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess
940	#endif	959	#endif
@@ -945,2 +964,3 @@ static OnePhoneModel allmodels[] = {
945	#if defined(GSM_ENABLE_ATGEN) \|\| defined(GSM_ENABLE_NOKIA6510)	964	#if defined(GSM_ENABLE_ATGEN) \|\| defined(GSM_ENABLE_NOKIA6510)
		965	{"7200" ,"RH-23" ,"Nokia 7200", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_PBKUSER,0}},//quess
946	{"7210" ,"NHL-4" ,"Nokia 7210", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},	966	{"7210" ,"NHL-4" ,"Nokia 7210", {F_PBKTONEGAL,F_TODO66,F_RADIO,0}},
@@ -977,4 +997,6 @@ static OnePhoneModel allmodels[] = {
977	{"at" , "at", "", {0}},	997	{"at" , "at", "", {0}},
		998	/* Siemens */
978	{"M20" , "M20", "", {F_M20SMS,F_SLOWWRITE,0}},	999	{"M20" , "M20", "", {F_M20SMS,F_SLOWWRITE,0}},
979	{"MC35" , "MC35", "", {0}},	1000	{"MC35" , "MC35", "", {0}},
		1001	{"TC35" , "TC35", "", {0}},
980	{"S25", "S25", "SIEMENS S25", {0}},	1002	{"S25", "S25", "SIEMENS S25", {0}},
@@ -993,2 +1015,11 @@ static OnePhoneModel allmodels[] = {
993	{"S55" , "S55" , "", {0}},	1015	{"S55" , "S55" , "", {0}},
		1016	/* Samsung */
		1017	{"S100" , "SGH-S100" , "", {0}},
		1018	{"S200" , "SGH-S200" , "", {0}},
		1019	{"S300" , "SGH-S300" , "", {0}},
		1020	{"S500" , "SGH-S500" , "", {0}},
		1021	{"V200" , "SGH-V200" , "", {0}},
		1022	{"T100" , "SGH-T100" , "", {0}},
		1023	{"E700" , "SGH-E700" , "", {0}},
		1024	/* Ericsson/Sony Ericsson */
994	{"T28s", "1101101-BVT28s","", {0}},	1025	{"T28s", "1101101-BVT28s","", {0}},
@@ -1006,2 +1037,3 @@ static OnePhoneModel allmodels[] = {
1006	{"P800", "7130501-BVP800" ,"", {0}},	1037	{"P800", "7130501-BVP800" ,"", {0}},
		1038	/* Other */
1007	{"iPAQ" , "iPAQ" , "" , {0}},	1039	{"iPAQ" , "iPAQ" , "" , {0}},