git://git.jankratochvil.net / gnokii.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Branch update for mygnokii2002_03_17_19_29nl
[gnokii.git] / common / newmodules / n6110.c
diff --git a/common/newmodules/n6110.c b/common/newmodules/n6110.c
index 7033493..a459961 100644 (file)
--- a/common/newmodules/n6110.c
+++ b/common/newmodules/n6110.c
@@ -190,7 +190,7 @@ GSM_Functions N6110_Functions = {
 GSM_Information N6110_Information = {
   "3210|3310|3330|5110|5130|5190|6110|6130|6150|6190|8210|8850",
      /* Supported models in FBUS */
-  "3210|3310|3330|5110|5130|5190|6110|6130|6150|6190|8210|8850",
+  "3210|3310|3330|5110|5130|5190|6110|6130|6150|6190|8210|8850|9210",
      /* Supported models in MBUS */
   "6110|6130|6150|8210|8850",
      /* Supported models in FBUS over infrared */
@@ -201,7 +201,7 @@ GSM_Information N6110_Information = {
   "8210|8850",
      /* infrared sockets */
   "6110|6130|6150|8210|8850",
-     /* Supported models in FBUS over infrared with Tekram device */  
+     /* Supported models in FBUS over infrared with Tekram device */  "",
   4,                     /* Max RF Level */
   0,                     /* Min RF Level */
   GRF_Arbitrary,         /* RF level units */
@@ -826,34 +826,35 @@ void N6110_ReplyCallDivert(u16 MessageLength, u8 *MessageBuffer, u8 MessageType)
       fprintf(stdout, _("   Status     : deactivated\n"));     
     }
 #endif /* DEBUG */
- 
-    switch (MessageBuffer[6]) {
-      case 0x43: CurrentCallDivert->DType=GSM_CDV_Busy;break;
-      case 0x3d: CurrentCallDivert->DType=GSM_CDV_NoAnswer;break;
-      case 0x3e: CurrentCallDivert->DType=GSM_CDV_OutOfReach;break;
-      case 0x15: CurrentCallDivert->DType=GSM_CDV_AllTypes;break; //?
-      case 0x02: CurrentCallDivert->DType=GSM_CDV_AllTypes;break; //?
-    }
 
-    if (MessageBuffer[6]==0x02) //?
-      CurrentCallDivert->CType=GSM_CDV_AllCalls;
-    else {
-      switch (MessageBuffer[8]) {
-        case 0x0b: CurrentCallDivert->CType=GSM_CDV_VoiceCalls;break;
-        case 0x0d: CurrentCallDivert->CType=GSM_CDV_FaxCalls;  break;
-        case 0x19: CurrentCallDivert->CType=GSM_CDV_DataCalls; break;
+    if (CurrentCallDivert!=NULL) { 
+      switch (MessageBuffer[6]) {
+        case 0x43: CurrentCallDivert->DType=GSM_CDV_Busy;break;
+        case 0x3d: CurrentCallDivert->DType=GSM_CDV_NoAnswer;break;
+        case 0x3e: CurrentCallDivert->DType=GSM_CDV_OutOfReach;break;
+        case 0x15: CurrentCallDivert->DType=GSM_CDV_AllTypes;break; //?
+        case 0x02: CurrentCallDivert->DType=GSM_CDV_AllTypes;break; //?
       }
-    }
 
-    if (MessageBuffer[10]==0x01) {
-      CurrentCallDivert->Enabled=true;
-      CurrentCallDivert->Timeout=MessageBuffer[45];
-      strcpy(CurrentCallDivert->Number,GSM_UnpackSemiOctetNumber(MessageBuffer+12,true));
-    } else {
-      CurrentCallDivert->Enabled=false;
-    }
+      if (MessageBuffer[6]==0x02) //?
+        CurrentCallDivert->CType=GSM_CDV_AllCalls;
+      else {
+        switch (MessageBuffer[8]) {
+          case 0x0b: CurrentCallDivert->CType=GSM_CDV_VoiceCalls;break;
+          case 0x0d: CurrentCallDivert->CType=GSM_CDV_FaxCalls;  break;
+          case 0x19: CurrentCallDivert->CType=GSM_CDV_DataCalls; break;
+        }
+      }
 
-    CurrentCallDivertError=GE_NONE;
+      if (MessageBuffer[10]==0x01) {
+        CurrentCallDivert->Enabled=true;
+        CurrentCallDivert->Timeout=MessageBuffer[45];
+        strcpy(CurrentCallDivert->Number,GSM_UnpackSemiOctetNumber(MessageBuffer+12,true));
+      } else {
+        CurrentCallDivert->Enabled=false;
+      }
+      CurrentCallDivertError=GE_NONE;
+    }
     break;
 
   case 0x03:
@@ -2630,10 +2631,13 @@ GSM_Error N6110_DialData(char *Number, char type, void (* callpassup)(char c))
        memcpy(req + 5 + strlen(Number), req_end, size);
 
        Protocol->SendMessage(5 + size + strlen(Number), 0x01, req);
-       usleep(1000000);
+        usleep(1000000);
 
 #if 0
-       if (type != 1) Protocol->SendMessage(26, 0x01, req2);
+       if (type != 1) {
+          Protocol->SendMessage(26, 0x01, req2);
+         usleep(1000000);
+        }
 #endif
 
        return (GE_NONE);
@@ -3293,7 +3297,8 @@ static void N6110_ReplyGetMemoryLocation(u16 MessageLength, u8 *MessageBuffer, u
     while (N6110_GetModel(model)  != GE_NONE)
       sleep(1);
         
-    if (GetModelFeature (FN_PHONEBOOK)==F_PBK33) {//pbk with Unicode
+    if (GetModelFeature (FN_PHONEBOOK)==F_PBK33SIM ||
+        GetModelFeature (FN_PHONEBOOK)==F_PBK33INT) {//pbk with Unicode
 #ifndef UCLINUX
       DecodeUnicode (CurrentPhonebookEntry->Name, MessageBuffer+6, count/2);
       CurrentPhonebookEntry->Name[count/2] = 0x00;
@@ -3310,7 +3315,8 @@ static void N6110_ReplyGetMemoryLocation(u16 MessageLength, u8 *MessageBuffer, u
 
     for (tmp=0; tmp <count; tmp++)
     {
-      if (GetModelFeature (FN_PHONEBOOK)==F_PBK33) {//pbk with Unicode
+      if (GetModelFeature (FN_PHONEBOOK)==F_PBK33INT ||
+          GetModelFeature (FN_PHONEBOOK)==F_PBK33SIM) {//pbk with Unicode
         /* We check only 1'st, 3'rd, ... char */
         if (tmp%2!=0 && MessageBuffer[6+tmp]==1) CurrentPhonebookEntry->Name[tmp/2]='~'; //enables/disables blinking
         if (tmp%2!=0 && MessageBuffer[6+tmp]==0) CurrentPhonebookEntry->Name[tmp/2]='`'; //hides rest ot contents
@@ -3467,7 +3473,8 @@ GSM_Error N6110_WritePhonebookLocation(GSM_PhonebookEntry *entry)
 
   current=7;
 
-  if (GetModelFeature (FN_PHONEBOOK)==F_PBK33) {
+  if (GetModelFeature (FN_PHONEBOOK)==F_PBK33INT ||
+      GetModelFeature (FN_PHONEBOOK)==F_PBK33SIM) {
 #ifndef UCLINUX
 
      req[6] = strlen(entry->Name)*2;
@@ -3844,14 +3851,10 @@ void N6110_ReplyGetSMSMessage(u16 MessageLength, u8 *MessageBuffer, u8 MessageTy
     fprintf(stdout, _("Message: SMS reading failed\n"));
 
     switch (MessageBuffer[4]) {
-      case 0x02:
-        fprintf(stdout, _("   Invalid location!\n"));break;
-      case 0x07:
-       fprintf(stdout, _("   Empty SMS location.\n"));break;
-      case 0x0c:
-       fprintf(stdout, _("   No access to memory (no PIN on card ?)\n"));break;
-      default:      
-        fprintf(stdout, _("   Error code %i - please report it \n"),MessageBuffer[4]);break;
+      case 0x02:fprintf(stdout, _("   Invalid location!\n"));break;
+      case 0x07:fprintf(stdout, _("   Empty SMS location.\n"));break;
+      case 0x0c:fprintf(stdout, _("   No access to memory (no PIN on card ?)\n"));break;
+      default  :fprintf(stdout, _("   Error code %i - please report it \n"),MessageBuffer[4]);break;
     }
 #endif /* DEBUG */
 
@@ -3938,8 +3941,7 @@ GSM_Error GSM_EncodeNokiaSMSFrame(GSM_SMSMessage *SMS, unsigned char *req, int *
   switch (PDU) {
     case SMS_Submit:
       offset=5;
-      for (i=0;i<((ETSI.Number[0]+1)/2+1)+1;i++)
-        req[i+12+offset]=ETSI.Number[i];
+      for (i=0;i<((ETSI.Number[0]+1)/2+1)+1;i++) req[i+12+offset]=ETSI.Number[i];
       req[10+offset]=ETSI.TPDCS;
       req[11+offset]=ETSI.TPUDL;
       req[24+offset]=ETSI.TPVP;
@@ -3949,21 +3951,17 @@ GSM_Error GSM_EncodeNokiaSMSFrame(GSM_SMSMessage *SMS, unsigned char *req, int *
 //      fprintf(stdout,_("   TP-DCS: %02x\n"),ETSI.TPDCS);
 #endif
 //    req[]=ETSI.TPPID;
-      for(i=0;i<*length;i++)
-        req[i+31+offset]=ETSI.MessageText[i];
+      for(i=0;i<*length;i++) req[i+31+offset]=ETSI.MessageText[i];
       break;
 
     case SMS_Deliver:
       offset=4;
-      for (i=0;i<((ETSI.Number[0]+1)/2+1)+1;i++)
-        req[i+12+offset]=ETSI.Number[i];
+      for (i=0;i<((ETSI.Number[0]+1)/2+1)+1;i++) req[i+12+offset]=ETSI.Number[i];
       req[10+offset]=ETSI.TPDCS;
       req[11+offset]=ETSI.TPUDL;
 //    req[]=ETSI.TPPID;
-      for(i=0;i<*length;i++)
-        req[i+31+offset]=ETSI.MessageText[i];
-      for (i=0;i<7;i++)
-        req[24+offset+i]=ETSI.DeliveryDateTime[i];
+      for(i=0;i<*length;i++) req[i+31+offset]=ETSI.MessageText[i];
+      for (i=0;i<7;i++) req[24+offset+i]=ETSI.DeliveryDateTime[i];
       break;
     default:
       break;
@@ -4982,7 +4980,7 @@ static void N6110_Dispatch0x03Message(u16 MessageLength, u8 *MessageBuffer, u8 M
        CurrentGetBitmap->width=MessageBuffer[count++];
         CurrentGetBitmap->height=MessageBuffer[count++];
        count++;
-       tmp=CurrentGetBitmap->height*CurrentGetBitmap->width/8;
+       tmp=GSM_GetBitmapSize(CurrentGetBitmap);
        if (CurrentGetBitmap->size>tmp) CurrentGetBitmap->size=tmp;
        memcpy(CurrentGetBitmap->bitmap,MessageBuffer+count,CurrentGetBitmap->size);
        CurrentGetBitmapError=GE_NONE;
@@ -5066,10 +5064,11 @@ static void N6110_Dispatch0x05Message(u16 MessageLength, u8 *MessageBuffer, u8 M
           if (CurrentGetBitmap->type==GSM_StartupLogo) {
             CurrentGetBitmap->height=MessageBuffer[count++];
            CurrentGetBitmap->width=MessageBuffer[count++];
-           CurrentGetBitmap->size=CurrentGetBitmap->height*CurrentGetBitmap->width/8;
+           CurrentGetBitmap->size=GSM_GetBitmapSize(CurrentGetBitmap);
            length=CurrentGetBitmap->size;
            memcpy(CurrentGetBitmap->bitmap,MessageBuffer+count,length);
           } else {
+            //bitmap size
            length=MessageBuffer[count++];
            length=length*MessageBuffer[count++]/8;
          }
@@ -5184,7 +5183,7 @@ static void N6110_Dispatch0x05Message(u16 MessageLength, u8 *MessageBuffer, u8 M
       CurrentGetBitmap->width=MessageBuffer[count++];
       CurrentGetBitmap->height=MessageBuffer[count++];
       count++;
-      tmp=CurrentGetBitmap->height*CurrentGetBitmap->width/8;
+      tmp=GSM_GetBitmapSize(CurrentGetBitmap);
       if (CurrentGetBitmap->size>tmp) CurrentGetBitmap->size=tmp;
       memcpy(CurrentGetBitmap->bitmap,MessageBuffer+count,CurrentGetBitmap->size);
       CurrentGetBitmapError=GE_NONE;
@@ -5434,7 +5433,7 @@ static void N6110_Dispatch0x47Message(u16 MessageLength, u8 *MessageBuffer, u8 M
 
     CurrentGetBitmap->width=MessageBuffer[count+1];
     CurrentGetBitmap->height=MessageBuffer[count+2]; 
-    CurrentGetBitmap->size=CurrentGetBitmap->height*CurrentGetBitmap->width/8;
+    CurrentGetBitmap->size=GSM_GetBitmapSize(CurrentGetBitmap);
       
     memcpy(CurrentGetBitmap->bitmap,MessageBuffer+count+4,CurrentGetBitmap->size);
       
Unnamed repository; edit this file 'description' to name the repository.