gammu updates

1 files changed, 28 insertions, 2 deletions

diff --git a/gammu/emb/common/gsmstate.h b/gammu/emb/common/gsmstate.h
index 2b4806c..6861fbc 100644
--- a/gammu/emb/common/gsmstate.h
+++ b/gammu/emb/common/gsmstate.h
@@ -317,128 +317,129 @@ typedef struct {
 #endif
 #if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX)
 	extern GSM_Protocol_Functions OBEXProtocol;
 #endif
 #if defined(GSM_ENABLE_MROUTERBLUE)
 	extern GSM_Protocol_Functions MROUTERProtocol;
 #endif
 
 /**
  * Structure containing protocol specific data and pointer to protocol
  * functions - @ref GSM_Protocol_Functions. The data are in a structure, so
  * you may use more protocols at once and switch between them.
  */
 typedef struct {
 	struct {
 		char fake;
 #ifdef GSM_ENABLE_MBUS2
 		GSM_Protocol_MBUS2Data		MBUS2;
 #endif
 #if defined(GSM_ENABLE_FBUS2) || defined(GSM_ENABLE_FBUS2IRDA) || defined(GSM_ENABLE_FBUS2DLR3) || defined(GSM_ENABLE_FBUS2DKU5) || defined(GSM_ENABLE_FBUS2PL2303) || defined(GSM_ENABLE_FBUS2BLUE) || defined(GSM_ENABLE_BLUEFBUS2)
 		GSM_Protocol_FBUS2Data		FBUS2;
 #endif
 #if defined(GSM_ENABLE_PHONETBLUE) || defined(GSM_ENABLE_IRDAPHONET) || defined(GSM_ENABLE_BLUEPHONET)
 		GSM_Protocol_PHONETData		PHONET;
 #endif
 #if defined(GSM_ENABLE_AT) || defined(GSM_ENABLE_BLUEAT) || defined(GSM_ENABLE_IRDAAT)
 		GSM_Protocol_ATData		AT;
 #endif
 #ifdef GSM_ENABLE_ALCABUS
 		GSM_Protocol_ALCABUSData	ALCABUS;
 #endif
 #if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX)
 		GSM_Protocol_OBEXData		OBEX;
 #endif
 #if defined(GSM_ENABLE_MROUTERBLUE)
 		GSM_Protocol_MROUTERData	MROUTER;
 #endif
 	} Data;
 	GSM_Protocol_Functions *Functions;
 } GSM_Protocol;
 
 /* -------------------------- Phone layer ---------------------------------- */
 
 /**
  * Phone requests identificators, these are used for internally identifying
  * which operation is being performed.
  */
 typedef enum {
 	ID_None=1,
 	ID_GetModel,
 	ID_GetFirmware,
 	ID_EnableSecurity,
 	ID_GetIMEI,
 	ID_GetDateTime,
 	ID_GetAlarm,
 	ID_GetMemory,
 	ID_GetMemoryStatus,
 	ID_GetSMSC,
 	ID_GetSMSMessage,
 	ID_EnableEcho,
 	ID_EnableErrorInfo,
 	ID_SetOBEX,
 	ID_SetUSSD,
 	ID_GetNote,
+	ID_SetNote,
 	ID_GetSignalQuality,
 	ID_GetBatteryCharge,
 	ID_GetSMSFolders,
 	ID_GetSMSFolderStatus,
 	ID_GetSMSStatus,
 	ID_AddSMSFolder,
 	ID_GetNetworkInfo,
 	ID_GetRingtone,
 	ID_DialVoice,
 	ID_GetCalendarNotesInfo,
 	ID_GetCalendarNote,
 	ID_GetSecurityCode,
 	ID_GetWAPBookmark,
 	ID_GetBitmap,
 	ID_SaveSMSMessage,
 	ID_CancelCall,
 	ID_SetDateTime,
 	ID_SetAlarm,
 	ID_DisableConnectFunc,
 	ID_EnableConnectFunc,
 	ID_AnswerCall,
 	ID_SetBitmap,
 	ID_SetRingtone,
 	ID_DeleteSMSMessage,
 	ID_DeleteCalendarNote,
 	ID_SetPath,
 	ID_SetSMSC,
 	ID_SetProfile,
 	ID_SetMemory,
 	ID_DeleteMemory,
 	ID_SetCalendarNote,
 	ID_SetIncomingSMS,
 	ID_SetIncomingCB,
 	ID_GetCalendarNotePos,
 	ID_Initialise,
 	ID_GetConnectSet,
 	ID_SetWAPBookmark,
 	ID_GetLocale,
 	ID_SetLocale,
 	ID_GetCalendarSettings,
 	ID_SetCalendarSettings,
 	ID_GetGPRSPoint,
 	ID_SetGPRSPoint,
 	ID_EnableGPRSPoint,
 	ID_DeleteWAPBookmark,
 	ID_Netmonitor,
 	ID_HoldCall,
 	ID_UnholdCall,
 	ID_ConferenceCall,
 	ID_SplitCall,
 	ID_TransferCall,
 	ID_SwitchCall,
 	ID_GetManufactureMonth,
 	ID_GetProductCode,
 	ID_GetOriginalIMEI,
 	ID_GetHardware,
 	ID_GetPPM,
 	ID_GetSMSMode,
 	ID_GetSMSMemories,
 	ID_GetManufacturer,
 	ID_SetMemoryType,
 	ID_SetMemoryCharset,
 	ID_GetMMSSettings,
 	ID_SetSMSParameters,
@@ -1229,131 +1230,156 @@ typedef struct {
 	 */
 	GSM_Error (*GetToDoStatus)      (GSM_StateMachine *s, GSM_ToDoStatus *status);
 	/**
 	 * Reads ToDo from phone.
 	 */
 	GSM_Error (*GetToDo)	    	(GSM_StateMachine *s, GSM_ToDoEntry *ToDo);
 	/**
 	 * Reads ToDo from phone.
 	 */
 	GSM_Error (*GetNextToDo)	(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start);
 	/**
 	 * Sets ToDo in phone.
 	 */
 	GSM_Error (*SetToDo)	    	(GSM_StateMachine *s, GSM_ToDoEntry *ToDo);
 	/**
 	 * Adds ToDo in phone.
 	 */
 	GSM_Error (*AddToDo)	    	(GSM_StateMachine *s, GSM_ToDoEntry *ToDo);
 	/**
 	 * Deletes ToDo entry in phone.
 	 */
 	GSM_Error (*DeleteToDo)	 	(GSM_StateMachine *s, GSM_ToDoEntry *ToDo);
 	/**
 	 * Deletes all todo entries in phone.
 	 */
 	GSM_Error (*DeleteAllToDo)      (GSM_StateMachine *s);
 	/**
 	 * Retrieves calendar status (number of used entries).
 	 */
 	GSM_Error (*GetCalendarStatus)  (GSM_StateMachine *s, GSM_CalendarStatus *Status);
 	/**
 	 * Retrieves calendar entry.
 	 */
 	GSM_Error (*GetCalendar)	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
 	/**
 	 * Retrieves calendar entry. This is useful for continuous reading of all
 	 * calendar entries.
 	 */
 	GSM_Error (*GetNextCalendar)    (GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start);
 	/**
 	 * Sets calendar entry
 	 */
 	GSM_Error (*SetCalendar)	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
 	/**
 	 * Adds calendar entry.
 	 */
 	GSM_Error (*AddCalendar)	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
 	/**
 	 * Deletes calendar entry.
 	 */
 	GSM_Error (*DeleteCalendar)     (GSM_StateMachine *s, GSM_CalendarEntry *Note);
 	/**
 	 * Deletes all calendar entries.
 	 */
 	GSM_Error (*DeleteAllCalendar)  (GSM_StateMachine *s);
 	/**
 	 * Reads calendar settings.
 	 */
 	GSM_Error (*GetCalendarSettings)(GSM_StateMachine *s, GSM_CalendarSettings *settings);
 	/**
 	 * Sets calendar settings.
 	 */
 	GSM_Error (*SetCalendarSettings)(GSM_StateMachine *s, GSM_CalendarSettings *settings);
 	/**
-	 * Gets note.
+	 * Retrieves notes status (number of used entries).
 	 */
-	GSM_Error (*GetNextNote)	(GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh);
+	GSM_Error (*GetNotesStatus)  	(GSM_StateMachine *s, GSM_ToDoStatus *status);
+	/**
+	 * Retrieves notes entry.
+	 */
+	GSM_Error (*GetNote)		(GSM_StateMachine *s, GSM_NoteEntry *Note);
+	/**
+	 * Retrieves note entry. This is useful for continuous reading of all
+	 * notes entries.
+	 */
+	GSM_Error (*GetNextNote)    	(GSM_StateMachine *s, GSM_NoteEntry *Note, bool start);
+	/**
+	 * Sets note entry
+	 */
+	GSM_Error (*SetNote)		(GSM_StateMachine *s, GSM_NoteEntry *Note);
+	/**
+	 * Adds note entry.
+	 */
+	GSM_Error (*AddNote)		(GSM_StateMachine *s, GSM_NoteEntry *Note);
+	/**
+	 * Deletes note entry.
+	 */
+	GSM_Error (*DeleteNote)     	(GSM_StateMachine *s, GSM_NoteEntry *Note);
+	/**
+	 * Deletes all notes entries.
+	 */
+	GSM_Error (*DeleteAllNotes)  	(GSM_StateMachine *s);
 	/**
 	 * Reads profile.
 	 */
 	GSM_Error (*GetProfile)	 	(GSM_StateMachine *s, GSM_Profile *Profile);
 	/**
 	 * Updates profile.
 	 */
 	GSM_Error (*SetProfile)	 	(GSM_StateMachine *s, GSM_Profile *Profile);
 	/**
 	 * Reads FM station.
 	 */
 	GSM_Error (*GetFMStation)       (GSM_StateMachine *s, GSM_FMStation *FMStation);
 	/**
 	 * Sets FM station.
 	 */
 	GSM_Error (*SetFMStation)       (GSM_StateMachine *s, GSM_FMStation *FMStation);
 	/**
 	 * Clears defined FM stations.
 	 */
 	GSM_Error (*ClearFMStations)    (GSM_StateMachine *s);
 	/**
 	 * Gets next filename from filesystem.
 	 */
 	GSM_Error (*GetNextFileFolder)  (GSM_StateMachine *s, GSM_File *File, bool start);
 	/**
 	 * Gets file part from filesystem.
 	 */
 	GSM_Error (*GetFilePart)	(GSM_StateMachine *s, GSM_File *File);
 	/**
 	 * Adds file part to filesystem.
 	 */
 	GSM_Error (*AddFilePart)	(GSM_StateMachine *s, GSM_File *File, int *Pos);
 	/**
 	 * Acquires filesystem status.
 	 */
 	GSM_Error (*GetFileSystemStatus)(GSM_StateMachine *s, GSM_FileSystemStatus *Status);
 	/**
 	 * Deletes file from filessytem.
 	 */
 	GSM_Error (*DeleteFile)	 	(GSM_StateMachine *s, unsigned char *ID);
 	/**
 	 * Adds folder to filesystem.
 	 */
 	GSM_Error (*AddFolder)	  	(GSM_StateMachine *s, GSM_File *File);
 	/**
 	 * Gets GPRS access point.
 	 */
 	GSM_Error (*GetGPRSAccessPoint) (GSM_StateMachine *s, GSM_GPRSAccessPoint *point);
 	/**
 	 * Sets GPRS access point.
 	 */
 	GSM_Error (*SetGPRSAccessPoint) (GSM_StateMachine *s, GSM_GPRSAccessPoint *point);
 } GSM_Phone_Functions;
 
 	extern GSM_Phone_Functions NAUTOPhone;
 #ifdef GSM_ENABLE_NOKIA3320
 	extern GSM_Phone_Functions N3320Phone;
 #endif
 #ifdef GSM_ENABLE_NOKIA3650
 	extern GSM_Phone_Functions N3650Phone;
 #endif
 #ifdef GSM_ENABLE_NOKIA6110
 	extern GSM_Phone_Functions N6110Phone;
 #endif