author | zautrix <zautrix> | 2004-10-25 08:56:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-25 08:56:23 (UTC) |
commit | 62e92aa86b6281b4e4c2a2bdb57f3ceb5a87f4e3 (patch) (unidiff) | |
tree | c2b7a41b0c8fffdc0786b84ff86724ea8f08d6a1 /gammu/emb/common/phone/at | |
parent | feff0930372dd51af24dc3b46697e70838277ea5 (diff) | |
download | kdepimpi-62e92aa86b6281b4e4c2a2bdb57f3ceb5a87f4e3.zip kdepimpi-62e92aa86b6281b4e4c2a2bdb57f3ceb5a87f4e3.tar.gz kdepimpi-62e92aa86b6281b4e4c2a2bdb57f3ceb5a87f4e3.tar.bz2 |
gammu updates
-rw-r--r-- | gammu/emb/common/phone/at/atgen.c | 8 | ||||
-rw-r--r-- | gammu/emb/common/phone/at/sonyeric.c | 19 |
2 files changed, 17 insertions, 10 deletions
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 | |||
@@ -693,13 +693,13 @@ GSM_Error ATGEN_Initialise(GSM_StateMachine *s) | |||
693 | } | 693 | } |
694 | 694 | ||
695 | GSM_Error ATGEN_SetSMSC(GSM_StateMachine *s, GSM_SMSC *smsc) | 695 | GSM_Error ATGEN_SetSMSC(GSM_StateMachine *s, GSM_SMSC *smsc) |
696 | { | 696 | { |
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)); |
702 | 702 | ||
703 | smprintf(s, "Setting SMSC\n"); | 703 | smprintf(s, "Setting SMSC\n"); |
704 | return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_SetSMSC); | 704 | return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_SetSMSC); |
705 | } | 705 | } |
@@ -3836,13 +3836,19 @@ GSM_Phone_Functions ATGENPhone = { | |||
3836 | NOTIMPLEMENTED, /* SetCalendar */ | 3836 | NOTIMPLEMENTED, /* SetCalendar */ |
3837 | ATGEN_AddCalendarNote, | 3837 | ATGEN_AddCalendarNote, |
3838 | ATGEN_DelCalendarNote, | 3838 | ATGEN_DelCalendarNote, |
3839 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ | 3839 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ |
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 */ |
3845 | NOTSUPPORTED, /* GetFMStation */ | 3851 | NOTSUPPORTED, /* GetFMStation */ |
3846 | NOTSUPPORTED, /* SetFMStation */ | 3852 | NOTSUPPORTED, /* SetFMStation */ |
3847 | NOTSUPPORTED, /* ClearFMStations */ | 3853 | NOTSUPPORTED, /* ClearFMStations */ |
3848 | NOTSUPPORTED, /* GetNextFileFolder*/ | 3854 | NOTSUPPORTED, /* GetNextFileFolder*/ |
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 | |||
@@ -11,16 +11,17 @@ | |||
11 | #include "../../gsmcomon.h" | 11 | #include "../../gsmcomon.h" |
12 | #include "../../misc/coding/coding.h" | 12 | #include "../../misc/coding/coding.h" |
13 | 13 | ||
14 | #include "atgen.h" | 14 | #include "atgen.h" |
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[]; |
23 | 24 | ||
24 | static GSM_Error SONYERIC_SetOBEXMode(GSM_StateMachine *s) | 25 | static GSM_Error SONYERIC_SetOBEXMode(GSM_StateMachine *s) |
25 | { | 26 | { |
26 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 27 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
@@ -121,13 +122,13 @@ static GSM_Error SONYERIC_SetFile(GSM_StateMachine *s, unsigned char *FileName, | |||
121 | } | 122 | } |
122 | 123 | ||
123 | #endif | 124 | #endif |
124 | 125 | ||
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; |
130 | int Pos, num, Loc; | 131 | int Pos, num, Loc; |
131 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 132 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
132 | 133 | ||
133 | if (start) { | 134 | if (start) { |
@@ -157,13 +158,13 @@ GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, | |||
157 | return ERR_SOURCENOTAVAILABLE; | 158 | return ERR_SOURCENOTAVAILABLE; |
158 | #endif | 159 | #endif |
159 | } | 160 | } |
160 | 161 | ||
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; |
166 | int Pos, num, Loc; | 167 | int Pos, num, Loc; |
167 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 168 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
168 | 169 | ||
169 | if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED; | 170 | if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED; |
@@ -196,13 +197,13 @@ GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool st | |||
196 | return ERR_SOURCENOTAVAILABLE; | 197 | return ERR_SOURCENOTAVAILABLE; |
197 | #endif | 198 | #endif |
198 | } | 199 | } |
199 | 200 | ||
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; |
205 | GSM_CalendarEntry Calendar; | 206 | GSM_CalendarEntry Calendar; |
206 | int Pos; | 207 | int Pos; |
207 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 208 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
208 | 209 | ||
@@ -227,13 +228,13 @@ GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) | |||
227 | return ERR_SOURCENOTAVAILABLE; | 228 | return ERR_SOURCENOTAVAILABLE; |
228 | #endif | 229 | #endif |
229 | } | 230 | } |
230 | 231 | ||
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; |
236 | 237 | ||
237 | smprintf(s,"Adding calendar note\n"); | 238 | smprintf(s,"Adding calendar note\n"); |
238 | 239 | ||
239 | GSM_EncodeVCALENDAR(req,&size,Note,true,SonyEricsson_VCalendar); | 240 | GSM_EncodeVCALENDAR(req,&size,Note,true,SonyEricsson_VCalendar); |
@@ -243,13 +244,13 @@ GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | |||
243 | return ERR_SOURCENOTAVAILABLE; | 244 | return ERR_SOURCENOTAVAILABLE; |
244 | #endif | 245 | #endif |
245 | } | 246 | } |
246 | 247 | ||
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]; |
252 | int size=0; | 253 | int size=0; |
253 | 254 | ||
254 | if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED; | 255 | if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED; |
255 | 256 | ||
@@ -262,13 +263,13 @@ GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) | |||
262 | return ERR_SOURCENOTAVAILABLE; | 263 | return ERR_SOURCENOTAVAILABLE; |
263 | #endif | 264 | #endif |
264 | } | 265 | } |
265 | 266 | ||
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; |
271 | unsigned char *Buf; | 272 | unsigned char *Buf; |
272 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 273 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
273 | unsigned char Line[2000]; | 274 | unsigned char Line[2000]; |
274 | 275 | ||
@@ -314,13 +315,13 @@ GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s) | |||
314 | return ERR_SOURCENOTAVAILABLE; | 315 | return ERR_SOURCENOTAVAILABLE; |
315 | #endif | 316 | #endif |
316 | } | 317 | } |
317 | 318 | ||
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; |
323 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 324 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
324 | unsigned char Line[2000]; | 325 | unsigned char Line[2000]; |
325 | unsigned char *Buf; | 326 | unsigned char *Buf; |
326 | 327 | ||
@@ -369,13 +370,13 @@ GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | |||
369 | return ERR_SOURCENOTAVAILABLE; | 370 | return ERR_SOURCENOTAVAILABLE; |
370 | #endif | 371 | #endif |
371 | } | 372 | } |
372 | 373 | ||
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; |
378 | GSM_CalendarEntry Calendar; | 379 | GSM_CalendarEntry Calendar; |
379 | int Pos; | 380 | int Pos; |
380 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 381 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
381 | 382 | ||