updated to latest gammu version

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
@@ -7,14 +7,22 @@
 
 #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
@@ -93,9 +101,9 @@
 #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
@@ -198,11 +206,8 @@
 #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 ---------------------------------- */
 
 /**
@@ -370,8 +375,10 @@ typedef enum {
 	ID_GetSMSMessage,
 	ID_EnableEcho,
 	ID_EnableErrorInfo,
 	ID_SetOBEX,
+	ID_SetUSSD,
+	ID_GetNote,
 	ID_GetSignalQuality,
 	ID_GetBatteryCharge,
 	ID_GetSMSFolders,
 	ID_GetSMSFolderStatus,
@@ -437,8 +444,9 @@ typedef enum {
 	ID_SetSMSParameters,
 	ID_GetFMStation,
 	ID_SetFMStation,
 	ID_GetLanguage,
+	ID_SetFastSMSSending,
 	ID_Reset,
 	ID_GetToDo,
 	ID_PressKey,
 	ID_DeleteAllToDo,
@@ -668,8 +676,9 @@ typedef struct {
 	/**
 	 * Pointer to structure used internally by phone drivers.
 	 */
 	GSM_ToDoEntry		*ToDo;
+	GSM_NoteEntry		*Note;
 	/**
 	 * Used internally by phone drivers.
 	 */
 	bool			PressKey;
@@ -769,8 +778,11 @@ typedef struct {
 #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
@@ -803,9 +815,9 @@ typedef struct {
  * 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);
@@ -827,9 +839,9 @@ typedef struct {
 	 * 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.
  */
@@ -1058,8 +1070,9 @@ 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.
 	 */
 	GSM_Error (*SetIncomingSMS)     (GSM_StateMachine *s, bool enable);
@@ -1278,9 +1291,9 @@ typedef struct {
 	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);
@@ -1343,8 +1356,11 @@ typedef struct {
 #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
@@ -1522,8 +1538,9 @@ 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			*/
 	F_BROKENCPBS, 	/* CPBS on some memories can hang phone				*/