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
@@ -10,2 +10,7 @@
 
+        typedef struct _GSM_StateMachine GSM_StateMachine;
+        typedef struct _GSM_User         GSM_User;
+        typedef struct _OnePhoneModel    OnePhoneModel;
+        typedef struct _GSM_Reply_FunctionGSM_Reply_Function;
+
 #ifdef GSM_ENABLE_NOKIA3320
@@ -16,2 +21,5 @@
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+#  include "phone/nokia/dct3/n0650.h"
+#endif
 #ifdef GSM_ENABLE_NOKIA6110
@@ -96,3 +104,3 @@
 
-#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
@@ -201,5 +209,2 @@
 
-typedef struct _GSM_StateMachine GSM_StateMachine;
-        typedef struct _GSM_User GSM_User;
-        typedef struct _OnePhoneModel OnePhoneModel;
 
@@ -373,2 +378,4 @@ typedef enum {
         ID_SetOBEX,
+        ID_SetUSSD,
+        ID_GetNote,
         ID_GetSignalQuality,
@@ -440,2 +447,3 @@ typedef enum {
         ID_GetLanguage,
+        ID_SetFastSMSSending,
         ID_Reset,
@@ -671,2 +679,3 @@ typedef struct {
                 GSM_ToDoEntry   *ToDo;
+                GSM_NoteEntry   *Note;
         /**
@@ -772,2 +781,5 @@ typedef struct {
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+                        GSM_Phone_N650Data N650;
+#endif
 #ifdef GSM_ENABLE_NOKIA6110
@@ -806,3 +818,3 @@ typedef struct {
  */
-typedef struct {
+struct _GSM_Reply_Function {
         /**
@@ -830,3 +842,3 @@ typedef struct {
                 GSM_Phone_RequestIDrequestID;
-} GSM_Reply_Function;
+};
 
@@ -1061,2 +1073,3 @@ typedef struct {
                 GSM_Error (*SendSavedSMS)(GSM_StateMachine *s, int Folder, int Location);
+        GSM_Error (*SetFastSMSSending)  (GSM_StateMachine *s, bool enable);
         /**
@@ -1281,3 +1294,3 @@ typedef struct {
          */
-                GSM_Error (*GetNote)        (GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh);
+                GSM_Error (*GetNextNote)(GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh);
         /**
@@ -1346,2 +1359,5 @@ typedef struct {
 #endif
+#ifdef GSM_ENABLE_NOKIA650
+        extern GSM_Phone_Functions N650Phone;
+#endif
 #ifdef GSM_ENABLE_NOKIA6510
@@ -1525,2 +1541,3 @@ typedef enum {
                 F_CAL62,        /* Calendar,6210 style - Call,Birthday,Memo,Meeting     */
+        F_NOTES,