| -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 @@ -5,18 +5,26 @@ #include <time.h> #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 #ifdef GSM_ENABLE_NOKIA6510 # include "phone/nokia/dct4/n6510.h" #endif @@ -91,13 +99,13 @@ # undef GSM_ENABLE_IRDAAT #endif #ifndef GSM_USED_MROUTERBLUE # 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) # define GSM_ENABLE_NOKIA_DCT4 #endif @@ -196,15 +204,12 @@ #include "service/gsmcall.h" #include "service/sms/gsmsms.h" #include "service/sms/gsmems.h" #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 ---------------------------------- */ /** * Device functions, each device has to provide these. */ @@ -368,12 +373,14 @@ typedef enum { ID_GetMemoryStatus, ID_GetSMSC, ID_GetSMSMessage, ID_EnableEcho, ID_EnableErrorInfo, ID_SetOBEX, + ID_SetUSSD, + ID_GetNote, ID_GetSignalQuality, ID_GetBatteryCharge, ID_GetSMSFolders, ID_GetSMSFolderStatus, ID_GetSMSStatus, ID_AddSMSFolder, @@ -435,12 +442,13 @@ typedef enum { ID_SetMemoryCharset, ID_GetMMSSettings, ID_SetSMSParameters, ID_GetFMStation, ID_SetFMStation, ID_GetLanguage, + ID_SetFastSMSSending, ID_Reset, ID_GetToDo, ID_PressKey, ID_DeleteAllToDo, ID_SetLight, ID_Divert, @@ -666,12 +674,13 @@ typedef struct { */ GSM_MultiCallDivert *Divert; /** * Pointer to structure used internally by phone drivers. */ GSM_ToDoEntry *ToDo; + GSM_NoteEntry *Note; /** * Used internally by phone drivers. */ bool PressKey; /** * Pointer to structure used internally by phone drivers. @@ -767,12 +776,15 @@ typedef struct { #ifdef GSM_ENABLE_NOKIA3320 GSM_Phone_N3320Data N3320; #endif #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 #ifdef GSM_ENABLE_NOKIA6510 GSM_Phone_N6510Data N6510; #endif @@ -801,13 +813,13 @@ typedef struct { * ID_IncomingFrame and msgtype matches start message and (if msgtype is just * one character) subtypechar is zero or subtypechar-th character of message * matches subtype. * * 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. */ GSM_Error (*Function) (GSM_Protocol_Message msg, GSM_StateMachine *s); /** * Message type, if it is longer than 1 character, it disables subtype @@ -825,13 +837,13 @@ typedef struct { unsigned char subtype; /** * Phone request when this can be called, use ID_IncomingFrame when * you want to use this in any state. */ GSM_Phone_RequestID requestID; -} GSM_Reply_Function; +}; /** * Structure defining phone functions. */ typedef struct { /** @@ -1056,12 +1068,13 @@ typedef struct { */ GSM_Error (*SendSMS) (GSM_StateMachine *s, GSM_SMSMessage *sms); /** * 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. */ GSM_Error (*SetIncomingSMS) (GSM_StateMachine *s, bool enable); /** * Gets network information from phone. @@ -1276,13 +1289,13 @@ typedef struct { * Sets calendar settings. */ GSM_Error (*SetCalendarSettings)(GSM_StateMachine *s, GSM_CalendarSettings *settings); /** * 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. */ GSM_Error (*GetProfile) (GSM_StateMachine *s, GSM_Profile *Profile); /** * Updates profile. @@ -1341,12 +1354,15 @@ typedef struct { #ifdef GSM_ENABLE_NOKIA3650 extern GSM_Phone_Functions N3650Phone; #endif #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 #ifdef GSM_ENABLE_NOKIA7110 extern GSM_Phone_Functions N7110Phone; #endif @@ -1520,12 +1536,13 @@ typedef enum { F_CAL65, /* Calendar,6510 style - CBMM, method 3 */ F_WAPMMSPROXY, /* WAP & MMS settings contains first & second proxy */ /* 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 */ F_BROKENCPBS, /* CPBS on some memories can hang phone */ F_M20SMS, /* Siemens M20 like SMS handling */ F_SLOWWRITE, /* Use slower writing which some phone need */ |