1 files changed, 14 insertions, 0 deletions

diff --git a/gammu/emb/common/phone/nokia/nfunc.c b/gammu/emb/common/phone/nokia/nfunc.c
index 3acfb10..d4d8b03 100644
--- a/gammu/emb/common/phone/nokia/nfunc.c
+++ b/gammu/emb/common/phone/nokia/nfunc.c
@@ -1348,125 +1348,139 @@ GSM_Error N71_65_ReplyCallInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
                 smprintf(s, "Call mode  : %i\n",msg.Buffer[5]);//such interpretation is in gnokii
                 tmp = 6;
                 NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,buffer,false);
                 smprintf(s, "Number     : \"%s\"\n",DecodeUnicodeString(buffer));
                 /* FIXME: read name from frame */
 
                 call.Status = GSM_CALL_CallStart;
                         break;          
         case 0x04:
                 smprintf(s, "Remote end hang up\n");
                 smprintf(s, "Cause Type : %i\n",msg.Buffer[5]);//such interpretation is in gnokii
                 smprintf(s, "CC         : %i\n",msg.Buffer[6]);
                 smprintf(s, "MM(?)      : %i\n",msg.Buffer[7]);
                 smprintf(s, "RR(?)      : %i\n",msg.Buffer[8]);
                         call.Status = GSM_CALL_CallRemoteEnd;
                 call.StatusCode = msg.Buffer[6];
                 break;
         case 0x05:
                 smprintf(s, "Incoming call\n");
                 smprintf(s, "Call mode  : %i\n",msg.Buffer[5]);//such interpretation is in gnokii
                 tmp = 6;
                 NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,buffer,false);
                 smprintf(s, "Number     : \"%s\"\n",DecodeUnicodeString(buffer));
                 /* FIXME: read name from frame */
                 call.Status = GSM_CALL_IncomingCall;
                 tmp = 6;
                 NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,call.PhoneNumber,false);
                 break;
         case 0x07:
                 smprintf(s, "Call answer initiated\n");
                 break;
         case 0x09:
                 smprintf(s, "Call released\n");
                 call.Status = GSM_CALL_CallLocalEnd;
                 break;
         case 0x0a:
                 smprintf(s, "Call is being released\n");
                 break;
         case 0x0b:
                 smprintf(s, "Meaning not known\n");
                 call.CallIDAvailable = false;
                 break;
         case 0x0c:
                 smprintf(s, "Audio status\n");
                 if (msg.Buffer[4] == 0x01) smprintf(s, "Audio enabled\n");
                                       else smprintf(s, "Audio disabled\n");
                 call.CallIDAvailable = false;
                 break;
+        case 0x0f:
+        case 0x10:
+                smprintf(s, "Meaning not known\n");
+                call.CallIDAvailable = false;
+                break;
         case 0x23:
                 smprintf(s, "Call held\n");
                 call.Status = GSM_CALL_CallHeld;
                 break;
         case 0x25:
                 smprintf(s, "Call resumed\n");
                 call.Status = GSM_CALL_CallResumed;
                 break;
         case 0x27:
                 smprintf(s, "Call switched\n");
                 call.Status = GSM_CALL_CallSwitched;
                 break;
         case 0x53:
                 smprintf(s, "Outgoing call\n");
                 smprintf(s, "Call mode  : %i\n",msg.Buffer[5]);//such interpretation is in gnokii
                 tmp = 6;
                 NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,buffer,false);
                 smprintf(s, "Number     : \"%s\"\n",DecodeUnicodeString(buffer));
                 /* FIXME: read name from frame */
                 call.Status = GSM_CALL_OutgoingCall;
                 tmp = 6;
                 NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,call.PhoneNumber,false);
                 break;
+        case 0xA6:
+        case 0xD2:
+        case 0xD3:
+                smprintf(s, "Meaning not known\n");
+                call.CallIDAvailable = false;
+                break;
         }
         if (call.CallIDAvailable) smprintf(s, "Call ID    : %d\n",msg.Buffer[4]);
         if (s->Phone.Data.EnableIncomingCall && s->User.IncomingCall!=NULL && call.Status != 0) {
                 if (call.CallIDAvailable) call.CallID = msg.Buffer[4];
                 s->User.IncomingCall(s->CurrentConfig->Device, call);
         }
+        if (s->Phone.Data.RequestID == ID_DialVoice) {
+                if (msg.Buffer[3] == 0x10) return ERR_NOTSUPPORTED;
+        }
         if (s->Phone.Data.RequestID == ID_CancelCall) {
                 if (msg.Buffer[3] == 0x09) {
                         if (s->Phone.Data.CallID == msg.Buffer[4]) return ERR_NONE;
                         /* when we canceled call and see frame about other
                          * call releasing, we don't give ERR_NONE for "our"
                          * call release command
                          */
                         return ERR_NEEDANOTHERANSWER;
                 }
         }
         if (s->Phone.Data.RequestID == ID_AnswerCall) {
                 if (msg.Buffer[3] == 0x07) {
                         if (s->Phone.Data.CallID == msg.Buffer[4]) return ERR_NONE;
                         return ERR_NEEDANOTHERANSWER;
                 }
         }
         return ERR_NONE;
 }
 
 void N71_65_GetCalendarRecurrance(GSM_StateMachine *s, unsigned char *buffer, GSM_CalendarEntry *entry)
 {
         int Recurrance;
 
         Recurrance = buffer[0]*256 + buffer[1];
         /* 8760 hours = 1 year */
         if (Recurrance == 0xffff) Recurrance=8760;
         if (Recurrance != 0) {
                 smprintf(s, "Recurrance   : %i hours\n",Recurrance);
                         entry->Entries[entry->EntriesNum].EntryType= CAL_RECURRANCE;
                         entry->Entries[entry->EntriesNum].Number= Recurrance;
                 entry->EntriesNum++;
         }
 }
 
 /* method 2 */
 GSM_Error N71_65_ReplyAddCalendar2(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
         smprintf(s, "Calendar note added\n");
         return ERR_NONE;
 }
 
 /* method 2 */
 GSM_Error N71_65_AddCalendar2(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 {
                 GSM_CalendarNoteTypeNoteType;
                 time_t          t_time1,t_time2;
                 GSM_DateTime    Date,date_time;
                 GSM_Error       error;