-rw-r--r-- | gammu/emb/common/gsmstate.h | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/gammu/emb/common/gsmstate.h b/gammu/emb/common/gsmstate.h index cb17623..2b4806c 100644 --- a/gammu/emb/common/gsmstate.h +++ b/gammu/emb/common/gsmstate.h | |||
@@ -8,12 +8,20 @@ | |||
8 | #include "config.h" | 8 | #include "config.h" |
9 | #include "misc/cfg.h" | 9 | #include "misc/cfg.h" |
10 | 10 | ||
11 | typedef struct _GSM_StateMachine GSM_StateMachine; | ||
12 | typedef struct _GSM_User GSM_User; | ||
13 | typedef struct _OnePhoneModel OnePhoneModel; | ||
14 | typedef struct _GSM_Reply_FunctionGSM_Reply_Function; | ||
15 | |||
11 | #ifdef GSM_ENABLE_NOKIA3320 | 16 | #ifdef GSM_ENABLE_NOKIA3320 |
12 | # include "phone/nokia/dct4/n3320.h" | 17 | # include "phone/nokia/dct4/n3320.h" |
13 | #endif | 18 | #endif |
14 | #ifdef GSM_ENABLE_NOKIA3650 | 19 | #ifdef GSM_ENABLE_NOKIA3650 |
15 | # include "phone/nokia/dct4/n3650.h" | 20 | # include "phone/nokia/dct4/n3650.h" |
16 | #endif | 21 | #endif |
22 | #ifdef GSM_ENABLE_NOKIA650 | ||
23 | # include "phone/nokia/dct3/n0650.h" | ||
24 | #endif | ||
17 | #ifdef GSM_ENABLE_NOKIA6110 | 25 | #ifdef GSM_ENABLE_NOKIA6110 |
18 | # include "phone/nokia/dct3/n6110.h" | 26 | # include "phone/nokia/dct3/n6110.h" |
19 | #endif | 27 | #endif |
@@ -94,7 +102,7 @@ | |||
94 | # undef GSM_ENABLE_MROUTERBLUE | 102 | # undef GSM_ENABLE_MROUTERBLUE |
95 | #endif | 103 | #endif |
96 | 104 | ||
97 | #if defined(GSM_ENABLE_NOKIA3320) || defined(GSM_ENABLE_NOKIA6110) || defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210) | 105 | #if defined(GSM_ENABLE_NOKIA3320) || defined(GSM_ENABLE_NOKIA650) || defined(GSM_ENABLE_NOKIA6110) || defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210) |
98 | # define GSM_ENABLE_NOKIA_DCT3 | 106 | # define GSM_ENABLE_NOKIA_DCT3 |
99 | #endif | 107 | #endif |
100 | #if defined(GSM_ENABLE_NOKIA3650) || defined(GSM_ENABLE_NOKIA6510) | 108 | #if defined(GSM_ENABLE_NOKIA3650) || defined(GSM_ENABLE_NOKIA6510) |
@@ -199,9 +207,6 @@ | |||
199 | #include "service/sms/gsmmulti.h" | 207 | #include "service/sms/gsmmulti.h" |
200 | #include "service/backup/gsmback.h" | 208 | #include "service/backup/gsmback.h" |
201 | 209 | ||
202 | typedef struct _GSM_StateMachine GSM_StateMachine; | ||
203 | typedef struct _GSM_User GSM_User; | ||
204 | typedef struct _OnePhoneModel OnePhoneModel; | ||
205 | 210 | ||
206 | /* ------------------------- Device layer ---------------------------------- */ | 211 | /* ------------------------- Device layer ---------------------------------- */ |
207 | 212 | ||
@@ -371,6 +376,8 @@ typedef enum { | |||
371 | ID_EnableEcho, | 376 | ID_EnableEcho, |
372 | ID_EnableErrorInfo, | 377 | ID_EnableErrorInfo, |
373 | ID_SetOBEX, | 378 | ID_SetOBEX, |
379 | ID_SetUSSD, | ||
380 | ID_GetNote, | ||
374 | ID_GetSignalQuality, | 381 | ID_GetSignalQuality, |
375 | ID_GetBatteryCharge, | 382 | ID_GetBatteryCharge, |
376 | ID_GetSMSFolders, | 383 | ID_GetSMSFolders, |
@@ -438,6 +445,7 @@ typedef enum { | |||
438 | ID_GetFMStation, | 445 | ID_GetFMStation, |
439 | ID_SetFMStation, | 446 | ID_SetFMStation, |
440 | ID_GetLanguage, | 447 | ID_GetLanguage, |
448 | ID_SetFastSMSSending, | ||
441 | ID_Reset, | 449 | ID_Reset, |
442 | ID_GetToDo, | 450 | ID_GetToDo, |
443 | ID_PressKey, | 451 | ID_PressKey, |
@@ -669,6 +677,7 @@ typedef struct { | |||
669 | * Pointer to structure used internally by phone drivers. | 677 | * Pointer to structure used internally by phone drivers. |
670 | */ | 678 | */ |
671 | GSM_ToDoEntry *ToDo; | 679 | GSM_ToDoEntry *ToDo; |
680 | GSM_NoteEntry *Note; | ||
672 | /** | 681 | /** |
673 | * Used internally by phone drivers. | 682 | * Used internally by phone drivers. |
674 | */ | 683 | */ |
@@ -770,6 +779,9 @@ typedef struct { | |||
770 | #ifdef GSM_ENABLE_NOKIA3650 | 779 | #ifdef GSM_ENABLE_NOKIA3650 |
771 | GSM_Phone_N3650Data N3650; | 780 | GSM_Phone_N3650Data N3650; |
772 | #endif | 781 | #endif |
782 | #ifdef GSM_ENABLE_NOKIA650 | ||
783 | GSM_Phone_N650Data N650; | ||
784 | #endif | ||
773 | #ifdef GSM_ENABLE_NOKIA6110 | 785 | #ifdef GSM_ENABLE_NOKIA6110 |
774 | GSM_Phone_N6110Data N6110; | 786 | GSM_Phone_N6110Data N6110; |
775 | #endif | 787 | #endif |
@@ -804,7 +816,7 @@ typedef struct { | |||
804 | * | 816 | * |
805 | * Should be used in array with last element containing ID_None as requestID. | 817 | * Should be used in array with last element containing ID_None as requestID. |
806 | */ | 818 | */ |
807 | typedef struct { | 819 | struct _GSM_Reply_Function { |
808 | /** | 820 | /** |
809 | * Pointer to function that should be executed. | 821 | * Pointer to function that should be executed. |
810 | */ | 822 | */ |
@@ -828,7 +840,7 @@ typedef struct { | |||
828 | * you want to use this in any state. | 840 | * you want to use this in any state. |
829 | */ | 841 | */ |
830 | GSM_Phone_RequestIDrequestID; | 842 | GSM_Phone_RequestIDrequestID; |
831 | } GSM_Reply_Function; | 843 | }; |
832 | 844 | ||
833 | /** | 845 | /** |
834 | * Structure defining phone functions. | 846 | * Structure defining phone functions. |
@@ -1059,6 +1071,7 @@ typedef struct { | |||
1059 | * Sends SMS already saved in phone. | 1071 | * Sends SMS already saved in phone. |
1060 | */ | 1072 | */ |
1061 | GSM_Error (*SendSavedSMS)(GSM_StateMachine *s, int Folder, int Location); | 1073 | GSM_Error (*SendSavedSMS)(GSM_StateMachine *s, int Folder, int Location); |
1074 | GSM_Error (*SetFastSMSSending) (GSM_StateMachine *s, bool enable); | ||
1062 | /** | 1075 | /** |
1063 | * Enable/disable notification on incoming SMS. | 1076 | * Enable/disable notification on incoming SMS. |
1064 | */ | 1077 | */ |
@@ -1279,7 +1292,7 @@ typedef struct { | |||
1279 | /** | 1292 | /** |
1280 | * Gets note. | 1293 | * Gets note. |
1281 | */ | 1294 | */ |
1282 | GSM_Error (*GetNote) (GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh); | 1295 | GSM_Error (*GetNextNote)(GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh); |
1283 | /** | 1296 | /** |
1284 | * Reads profile. | 1297 | * Reads profile. |
1285 | */ | 1298 | */ |
@@ -1344,6 +1357,9 @@ typedef struct { | |||
1344 | #ifdef GSM_ENABLE_NOKIA6110 | 1357 | #ifdef GSM_ENABLE_NOKIA6110 |
1345 | extern GSM_Phone_Functions N6110Phone; | 1358 | extern GSM_Phone_Functions N6110Phone; |
1346 | #endif | 1359 | #endif |
1360 | #ifdef GSM_ENABLE_NOKIA650 | ||
1361 | extern GSM_Phone_Functions N650Phone; | ||
1362 | #endif | ||
1347 | #ifdef GSM_ENABLE_NOKIA6510 | 1363 | #ifdef GSM_ENABLE_NOKIA6510 |
1348 | extern GSM_Phone_Functions N6510Phone; | 1364 | extern GSM_Phone_Functions N6510Phone; |
1349 | #endif | 1365 | #endif |
@@ -1523,6 +1539,7 @@ typedef enum { | |||
1523 | /* n6510.c && n7110.c */ | 1539 | /* n6510.c && n7110.c */ |
1524 | F_VOICETAGS, /* Voice tags available */ | 1540 | F_VOICETAGS, /* Voice tags available */ |
1525 | F_CAL62, /* Calendar,6210 style - Call,Birthday,Memo,Meeting */ | 1541 | F_CAL62, /* Calendar,6210 style - Call,Birthday,Memo,Meeting */ |
1542 | F_NOTES, | ||
1526 | 1543 | ||
1527 | /* AT modules */ | 1544 | /* AT modules */ |
1528 | F_SMSONLYSENT, /* Phone supports only sent/unsent messages */ | 1545 | F_SMSONLYSENT, /* Phone supports only sent/unsent messages */ |