| -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 @@ #include "config.h" #include "misc/cfg.h" +typedef struct _GSM_StateMachine GSM_StateMachine; +typedef struct _GSM_User GSM_User; +typedef struct _OnePhoneModel OnePhoneModel; +typedef struct _GSM_Reply_Function GSM_Reply_Function; + #ifdef GSM_ENABLE_NOKIA3320 # include "phone/nokia/dct4/n3320.h" #endif #ifdef GSM_ENABLE_NOKIA3650 # include "phone/nokia/dct4/n3650.h" #endif +#ifdef GSM_ENABLE_NOKIA650 +# include "phone/nokia/dct3/n0650.h" +#endif #ifdef GSM_ENABLE_NOKIA6110 # include "phone/nokia/dct3/n6110.h" #endif @@ -94,7 +102,7 @@ # undef GSM_ENABLE_MROUTERBLUE #endif -#if defined(GSM_ENABLE_NOKIA3320) || defined(GSM_ENABLE_NOKIA6110) || defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210) +#if defined(GSM_ENABLE_NOKIA3320) || defined(GSM_ENABLE_NOKIA650) || defined(GSM_ENABLE_NOKIA6110) || defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210) # define GSM_ENABLE_NOKIA_DCT3 #endif #if defined(GSM_ENABLE_NOKIA3650) || defined(GSM_ENABLE_NOKIA6510) @@ -199,9 +207,6 @@ #include "service/sms/gsmmulti.h" #include "service/backup/gsmback.h" -typedef struct _GSM_StateMachine GSM_StateMachine; -typedef struct _GSM_User GSM_User; -typedef struct _OnePhoneModel OnePhoneModel; /* ------------------------- Device layer ---------------------------------- */ @@ -371,6 +376,8 @@ typedef enum { ID_EnableEcho, ID_EnableErrorInfo, ID_SetOBEX, + ID_SetUSSD, + ID_GetNote, ID_GetSignalQuality, ID_GetBatteryCharge, ID_GetSMSFolders, @@ -438,6 +445,7 @@ typedef enum { ID_GetFMStation, ID_SetFMStation, ID_GetLanguage, + ID_SetFastSMSSending, ID_Reset, ID_GetToDo, ID_PressKey, @@ -669,6 +677,7 @@ typedef struct { * Pointer to structure used internally by phone drivers. */ GSM_ToDoEntry *ToDo; + GSM_NoteEntry *Note; /** * Used internally by phone drivers. */ @@ -770,6 +779,9 @@ typedef struct { #ifdef GSM_ENABLE_NOKIA3650 GSM_Phone_N3650Data N3650; #endif +#ifdef GSM_ENABLE_NOKIA650 + GSM_Phone_N650Data N650; +#endif #ifdef GSM_ENABLE_NOKIA6110 GSM_Phone_N6110Data N6110; #endif @@ -804,7 +816,7 @@ typedef struct { * * Should be used in array with last element containing ID_None as requestID. */ -typedef struct { +struct _GSM_Reply_Function { /** * Pointer to function that should be executed. */ @@ -828,7 +840,7 @@ typedef struct { * you want to use this in any state. */ GSM_Phone_RequestID requestID; -} GSM_Reply_Function; +}; /** * Structure defining phone functions. @@ -1059,6 +1071,7 @@ typedef struct { * Sends SMS already saved in phone. */ GSM_Error (*SendSavedSMS) (GSM_StateMachine *s, int Folder, int Location); + GSM_Error (*SetFastSMSSending) (GSM_StateMachine *s, bool enable); /** * Enable/disable notification on incoming SMS. */ @@ -1279,7 +1292,7 @@ typedef struct { /** * Gets note. */ - GSM_Error (*GetNote) (GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh); + GSM_Error (*GetNextNote) (GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh); /** * Reads profile. */ @@ -1344,6 +1357,9 @@ typedef struct { #ifdef GSM_ENABLE_NOKIA6110 extern GSM_Phone_Functions N6110Phone; #endif +#ifdef GSM_ENABLE_NOKIA650 + extern GSM_Phone_Functions N650Phone; +#endif #ifdef GSM_ENABLE_NOKIA6510 extern GSM_Phone_Functions N6510Phone; #endif @@ -1523,6 +1539,7 @@ typedef enum { /* n6510.c && n7110.c */ F_VOICETAGS, /* Voice tags available */ F_CAL62, /* Calendar,6210 style - Call,Birthday,Memo,Meeting */ + F_NOTES, /* AT modules */ F_SMSONLYSENT, /* Phone supports only sent/unsent messages */ |