-rw-r--r-- | gammu/emb/common/phone/alcatel/alcatel.c | 6 | ||||
-rw-r--r-- | gammu/emb/common/phone/at/atgen.c | 8 | ||||
-rw-r--r-- | gammu/emb/common/phone/at/sonyeric.c | 19 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct3/dct3func.c | 17 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct3/n0650.c | 150 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct3/n0650.h | 18 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct3/n6110.c | 17 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct3/n7110.c | 15 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct3/n9210.c | 6 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct4/n3320.c | 6 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct4/n3650.c | 6 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/dct4/n6510.c | 142 | ||||
-rw-r--r-- | gammu/emb/common/phone/nokia/nauto.c | 6 | ||||
-rw-r--r-- | gammu/emb/common/phone/obex/obexgen.c | 6 | ||||
-rw-r--r-- | gammu/emb/common/phone/pfunc.c | 1 | ||||
-rw-r--r-- | gammu/emb/common/phone/symbian/mroutgen.c | 6 |
16 files changed, 398 insertions, 31 deletions
diff --git a/gammu/emb/common/phone/alcatel/alcatel.c b/gammu/emb/common/phone/alcatel/alcatel.c index 3821f13..b75077f 100644 --- a/gammu/emb/common/phone/alcatel/alcatel.c +++ b/gammu/emb/common/phone/alcatel/alcatel.c | |||
@@ -3980,5 +3980,11 @@ GSM_Phone_Functions ALCATELPhone = { | |||
3980 | NOTSUPPORTED, /* GetCalendarSettings*/ | 3980 | NOTSUPPORTED, /* GetCalendarSettings*/ |
3981 | NOTSUPPORTED, /* SetCalendarSettings*/ | 3981 | NOTSUPPORTED, /* SetCalendarSettings*/ |
3982 | NOTSUPPORTED, /* GetNoteStatus */ | ||
3983 | NOTSUPPORTED, /* GetNote */ | ||
3982 | NOTSUPPORTED, /* GetNextNote */ | 3984 | NOTSUPPORTED, /* GetNextNote */ |
3985 | NOTSUPPORTED, /* SetNote */ | ||
3986 | NOTSUPPORTED, /* AddNote */ | ||
3987 | NOTSUPPORTED, /* DeleteNote */ | ||
3988 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
3983 | NOTSUPPORTED, /* GetProfile */ | 3989 | NOTSUPPORTED, /* GetProfile */ |
3984 | NOTSUPPORTED, /* SetProfile */ | 3990 | NOTSUPPORTED, /* SetProfile */ |
diff --git a/gammu/emb/common/phone/at/atgen.c b/gammu/emb/common/phone/at/atgen.c index ba23eb2..a875f0a 100644 --- a/gammu/emb/common/phone/at/atgen.c +++ b/gammu/emb/common/phone/at/atgen.c | |||
@@ -697,5 +697,5 @@ GSM_Error ATGEN_SetSMSC(GSM_StateMachine *s, GSM_SMSC *smsc) | |||
697 | unsigned char req[50]; | 697 | unsigned char req[50]; |
698 | 698 | ||
699 | if (smsc->Location!=1) return ERR_NOTSUPPORTED; | 699 | if (smsc->Location!=1) return ERR_INVALIDLOCATION; |
700 | 700 | ||
701 | sprintf(req, "AT+CSCA=\"%s\"\r",DecodeUnicodeString(smsc->Number)); | 701 | sprintf(req, "AT+CSCA=\"%s\"\r",DecodeUnicodeString(smsc->Number)); |
@@ -3840,5 +3840,11 @@ GSM_Phone_Functions ATGENPhone = { | |||
3840 | NOTSUPPORTED, /* GetCalendarSettings*/ | 3840 | NOTSUPPORTED, /* GetCalendarSettings*/ |
3841 | NOTSUPPORTED, /* SetCalendarSettings*/ | 3841 | NOTSUPPORTED, /* SetCalendarSettings*/ |
3842 | NOTSUPPORTED, /* GetNoteStatus */ | ||
3843 | NOTSUPPORTED, /* GetNote */ | ||
3842 | NOTSUPPORTED, /* GetNextNote */ | 3844 | NOTSUPPORTED, /* GetNextNote */ |
3845 | NOTSUPPORTED, /* SetNote */ | ||
3846 | NOTSUPPORTED, /* AddNote */ | ||
3847 | NOTSUPPORTED, /* DeleteNote */ | ||
3848 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
3843 | NOTSUPPORTED, /* GetProfile */ | 3849 | NOTSUPPORTED, /* GetProfile */ |
3844 | NOTSUPPORTED, /* SetProfile */ | 3850 | NOTSUPPORTED, /* SetProfile */ |
diff --git a/gammu/emb/common/phone/at/sonyeric.c b/gammu/emb/common/phone/at/sonyeric.c index 8eeb39b..363e043 100644 --- a/gammu/emb/common/phone/at/sonyeric.c +++ b/gammu/emb/common/phone/at/sonyeric.c | |||
@@ -15,8 +15,9 @@ | |||
15 | #include "sonyeric.h" | 15 | #include "sonyeric.h" |
16 | 16 | ||
17 | #ifdef GSM_ENABLE_OBEXGEN | 17 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
18 | 18 | ||
19 | #include "../obex/obexgen.h" | 19 | #include "../obex/obexgen.h" |
20 | 20 | ||
21 | extern GSM_Protocol_Functions OBEXProtocol; | ||
21 | extern GSM_Reply_FunctionOBEXGENReplyFunctions[]; | 22 | extern GSM_Reply_FunctionOBEXGENReplyFunctions[]; |
22 | extern GSM_Reply_FunctionATGENReplyFunctions[]; | 23 | extern GSM_Reply_FunctionATGENReplyFunctions[]; |
@@ -125,5 +126,5 @@ static GSM_Error SONYERIC_SetFile(GSM_StateMachine *s, unsigned char *FileName, | |||
125 | GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start) | 126 | GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start) |
126 | { | 127 | { |
127 | #ifdef GSM_ENABLE_OBEXGEN | 128 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
128 | GSM_Error error; | 129 | GSM_Error error; |
129 | GSM_ToDoEntry ToDo; | 130 | GSM_ToDoEntry ToDo; |
@@ -161,5 +162,5 @@ GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, | |||
161 | GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start) | 162 | GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start) |
162 | { | 163 | { |
163 | #ifdef GSM_ENABLE_OBEXGEN | 164 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
164 | GSM_Error error; | 165 | GSM_Error error; |
165 | GSM_CalendarEntryCalendar; | 166 | GSM_CalendarEntryCalendar; |
@@ -200,5 +201,5 @@ GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool st | |||
200 | GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) | 201 | GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) |
201 | { | 202 | { |
202 | #ifdef GSM_ENABLE_OBEXGEN | 203 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
203 | GSM_Error error; | 204 | GSM_Error error; |
204 | GSM_ToDoEntry ToDo; | 205 | GSM_ToDoEntry ToDo; |
@@ -231,5 +232,5 @@ GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) | |||
231 | GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | 232 | GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) |
232 | { | 233 | { |
233 | #ifdef GSM_ENABLE_OBEXGEN | 234 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
234 | unsigned char req[5000]; | 235 | unsigned char req[5000]; |
235 | int size=0; | 236 | int size=0; |
@@ -247,5 +248,5 @@ GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | |||
247 | GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) | 248 | GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) |
248 | { | 249 | { |
249 | #ifdef GSM_ENABLE_OBEXGEN | 250 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
250 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 251 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
251 | unsigned char req[5000]; | 252 | unsigned char req[5000]; |
@@ -266,5 +267,5 @@ GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) | |||
266 | GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s) | 267 | GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s) |
267 | { | 268 | { |
268 | #ifdef GSM_ENABLE_OBEXGEN | 269 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
269 | GSM_Error error; | 270 | GSM_Error error; |
270 | int Pos,Level = 0,Used; | 271 | int Pos,Level = 0,Used; |
@@ -318,5 +319,5 @@ GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s) | |||
318 | GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | 319 | GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) |
319 | { | 320 | { |
320 | #ifdef GSM_ENABLE_OBEXGEN | 321 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
321 | GSM_Error error; | 322 | GSM_Error error; |
322 | int Pos,Level = 0,Loc=0,Used; | 323 | int Pos,Level = 0,Loc=0,Used; |
@@ -373,5 +374,5 @@ GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | |||
373 | GSM_Error SONYERIC_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *Status) | 374 | GSM_Error SONYERIC_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *Status) |
374 | { | 375 | { |
375 | #ifdef GSM_ENABLE_OBEXGEN | 376 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
376 | GSM_Error error; | 377 | GSM_Error error; |
377 | GSM_ToDoEntry ToDo; | 378 | GSM_ToDoEntry ToDo; |
diff --git a/gammu/emb/common/phone/nokia/dct3/dct3func.c b/gammu/emb/common/phone/nokia/dct3/dct3func.c index 17cd0a4..9810a35 100644 --- a/gammu/emb/common/phone/nokia/dct3/dct3func.c +++ b/gammu/emb/common/phone/nokia/dct3/dct3func.c | |||
@@ -5,4 +5,13 @@ | |||
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include <string.h> /* memcpy only */ | 17 | #include <string.h> /* memcpy only */ |
@@ -458,8 +467,8 @@ GSM_Error DCT3_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMachine *s | |||
458 | smprintf(s, "Network selection : %s\n", msg.Buffer[9]==1?"manual":"automatic"); | 467 | smprintf(s, "Network selection : %s\n", msg.Buffer[9]==1?"manual":"automatic"); |
459 | if (msg.Buffer[8]<0x03) { | 468 | if (msg.Buffer[8]<0x03) { |
460 | sprintf(NetInfo.CID, "%02x%02x", msg.Buffer[10], msg.Buffer[11]); | 469 | sprintf(NetInfo.CID, "%02X%02X", msg.Buffer[10], msg.Buffer[11]); |
461 | smprintf(s, "CID : %s\n", NetInfo.CID); | 470 | smprintf(s, "CID : %s\n", NetInfo.CID); |
462 | 471 | ||
463 | sprintf(NetInfo.LAC, "%02x%02x", msg.Buffer[12], msg.Buffer[13]); | 472 | sprintf(NetInfo.LAC, "%02X%02X", msg.Buffer[12], msg.Buffer[13]); |
464 | smprintf(s, "LAC : %s\n", NetInfo.LAC); | 473 | smprintf(s, "LAC : %s\n", NetInfo.LAC); |
465 | 474 | ||
@@ -512,6 +521,6 @@ GSM_Error DCT3_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMachine *s | |||
512 | } | 521 | } |
513 | NOKIA_DecodeNetworkCode(msg.Buffer+14,Data->NetworkInfo->NetworkCode); | 522 | NOKIA_DecodeNetworkCode(msg.Buffer+14,Data->NetworkInfo->NetworkCode); |
514 | sprintf(Data->NetworkInfo->CID, "%02x%02x", msg.Buffer[10], msg.Buffer[11]); | 523 | sprintf(Data->NetworkInfo->CID, "%02X%02X", msg.Buffer[10], msg.Buffer[11]); |
515 | sprintf(Data->NetworkInfo->LAC, "%02x%02x", msg.Buffer[12], msg.Buffer[13]); | 524 | sprintf(Data->NetworkInfo->LAC, "%02X%02X", msg.Buffer[12], msg.Buffer[13]); |
516 | } | 525 | } |
517 | } | 526 | } |
diff --git a/gammu/emb/common/phone/nokia/dct3/n0650.c b/gammu/emb/common/phone/nokia/dct3/n0650.c new file mode 100644 index 0000000..3899a16 --- a/dev/null +++ b/gammu/emb/common/phone/nokia/dct3/n0650.c | |||
@@ -0,0 +1,150 @@ | |||
1 | /* (c) 2004 by Marcin Wiacek */ | ||
2 | |||
3 | #include <string.h> | ||
4 | #include <time.h> | ||
5 | |||
6 | #include "../../../gsmcomon.h" | ||
7 | #include "../../../gsmstate.h" | ||
8 | #include "../nfunc.h" | ||
9 | |||
10 | #ifdef GSM_ENABLE_NOKIA650 | ||
11 | |||
12 | static GSM_Reply_Function N650ReplyFunctions[] = { | ||
13 | {DCT3DCT4_ReplyGetModelFirmware,"\xD2",0x02,0x00,ID_GetModel }, | ||
14 | {DCT3DCT4_ReplyGetModelFirmware,"\xD2",0x02,0x00,ID_GetFirmware }, | ||
15 | |||
16 | {NULL, "\x00",0x00,0x00,ID_None } | ||
17 | }; | ||
18 | |||
19 | GSM_Phone_Functions N650Phone = { | ||
20 | "0650", | ||
21 | N650ReplyFunctions, | ||
22 | NONEFUNCTION, /* Initialise */ | ||
23 | NONEFUNCTION, /* Terminate */ | ||
24 | GSM_DispatchMessage, | ||
25 | NOTSUPPORTED, /* ShowStartInfo */ | ||
26 | NOKIA_GetManufacturer, | ||
27 | DCT3DCT4_GetModel, | ||
28 | DCT3DCT4_GetFirmware, | ||
29 | NOTSUPPORTED, /* GetIMEI */ | ||
30 | NOTSUPPORTED, /* GetOriginalIMEI */ | ||
31 | NOTSUPPORTED, /* GetManufactureMonth*/ | ||
32 | NOTSUPPORTED, /* GetProductCode */ | ||
33 | NOTSUPPORTED, /* GetHardware */ | ||
34 | NOTSUPPORTED, /* GetPPM */ | ||
35 | NOTSUPPORTED, /* GetSIMIMSI */ | ||
36 | NOTSUPPORTED, /* GetDateTime */ | ||
37 | NOTSUPPORTED, /* SetDateTime */ | ||
38 | NOTSUPPORTED, /* GetAlarm */ | ||
39 | NOTSUPPORTED, /* SetAlarm */ | ||
40 | NOTSUPPORTED, /* GetLocale */ | ||
41 | NOTSUPPORTED, /* SetLocale */ | ||
42 | NOTSUPPORTED, /* PressKey */ | ||
43 | NOTSUPPORTED, /* Reset */ | ||
44 | NOTSUPPORTED, /* ResetPhoneSettings*/ | ||
45 | NOTSUPPORTED, /* EnterSecurityCode*/ | ||
46 | NOTSUPPORTED, /* GetSecurityStatus*/ | ||
47 | NOTSUPPORTED, /* GetDisplayStatus*/ | ||
48 | NOTSUPPORTED, /* SetAutoNetworkLogin*/ | ||
49 | NOTSUPPORTED, /* GetBatteryCharge*/ | ||
50 | NOTSUPPORTED, /* GetSignalQuality*/ | ||
51 | NOTSUPPORTED, /* GetNetworkInfo */ | ||
52 | NOTSUPPORTED, /* GetCategory */ | ||
53 | NOTSUPPORTED, /* AddCategory */ | ||
54 | NOTSUPPORTED, /* GetCategoryStatus */ | ||
55 | NOTSUPPORTED, /* GetMemoryStatus */ | ||
56 | NOTSUPPORTED, /* GetMemory */ | ||
57 | NOTSUPPORTED, /* GetNextMemory */ | ||
58 | NOTSUPPORTED, /* SetMemory */ | ||
59 | NOTSUPPORTED, /* AddMemory */ | ||
60 | NOTSUPPORTED, /* DeleteMemory */ | ||
61 | NOTIMPLEMENTED, /* DeleteAllMemory */ | ||
62 | NOTSUPPORTED, /* GetSpeedDial */ | ||
63 | NOTSUPPORTED, /* SetSpeedDial */ | ||
64 | NOTSUPPORTED, /* GetSMSC */ | ||
65 | NOTSUPPORTED, /* SetSMSC */ | ||
66 | NOTSUPPORTED, /* GetSMSStatus */ | ||
67 | NOTSUPPORTED, /* GetSMS */ | ||
68 | NOTSUPPORTED, /* GetNextSMS */ | ||
69 | NOTSUPPORTED, /* SetSMS */ | ||
70 | NOTSUPPORTED, /* AddSMS */ | ||
71 | NOTSUPPORTED, /* DeleteSMS */ | ||
72 | NOTSUPPORTED, /* SendSMSMessage */ | ||
73 | NOTSUPPORTED, /* SendSavedSMS */ | ||
74 | NOTSUPPORTED, /* SetIncomingSMS */ | ||
75 | NOTSUPPORTED, /* SetIncomingCB */ | ||
76 | NOTSUPPORTED, /* GetSMSFolders */ | ||
77 | NOTSUPPORTED, /* AddSMSFolder */ | ||
78 | NOTSUPPORTED, /* DeleteSMSFolder */ | ||
79 | NOTSUPPORTED, /* DialVoice */ | ||
80 | NOTSUPPORTED, /* AnswerCall */ | ||
81 | NOTSUPPORTED, /* CancelCall */ | ||
82 | NOTSUPPORTED, /* HoldCall */ | ||
83 | NOTSUPPORTED, /* UnholdCall */ | ||
84 | NOTSUPPORTED, /* ConferenceCall */ | ||
85 | NOTSUPPORTED, /* SplitCall */ | ||
86 | NOTSUPPORTED, /* TransferCall */ | ||
87 | NOTSUPPORTED, /* SwitchCall */ | ||
88 | NOTSUPPORTED, /* GetCallDivert */ | ||
89 | NOTSUPPORTED, /* SetCallDivert */ | ||
90 | NOTSUPPORTED, /* CancelAllDiverts*/ | ||
91 | NOTSUPPORTED, /* SetIncomingCall */ | ||
92 | NOTSUPPORTED, /* SetIncomingUSSD */ | ||
93 | NOTSUPPORTED, /* SendDTMF */ | ||
94 | NOTSUPPORTED, /* GetRingtone */ | ||
95 | NOTSUPPORTED, /* SetRingtone */ | ||
96 | NOTSUPPORTED, /* GetRingtonesInfo*/ | ||
97 | NOTSUPPORTED, /* DeleteUserRingtones*/ | ||
98 | NOTSUPPORTED, /* PlayTone */ | ||
99 | NOTSUPPORTED, /* GetWAPBookmark */ | ||
100 | NOTSUPPORTED, /* SetWAPBookmark */ | ||
101 | NOTSUPPORTED, /* DeleteWAPBookmark */ | ||
102 | NOTSUPPORTED, /* GetWAPSettings */ | ||
103 | NOTSUPPORTED, /* SetWAPSettings */ | ||
104 | NOTSUPPORTED, /* GetMMSSettings */ | ||
105 | NOTSUPPORTED, /* SetMMSSettings */ | ||
106 | NOTSUPPORTED, /* GetBitmap */ | ||
107 | NOTSUPPORTED, /* SetBitmap */ | ||
108 | NOTSUPPORTED, /* GetToDoStatus */ | ||
109 | NOTSUPPORTED, /* GetToDo */ | ||
110 | NOTSUPPORTED, /* GetNextToDo */ | ||
111 | NOTSUPPORTED, /* SetToDo */ | ||
112 | NOTSUPPORTED, /* AddToDo */ | ||
113 | NOTSUPPORTED, /* DeleteToDo */ | ||
114 | NOTSUPPORTED, /* DeleteAllToDo */ | ||
115 | NOTSUPPORTED, /* GetCalendarStatus*/ | ||
116 | NOTSUPPORTED, /* GetCalendar */ | ||
117 | NOTSUPPORTED, /* GetNextCalendar */ | ||
118 | NOTSUPPORTED, /* SetCalendar */ | ||
119 | NOTSUPPORTED, /* AddCalendar */ | ||
120 | NOTSUPPORTED, /* DeleteCalendar */ | ||
121 | NOTSUPPORTED, /* DeleteAllCalendar*/ | ||
122 | NOTSUPPORTED, /* GetCalendarSettings*/ | ||
123 | NOTSUPPORTED, /* SetCalendarSettings*/ | ||
124 | NOTSUPPORTED, /* GetNoteStatus */ | ||
125 | NOTSUPPORTED, /* GetNote */ | ||
126 | NOTSUPPORTED, /* GetNextNote */ | ||
127 | NOTSUPPORTED, /* SetNote */ | ||
128 | NOTSUPPORTED, /* AddNote */ | ||
129 | NOTSUPPORTED, /* DeleteNote */ | ||
130 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
131 | NOTSUPPORTED, /* GetProfile */ | ||
132 | NOTSUPPORTED, /* SetProfile */ | ||
133 | NOTSUPPORTED, /* GetFMStation */ | ||
134 | NOTSUPPORTED, /* SetFMStation */ | ||
135 | NOTSUPPORTED, /* ClearFMStations */ | ||
136 | NOTSUPPORTED, /* GetNextFileFolder*/ | ||
137 | NOTSUPPORTED, /* GetFilePart */ | ||
138 | NOTSUPPORTED, /* AddFilePart */ | ||
139 | NOTSUPPORTED, /* GetFileSystemStatus*/ | ||
140 | NOTSUPPORTED, /* DeleteFile */ | ||
141 | NOTSUPPORTED, /* AddFolder */ | ||
142 | NOTSUPPORTED, /* GetGPRSAccessPoint*/ | ||
143 | NOTSUPPORTED /* SetGPRSAccessPoint*/ | ||
144 | }; | ||
145 | |||
146 | #endif | ||
147 | |||
148 | /* How should editor hadle tabs in this file? Add editor commands here. | ||
149 | * vim: noexpandtab sw=8 ts=8 sts=8: | ||
150 | */ | ||
diff --git a/gammu/emb/common/phone/nokia/dct3/n0650.h b/gammu/emb/common/phone/nokia/dct3/n0650.h new file mode 100644 index 0000000..be491eb --- a/dev/null +++ b/gammu/emb/common/phone/nokia/dct3/n0650.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* (c) 2004 by Marcin Wiacek */ | ||
2 | |||
3 | #ifndef n650_h | ||
4 | #define n650_h | ||
5 | |||
6 | typedef struct { | ||
7 | int fake; | ||
8 | } GSM_Phone_N650Data; | ||
9 | |||
10 | #ifndef GSM_USED_MBUS2 | ||
11 | # define GSM_USED_MBUS2 | ||
12 | #endif | ||
13 | |||
14 | #endif | ||
15 | |||
16 | /* How should editor hadle tabs in this file? Add editor commands here. | ||
17 | * vim: noexpandtab sw=8 ts=8 sts=8: | ||
18 | */ | ||
diff --git a/gammu/emb/common/phone/nokia/dct3/n6110.c b/gammu/emb/common/phone/nokia/dct3/n6110.c index dac6c12..c3ddfb6 100644 --- a/gammu/emb/common/phone/nokia/dct3/n6110.c +++ b/gammu/emb/common/phone/nokia/dct3/n6110.c | |||
@@ -5,4 +5,13 @@ | |||
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include "../../../gsmstate.h" | 17 | #include "../../../gsmstate.h" |
@@ -2869,5 +2878,11 @@ GSM_Phone_Functions N6110Phone = { | |||
2869 | NOTSUPPORTED, /* GetCalendarSettings */ | 2878 | NOTSUPPORTED, /* GetCalendarSettings */ |
2870 | NOTSUPPORTED, /* SetCalendarSettings */ | 2879 | NOTSUPPORTED, /* SetCalendarSettings */ |
2871 | NOTSUPPORTED, /* GetNextNote */ | 2880 | NOTSUPPORTED, /* GetNoteStatus */ |
2881 | NOTSUPPORTED, /* GetNote */ | ||
2882 | NOTSUPPORTED, /* GetNextNote */ | ||
2883 | NOTSUPPORTED, /* SetNote */ | ||
2884 | NOTSUPPORTED, /* AddNote */ | ||
2885 | NOTSUPPORTED, /* DeleteNote */ | ||
2886 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
2872 | N6110_GetProfile, | 2887 | N6110_GetProfile, |
2873 | N6110_SetProfile, | 2888 | N6110_SetProfile, |
diff --git a/gammu/emb/common/phone/nokia/dct3/n7110.c b/gammu/emb/common/phone/nokia/dct3/n7110.c index b597f9b..a8e0545 100644 --- a/gammu/emb/common/phone/nokia/dct3/n7110.c +++ b/gammu/emb/common/phone/nokia/dct3/n7110.c | |||
@@ -4,4 +4,13 @@ | |||
4 | * GNU GPL version 2 or later | 4 | * GNU GPL version 2 or later |
5 | */ | 5 | */ |
6 | /* Due to a problem in the source code management, the names of some of | ||
7 | * the authors have unfortunately been lost. We do not mean to belittle | ||
8 | * their efforts and hope they will contact us to see their names | ||
9 | * properly added to the Copyright notice above. | ||
10 | * Having published their contributions under the terms of the GNU | ||
11 | * General Public License (GPL) [version 2], the Copyright of these | ||
12 | * authors will remain respected by adhering to the license they chose | ||
13 | * to publish their code under. | ||
14 | */ | ||
6 | 15 | ||
7 | #include "../../../gsmstate.h" | 16 | #include "../../../gsmstate.h" |
@@ -1707,5 +1716,11 @@ GSM_Phone_Functions N7110Phone = { | |||
1707 | NOTSUPPORTED, /* GetCalendarSettings*/ | 1716 | NOTSUPPORTED, /* GetCalendarSettings*/ |
1708 | NOTSUPPORTED, /* SetCalendarSettings*/ | 1717 | NOTSUPPORTED, /* SetCalendarSettings*/ |
1718 | NOTSUPPORTED, /* GetNoteStatus */ | ||
1719 | NOTSUPPORTED, /* GetNote */ | ||
1709 | NOTSUPPORTED, /* GetNextNote */ | 1720 | NOTSUPPORTED, /* GetNextNote */ |
1721 | NOTSUPPORTED, /* SetNote */ | ||
1722 | NOTSUPPORTED, /* AddNote */ | ||
1723 | NOTSUPPORTED, /* DeleteNote */ | ||
1724 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
1710 | N7110_GetProfile, | 1725 | N7110_GetProfile, |
1711 | N7110_SetProfile, | 1726 | N7110_SetProfile, |
diff --git a/gammu/emb/common/phone/nokia/dct3/n9210.c b/gammu/emb/common/phone/nokia/dct3/n9210.c index ff71ad3..f535c2a 100644 --- a/gammu/emb/common/phone/nokia/dct3/n9210.c +++ b/gammu/emb/common/phone/nokia/dct3/n9210.c | |||
@@ -375,5 +375,11 @@ GSM_Phone_Functions N9210Phone = { | |||
375 | NOTSUPPORTED, /* GetCalendarSettings*/ | 375 | NOTSUPPORTED, /* GetCalendarSettings*/ |
376 | NOTSUPPORTED, /* SetCalendarSettings*/ | 376 | NOTSUPPORTED, /* SetCalendarSettings*/ |
377 | NOTSUPPORTED, /* GetNoteStatus */ | ||
378 | NOTSUPPORTED, /* GetNote */ | ||
377 | NOTSUPPORTED, /* GetNextNote */ | 379 | NOTSUPPORTED, /* GetNextNote */ |
380 | NOTSUPPORTED, /* SetNote */ | ||
381 | NOTSUPPORTED, /* AddNote */ | ||
382 | NOTSUPPORTED, /* DeleteNote */ | ||
383 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
378 | NOTIMPLEMENTED, /* GetProfile */ | 384 | NOTIMPLEMENTED, /* GetProfile */ |
379 | NOTSUPPORTED, /* SetProfile */ | 385 | NOTSUPPORTED, /* SetProfile */ |
diff --git a/gammu/emb/common/phone/nokia/dct4/n3320.c b/gammu/emb/common/phone/nokia/dct4/n3320.c index 9b1d6cd..9dd9ffb 100644 --- a/gammu/emb/common/phone/nokia/dct4/n3320.c +++ b/gammu/emb/common/phone/nokia/dct4/n3320.c | |||
@@ -250,5 +250,11 @@ GSM_Phone_Functions N3320Phone = { | |||
250 | NOTSUPPORTED, /* GetCalendarSettings*/ | 250 | NOTSUPPORTED, /* GetCalendarSettings*/ |
251 | NOTSUPPORTED, /* SetCalendarSettings*/ | 251 | NOTSUPPORTED, /* SetCalendarSettings*/ |
252 | NOTSUPPORTED, /* GetNoteStatus */ | ||
253 | NOTSUPPORTED, /* GetNote */ | ||
252 | NOTSUPPORTED, /* GetNextNote */ | 254 | NOTSUPPORTED, /* GetNextNote */ |
255 | NOTSUPPORTED, /* SetNote */ | ||
256 | NOTSUPPORTED, /* AddNote */ | ||
257 | NOTSUPPORTED, /* DeleteNote */ | ||
258 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
253 | NOTSUPPORTED, /* GetProfile */ | 259 | NOTSUPPORTED, /* GetProfile */ |
254 | NOTSUPPORTED, /* SetProfile */ | 260 | NOTSUPPORTED, /* SetProfile */ |
diff --git a/gammu/emb/common/phone/nokia/dct4/n3650.c b/gammu/emb/common/phone/nokia/dct4/n3650.c index d4746a7..f1fa826 100644 --- a/gammu/emb/common/phone/nokia/dct4/n3650.c +++ b/gammu/emb/common/phone/nokia/dct4/n3650.c | |||
@@ -371,5 +371,11 @@ GSM_Phone_Functions N3650Phone = { | |||
371 | NOTSUPPORTED, /* GetCalendarSettings*/ | 371 | NOTSUPPORTED, /* GetCalendarSettings*/ |
372 | NOTSUPPORTED, /* SetCalendarSettings*/ | 372 | NOTSUPPORTED, /* SetCalendarSettings*/ |
373 | NOTSUPPORTED, /* GetNoteStatus */ | ||
374 | NOTSUPPORTED, /* GetNote */ | ||
373 | NOTSUPPORTED, /* GetNextNote */ | 375 | NOTSUPPORTED, /* GetNextNote */ |
376 | NOTSUPPORTED, /* SetNote */ | ||
377 | NOTSUPPORTED, /* AddNote */ | ||
378 | NOTSUPPORTED, /* DeleteNote */ | ||
379 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
374 | NOTSUPPORTED, /* GetProfile */ | 380 | NOTSUPPORTED, /* GetProfile */ |
375 | NOTSUPPORTED, /* SetProfile */ | 381 | NOTSUPPORTED, /* SetProfile */ |
diff --git a/gammu/emb/common/phone/nokia/dct4/n6510.c b/gammu/emb/common/phone/nokia/dct4/n6510.c index 2208def..c481863 100644 --- a/gammu/emb/common/phone/nokia/dct4/n6510.c +++ b/gammu/emb/common/phone/nokia/dct4/n6510.c | |||
@@ -5,4 +5,13 @@ | |||
5 | */ | 5 | */ |
6 | /* function for making CRC for filesystem (c) 2003 by Michael Schroeder */ | 6 | /* function for making CRC for filesystem (c) 2003 by Michael Schroeder */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include "../../../gsmstate.h" | 17 | #include "../../../gsmstate.h" |
@@ -287,8 +296,8 @@ static GSM_Error N6510_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMa | |||
287 | smprintf(s, "(%s)\n",DecodeUnicodeString(GSM_GetCountryName(NetInfo.NetworkCode))); | 296 | smprintf(s, "(%s)\n",DecodeUnicodeString(GSM_GetCountryName(NetInfo.NetworkCode))); |
288 | 297 | ||
289 | sprintf(NetInfo.LAC,"%02x%02x", msg.Buffer[current+1], msg.Buffer[current+2]); | 298 | sprintf(NetInfo.LAC,"%02X%02X", msg.Buffer[current+1], msg.Buffer[current+2]); |
290 | smprintf(s, "LAC : %s\n", NetInfo.LAC); | 299 | smprintf(s, "LAC : %s\n", NetInfo.LAC); |
291 | 300 | ||
292 | sprintf(NetInfo.CID, "%02x%02x", msg.Buffer[current+5], msg.Buffer[current+6]); | 301 | sprintf(NetInfo.CID, "%02X%02X", msg.Buffer[current+5], msg.Buffer[current+6]); |
293 | smprintf(s, "CID : %s\n", NetInfo.CID); | 302 | smprintf(s, "CID : %s\n", NetInfo.CID); |
294 | 303 | ||
@@ -312,6 +321,6 @@ static GSM_Error N6510_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMa | |||
312 | tmp = 10; | 321 | tmp = 10; |
313 | NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,Data->NetworkInfo->NetworkName,true); | 322 | NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,Data->NetworkInfo->NetworkName,true); |
314 | sprintf(Data->NetworkInfo->LAC, "%02x%02x", msg.Buffer[current+1], msg.Buffer[current+2]); | 323 | sprintf(Data->NetworkInfo->LAC, "%02X%02X", msg.Buffer[current+1], msg.Buffer[current+2]); |
315 | sprintf(Data->NetworkInfo->CID, "%02x%02x", msg.Buffer[current+5], msg.Buffer[current+6]); | 324 | sprintf(Data->NetworkInfo->CID, "%02X%02X", msg.Buffer[current+5], msg.Buffer[current+6]); |
316 | NOKIA_DecodeNetworkCode(msg.Buffer + (current+7),Data->NetworkInfo->NetworkCode); | 325 | NOKIA_DecodeNetworkCode(msg.Buffer + (current+7),Data->NetworkInfo->NetworkCode); |
317 | } | 326 | } |
@@ -1128,8 +1137,6 @@ static GSM_Error N6510_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap) | |||
1128 | GSM_Phone_Bitmap_TypesType; | 1137 | GSM_Phone_Bitmap_TypesType; |
1129 | int Width, Height, i, count; | 1138 | int Width, Height, i, count; |
1130 | #ifdef DEVELOP | ||
1131 | unsigned char folderid; | 1139 | unsigned char folderid; |
1132 | int location; | 1140 | int location; |
1133 | #endif | ||
1134 | GSM_NetworkInfo NetInfo; | 1141 | GSM_NetworkInfo NetInfo; |
1135 | GSM_Error error; | 1142 | GSM_Error error; |
@@ -1256,5 +1263,4 @@ static GSM_Error N6510_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap) | |||
1256 | error = N6510_GetPictureImage(s, Bitmap, &sms.Location); | 1263 | error = N6510_GetPictureImage(s, Bitmap, &sms.Location); |
1257 | if (error == ERR_NONE) { | 1264 | if (error == ERR_NONE) { |
1258 | #ifdef DEVELOP | ||
1259 | sms.Folder = 0; | 1265 | sms.Folder = 0; |
1260 | N6510_GetSMSLocation(s, &sms, &folderid, &location); | 1266 | N6510_GetSMSLocation(s, &sms, &folderid, &location); |
@@ -1266,7 +1272,4 @@ static GSM_Error N6510_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap) | |||
1266 | reqPicture[6]=location / 256; | 1272 | reqPicture[6]=location / 256; |
1267 | reqPicture[7]=location; | 1273 | reqPicture[7]=location; |
1268 | #else | ||
1269 | return ERR_NOTSUPPORTED; | ||
1270 | #endif | ||
1271 | } | 1274 | } |
1272 | Type = GSM_NokiaPictureImage; | 1275 | Type = GSM_NokiaPictureImage; |
@@ -2420,4 +2423,7 @@ static GSM_Error N6510_ReplySaveSMSMessage(GSM_Protocol_Message msg, GSM_StateMa | |||
2420 | printf("Incorrect location\n"); | 2423 | printf("Incorrect location\n"); |
2421 | return ERR_INVALIDLOCATION; | 2424 | return ERR_INVALIDLOCATION; |
2425 | case 0x03: | ||
2426 | printf("Memory full (for example no empty space in SIM)\n"); | ||
2427 | return ERR_FULL; | ||
2422 | case 0x05: | 2428 | case 0x05: |
2423 | printf("Incorrect folder\n"); | 2429 | printf("Incorrect folder\n"); |
@@ -2677,4 +2683,6 @@ static GSM_Error N6510_ReplyGetRingtonesInfo(GSM_Protocol_Message msg, GSM_State | |||
2677 | if (msg.Buffer[4] * 256 + msg.Buffer[5] == 0x00) return ERR_EMPTY; | 2683 | if (msg.Buffer[4] * 256 + msg.Buffer[5] == 0x00) return ERR_EMPTY; |
2678 | Data->RingtonesInfo->Number = msg.Buffer[4] * 256 + msg.Buffer[5]; | 2684 | Data->RingtonesInfo->Number = msg.Buffer[4] * 256 + msg.Buffer[5]; |
2685 | // allocate array of ringtones based on number | ||
2686 | Data->RingtonesInfo->Ringtone = calloc(Data->RingtonesInfo->Number, sizeof(GSM_RingtoneInfo)); | ||
2679 | tmp = 6; | 2687 | tmp = 6; |
2680 | for (i=0;i<Data->RingtonesInfo->Number;i++) { | 2688 | for (i=0;i<Data->RingtonesInfo->Number;i++) { |
@@ -2755,5 +2763,5 @@ static GSM_Error N6510_ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachi | |||
2755 | static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone) | 2763 | static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone) |
2756 | { | 2764 | { |
2757 | GSM_AllRingtonesInfo Info; | 2765 | GSM_AllRingtonesInfo Info = {0, NULL}; |
2758 | GSM_Error error; | 2766 | GSM_Error error; |
2759 | unsigned char req2[6] = {N7110_FRAME_HEADER, 0x12, | 2767 | unsigned char req2[6] = {N7110_FRAME_HEADER, 0x12, |
@@ -2775,5 +2783,7 @@ static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, | |||
2775 | req2[5] = Info.Ringtone[Ringtone->Location-1].ID % 256; | 2783 | req2[5] = Info.Ringtone[Ringtone->Location-1].ID % 256; |
2776 | smprintf(s, "Getting binary ringtone\n"); | 2784 | smprintf(s, "Getting binary ringtone\n"); |
2777 | return GSM_WaitFor (s, req2, 6, 0x1f, 4, ID_GetRingtone); | 2785 | error = GSM_WaitFor (s, req2, 6, 0x1f, 4, ID_GetRingtone); |
2786 | if (Info.Ringtone) free(Info.Ringtone); | ||
2787 | return error; | ||
2778 | case RING_MIDI: | 2788 | case RING_MIDI: |
2779 | case RING_MMF: | 2789 | case RING_MMF: |
@@ -4055,4 +4065,95 @@ GSM_Error N6510_GetNextNote(GSM_StateMachine *s, GSM_NoteEntry *Note, bool start | |||
4055 | } | 4065 | } |
4056 | 4066 | ||
4067 | static GSM_Error N6510_DeleteNote(GSM_StateMachine *s, GSM_NoteEntry *Not) | ||
4068 | { | ||
4069 | GSM_Error error; | ||
4070 | GSM_NOKIACalToDoLocations *LastNote = &s->Phone.Data.Priv.N6510.LastNote; | ||
4071 | GSM_CalendarEntry Note; | ||
4072 | |||
4073 | if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_NOTES)) return ERR_NOTSUPPORTED; | ||
4074 | |||
4075 | error=N6510_GetCalendarInfo3(s,LastNote,2); | ||
4076 | if (error!=ERR_NONE) return error; | ||
4077 | |||
4078 | smprintf(s, "Deleting Note\n"); | ||
4079 | |||
4080 | if (Not->Location > LastNote->Number || Not->Location == 0) return ERR_INVALIDLOCATION; | ||
4081 | |||
4082 | Note.Location = LastNote->Location[Not->Location-1]; | ||
4083 | return N71_65_DelCalendar(s,&Note); | ||
4084 | } | ||
4085 | |||
4086 | static GSM_Error N6510_ReplyGetNoteFirstLoc(GSM_Protocol_Message msg, GSM_StateMachine *s) | ||
4087 | { | ||
4088 | smprintf(s, "First Note location: %i\n",msg.Buffer[8]*256+msg.Buffer[9]); | ||
4089 | s->Phone.Data.Note->Location = msg.Buffer[8]*256+msg.Buffer[9]; | ||
4090 | return ERR_NONE; | ||
4091 | } | ||
4092 | |||
4093 | static GSM_Error N6510_ReplyAddNote(GSM_Protocol_Message msg, GSM_StateMachine *s) | ||
4094 | { | ||
4095 | smprintf(s, "ToDo added\n"); | ||
4096 | return ERR_NONE; | ||
4097 | } | ||
4098 | |||
4099 | static GSM_Error N6510_AddNote(GSM_StateMachine *s, GSM_NoteEntry *Not) | ||
4100 | { | ||
4101 | GSM_Error error; | ||
4102 | int count=54; | ||
4103 | unsigned char reqLoc[] = {N6110_FRAME_HEADER, 0x95, | ||
4104 | 0x02};/* 1 = todo, 2 = note */ | ||
4105 | unsigned char req[5000] = { | ||
4106 | N6110_FRAME_HEADER, 0x65, | ||
4107 | 0x02, /* 0 = calendar, 1 = todo, 2 = note */ | ||
4108 | 0x00, 0x00, 0x00, | ||
4109 | 0x00, 0x00, /* location */ | ||
4110 | 0x00, 0x00, 0x00, 0x00, | ||
4111 | 0xFF, 0xFF, 0xFF, 0xFF, /* alarm */ | ||
4112 | 0x80, 0x00, 0x00, | ||
4113 | 0xA9, /* note icon */ | ||
4114 | 0x00, 0x00, 0x00, 0x00, /* alarm type */ | ||
4115 | 0x00, /* 0x02 or 0x00 */ | ||
4116 | 0x80, /* note type */ | ||
4117 | 0x07, 0xD2, 0x01, 0x01, 0x00, 0x00, /* start date/time */ | ||
4118 | 0x07, 0xD2, 0x01, 0x11, 0x00, 0x00, /* end date/time */ | ||
4119 | 0x00, 0x00, /* recurrance */ | ||
4120 | 0xFF, 0xFF, /* birth year */ | ||
4121 | 0x00, /* ToDo priority */ | ||
4122 | 0x00, /* ToDo completed ? */ | ||
4123 | 0x00, 0x00, 0x00, | ||
4124 | 0x00, /* note text length */ | ||
4125 | 0x00, /* phone length/meeting place */ | ||
4126 | 0x00, 0x00, 0x00}; | ||
4127 | |||
4128 | s->Phone.Data.Note = Not; | ||
4129 | |||
4130 | smprintf(s, "Getting first free Note location\n"); | ||
4131 | error = GSM_WaitFor (s, reqLoc, 5, 0x13, 4, ID_SetNote); | ||
4132 | if (error!=ERR_NONE) return error; | ||
4133 | req[8] = Not->Location/256; | ||
4134 | req[9] = Not->Location%256; | ||
4135 | |||
4136 | req[49] = UnicodeLength(Not->Text); | ||
4137 | CopyUnicodeString(req+54,Not->Text); | ||
4138 | count+= req[49]*2; | ||
4139 | |||
4140 | req[count++] = 0x00; | ||
4141 | |||
4142 | smprintf(s, "Adding Note\n"); | ||
4143 | return GSM_WaitFor (s, req, count, 0x13, 4, ID_SetNote); | ||
4144 | } | ||
4145 | |||
4146 | static GSM_Error N6510_GetNoteStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) | ||
4147 | { | ||
4148 | GSM_NOKIACalToDoLocations*LastNote = &s->Phone.Data.Priv.N6510.LastNote; | ||
4149 | GSM_Error error; | ||
4150 | |||
4151 | error = N6510_GetCalendarInfo3(s,LastNote,2); | ||
4152 | if (error!=ERR_NONE) return error; | ||
4153 | |||
4154 | status->Used = LastNote->Number; | ||
4155 | return ERR_NONE; | ||
4156 | } | ||
4157 | |||
4057 | static int N6510_FindFileCheckSum(unsigned char *ptr, int len) | 4158 | static int N6510_FindFileCheckSum(unsigned char *ptr, int len) |
4058 | { | 4159 | { |
@@ -5190,5 +5291,5 @@ static GSM_Error N6510_ReplyGetToDoFirstLoc2(GSM_Protocol_Message msg, GSM_State | |||
5190 | { | 5291 | { |
5191 | smprintf(s, "First ToDo location method 2: %i\n",msg.Buffer[8]*256+msg.Buffer[9]); | 5292 | smprintf(s, "First ToDo location method 2: %i\n",msg.Buffer[8]*256+msg.Buffer[9]); |
5192 | s->Phone.Data.ToDo->Location = msg.Buffer[9]; | 5293 | s->Phone.Data.ToDo->Location = msg.Buffer[8]*256+msg.Buffer[9]; |
5193 | return ERR_NONE; | 5294 | return ERR_NONE; |
5194 | } | 5295 | } |
@@ -5202,5 +5303,6 @@ static GSM_Error N6510_AddToDo2(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) | |||
5202 | GSM_DateTime DT; | 5303 | GSM_DateTime DT; |
5203 | int Text, Alarm, EndTime, Completed, count=54, Phone; | 5304 | int Text, Alarm, EndTime, Completed, count=54, Phone; |
5204 | unsigned char reqLoc[] = {N6110_FRAME_HEADER, 0x95, 0x01}; | 5305 | unsigned char reqLoc[] = {N6110_FRAME_HEADER, 0x95, |
5306 | 0x01};/* 1 = todo, 2 = note */ | ||
5205 | unsigned char req[5000] = { | 5307 | unsigned char req[5000] = { |
5206 | N6110_FRAME_HEADER, 0x65, | 5308 | N6110_FRAME_HEADER, 0x65, |
@@ -5586,4 +5688,5 @@ static GSM_Reply_Function N6510ReplyFunctions[] = { | |||
5586 | {N6510_ReplyAddCalendar3, "\x13",0x03,0x66,ID_SetCalendarNote },/*method 3*/ | 5688 | {N6510_ReplyAddCalendar3, "\x13",0x03,0x66,ID_SetCalendarNote },/*method 3*/ |
5587 | {N6510_ReplyAddToDo2, "\x13",0x03,0x66,ID_SetToDo }, | 5689 | {N6510_ReplyAddToDo2, "\x13",0x03,0x66,ID_SetToDo }, |
5690 | {N6510_ReplyAddNote, "\x13",0x03,0x66,ID_SetNote }, | ||
5588 | {N6510_ReplyGetCalendar3, "\x13",0x03,0x7E,ID_GetCalendarNote },/*method 3*/ | 5691 | {N6510_ReplyGetCalendar3, "\x13",0x03,0x7E,ID_GetCalendarNote },/*method 3*/ |
5589 | {N6510_ReplyGetToDo2, "\x13",0x03,0x7E,ID_GetToDo }, | 5692 | {N6510_ReplyGetToDo2, "\x13",0x03,0x7E,ID_GetToDo }, |
@@ -5594,4 +5697,5 @@ static GSM_Reply_Function N6510ReplyFunctions[] = { | |||
5594 | {N6510_ReplyGetCalendarNotePos, "\x13",0x03,0x96,ID_GetCalendarNotePos },/*method 3*/ | 5697 | {N6510_ReplyGetCalendarNotePos, "\x13",0x03,0x96,ID_GetCalendarNotePos },/*method 3*/ |
5595 | {N6510_ReplyGetToDoFirstLoc2, "\x13",0x03,0x96,ID_SetToDo }, | 5698 | {N6510_ReplyGetToDoFirstLoc2, "\x13",0x03,0x96,ID_SetToDo }, |
5699 | {N6510_ReplyGetNoteFirstLoc, "\x13",0x03,0x96,ID_SetNote }, | ||
5596 | {N6510_ReplyGetCalendarInfo, "\x13",0x03,0x9F,ID_GetCalendarNotesInfo},/*method 3*/ | 5700 | {N6510_ReplyGetCalendarInfo, "\x13",0x03,0x9F,ID_GetCalendarNotesInfo},/*method 3*/ |
5597 | {N6510_ReplyGetToDoStatus2, "\x13",0x03,0x9F,ID_GetToDo }, | 5701 | {N6510_ReplyGetToDoStatus2, "\x13",0x03,0x9F,ID_GetToDo }, |
@@ -5733,5 +5837,5 @@ static GSM_Reply_Function N6510ReplyFunctions[] = { | |||
5733 | 5837 | ||
5734 | GSM_Phone_Functions N6510Phone = { | 5838 | GSM_Phone_Functions N6510Phone = { |
5735 | "1100|1100a|1100b|3100|3100b|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|5140|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6610i|6800|6810|6820|7210|7250|7250i|7600|8310|8390|8910|8910i", | 5839 | "1100|1100a|1100b|3100|3100b|3105|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|5140|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6610i|6800|6810|6820|7210|7250|7250i|7600|8310|8390|8910|8910i", |
5736 | N6510ReplyFunctions, | 5840 | N6510ReplyFunctions, |
5737 | N6510_Initialise, | 5841 | N6510_Initialise, |
@@ -5842,5 +5946,11 @@ GSM_Phone_Functions N6510Phone = { | |||
5842 | N6510_GetCalendarSettings, | 5946 | N6510_GetCalendarSettings, |
5843 | NOTSUPPORTED, /* SetCalendarSettings*/ | 5947 | NOTSUPPORTED, /* SetCalendarSettings*/ |
5948 | N6510_GetNoteStatus, | ||
5949 | NOTIMPLEMENTED, /* GetNote */ | ||
5844 | N6510_GetNextNote, | 5950 | N6510_GetNextNote, |
5951 | NOTIMPLEMENTED, /* SetNote */ | ||
5952 | N6510_AddNote, | ||
5953 | N6510_DeleteNote, | ||
5954 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
5845 | N6510_GetProfile, | 5955 | N6510_GetProfile, |
5846 | N6510_SetProfile, | 5956 | N6510_SetProfile, |
diff --git a/gammu/emb/common/phone/nokia/nauto.c b/gammu/emb/common/phone/nokia/nauto.c index 3bb53ec..3c7f2cd 100644 --- a/gammu/emb/common/phone/nokia/nauto.c +++ b/gammu/emb/common/phone/nokia/nauto.c | |||
@@ -122,5 +122,11 @@ GSM_Phone_Functions NAUTOPhone = { | |||
122 | NOTSUPPORTED, /* GetCalendarSettings*/ | 122 | NOTSUPPORTED, /* GetCalendarSettings*/ |
123 | NOTSUPPORTED, /* SetCalendarSettings*/ | 123 | NOTSUPPORTED, /* SetCalendarSettings*/ |
124 | NOTSUPPORTED, /* GetNoteStatus */ | ||
125 | NOTSUPPORTED, /* GetNote */ | ||
124 | NOTSUPPORTED, /* GetNextNote */ | 126 | NOTSUPPORTED, /* GetNextNote */ |
127 | NOTSUPPORTED, /* SetNote */ | ||
128 | NOTSUPPORTED, /* AddNote */ | ||
129 | NOTSUPPORTED, /* DeleteNote */ | ||
130 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
125 | NOTSUPPORTED, /* GetProfile */ | 131 | NOTSUPPORTED, /* GetProfile */ |
126 | NOTSUPPORTED, /* SetProfile */ | 132 | NOTSUPPORTED, /* SetProfile */ |
diff --git a/gammu/emb/common/phone/obex/obexgen.c b/gammu/emb/common/phone/obex/obexgen.c index 3106369..b91afac 100644 --- a/gammu/emb/common/phone/obex/obexgen.c +++ b/gammu/emb/common/phone/obex/obexgen.c | |||
@@ -830,5 +830,11 @@ GSM_Phone_Functions OBEXGENPhone = { | |||
830 | NOTSUPPORTED, /* GetCalendarSettings*/ | 830 | NOTSUPPORTED, /* GetCalendarSettings*/ |
831 | NOTSUPPORTED, /* SetCalendarSettings*/ | 831 | NOTSUPPORTED, /* SetCalendarSettings*/ |
832 | NOTSUPPORTED, /* GetNoteStatus */ | ||
833 | NOTSUPPORTED, /* GetNote */ | ||
832 | NOTSUPPORTED, /* GetNextNote */ | 834 | NOTSUPPORTED, /* GetNextNote */ |
835 | NOTSUPPORTED, /* SetNote */ | ||
836 | NOTSUPPORTED, /* AddNote */ | ||
837 | NOTSUPPORTED, /* DeleteNote */ | ||
838 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
833 | NOTIMPLEMENTED, /* GetProfile */ | 839 | NOTIMPLEMENTED, /* GetProfile */ |
834 | NOTIMPLEMENTED, /* SetProfile */ | 840 | NOTIMPLEMENTED, /* SetProfile */ |
diff --git a/gammu/emb/common/phone/pfunc.c b/gammu/emb/common/phone/pfunc.c index a03a81d..fe890fc 100644 --- a/gammu/emb/common/phone/pfunc.c +++ b/gammu/emb/common/phone/pfunc.c | |||
@@ -62,4 +62,5 @@ GSM_Error PHONE_EncodeSMSFrame(GSM_StateMachine *s, GSM_SMSMessage *SMS, unsigne | |||
62 | if (SMS->PDU == SMS_Deliver) { | 62 | if (SMS->PDU == SMS_Deliver) { |
63 | if (SMS->SMSC.Number[0] == 0x00 && SMS->SMSC.Number[1] == 0x00) { | 63 | if (SMS->SMSC.Number[0] == 0x00 && SMS->SMSC.Number[1] == 0x00) { |
64 | smprintf(s,"No SMSC in SMS Deliver\n"); | ||
64 | return ERR_EMPTYSMSC; | 65 | return ERR_EMPTYSMSC; |
65 | } | 66 | } |
diff --git a/gammu/emb/common/phone/symbian/mroutgen.c b/gammu/emb/common/phone/symbian/mroutgen.c index a7382cf..63d26cf 100644 --- a/gammu/emb/common/phone/symbian/mroutgen.c +++ b/gammu/emb/common/phone/symbian/mroutgen.c | |||
@@ -199,5 +199,11 @@ GSM_Phone_Functions MROUTERGENPhone = { | |||
199 | NOTSUPPORTED, /* GetCalendarSettings*/ | 199 | NOTSUPPORTED, /* GetCalendarSettings*/ |
200 | NOTSUPPORTED, /* SetCalendarSettings*/ | 200 | NOTSUPPORTED, /* SetCalendarSettings*/ |
201 | NOTSUPPORTED, /* GetNoteStatus */ | ||
202 | NOTSUPPORTED, /* GetNote */ | ||
201 | NOTSUPPORTED, /* GetNextNote */ | 203 | NOTSUPPORTED, /* GetNextNote */ |
204 | NOTSUPPORTED, /* SetNote */ | ||
205 | NOTSUPPORTED, /* AddNote */ | ||
206 | NOTSUPPORTED, /* DeleteNote */ | ||
207 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
202 | NOTSUPPORTED, /* GetProfile */ | 208 | NOTSUPPORTED, /* GetProfile */ |
203 | NOTSUPPORTED, /* SetProfile */ | 209 | NOTSUPPORTED, /* SetProfile */ |