updated to latest gammu version

4 files changed, 131 insertions, 45 deletions

diff --git a/gammu/emb/common/phone/nokia/dct4/n3320.c b/gammu/emb/common/phone/nokia/dct4/n3320.c
index 51e6f18..9b1d6cd 100644
--- a/gammu/emb/common/phone/nokia/dct4/n3320.c
+++ b/gammu/emb/common/phone/nokia/dct4/n3320.c
@@ -173,48 +173,49 @@ GSM_Phone_Functions N3320Phone = {
 	NOTSUPPORTED,			/*	GetSignalQuality	*/
 	NOTSUPPORTED,			/*	GetNetworkInfo		*/
 	NOTSUPPORTED,     		/*  	GetCategory 		*/
  	NOTSUPPORTED,       		/*  	AddCategory 		*/
         NOTSUPPORTED,      		/*  	GetCategoryStatus 	*/	
 	N3320_GetMemoryStatus,
 	N3320_GetMemory,
 	NOTSUPPORTED,			/*	GetNextMemory		*/
 	NOTSUPPORTED,			/*	SetMemory		*/
 	NOTSUPPORTED,			/*	AddMemory		*/
 	NOTSUPPORTED,			/*	DeleteMemory		*/
 	NOTIMPLEMENTED,			/*	DeleteAllMemory		*/
 	NOTSUPPORTED,			/*	GetSpeedDial		*/
 	NOTSUPPORTED,			/*	SetSpeedDial		*/
 	NOTSUPPORTED,			/*	GetSMSC			*/
 	NOTSUPPORTED,			/*	SetSMSC			*/
 	NOTSUPPORTED,			/*	GetSMSStatus		*/
 	NOTSUPPORTED,			/*	GetSMS			*/
 	NOTSUPPORTED,			/*	GetNextSMS		*/
 	NOTSUPPORTED,			/*	SetSMS			*/
 	NOTSUPPORTED,			/*	AddSMS			*/
 	NOTSUPPORTED,			/* 	DeleteSMS 		*/
 	NOTSUPPORTED,			/*	SendSMS			*/
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOTSUPPORTED,			/*	SetIncomingSMS		*/
 	NOTSUPPORTED,			/* 	SetIncomingCB		*/
 	NOTSUPPORTED,			/*	GetSMSFolders		*/
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	NOTIMPLEMENTED,			/*	DialVoice		*/
 	NOTIMPLEMENTED,			/*	AnswerCall		*/
 	NOTIMPLEMENTED,			/*	CancelCall		*/
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
  	NOTIMPLEMENTED,			/* 	TransferCall		*/
  	NOTIMPLEMENTED,			/* 	SwitchCall		*/
  	NOTSUPPORTED,			/* 	GetCallDivert		*/
  	NOTSUPPORTED,			/* 	SetCallDivert		*/
  	NOTSUPPORTED,			/* 	CancelAllDiverts	*/
 	NOTIMPLEMENTED,			/*	SetIncomingCall		*/
 	NOTIMPLEMENTED,			/*  	SetIncomingUSSD		*/
 	NOTSUPPORTED,			/*	SendDTMF		*/
 	NOTSUPPORTED,			/*	GetRingtone		*/
 	NOTSUPPORTED,			/*	SetRingtone		*/
 	NOTSUPPORTED,			/*	GetRingtonesInfo	*/
 	NOTIMPLEMENTED,			/* 	DeleteUserRingtones	*/
@@ -227,45 +228,45 @@ GSM_Phone_Functions N3320Phone = {
 	NOTSUPPORTED,			/* 	GetMMSSettings		*/
  	NOTSUPPORTED,			/* 	SetMMSSettings		*/
 	NOTSUPPORTED,			/*	GetSyncMLSettings	*/
 	NOTSUPPORTED,			/*	SetSyncMLSettings	*/
 	NOTSUPPORTED,			/*	GetChatSettings		*/
 	NOTSUPPORTED,			/*	SetChatSettings		*/
 	NOTSUPPORTED,			/*	GetBitmap		*/
 	NOTSUPPORTED,			/*	SetBitmap		*/
 	NOTSUPPORTED,			/*	GetToDoStatus		*/
 	NOTSUPPORTED,			/*	GetToDo			*/
 	NOTSUPPORTED,			/*	GetNextToDo		*/
 	NOTSUPPORTED,			/*	SetToDo			*/
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	N3320_GetCalendarStatus,
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	N3320_GetNextCalendar,
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	NOTSUPPORTED,			/*	AddCalendar		*/
 	NOTSUPPORTED,			/*	DeleteCalendar		*/
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED, 			/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
     	NOTSUPPORTED,			/*  	ClearFMStations       	*/
 	NOTSUPPORTED,			/*	GetNextFileFolder	*/
 	NOTSUPPORTED,			/*	GetFilePart		*/
 	NOTIMPLEMENTED,			/*	AddFilePart		*/
 	NOTSUPPORTED,	 		/* 	GetFileSystemStatus	*/
 	NOTIMPLEMENTED,			/*	DeleteFile		*/
 	NOTIMPLEMENTED,			/*	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
 	NOTSUPPORTED			/* 	SetGPRSAccessPoint	*/
 };
 
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/phone/nokia/dct4/n3650.c b/gammu/emb/common/phone/nokia/dct4/n3650.c
index 2da55bf..d4746a7 100644
--- a/gammu/emb/common/phone/nokia/dct4/n3650.c
+++ b/gammu/emb/common/phone/nokia/dct4/n3650.c
@@ -294,48 +294,49 @@ GSM_Phone_Functions N3650Phone = {
 	NOTSUPPORTED,			/*	GetSignalQuality	*/
 	NOTSUPPORTED,			/*	GetNetworkInfo		*/
 	NOTSUPPORTED,     		/*  	GetCategory 		*/
  	NOTSUPPORTED,       		/*  	AddCategory 		*/
         NOTSUPPORTED,      		/*  	GetCategoryStatus 	*/	
 	NOTSUPPORTED,			/*	GetMemoryStatus		*/
 	NOTSUPPORTED,			/*	GetMemory		*/
 	NOTSUPPORTED,			/*	GetNextMemory		*/
 	NOTSUPPORTED,			/*	SetMemory		*/
 	NOTSUPPORTED,			/*	AddMemory		*/
 	NOTSUPPORTED,			/*	DeleteMemory		*/
 	NOTIMPLEMENTED,			/*	DeleteAllMemory		*/
 	NOTSUPPORTED,			/*	GetSpeedDial		*/
 	NOTSUPPORTED,			/*	SetSpeedDial		*/
 	NOTSUPPORTED,			/*	GetSMSC			*/
 	NOTSUPPORTED,			/*	SetSMSC			*/
 	NOTSUPPORTED,			/*	GetSMSStatus		*/
 	NOTSUPPORTED,			/*	GetSMS			*/
 	NOTSUPPORTED,			/*	GetNextSMS		*/
 	NOTSUPPORTED,			/*	SetSMS			*/
 	NOTSUPPORTED,			/*	AddSMS			*/
 	NOTSUPPORTED,			/* 	DeleteSMS 		*/
 	NOTSUPPORTED,			/*	SendSMS			*/
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOTSUPPORTED,			/*	SetIncomingSMS		*/
 	NOTSUPPORTED,			/* 	SetIncomingCB		*/
 	NOTSUPPORTED,			/*	GetSMSFolders		*/
  	NOTSUPPORTED,			/* 	AddSMSFolder		*/
  	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
 	NOTIMPLEMENTED,			/*	DialVoice		*/
 	NOTIMPLEMENTED,			/*	AnswerCall		*/
 	NOTIMPLEMENTED,			/*	CancelCall		*/
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
  	NOTIMPLEMENTED,			/* 	TransferCall		*/
  	NOTIMPLEMENTED,			/* 	SwitchCall		*/
  	NOTSUPPORTED,			/* 	GetCallDivert		*/
  	NOTSUPPORTED,			/* 	SetCallDivert		*/
  	NOTSUPPORTED,			/* 	CancelAllDiverts	*/
 	NOTIMPLEMENTED,			/*	SetIncomingCall		*/
 	NOTIMPLEMENTED,			/*  	SetIncomingUSSD		*/
 	NOTSUPPORTED,			/*	SendDTMF		*/
 	NOTSUPPORTED,			/*	GetRingtone		*/
 	NOTSUPPORTED,			/*	SetRingtone		*/
 	NOTSUPPORTED,			/*	GetRingtonesInfo	*/
 	NOTIMPLEMENTED,			/* 	DeleteUserRingtones	*/
@@ -348,45 +349,45 @@ GSM_Phone_Functions N3650Phone = {
 	NOTSUPPORTED,			/* 	GetMMSSettings		*/
  	NOTSUPPORTED,			/* 	SetMMSSettings		*/
 	NOTSUPPORTED,			/*	GetSyncMLSettings	*/
 	NOTSUPPORTED,			/*	SetSyncMLSettings	*/
 	NOTSUPPORTED,			/*	GetChatSettings		*/
 	NOTSUPPORTED,			/*	SetChatSettings		*/
 	NOTSUPPORTED,			/*	GetBitmap		*/
 	NOTSUPPORTED,			/*	SetBitmap		*/
 	NOTSUPPORTED,			/*	GetToDoStatus		*/
 	NOTSUPPORTED,			/*	GetToDo			*/
 	NOTSUPPORTED,			/*	GetNextToDo		*/
 	NOTSUPPORTED,			/*	SetToDo			*/
 	NOTSUPPORTED,			/*	AddToDo			*/
 	NOTSUPPORTED,			/*	DeleteToDo		*/
 	NOTSUPPORTED,			/*	DeleteAllToDo		*/
 	NOTIMPLEMENTED,			/*	GetCalendarStatus	*/
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	NOTSUPPORTED,			/*  	GetNextCalendar		*/
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	NOTSUPPORTED,			/*	AddCalendar		*/
 	NOTSUPPORTED,			/*	DeleteCalendar		*/
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED,			/*	GetNextNote		*/
 	NOTSUPPORTED, 			/*	GetProfile		*/
 	NOTSUPPORTED, 			/*	SetProfile		*/
     	NOTSUPPORTED,			/*  	GetFMStation        	*/
     	NOTSUPPORTED,			/*  	SetFMStation        	*/
     	NOTSUPPORTED,			/*  	ClearFMStations       	*/
 	N3650_GetNextFileFolder,
 	N3650_GetFilePart,
 	NOTIMPLEMENTED,			/*	AddFilePart		*/
 	NOTSUPPORTED,	 		/* 	GetFileSystemStatus	*/
 	NOTIMPLEMENTED,			/*	DeleteFile		*/
 	NOTIMPLEMENTED,			/*	AddFolder		*/
 	NOTSUPPORTED,			/* 	GetGPRSAccessPoint	*/
 	NOTSUPPORTED			/* 	SetGPRSAccessPoint	*/
 };
 
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/phone/nokia/dct4/n6510.c b/gammu/emb/common/phone/nokia/dct4/n6510.c
index 67fe492..2208def 100644
--- a/gammu/emb/common/phone/nokia/dct4/n6510.c
+++ b/gammu/emb/common/phone/nokia/dct4/n6510.c
@@ -1,26 +1,29 @@
 /* (c) 2002-2004 by Marcin Wiacek */
-/* based on some work from Markus Plail, Pawel Kot and Gnokii */
+/* based on some Markus Plail, Pawel Kot work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 /* function for making CRC for filesystem (c) 2003 by Michael Schroeder */
 
 #include "../../../gsmstate.h"
 
 #ifdef GSM_ENABLE_NOKIA6510
 
 #include <string.h>
 #include <time.h>
 
 #include "../../../misc/coding/coding.h"
 #include "../../../gsmcomon.h"
 #include "../../../service/gsmlogo.h"
 #include "../nfunc.h"
 #include "../nfuncold.h"
 #include "../../pfunc.h"
 #include "dct4func.h"
 #include "n6510.h"
 
 static GSM_Error N6510_Initialise (GSM_StateMachine *s)
 {
 	s->Phone.Data.Priv.N6510.CalendarIconsNum = 0;
 
 	/* Enables various things like incoming SMS, call info, etc. */
 	return N71_65_EnableFunctions (s, "\x01\x02\x06\x0A\x14\x17\x39", 7);
@@ -98,48 +101,50 @@ static GSM_Error N6510_ReplyGetSMSC(GSM_Protocol_Message msg, GSM_StateMachine *
 	GSM_Phone_Data		*Data = &s->Phone.Data;
 
 	switch (msg.Buffer[4]) {
 		case 0x00:
 			smprintf(s, "SMSC received\n");
 			break;
 		case 0x02:
 			smprintf(s, "SMSC empty\n");
 			return ERR_INVALIDLOCATION;
 		default:
 			smprintf(s, "Unknown SMSC state: %02x\n",msg.Buffer[4]);
 			return ERR_UNKNOWNRESPONSE;
 	}
 	memset(Data->SMSC,0,sizeof(GSM_SMSC));
 	Data->SMSC->Location 	= msg.Buffer[8];
 	Data->SMSC->Format 	= SMS_FORMAT_Text;
 	switch (msg.Buffer[10]) {
 		case 0x00: Data->SMSC->Format = SMS_FORMAT_Text; 	break;
 		case 0x22: Data->SMSC->Format = SMS_FORMAT_Fax; 	break;
 		case 0x26: Data->SMSC->Format = SMS_FORMAT_Pager;	break;
 		case 0x32: Data->SMSC->Format = SMS_FORMAT_Email;	break;
 	}
 	Data->SMSC->Validity.Format	= SMS_Validity_RelativeFormat;
 	Data->SMSC->Validity.Relative	= msg.Buffer[12];
+	if (msg.Buffer[12] == 0x00) Data->SMSC->Validity.Relative = SMS_VALID_Max_Time;
+
 	current = 14;
 	for (i=0;i<msg.Buffer[13];i++) {
 		switch (msg.Buffer[current]) {
 		case 0x81:
 			j=current+4;
 			while (msg.Buffer[j]!=0) {j++;}
 			j=j-33;
 			if (j>GSM_MAX_SMSC_NAME_LENGTH) {
 				smprintf(s, "Too long name\n");
 				return ERR_UNKNOWNRESPONSE;
 			}
 			CopyUnicodeString(Data->SMSC->Name,msg.Buffer+current+4);
 			smprintf(s, "   Name \"%s\"\n", DecodeUnicodeString(Data->SMSC->Name));
 			break;
 		case 0x82:
 			switch (msg.Buffer[current+2]) {
 			case 0x01:
 				GSM_UnpackSemiOctetNumber(Data->SMSC->DefaultNumber,msg.Buffer+current+4,true);
 				smprintf(s, "   Default number \"%s\"\n", DecodeUnicodeString(Data->SMSC->DefaultNumber));
 				break;
 			case 0x02:
 				GSM_UnpackSemiOctetNumber(Data->SMSC->Number,msg.Buffer+current+4,false);
 				smprintf(s, "   Number \"%s\"\n", DecodeUnicodeString(Data->SMSC->Number));
 				break;
@@ -244,49 +249,49 @@ static GSM_Error N6510_SetSMSC(GSM_StateMachine *s, GSM_SMSC *smsc)
 	/* -------------- SMSC name ------------------- */
 	req[count++] 		 = 0x81;
 	req[count++] 		 = UnicodeLength(smsc->Name)*2 + 2 + 4;
 	req[count++] 		 = UnicodeLength(smsc->Name)*2 + 2;
 	req[count++] 		 = 0x00;
 	/* Can't make CopyUnicodeString(req+count,sms->Name) !!!!
 	 * with MSVC6 count is changed then
 	 */
 	i = count;
 	CopyUnicodeString(req+i,smsc->Name);
 	count += UnicodeLength(smsc->Name)*2 + 2;
 	
 	smprintf(s, "Setting SMSC\n");
 	return GSM_WaitFor (s, req, count, 0x02, 4, ID_SetSMSC);
 }
 
 static GSM_Error N6510_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	int		current = msg.Buffer[7]+7, tmp;
 	GSM_Phone_Data	*Data = &s->Phone.Data;
 #ifdef DEBUG
 	char		name[100];
 	GSM_NetworkInfo NetInfo;
 
-	smprintf(s, "Network status: ");
+	smprintf(s, "Network status            : ");
 	switch (msg.Buffer[8]) {
 		case 0x00 : smprintf(s, "home network\n");		break;
 		case 0x01 : smprintf(s, "roaming network\n");      	break;
 		case 0x04 : smprintf(s, "not logged");		  	break;
 		case 0x06 : smprintf(s, "SIM card rejected\n");		break;
 		case 0x09 : smprintf(s, "not logged");		  	break;
 		default	  : smprintf(s, "unknown %i!\n",msg.Buffer[8]); break;
 	}
 	if (msg.Buffer[8]==0x00 || msg.Buffer[8] == 0x01) {
 		NOKIA_DecodeNetworkCode(msg.Buffer + (current + 7),NetInfo.NetworkCode);
 		smprintf(s, "Network code              : %s\n", NetInfo.NetworkCode);
 		smprintf(s, "Network name for Gammu    : %s ",
 			DecodeUnicodeString(GSM_GetNetworkName(NetInfo.NetworkCode)));
 		smprintf(s, "(%s)\n",DecodeUnicodeString(GSM_GetCountryName(NetInfo.NetworkCode)));
 
 		sprintf(NetInfo.LAC,	"%02x%02x", msg.Buffer[current+1], msg.Buffer[current+2]);
 		smprintf(s, "LAC                       : %s\n", NetInfo.LAC);
 
 		sprintf(NetInfo.CID, "%02x%02x", msg.Buffer[current+5], msg.Buffer[current+6]);
 		smprintf(s, "CID                       : %s\n", NetInfo.CID);
 
 		tmp = 10;
 		NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,name,true);
 		smprintf(s, "Network name for phone    : %s\n",DecodeUnicodeString(name));
@@ -964,53 +969,53 @@ static GSM_Error N6510_ReplyGetBatteryCharge(GSM_Protocol_Message msg, GSM_State
     	Data->BatteryCharge->BatteryPercent 	= ((int)(msg.Buffer[9]*100/7));
     	Data->BatteryCharge->ChargeState 	= 0;
 	return ERR_NONE;
 }
 
 static GSM_Error N6510_GetBatteryCharge(GSM_StateMachine *s, GSM_BatteryCharge *bat)
 {
 	unsigned char req[] = {N6110_FRAME_HEADER, 0x0A, 0x02, 0x00};
 
 	s->Phone.Data.BatteryCharge = bat;
 	smprintf(s, "Getting battery level\n");
 	return GSM_WaitFor (s, req, 6, 0x17, 4, ID_GetBatteryCharge);
 }
 
 static GSM_Error N6510_ReplyGetWAPBookmark(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	return DCT3DCT4_ReplyGetWAPBookmark (msg, s, true);
 }
 
 static GSM_Error N6510_ReplyGetOperatorLogo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_Phone_Data *Data = &s->Phone.Data;
 
 	smprintf(s, "Operator logo received\n");
+	if (msg.Length == 18) return ERR_EMPTY;
 	NOKIA_DecodeNetworkCode(msg.Buffer+12,Data->Bitmap->NetworkCode);
 	smprintf(s, "Network code %s\n",Data->Bitmap->NetworkCode);
 	Data->Bitmap->BitmapWidth	= msg.Buffer[20];
 	Data->Bitmap->BitmapHeight	= msg.Buffer[21];
-	if (msg.Length == 18) return ERR_EMPTY;
 	PHONE_DecodeBitmap(GSM_Nokia6510OperatorLogo,msg.Buffer+26,Data->Bitmap);
 	return ERR_NONE;
 }
 
 GSM_Error N6510_ReplyDeleteMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	smprintf(s, "Phonebook entry deleted\n");
 	return ERR_NONE;
 }
 
 GSM_Error N6510_DeleteMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
 {
 	unsigned char req[] = {N7110_FRAME_HEADER, 0x0f, 0x55, 0x01,
 			       0x04, 0x55, 0x00, 0x10, 0xFF, 0x02,
 			       0x00, 0x01,		/* location	*/
 			       0x00, 0x00, 0x00, 0x00,
 			       0x05, 			/* memory type	*/
 			       0x55, 0x55, 0x55};
 
 	req[12] = entry->Location / 256;
 	req[13] = entry->Location % 256;
 
 	req[18] = NOKIA_GetMemoryType(s, entry->MemoryType,N71_65_MEMORY_TYPES);
 	if (req[18]==0xff) return ERR_NOTSUPPORTED;
@@ -1744,49 +1749,50 @@ static GSM_Error N6510_ReplyGetSyncMLName(GSM_Protocol_Message msg, GSM_StateMac
 }
 
 static GSM_Error N6510_GetSyncMLSettings(GSM_StateMachine *s, GSM_SyncMLSettings *settings)
 {
 	GSM_Error 	error;
 //	unsigned char 	NameReq[] = {N6110_FRAME_HEADER, 0x05,
 //				 0x00, 0x00, 0x00, 0x31, 0x00,
 //				 0x06, 0x00, 0x00, 0x00, 0xDE, 0x00, 0x00};
 //	unsigned char 	GetActive[] = {N6110_FRAME_HEADER, 0x05,
 //				 0x00, 0x00, 0x00, 0x31, 0x00,
 //				 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
 	unsigned char 	req[] = {N6110_FRAME_HEADER, 0x05,
 				 0x00, 0x00, 0x00, 0x31, 0x00, 
 				 0x01, //location
 				 0x00, 0x00, 0x02, 0x46, 0x00, 0x00};
 
 	settings->Connection.Location = settings->Location;
 	error = N6510_GetConnectionSettings(s, &settings->Connection, N6510_SYNCML_SETTINGS);
 	if (error != ERR_NONE) return error;
 
 	settings->Active = settings->Connection.Active;
 
 	settings->Name[0] = 0;
 	settings->Name[1] = 0;
-//	s->Phone.Data.SyncMLSettings  = settings;
+	s->Phone.Data.SyncMLSettings  = settings;
+
 //	smprintf(s, "Getting SyncML settings name\n");
 //	error = GSM_WaitFor (s, NameReq, 16, 0x43, 4, ID_GetSyncMLName);
 //	if (error != ERR_NONE) return error;
 
 	req[9] = settings->Location - 1;
 	smprintf(s, "Getting additional SyncML settings\n");
 	return GSM_WaitFor (s, req, 16, 0x43, 4, ID_GetSyncMLSettings);
 }
 
 static GSM_Error N6510_ReplyGetChatSettings(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_ChatSettings 	*Sett = s->Phone.Data.ChatSettings;
 	int			i;
 
 	Sett->Name[0] 	  = 0;
 	Sett->Name[1] 	  = 0;
 	Sett->HomePage[0] = 0;
 	Sett->HomePage[1] = 0;
 	Sett->User[0] 	  = 0;
 	Sett->User[1] 	  = 0;
 	Sett->Password[0] = 0;
 	Sett->Password[1] = 0;
 
 	switch(msg.Buffer[3]) {
@@ -2262,49 +2268,49 @@ static GSM_Error N6510_DeleteSMSMessage(GSM_StateMachine *s, GSM_SMSMessage *sms
 	unsigned char 		req[] = {N6110_FRAME_HEADER, 0x04,
 					 0x01, 		/* 0x01=SM, 0x02=ME */
 					 0x00, 		/* FolderID */
 					 0x00, 0x02, 	/* Location */
 					 0x0F, 0x55};
 
 	N6510_GetSMSLocation(s, sms, &folderid, &location);
 
 	switch (folderid) {
 		case 0x01: req[5] = 0x02; 			 break; /* INBOX SIM 	*/
 		case 0x02: req[5] = 0x03; 			 break; /* OUTBOX SIM 	*/
 		default	 : req[5] = folderid - 1; req[4] = 0x02; break; /* ME folders	*/
 	}
 	req[6]=location / 256;
 	req[7]=location;
 
 	smprintf(s, "Deleting sms\n");
 	return GSM_WaitFor (s, req, 10, 0x14, 4, ID_DeleteSMSMessage);
 }
 
 static GSM_Error N6510_ReplySendSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	switch (msg.Buffer[8]) {
 	case 0x00:
-		smprintf(s, "SMS sent OK, TPMR for sent sms is %02x\n",msg.Buffer[10]);
+		smprintf(s, "SMS sent OK, TPMR for sent sms is %d\n",msg.Buffer[10]);
 		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,0,msg.Buffer[10]);
 		return ERR_NONE;
 	default:
 		smprintf(s, "SMS not sent OK, error code probably %i\n",msg.Buffer[8]);
 		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,msg.Buffer[8],msg.Buffer[10]);
 		return ERR_NONE;
 	}
 }
 
 static GSM_Error N6510_SendSMSMessage(GSM_StateMachine *s, GSM_SMSMessage *sms)
 {
 	int			length = 11;
 	GSM_Error		error;
 	GSM_SMSMessageLayout 	Layout;
 	unsigned char req [300] = {
 		N6110_FRAME_HEADER, 0x02, 0x00, 0x00, 0x00, 0x55, 0x55};
 
 	if (sms->PDU == SMS_Deliver) sms->PDU = SMS_Submit;
 	memset(req+9,0x00,sizeof(req) - 9);
 	error=N6510_EncodeSMSFrame(s, sms, req + 9, &Layout, &length);
 	if (error != ERR_NONE) return error;
 
 	smprintf(s, "Sending sms\n");
 	return s->Protocol.Functions->WriteMessage(s, req, length + 9, 0x02);
@@ -2749,48 +2755,49 @@ static GSM_Error N6510_ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachi
 static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone)
 {
 	GSM_AllRingtonesInfo 	Info;
 	GSM_Error		error;
 	unsigned char 		req2[6] = {N7110_FRAME_HEADER, 0x12,
 					   0x00, 0xe7}; 	/* Location */
 
 	if (Ringtone->Format == 0x00) Ringtone->Format = RING_NOKIABINARY;
 
 	switch (Ringtone->Format) {
 	case RING_NOTETONE:
 		/* In the future get binary and convert */
 		return ERR_NOTSUPPORTED;
 	case RING_NOKIABINARY:
 		s->Phone.Data.Ringtone	= Ringtone;
 		Info.Number 		= 0;
 		error=N6510_PrivGetRingtonesInfo(s, &Info, PhoneRingtone);
 		if (error != ERR_NONE) return error;
 		if (Ringtone->Location > Info.Number) return ERR_INVALIDLOCATION;
 		req2[4] = Info.Ringtone[Ringtone->Location-1].ID / 256;
 		req2[5] = Info.Ringtone[Ringtone->Location-1].ID % 256;
 		smprintf(s, "Getting binary ringtone\n");
 		return GSM_WaitFor (s, req2, 6, 0x1f, 4, ID_GetRingtone);
 	case RING_MIDI:
+	case RING_MMF:
 		return ERR_NOTSUPPORTED;
 	}
 	return ERR_NOTSUPPORTED;
 }
 
 static GSM_Error N6510_PlayTone(GSM_StateMachine *s, int Herz, unsigned char Volume, bool start)
 {
 	GSM_Error 	error;
 	unsigned char 	reqStart[] = {
 		0x00,0x06,0x01,0x00,0x07,0x00 };
 	unsigned char 	reqPlay[] = {
 		0x00,0x06,0x01,0x14,0x05,0x04,
 		0x00,0x00,0x00,0x03,0x03,0x08,
 		0x00,0x00,0x00,0x01,0x00,0x00,
 		0x03,0x08,0x01,0x00,
 		0x07,0xd0,	/*Frequency */
 		0x00,0x00,0x03,0x08,0x02,0x00,0x00,
 		0x05,		/*Volume */
 		0x00,0x00};
 	unsigned char 	reqOff[] = {
 		0x00,0x06,0x01,0x14,0x05,0x05,
 		0x00,0x00,0x00,0x01,0x03,0x08,
 		0x05,0x00,0x00,0x08,0x00,0x00};
 //	unsigned char 	reqOff2[] = {
@@ -2965,48 +2972,51 @@ static GSM_Error N6510_ReplyGetProfile(GSM_Protocol_Message msg, GSM_StateMachin
 	}
 	return ERR_NONE;
 	case 0x06:
 		Data->Profile->Active = false;
 		if (Data->Profile->Location == msg.Buffer[5]) Data->Profile->Active = true;
 		return ERR_NONE;
 	}
 	return ERR_UNKNOWNRESPONSE;
 }
 
 static GSM_Error N6510_GetProfile(GSM_StateMachine *s, GSM_Profile *Profile)
 {
 	unsigned char 	req[150]    = {N6110_FRAME_HEADER, 0x01, 0x01, 0x0C, 0x01};
 	unsigned char	reqActive[] = {N6110_FRAME_HEADER, 0x05};
 	int 		i, length = 7;
 	GSM_Error	error;
 
 	/* For now !!! */
 	if (!strcmp(s->Phone.Data.ModelInfo->model,"3510")) {
 		if (s->Phone.Data.VerNum>3.37) return ERR_NOTSUPPORTED;
 	}
 	if (!strcmp(s->Phone.Data.ModelInfo->model,"6230")) {
 		return ERR_NOTSUPPORTED;
 	}
+	if (!strcmp(s->Phone.Data.ModelInfo->model,"5140")) {
+		return ERR_NOTSUPPORTED;
+	}
 
 	if (Profile->Location>5) return ERR_INVALIDLOCATION;
 
 	for (i = 0; i < 0x0a; i++) {
 		req[length++] = 0x04;
 		req[length++] = Profile->Location;
 		req[length++] = i;
 		req[length++] = 0x01;
 	}
 
 	req[length++] = 0x04;
 	req[length++] = Profile->Location;
 	req[length++] = 0x0c;
 	req[length++] = 0x01;
 
 	req[length++] = 0x04;
 
 	Profile->CarKitProfile	= false;
 	Profile->HeadSetProfile	= false;
 
 	Profile->FeaturesNumber = 0;
 
 	s->Phone.Data.Profile=Profile;
 	smprintf(s, "Getting profile\n");
@@ -3094,146 +3104,176 @@ static GSM_Error N6510_SetProfile(GSM_StateMachine *s, GSM_Profile *Profile)
 }
 
 static GSM_Error N6510_ReplyIncomingSMS(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_SMSMessage sms;
 
 #ifdef DEBUG
 	smprintf(s, "SMS message received\n");
 	N6510_DecodeSMSFrame(s, &sms, msg.Buffer+10);
 #endif
 
 	if (s->Phone.Data.EnableIncomingSMS && s->User.IncomingSMS!=NULL) {
 		sms.State 	 = SMS_UnRead;
 		sms.InboxFolder  = true;
 
 		N6510_DecodeSMSFrame(s, &sms, msg.Buffer+10);
 
 		s->User.IncomingSMS(s->CurrentConfig->Device,sms);
 	}
 	return ERR_NONE;
 }
 
 static GSM_Error N6510_DialVoice(GSM_StateMachine *s, char *number, GSM_CallShowNumber ShowNumber)
 {
+	unsigned int 	pos2 = 15;
 	unsigned int	pos = 4;
+	unsigned char 	req2[100] = {N6110_FRAME_HEADER,0x01,
+				    0x00,0x02,0x07,0x04,
+				    0x01,  // 1 - voice, 2 - data
+				    0x00,0x03,
+				    0x18,  // length of rest + 1
+				    0x00,0x00,0x00};
 	unsigned char 	req[100] = {N6110_FRAME_HEADER,0x01,
 				    0x0c};	/* Number length */
+	GSM_Error	error;
+
+	/* USSD not supported */
+	if (number[0] == '*') return ERR_NOTSUPPORTED;
+	if (number[0] == '#') return ERR_NOTSUPPORTED;
 
 	req[pos++] = strlen(number);
 	EncodeUnicode(req+pos,number,strlen(number));
 	pos += strlen(number)*2;
 	req[pos++] = 0x05; /* call type: voice - 0x05, data - 0x01 */
 	req[pos++] = 0x01;
 	req[pos++] = 0x05;
 	req[pos++] = 0x00;
 	req[pos++] = 0x02;
 	req[pos++] = 0x00;
 	req[pos++] = 0x00;
 	switch (ShowNumber) {
 	case GSM_CALL_HideNumber:
 		req[pos++] = 0x02;
 		break;
 	case GSM_CALL_ShowNumber:
 		req[pos++] = 0x03;
 		break;
 	case GSM_CALL_DefaultNumberPresence:
 		req[pos++] = 0x01;
 		break;
 	}
+	smprintf(s, "Making voice call\n");
+	error = GSM_WaitFor (s, req, pos, 0x01, 4, ID_DialVoice);
+	if (error != ERR_NOTSUPPORTED) return error;
+
+	if (ShowNumber != GSM_CALL_DefaultNumberPresence) return ERR_NOTSUPPORTED;
+
+	req2[11] = strlen(number)*2+6;
+	req2[pos2++] = strlen(number);
+	EncodeUnicode(req2+pos2,number,strlen(number));
+	pos2 += strlen(number)*2;
 
 	smprintf(s, "Making voice call\n");
-	return GSM_WaitFor (s, req, pos, 0x01, 4, ID_DialVoice);
+	error = GSM_WaitFor (s, req2, pos2, 0x01, 4, ID_DialVoice);
+	if (error == ERR_NOTSUPPORTED) return ERR_NONE;
+	return error;
 }
 
 /* method 3 */
 static GSM_Error N6510_ReplyGetCalendarInfo3(GSM_Protocol_Message msg, GSM_StateMachine *s, GSM_NOKIACalToDoLocations *Last)
 {
 	int i=0,j=0;
 
 	while (Last->Location[j] != 0x00) j++;
 	if (j >= GSM_MAXCALENDARTODONOTES) {
 		smprintf(s, "Increase GSM_MAXCALENDARTODONOTES\n");
 		return ERR_UNKNOWN;
 	}
 	if (j == 0) {
 		Last->Number=msg.Buffer[8]*256+msg.Buffer[9];
 		smprintf(s, "Number of Entries: %i\n",Last->Number);
 	}
 	smprintf(s, "Locations: ");
 	while (14+(i*4) <= msg.Length) {
 		Last->Location[j++]=msg.Buffer[12+i*4]*256+msg.Buffer[13+i*4];
 		smprintf(s, "%i ",Last->Location[j-1]);
 		i++;
 	}
 	smprintf(s, "\nNumber of Entries in frame: %i\n",i);
 	Last->Location[j] = 0;
 	smprintf(s, "\n");
 	if (i == 1 && msg.Buffer[12+0*4]*256+msg.Buffer[13+0*4] == 0) return ERR_EMPTY;
 	if (i == 0) return ERR_EMPTY;
 	return ERR_NONE;
 }
 
 /* method 3 */
-static GSM_Error N6510_GetCalendarInfo3(GSM_StateMachine *s, GSM_NOKIACalToDoLocations *Last, bool Calendar)
+static GSM_Error N6510_GetCalendarInfo3(GSM_StateMachine *s, GSM_NOKIACalToDoLocations *Last, char Type)
 {
-	GSM_Error 	error;
+	GSM_Error 	error = ERR_UNKNOWN;
 	int		i;
 	unsigned char   req[] = {N6110_FRAME_HEADER, 0x9E, 0xFF, 0xFF, 0x00, 0x00,
 			         0x00, 0x00,	/* First location */
-			         0x00};		/* 0 = calendar, 1 = ToDo in 6610 style */
+			         0x00};		/* 0 = calendar, 1 = ToDo in 6610 style, 2 = Notes */
 
 	Last->Location[0] = 0x00;
 	Last->Number	  = 0;
 
-	if (Calendar) {
+	req[10] = Type;	
+	if (Type == 0) {
 		smprintf(s, "Getting locations for calendar method 3\n");
 		error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetCalendarNotesInfo);
-	} else {
-		req[10] = 0x01;
+	} else if (Type == 1) {
 		smprintf(s, "Getting locations for ToDo method 2\n");
 		error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetToDo);
+	} else if (Type == 2) {
+		smprintf(s, "Getting locations for Notes\n");
+		error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetNote);
 	}
 	if (error != ERR_NONE && error != ERR_EMPTY) return error;
 
 	while (1) {
 		i=0;
 		while (Last->Location[i] != 0x00) i++;
 		smprintf(s, "i = %i %i\n",i,Last->Number);
 		if (i == Last->Number) break;
 		if (i != Last->Number && error == ERR_EMPTY) {
 			smprintf(s, "Phone doesn't support some notes with this method. Workaround\n");
 			Last->Number = i;
 			break;
 		}
 		req[8] = Last->Location[i-1] / 256;
 		req[9] = Last->Location[i-1] % 256;
-		if (Calendar) {
+		if (Type == 0) {
 			smprintf(s, "Getting locations for calendar method 3\n");
 			error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetCalendarNotesInfo);
-		} else {
+		} else if (Type == 1) {
 			smprintf(s, "Getting locations for todo method 2\n");
 			error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetToDo);
+		} else if (Type == 2) {
+			smprintf(s, "Getting locations for Notes\n");
+			error = GSM_WaitFor (s, req, 11, 0x13, 4, ID_GetNote);
 		}
 		if (error != ERR_NONE && error != ERR_EMPTY) return error;
 	}
 	return ERR_NONE;
 }
 
 /* method 3 */
 GSM_Error N6510_ReplyGetCalendar3(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_CalendarEntry 		*entry = s->Phone.Data.Cal;
 	GSM_DateTime			Date;
 	unsigned long			diff;
 	int				i;
 	bool				found = false;
 	GSM_Phone_N6510Data		*Priv = &s->Phone.Data.Priv.N6510;
 
 	smprintf(s, "Calendar note received method 3\n");
 
 	smprintf(s,"Note type %02i: ",msg.Buffer[27]);
 	switch(msg.Buffer[27]) {
 		case 0x00: smprintf(s,"Reminder\n"); entry->Type = GSM_CAL_REMINDER; break;
 		case 0x01: smprintf(s,"Meeting\n");  entry->Type = GSM_CAL_MEETING;  break;
 		case 0x02: smprintf(s,"Call\n");     entry->Type = GSM_CAL_CALL;     break;
 		case 0x04: smprintf(s,"Birthday\n"); entry->Type = GSM_CAL_BIRTHDAY; break;
@@ -3329,93 +3369,99 @@ GSM_Error N6510_ReplyGetCalendar3(GSM_Protocol_Message msg, GSM_StateMachine *s)
 	entry->Entries[entry->EntriesNum].Text[msg.Buffer[51]*2]   = 0;
 	entry->Entries[entry->EntriesNum].Text[msg.Buffer[51]*2+1] = 0;
 	entry->Entries[entry->EntriesNum].EntryType		   = CAL_TEXT;
 	entry->EntriesNum++;
 	smprintf(s, "Note text: \"%s\"\n",DecodeUnicodeString(entry->Entries[entry->EntriesNum-1].Text));
 
 	if (entry->Type == GSM_CAL_CALL) {
 		memcpy(entry->Entries[entry->EntriesNum].Text, msg.Buffer+(54+msg.Buffer[51]*2), msg.Buffer[52]*2);
 		entry->Entries[entry->EntriesNum].Text[msg.Buffer[52]*2]   = 0;
 		entry->Entries[entry->EntriesNum].Text[msg.Buffer[52]*2+1] = 0;
 		entry->Entries[entry->EntriesNum].EntryType		   = CAL_PHONE;
 		entry->EntriesNum++;
 	}
 	if (entry->Type == GSM_CAL_MEETING) {
 		memcpy(entry->Entries[entry->EntriesNum].Text, msg.Buffer+(54+msg.Buffer[51]*2), msg.Buffer[52]*2);
 		entry->Entries[entry->EntriesNum].Text[msg.Buffer[52]*2]   = 0;
 		entry->Entries[entry->EntriesNum].Text[msg.Buffer[52]*2+1] = 0;
 		entry->Entries[entry->EntriesNum].EntryType		   = CAL_LOCATION;
 		entry->EntriesNum++;
 	}
 
 	return ERR_NONE;
 }
 
+static GSM_Error N6510_PrivGetGenericCalendar3(GSM_StateMachine *s, int Location, GSM_Phone_RequestID ID)
+{
+	unsigned char req[] = {N6110_FRAME_HEADER,0x7D,0x00,0x00,0x00,0x00,
+			       0x00,0x99,	/* Location */
+			       0xff,0xff,0xff,0xff};	
+
+	req[8] = Location / 256;
+	req[9] = Location % 256;
+
+	return GSM_WaitFor (s, req, 14, 0x13, 4, ID);
+}
+
 static GSM_Error N6510_PrivGetCalendar3(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start, int *LastCalendarYear)
 {
 	GSM_Error		error;
 	GSM_DateTime		date_time;
-	unsigned char 		req[] = {N6110_FRAME_HEADER,0x7D,0x00,0x00,0x00,0x00,
-					 0x00,0x99,	/* Location */
-					 0xff,0xff,0xff,0xff,0x01};	
 
 	if (start) {
 		/* We have to get current year. It's NOT written in frame for
 		 * Birthday
 		 */
 		error=s->Phone.Functions->GetDateTime(s,&date_time);
 		switch (error) {
 			case ERR_EMPTY:
 			case ERR_NOTIMPLEMENTED:
 				GSM_GetCurrentDateTime(&date_time);
 				break;
 			case ERR_NONE:
 				break;
 			default:
 				return error;
 		}
 		*LastCalendarYear = date_time.Year;
 	}
 
 	Note->EntriesNum		= 0;
 	Note->Entries[0].Date.Year 	= *LastCalendarYear;
 
-	req[8] = Note->Location / 256;
-	req[9] = Note->Location % 256;
-                        
 	s->Phone.Data.Cal=Note;
 	smprintf(s, "Getting calendar note method 3\n");
-	return GSM_WaitFor (s, req, 15, 0x13, 4, ID_GetCalendarNote);
+	return N6510_PrivGetGenericCalendar3(s, Note->Location, ID_GetCalendarNote);
 }
 
 /* method 3 */
 GSM_Error N6510_GetNextCalendar3(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start, GSM_NOKIACalToDoLocations *LastCalendar, int *LastCalendarYear, int *LastCalendarPos)
 {
 	GSM_Error error;
 	bool	  start2;
 
 	if (start) {
-		error=N6510_GetCalendarInfo3(s,LastCalendar,true);
+		error=N6510_GetCalendarInfo3(s,LastCalendar,0);
 		if (error!=ERR_NONE) return error;
 		if (LastCalendar->Number == 0) return ERR_EMPTY;
 
 		*LastCalendarPos = 0;
 	} else {
 		(*LastCalendarPos)++;
 	}
 
 	error  = ERR_EMPTY;
 	start2 = start;
 	while (error == ERR_EMPTY) {
 		if (*LastCalendarPos >= LastCalendar->Number) return ERR_EMPTY;
 	
 		Note->Location = LastCalendar->Location[*LastCalendarPos];
 		error=N6510_PrivGetCalendar3(s, Note, start2, LastCalendarYear);
 		if (error == ERR_EMPTY) (*LastCalendarPos)++;
 
 		start2 = false;
 	}
 	return error;
 }
 
 static GSM_Error N6510_ReplyGetCalendarInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
@@ -3456,66 +3502,66 @@ static GSM_Error N6510_ReplyGetCalendarNotePos(GSM_Protocol_Message msg, GSM_Sta
 	case 0x96:
 		return N6510_ReplyGetCalendarNotePos3(msg, s,&s->Phone.Data.Priv.N6510.FirstCalendarPos);
 	}
 	return ERR_UNKNOWNRESPONSE;
 }
 
 static GSM_Error N6510_FindCalendarIconID3(GSM_StateMachine *s, GSM_CalendarEntry *Entry, unsigned char *ID)
 {
 	int 				i,j,LastCalendarYear;
 	GSM_Phone_N6510Data		*Priv = &s->Phone.Data.Priv.N6510;
 	GSM_CalendarEntry 		Note;
 	GSM_NOKIACalToDoLocations	LastCalendar1,LastCalendar2;
 	GSM_Error			error;
 	bool				found;
 
 	for(i=0;i<Priv->CalendarIconsNum;i++) {
 		if (Priv->CalendarIconsTypes[i] == Entry->Type) {
 			*ID = Priv->CalendarIcons[i];
 			return ERR_NONE;
 		}
 	}
 
 	smprintf(s, "Starting finding note ID\n");
 
-	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,true);
+	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,0);
 	memcpy(&LastCalendar1,&Priv->LastCalendar,sizeof(GSM_NOKIACalToDoLocations));
 	if (error != ERR_NONE) return error;
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL35) ||
 	    IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL65) ||
 	    IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL62)) {
 		error=N71_65_AddCalendar2(s,Entry);
 	} else {
 		if (Entry->Type == GSM_CAL_MEETING) {
 			error=N71_65_AddCalendar1(s, Entry, &s->Phone.Data.Priv.N6510.FirstCalendarPos);
 		} else {
 			error=N71_65_AddCalendar2(s,Entry);
 		}
 	}
 	if (error != ERR_NONE) return error;
 
-	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,true);
+	error=N6510_GetCalendarInfo3(s, &Priv->LastCalendar,0);
 	memcpy(&LastCalendar2,&Priv->LastCalendar,sizeof(GSM_NOKIACalToDoLocations));
 	if (error != ERR_NONE) return error;
 
 	smprintf(s,"Number of entries: %i %i\n",LastCalendar1.Number,LastCalendar2.Number);
 
 	for(i=0;i<LastCalendar2.Number;i++) {
 		found = true;
 		for(j=0;j<LastCalendar1.Number;j++) {
 			if (LastCalendar1.Location[j] == LastCalendar2.Location[i]) {
 				found = false;
 				break;
 			}
 		}
 		if (found) {
 			Note.Location = LastCalendar2.Location[i];
 			error=N6510_PrivGetCalendar3(s, &Note, true, &LastCalendarYear);
 			if (error != ERR_NONE) return error;
 
 			error=N71_65_DelCalendar(s, &Note);
 			if (error != ERR_NONE) return error;
 
 			smprintf(s, "Ending finding note ID\n");
 
 			for(j=0;j<Priv->CalendarIconsNum;j++) {
@@ -3716,49 +3762,49 @@ static GSM_Error N6510_GetNextCalendar(GSM_StateMachine *s,  GSM_CalendarEntry *
 
 static GSM_Error N6510_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *Status)
 {
 	GSM_Error error;
 
 #ifdef GSM_FORCE_DCT4_CALENDAR_6210
         /* Method 1 */
 	error=N71_65_GetCalendarInfo1(s, &s->Phone.Data.Priv.N6510.LastCalendar);
 	if (error!=ERR_NONE) return error;
 	Status->Used = s->Phone.Data.Priv.N6510.LastCalendar.Number;
 	return ERR_NONE;
 #endif              
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL62)) {
 	        /* Method 1 */
 		error=N71_65_GetCalendarInfo1(s, &s->Phone.Data.Priv.N6510.LastCalendar);
 		if (error!=ERR_NONE) return error;
 		Status->Used = s->Phone.Data.Priv.N6510.LastCalendar.Number;
 		return ERR_NONE;
 
 	    	/* Method 2 */
 //		return ERR_NOTSUPPORTED;		
 	} else {
 		/* Method 3 */
-		error=N6510_GetCalendarInfo3(s,&s->Phone.Data.Priv.N6510.LastCalendar,true);
+		error=N6510_GetCalendarInfo3(s,&s->Phone.Data.Priv.N6510.LastCalendar,0);
 		if (error!=ERR_NONE) return error;
 		Status->Used = s->Phone.Data.Priv.N6510.LastCalendar.Number;
 		return ERR_NONE;
 	}
 }
 
 static GSM_Error N6510_AddCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note)
 {
 #ifdef GSM_FORCE_DCT4_CALENDAR_6210
 	return N71_65_AddCalendar2(s,Note);
 #endif
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_CAL62)) {
 		return N71_65_AddCalendar2(s,Note);
 //		return N71_65_AddCalendar1(s, Note, &s->Phone.Data.Priv.N6510.FirstCalendarPos);
 	} else {
 		/* Method 3. All DCT4 features supported. Not supported by 8910 */
 		return N6510_AddCalendar3(s, Note, &s->Phone.Data.Priv.N6510.FirstCalendarPos);
 	}
 }
 
 static GSM_Error N6510_ReplyLogIntoNetwork(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	smprintf(s, "Probably phone says: I log into network\n");
@@ -3951,48 +3997,84 @@ GSM_Error N6510_SetLight(GSM_StateMachine *s, N6510_PHONE_LIGHTS light, bool ena
 
 static GSM_Error N6510_ShowStartInfo(GSM_StateMachine *s, bool enable)
 {
 	GSM_Error error;
 
 	if (enable) {
 		error=N6510_SetLight(s,N6510_LIGHT_DISPLAY,true);
 		if (error != ERR_NONE) return error;
 
 		error=N6510_SetLight(s,N6510_LIGHT_TORCH,true);
 		if (error != ERR_NONE) return error;
 
 		return N6510_SetLight(s,N6510_LIGHT_KEYPAD,true);
 	} else {
 		error=N6510_SetLight(s,N6510_LIGHT_DISPLAY,false);
 		if (error != ERR_NONE) return error;
 
 		error=N6510_SetLight(s,N6510_LIGHT_TORCH,false);
 		if (error != ERR_NONE) return error;
 
 		return N6510_SetLight(s,N6510_LIGHT_KEYPAD,false);
 	}
 }
 
+static GSM_Error N6510_ReplyGetNoteInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	return N6510_ReplyGetCalendarInfo3(msg, s, &s->Phone.Data.Priv.N6510.LastNote);
+}
+
+static GSM_Error N6510_ReplyGetNote(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Note received\n");
+	memcpy(s->Phone.Data.Note->Text,msg.Buffer+54,(msg.Buffer[50]*256+msg.Buffer[51])*2);
+	s->Phone.Data.Note->Text[(msg.Buffer[50]*256+msg.Buffer[51])*2] = 0;
+	s->Phone.Data.Note->Text[(msg.Buffer[50]*256+msg.Buffer[51])*2+1] = 0;
+	return ERR_NONE;
+}
+
+GSM_Error N6510_GetNextNote(GSM_StateMachine *s, GSM_NoteEntry *Note, bool start)
+{
+	GSM_Error 			error;
+	GSM_NOKIACalToDoLocations	*LastNote = &s->Phone.Data.Priv.N6510.LastNote;	
+
+	if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_NOTES)) return ERR_NOTSUPPORTED;
+
+	if (start) {
+		error=N6510_GetCalendarInfo3(s,LastNote,2);
+		if (error!=ERR_NONE) return error;
+		Note->Location = 1;
+	} else {
+		Note->Location++;
+	}
+		
+	if (Note->Location > LastNote->Number) return ERR_EMPTY;
+
+	s->Phone.Data.Note = Note;
+	smprintf(s, "Getting note\n");
+	return N6510_PrivGetGenericCalendar3(s, LastNote->Location[Note->Location-1], ID_GetNote);
+}
+
 static int N6510_FindFileCheckSum(unsigned char *ptr, int len)
 {
 	int acc, i, accx;
  
 	accx = 0;
 	acc  = 0xffff; 
 	while (len--) {
 		accx = (accx & 0xffff00ff) | (acc & 0xff00);
 		acc  = (acc  & 0xffff00ff) | *ptr++ << 8;
 		for (i = 0; i < 8; i++) {
 			acc <<= 1;
 			if (acc & 0x10000)     acc ^= 0x1021; 
 			if (accx & 0x80000000) acc ^= 0x1021; 
 			accx <<= 1;
 		}
 	}
 	dbgprintf("Checksum from Gammu is %04X\n",(acc & 0xffff));
 	return (acc & 0xffff);
 }
 
 static GSM_Error N6510_ReplyGetFileFolderInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_File	 	*File = s->Phone.Data.FileInfo;
 	GSM_Phone_N6510Data	*Priv = &s->Phone.Data.Priv.N6510;
@@ -4034,49 +4116,49 @@ static GSM_Error N6510_ReplyGetFileFolderInfo(GSM_Protocol_Message msg, GSM_Stat
 
 		File->Type = GSM_File_Other;
 		if (msg.Length > 240){
 			i = 227;
 			if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x01)
 				File->Type = GSM_File_Image_JPG;
 			else if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x02)
 				File->Type = GSM_File_Image_BMP;
 			else if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x07)
 				File->Type = GSM_File_Image_BMP;
 			else if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x03)
 				File->Type = GSM_File_Image_PNG;
 			else if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x05)
 				File->Type = GSM_File_Image_GIF;
 			else if (msg.Buffer[i]==0x02 && msg.Buffer[i+2]==0x09)
 				File->Type = GSM_File_Image_WBMP;
                         else if (msg.Buffer[i]==0x04 && msg.Buffer[i+2]==0x01)
                                 File->Type = GSM_File_Sound_AMR;
                         else if (msg.Buffer[i]==0x04 && msg.Buffer[i+2]==0x02)
                                 File->Type = GSM_File_Sound_MIDI;
                         else if (msg.Buffer[i]==0x08 && msg.Buffer[i+2]==0x05)
                                 File->Type = GSM_File_Video_3GP;
                         else if (msg.Buffer[i]==0x10 && msg.Buffer[i+2]==0x01)
                                 File->Type = GSM_File_Java_JAR;
-#if DEVELOP
+#ifdef DEVELOP
 			else if (msg.Buffer[i]==0x00 && msg.Buffer[i+2]==0x01)
 				File->Type = GSM_File_MMS;
 #endif
 		}
 		return ERR_NONE;	
 	case 0x2F:
 		smprintf(s,"File or folder used bytes received\n");
 		File->Used = msg.Buffer[6]*256*256*256+
 			     msg.Buffer[7]*256*256+
 			     msg.Buffer[8]*256+
 			     msg.Buffer[9];
 		return ERR_NONE;
 	case 0x33:
 		if (s->Phone.Data.RequestID == ID_GetFileInfo) {
 			i = Priv->FilesLocationsUsed-1;
 			while (1) {
 				if (i==Priv->FilesLocationsCurrent-1) break;
 				dbgprintf("Copying %i to %i, max %i, current %i\n",
 					i,i+msg.Buffer[9],
 					Priv->FilesLocationsUsed,Priv->FilesLocationsCurrent);
 				Priv->FilesLocations[i+msg.Buffer[9]] 	= Priv->FilesLocations[i];
 				Priv->FilesLevels[i+msg.Buffer[9]]	= Priv->FilesLevels[i];
 				i--;
 			}
@@ -4377,49 +4459,49 @@ static GSM_Error N6510_AddFilePart(GSM_StateMachine *s, GSM_File *File, int *Pos
 	GSM_Phone_N6510Data	*Priv = &s->Phone.Data.Priv.N6510;
 	GSM_File		File2;
 	GSM_Error		error;
 	int			j;
 	unsigned char 		Header[400] = {
 		N7110_FRAME_HEADER, 0x02, 0x00, 0x00, 0x00, 0x01,
 		0x00, 0x0C, 		/* parent folder ID */
  		0x00, 0x00, 0x00, 0xE8};
 	unsigned char		Add[15000] = {
 		N7110_FRAME_HEADER, 0x40, 0x00, 0x00, 0x00, 0x01,
 		0x00, 0x04, 		/* file ID */
 		0x00, 0x00, 
 		0x01, 0x28}; 		/* length */
 	unsigned char end[30] = {
 		N7110_FRAME_HEADER, 0x40, 0x00, 0x00, 0x00, 0x01,
 		0x00, 0x04, 		/* file ID */
 		0x00, 0x00, 0x00, 0x00};
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_NOFILESYSTEM)) return ERR_NOTSUPPORTED;
 
 	s->Phone.Data.File = File;
 
 	if (*Pos == 0) {
 		error = N6510_SearchForFileName(s,File);
-		if (error == ERR_NONE) return ERR_INVALIDLOCATION;
+		if (error == ERR_NONE) return ERR_FILEALREADYEXIST;
 		if (error != ERR_EMPTY) return error;
 
 		Header[8] = atoi(File->ID_FullName) / 256;
 		Header[9] = atoi(File->ID_FullName) % 256;
 		memset(Header+14, 0x00, 300);
 		CopyUnicodeString(Header+14,File->Name);
                 Header[222] = File->Used / (256*256*256);
                 Header[223] = File->Used / (256*256);
                 Header[224] = File->Used / 256;
                 Header[225] = File->Used % 256;
 		switch(File->Type) {
 			case GSM_File_Image_JPG    : Header[231]=0x02; Header[233]=0x01; break;
 			case GSM_File_Image_BMP    : Header[231]=0x02; Header[233]=0x02; break;
 			case GSM_File_Image_PNG    : Header[231]=0x02; Header[233]=0x03; break;
 			case GSM_File_Image_GIF    : Header[231]=0x02; Header[233]=0x05; break;
 			case GSM_File_Image_WBMP   : Header[231]=0x02; Header[233]=0x09; break;
 	            	case GSM_File_Sound_AMR    : Header[231]=0x04; Header[233]=0x01; break;
 	            	case GSM_File_Sound_MIDI   : Header[231]=0x04; Header[233]=0x05; break; //Header[238]=0x01; 
 	            	case GSM_File_Sound_NRT    : Header[231]=0x04; Header[233]=0x06; break;
 	            	case GSM_File_Video_3GP    : Header[231]=0x08; Header[233]=0x05; break;
 	            	case GSM_File_Java_JAR     : Header[231]=0x10; Header[233]=0x01; break;
 #ifdef DEVELOP
 			case GSM_File_MMS:
 				Header[214]=0x07;
@@ -4793,49 +4875,49 @@ static GSM_Error N6510_ReplyGetToDoStatus1(GSM_Protocol_Message msg, GSM_StateMa
 
 /* ToDo support - 6310 style */
 static GSM_Error N6510_GetToDoStatus1(GSM_StateMachine *s, GSM_ToDoStatus *status)
 {
 	GSM_Error 			error;
 	GSM_NOKIACalToDoLocations	*LastToDo = &s->Phone.Data.Priv.N6510.LastToDo;
 	unsigned char reqLoc[] = {
 			N6110_FRAME_HEADER,
 			0x15, 0x01, 0x00, 0x00,
 			0x00, 0x00, 0x00};
 
 	smprintf(s, "Getting ToDo locations\n");
 	error = GSM_WaitFor (s, reqLoc, 10, 0x55, 4, ID_GetToDo);
 	if (error != ERR_NONE) return error;
 
 	status->Used = LastToDo->Number;
 	return ERR_NONE;
 }
 
 static GSM_Error N6510_GetToDoStatus2(GSM_StateMachine *s, GSM_ToDoStatus *status)
 {
 	GSM_NOKIACalToDoLocations	*LastToDo = &s->Phone.Data.Priv.N6510.LastToDo;
 	GSM_Error			error;
 
-	error = N6510_GetCalendarInfo3(s,LastToDo,false);
+	error = N6510_GetCalendarInfo3(s,LastToDo,1);
 	if (error!=ERR_NONE) return error;
 
 	status->Used = LastToDo->Number;
 	return ERR_NONE;
 }
 
 static GSM_Error N6510_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status)
 {
 	status->Used = 0;
 
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO63)) {
 		return N6510_GetToDoStatus1(s, status);
 	} else if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO66)) {
 		return N6510_GetToDoStatus2(s, status);
 	} else {
 		return ERR_NOTSUPPORTED;
 	}
 }
 
 /* ToDo support - 6310 style */
 static GSM_Error N6510_ReplyGetToDo1(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	GSM_ToDoEntry *Last = s->Phone.Data.ToDo;
 
@@ -4923,148 +5005,139 @@ static GSM_Error N6510_ReplyGetToDo2(GSM_Protocol_Message msg, GSM_StateMachine
 	Date.Second	= 0;
 	Last->Entries[1].EntryType = TODO_END_DATETIME;
 	memcpy(&Last->Entries[1].Date,&Date,sizeof(GSM_DateTime));
 
 	smprintf(s,"StartTime: %04i-%02i-%02i %02i:%02i\n",
 		msg.Buffer[28]*256+msg.Buffer[29],
 		msg.Buffer[30],msg.Buffer[31],msg.Buffer[32],
 		msg.Buffer[33]);
 	Date.Year 	= msg.Buffer[28]*256+msg.Buffer[29];	
 	Date.Month 	= msg.Buffer[30];
 	Date.Day 	= msg.Buffer[31];
 	Date.Hour 	= msg.Buffer[32];
 	Date.Minute 	= msg.Buffer[33];
 	Date.Second	= 0;
 
 	Last->EntriesNum = 2;
 
 	if (msg.Buffer[45] == 0x01) {
 		Last->Entries[2].Number		= msg.Buffer[45];
 	    	Last->Entries[2].EntryType 	= TODO_COMPLETED;
 		Last->EntriesNum++;
 		smprintf(s,"Completed\n");
 	}
 
-	if (msg.Buffer[14] == 0xFF && msg.Buffer[15] == 0xFF && msg.Buffer[16] == 0xff && msg.Buffer[17] == 0xff)
-	{
+	if (msg.Buffer[14] == 0xFF && msg.Buffer[15] == 0xFF && msg.Buffer[16] == 0xff && msg.Buffer[17] == 0xff) {
 		smprintf(s, "No alarm\n");
 	} else {
 		diff  = ((unsigned int)msg.Buffer[14]) << 24;
 		diff += ((unsigned int)msg.Buffer[15]) << 16;
 		diff += ((unsigned int)msg.Buffer[16]) << 8;
 		diff += msg.Buffer[17];
 
 		memcpy(&Last->Entries[Last->EntriesNum].Date,&Date,sizeof(GSM_DateTime));
 		GetTimeDifference(diff, &Last->Entries[Last->EntriesNum].Date, false, 60);
 		smprintf(s, "Alarm date   : %02i-%02i-%04i %02i:%02i:%02i\n",
 			Last->Entries[Last->EntriesNum].Date.Day,   Last->Entries[Last->EntriesNum].Date.Month,
 			Last->Entries[Last->EntriesNum].Date.Year,  Last->Entries[Last->EntriesNum].Date.Hour,
 			Last->Entries[Last->EntriesNum].Date.Minute,Last->Entries[Last->EntriesNum].Date.Second);
 
 		Last->Entries[Last->EntriesNum].EntryType = TODO_ALARM_DATETIME;
 		if (msg.Buffer[22]==0x00 && msg.Buffer[23]==0x00 &&
 		    msg.Buffer[24]==0x00 && msg.Buffer[25]==0x00)
 		{
 			Last->Entries[Last->EntriesNum].EntryType = TODO_SILENT_ALARM_DATETIME;
 			smprintf(s, "Alarm type   : Silent\n");
 		}
 		Last->EntriesNum++;
 	}
 	
 	return ERR_NONE;
 }
 
 /* ToDo support - 6610 style */
 static GSM_Error N6510_GetNextToDo2(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool refresh)
 {
 	GSM_Error 			error;
 	GSM_NOKIACalToDoLocations	*LastToDo = &s->Phone.Data.Priv.N6510.LastToDo;	
-	/* The same to getting calendar method 3 */
-	unsigned char 			req[] = { 
-		N6110_FRAME_HEADER,0x7D,0x00,0x00,0x00,0x00,
-		0x00,0x99,			/* Location */
-		0xff,0xff,0xff,0xff,0x01};	
 
 	if (refresh) {
-		error=N6510_GetCalendarInfo3(s,LastToDo,false);
+		error=N6510_GetCalendarInfo3(s,LastToDo,1);
 		if (error!=ERR_NONE) return error;
 		ToDo->Location = 1;
 	} else {
 		ToDo->Location++;
 	}
 		
 	if (ToDo->Location > LastToDo->Number) return ERR_EMPTY;
 
-	req[8] = LastToDo->Location[ToDo->Location-1] / 256;
-	req[9] = LastToDo->Location[ToDo->Location-1] % 256;
-                        
 	s->Phone.Data.ToDo = ToDo;	
 	smprintf(s, "Getting todo method 2\n");
-	return GSM_WaitFor (s, req, 15, 0x13, 4, ID_GetToDo);
+	return N6510_PrivGetGenericCalendar3(s, LastToDo->Location[ToDo->Location-1], ID_GetToDo);
 }
 
 static GSM_Error N6510_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool refresh)
 {
 	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO63)) {
 		return N6510_GetNextToDo1(s, ToDo, refresh);
 	} else if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO66)) {
 		return N6510_GetNextToDo2(s, ToDo, refresh);
 	} else {
 		return ERR_NOTSUPPORTED;
 	}
 }
 
 /* ToDo support - 6310 style */
 static GSM_Error N6510_ReplyDeleteAllToDo1(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	smprintf(s, "All TODO deleted\n");
 	return ERR_NONE;
 }
 
 /* ToDo support - 6310 style */
 static GSM_Error N6510_DeleteAllToDo1(GSM_StateMachine *s)
 {
 	unsigned char req[] = {N6110_FRAME_HEADER, 0x11};
 
 	if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO63)) {
 		return ERR_NOTSUPPORTED;
 	}
 
 	smprintf(s, "Deleting all ToDo method 1\n");
 	return GSM_WaitFor (s, req, 4, 0x55, 4, ID_DeleteAllToDo);
 }
 
 static GSM_Error N6510_DeleteToDo2(GSM_StateMachine *s, GSM_ToDoEntry *ToDo)
 {
 	GSM_Error 			error;
 	GSM_NOKIACalToDoLocations	*LastToDo = &s->Phone.Data.Priv.N6510.LastToDo;	
 	GSM_CalendarEntry		Note;
 
 	if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_TODO66)) {
 		return ERR_NOTSUPPORTED;
 	}
 
-	error=N6510_GetCalendarInfo3(s,LastToDo,false);
+	error=N6510_GetCalendarInfo3(s,LastToDo,1);
 	if (error!=ERR_NONE) return error;
 
 	smprintf(s, "Deleting ToDo method 2\n");
 
 	if (ToDo->Location > LastToDo->Number || ToDo->Location == 0) return ERR_INVALIDLOCATION;
 
 	Note.Location = LastToDo->Location[ToDo->Location-1];
 	return N71_65_DelCalendar(s,&Note);
 }
 
 /* ToDo support - 6310 style */
 static GSM_Error N6510_ReplyGetToDoFirstLoc1(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	smprintf(s, "TODO first location received method 1: %02x\n",msg.Buffer[9]);
 	s->Phone.Data.ToDo->Location = msg.Buffer[9];
 	return ERR_NONE;
 }
 
 /* ToDo support - 6310 style */
 static GSM_Error N6510_ReplyAddToDo1(GSM_Protocol_Message msg, GSM_StateMachine *s)
 {
 	smprintf(s, "TODO set OK\n");
 	return ERR_NONE;
 }
@@ -5430,55 +5503,61 @@ GSM_Error N6510_DeleteWAPBookmark(GSM_StateMachine *s, GSM_WAPBookmark *bookmark
 GSM_Error N6510_GetWAPBookmark(GSM_StateMachine *s, GSM_WAPBookmark *bookmark)
 {
 	GSM_Error error;
 
 	/* We have to enable WAP frames in phone */
 	error=N6510_EnableConnectionFunctions(s,N6510_WAP_SETTINGS);
 	if (error!=ERR_NONE) return error;
 
 	return DCT3DCT4_GetWAPBookmarkPart(s,bookmark);
 }
 
 static GSM_Reply_Function N6510ReplyFunctions[] = {
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x02,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x03,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x04,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x05,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x07,ID_AnswerCall	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x07,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x09,ID_CancelCall	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x09,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0A,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0B,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0C,ID_DialVoice		  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0C,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x0F,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x10,ID_DialVoice		  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x10,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x23,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x25,ID_IncomingFrame	  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x27,ID_IncomingFrame	  },
 	{N71_65_ReplySendDTMF,		  "\x01",0x03,0x51,ID_SendDTMF		  },
 	{N71_65_ReplyCallInfo,		  "\x01",0x03,0x53,ID_IncomingFrame	  },
 	{N71_65_ReplySendDTMF,		  "\x01",0x03,0x59,ID_SendDTMF		  },
 	{N71_65_ReplySendDTMF,		  "\x01",0x03,0x5E,ID_SendDTMF		  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0xA6,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0xD2,ID_IncomingFrame	  },
+	{N71_65_ReplyCallInfo,		  "\x01",0x03,0xD3,ID_IncomingFrame	  },
 
 	{N6510_ReplySendSMSMessage,	  "\x02",0x03,0x03,ID_IncomingFrame	  },
 	{N6510_ReplyIncomingSMS,	  "\x02",0x03,0x04,ID_IncomingFrame	  },
 	{N6510_ReplySetSMSC,		  "\x02",0x03,0x13,ID_SetSMSC		  },
 	{N6510_ReplyGetSMSC,		  "\x02",0x03,0x15,ID_GetSMSC		  },
 
 	{N6510_ReplyGetMemoryStatus,	  "\x03",0x03,0x04,ID_GetMemoryStatus	  },
 	{N6510_ReplyGetMemory,		  "\x03",0x03,0x08,ID_GetMemory		  },
 	{N6510_ReplyDeleteMemory,	  "\x03",0x03,0x10,ID_SetMemory		  },
 	{N71_65_ReplyWritePhonebook,	  "\x03",0x03,0x0C,ID_SetBitmap		  },
 	{N71_65_ReplyWritePhonebook,	  "\x03",0x03,0x0C,ID_SetMemory		  },
 
 	{DCT3DCT4_ReplyCallDivert,	  "\x06",0x03,0x02,ID_Divert		  },
 	{N71_65_ReplyUSSDInfo,		  "\x06",0x03,0x03,ID_IncomingFrame	  },
 	{NoneReply,			  "\x06",0x03,0x06,ID_IncomingFrame	  },
 	{NoneReply,			  "\x06",0x03,0x09,ID_IncomingFrame	  },
 
 	{N6510_ReplyEnterSecurityCode,	  "\x08",0x03,0x08,ID_EnterSecurityCode	  },
 	{N6510_ReplyEnterSecurityCode,	  "\x08",0x03,0x09,ID_EnterSecurityCode	  },
 	{N6510_ReplyGetSecurityStatus,	  "\x08",0x03,0x12,ID_GetSecurityStatus	  },
 
 	{N6510_ReplyGetNetworkInfo,	  "\x0A",0x03,0x01,ID_GetNetworkInfo	  },
 	{N6510_ReplyGetNetworkInfo,	  "\x0A",0x03,0x01,ID_IncomingFrame	  },
 	{N6510_ReplyLogIntoNetwork,	  "\x0A",0x03,0x02,ID_IncomingFrame	  },
@@ -5487,55 +5566,57 @@ static GSM_Reply_Function N6510ReplyFunctions[] = {
 	{NoneReply,			  "\x0A",0x03,0x20,ID_IncomingFrame	  },
 	{N6510_ReplyGetOperatorLogo,	  "\x0A",0x03,0x24,ID_GetBitmap		  },
 	{N6510_ReplySetOperatorLogo,	  "\x0A",0x03,0x26,ID_SetBitmap		  },
 
 	{NoneReply,			  "\x0B",0x03,0x01,ID_PlayTone		  },
 	{NoneReply,			  "\x0B",0x03,0x15,ID_PlayTone		  },
 	{NoneReply,			  "\x0B",0x03,0x16,ID_PlayTone		  },
 
 	{N71_65_ReplyAddCalendar1,	  "\x13",0x03,0x02,ID_SetCalendarNote	  },
 	{N71_65_ReplyAddCalendar1,	  "\x13",0x03,0x04,ID_SetCalendarNote	  },
 	{N71_65_ReplyAddCalendar1,	  "\x13",0x03,0x06,ID_SetCalendarNote	  },
 	{N71_65_ReplyAddCalendar1,	  "\x13",0x03,0x08,ID_SetCalendarNote	  },
 	{N71_65_ReplyDelCalendar,	  "\x13",0x03,0x0C,ID_DeleteCalendarNote  },
 	{N71_65_ReplyGetNextCalendar1,	  "\x13",0x03,0x1A,ID_GetCalendarNote	  },/*method 1*/
 	{N6510_ReplyGetCalendarNotePos,	  "\x13",0x03,0x32,ID_GetCalendarNotePos  },/*method 1*/
 	{N6510_ReplyGetCalendarInfo,	  "\x13",0x03,0x3B,ID_GetCalendarNotesInfo},/*method 1*/
 #ifdef DEBUG
 	{N71_65_ReplyGetNextCalendar2,	  "\x13",0x03,0x3F,ID_GetCalendarNote	  },
 #endif
 	{N71_65_ReplyAddCalendar2,	  "\x13",0x03,0x41,ID_SetCalendarNote	  },/*method 2*/
 	{N6510_ReplyAddCalendar3,	  "\x13",0x03,0x66,ID_SetCalendarNote	  },/*method 3*/
 	{N6510_ReplyAddToDo2,		  "\x13",0x03,0x66,ID_SetToDo		  },
 	{N6510_ReplyGetCalendar3,	  "\x13",0x03,0x7E,ID_GetCalendarNote	  },/*method 3*/
 	{N6510_ReplyGetToDo2,		  "\x13",0x03,0x7E,ID_GetToDo		  },
+	{N6510_ReplyGetNote,		  "\x13",0x03,0x7E,ID_GetNote		  },
 	{N6510_ReplyGetCalendarSettings,  "\x13",0x03,0x86,ID_GetCalendarSettings },
 	{N6510_ReplyGetLocale,		  "\x13",0x03,0x8A,ID_GetLocale		  },
 	{N6510_ReplyGetCalendarSettings,  "\x13",0x03,0x8E,ID_GetCalendarSettings },
 	{N6510_ReplyGetCalendarNotePos,	  "\x13",0x03,0x96,ID_GetCalendarNotePos  },/*method 3*/
 	{N6510_ReplyGetToDoFirstLoc2,	  "\x13",0x03,0x96,ID_SetToDo		  },
 	{N6510_ReplyGetCalendarInfo,	  "\x13",0x03,0x9F,ID_GetCalendarNotesInfo},/*method 3*/
 	{N6510_ReplyGetToDoStatus2,	  "\x13",0x03,0x9F,ID_GetToDo		  },
+	{N6510_ReplyGetNoteInfo,	  "\x13",0x03,0x9F,ID_GetNote		  },
 
 	{N6510_ReplySaveSMSMessage,	  "\x14",0x03,0x01,ID_SaveSMSMessage	  },
 	{N6510_ReplySetPicture,		  "\x14",0x03,0x01,ID_SetBitmap		  },
 	{N6510_ReplyGetSMSMessage,	  "\x14",0x03,0x03,ID_GetSMSMessage	  },
 	{N6510_ReplyDeleteSMSMessage,	  "\x14",0x03,0x05,ID_DeleteSMSMessage	  },
 	{N6510_ReplyDeleteSMSMessage,	  "\x14",0x03,0x06,ID_DeleteSMSMessage	  },
 	{N6510_ReplyGetSMSStatus,	  "\x14",0x03,0x09,ID_GetSMSStatus	  },
 	{N6510_ReplyGetSMSFolderStatus,	  "\x14",0x03,0x0d,ID_GetSMSFolderStatus  },
 	{N6510_ReplyGetSMSMessage,	  "\x14",0x03,0x0f,ID_GetSMSMessage	  },
 	{N6510_ReplyAddSMSFolder,	  "\x14",0x03,0x11,ID_AddSMSFolder	  },
 	{N6510_ReplyGetSMSFolders,	  "\x14",0x03,0x13,ID_GetSMSFolders	  },
 	{N6510_ReplySaveSMSMessage,	  "\x14",0x03,0x17,ID_SaveSMSMessage	  },
 	{N6510_ReplyGetSMSStatus,	  "\x14",0x03,0x1a,ID_GetSMSStatus	  },
 
 	{DCT4_ReplySetPhoneMode,	  "\x15",0x03,0x64,ID_Reset		  },
 	{DCT4_ReplyGetPhoneMode,	  "\x15",0x03,0x65,ID_Reset		  },
 	{NoneReply,		  	  "\x15",0x03,0x68,ID_Reset		  },
 
 	{N6510_ReplyGetBatteryCharge,	  "\x17",0x03,0x0B,ID_GetBatteryCharge	  },
 
 	{N6510_ReplySetDateTime,	  "\x19",0x03,0x02,ID_SetDateTime	  },
 	{N6510_ReplyGetDateTime,	  "\x19",0x03,0x0B,ID_GetDateTime	  },
 	{N6510_ReplySetAlarm,		  "\x19",0x03,0x12,ID_SetAlarm		  },
 	{N6510_ReplyGetAlarm,		  "\x19",0x03,0x1A,ID_GetAlarm		  },
@@ -5630,49 +5711,49 @@ static GSM_Reply_Function N6510ReplyFunctions[] = {
 	{N6510_ReplyAddFilePart,	  "\x6D",0x03,0x41,ID_AddFile		  },
 	{N6510_ReplyGetFileFolderInfo,	  "\x6D",0x03,0x43,ID_AddFile		  },
 	{N6510_ReplyGetFileFolderInfo,	  "\x6D",0x03,0x43,ID_GetFile		  },
 	{N6510_ReplyGetFileFolderInfo,	  "\x6D",0x03,0x43,ID_GetFileInfo	  },
 
 	{N6510_ReplyStartupNoteLogo,	  "\x7A",0x04,0x01,ID_GetBitmap		  },
 	{N6510_ReplyStartupNoteLogo,	  "\x7A",0x04,0x01,ID_SetBitmap		  },
 	{N6510_ReplyStartupNoteLogo,	  "\x7A",0x04,0x0F,ID_GetBitmap		  },
 	{N6510_ReplyStartupNoteLogo,	  "\x7A",0x04,0x0F,ID_SetBitmap		  },
 	{N6510_ReplyStartupNoteLogo,	  "\x7A",0x04,0x10,ID_GetBitmap		  },
 	{N6510_ReplyStartupNoteLogo,	  "\x7A",0x04,0x10,ID_SetBitmap		  },
 	{N6510_ReplyStartupNoteLogo,	  "\x7A",0x04,0x25,ID_SetBitmap		  },
 
 	{DCT3DCT4_ReplyGetModelFirmware,  "\xD2",0x02,0x00,ID_GetModel		  },
 	{DCT3DCT4_ReplyGetModelFirmware,  "\xD2",0x02,0x00,ID_GetFirmware	  },
 
 	/* 0xD7 - Bluetooth */
 
 	{N6510_ReplyGetRingtoneID,	  "\xDB",0x03,0x02,ID_SetRingtone	  },
 
 	{NULL,				  "\x00",0x00,0x00,ID_None		  }
 };
 
 GSM_Phone_Functions N6510Phone = {
-	"1100|1100a|1100b|3100|3100b|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6800|7210|7250|7250i|7600|8310|8390|8910|8910i",
+	"1100|1100a|1100b|3100|3100b|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|5140|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6610i|6800|6810|6820|7210|7250|7250i|7600|8310|8390|8910|8910i",
 	N6510ReplyFunctions,
 	N6510_Initialise,
 	NONEFUNCTION,			/*	Terminate 		*/
 	GSM_DispatchMessage,
 	N6510_ShowStartInfo,
 	NOKIA_GetManufacturer,
 	DCT3DCT4_GetModel,
 	DCT3DCT4_GetFirmware,
 	DCT4_GetIMEI,
 	N6510_GetOriginalIMEI,
 	N6510_GetManufactureMonth,
 	DCT4_GetProductCode,
 	DCT4_GetHardware,
 	N6510_GetPPM,
 	NOTSUPPORTED,			/*	GetSIMIMSI		*/
 	N6510_GetDateTime,
 	N6510_SetDateTime,
 	N6510_GetAlarm,
 	N6510_SetAlarm,
 	N6510_GetLocale,
 	NOTSUPPORTED,			/* 	SetLocale		*/
 	N6510_PressKey,
 	DCT4_Reset,
 	NOTIMPLEMENTED,			/*	ResetPhoneSettings	*/
@@ -5684,48 +5765,49 @@ GSM_Phone_Functions N6510Phone = {
 	N6510_GetSignalQuality,
 	N6510_GetNetworkInfo,
 	NOTSUPPORTED,       		/*  	GetCategory 		*/
  	NOTSUPPORTED,       		/*  	AddCategory 		*/
 	NOTSUPPORTED,        		/*  	GetCategoryStatus 	*/
 	N6510_GetMemoryStatus,
 	N6510_GetMemory,
 	NOTIMPLEMENTED,			/*	GetNextMemory		*/
 	N6510_SetMemory,
 	NOTIMPLEMENTED,			/*	AddMemory		*/
 	N6510_DeleteMemory,
 	NOTIMPLEMENTED,			/*	DeleteAllMemory		*/
 	N6510_GetSpeedDial,
 	NOTIMPLEMENTED,			/*	SetSpeedDial		*/
 	N6510_GetSMSC,
 	N6510_SetSMSC,
 	N6510_GetSMSStatus,
 	N6510_GetSMSMessage,
 	N6510_GetNextSMSMessage,
 	N6510_SetSMS,
 	N6510_AddSMS,
 	N6510_DeleteSMSMessage,
 	N6510_SendSMSMessage,
 	NOTSUPPORTED,			/*	SendSavedSMS		*/
+	NOTSUPPORTED,			/*	SetFastSMSSending	*/
 	NOKIA_SetIncomingSMS,
 	NOTIMPLEMENTED,			/* 	SetIncomingCB		*/
 	N6510_GetSMSFolders,
  	N6510_AddSMSFolder,
  	NOTIMPLEMENTED,			/* 	DeleteSMSFolder		*/
 	N6510_DialVoice,
  	N6510_AnswerCall,
  	N6510_CancelCall,
  	NOTIMPLEMENTED,			/* 	HoldCall 		*/
  	NOTIMPLEMENTED,			/* 	UnholdCall 		*/
  	NOTIMPLEMENTED,			/* 	ConferenceCall 		*/
  	NOTIMPLEMENTED,			/* 	SplitCall		*/
  	NOTIMPLEMENTED,			/* 	TransferCall		*/
  	NOTIMPLEMENTED,			/* 	SwitchCall		*/
  	DCT3DCT4_GetCallDivert,
  	DCT3DCT4_SetCallDivert,
  	DCT3DCT4_CancelAllDiverts,
 	NOKIA_SetIncomingCall,
 	NOKIA_SetIncomingUSSD,
 	DCT3DCT4_SendDTMF,
 	N6510_GetRingtone,
 	N6510_SetRingtone,
 	N6510_GetRingtonesInfo,
 	N6510_DeleteUserRingtones,
@@ -5738,45 +5820,45 @@ GSM_Phone_Functions N6510Phone = {
 	N6510_GetMMSSettings,
 	N6510_SetMMSSettings,
 	N6510_GetSyncMLSettings,
 	NOTSUPPORTED,			/*	SetSyncMLSettings	*/
 	N6510_GetChatSettings,
 	NOTSUPPORTED,			/*	SetChatSettings		*/
 	N6510_GetBitmap,
 	N6510_SetBitmap,
 	N6510_GetToDoStatus,
 	NOTIMPLEMENTED,			/*	GetToDo			*/
 	N6510_GetNextToDo,
 	NOTIMPLEMENTED,			/*	SetToDo			*/
 	N6510_AddToDo,
 	N6510_DeleteToDo2,
 	N6510_DeleteAllToDo1,
 	N6510_GetCalendarStatus,
 	NOTIMPLEMENTED,			/*	GetCalendar		*/
     	N6510_GetNextCalendar,
 	NOTIMPLEMENTED,			/*	SetCalendar		*/
 	N6510_AddCalendar,
 	N71_65_DelCalendar,
 	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
 	N6510_GetCalendarSettings,
 	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
-	NOTIMPLEMENTED,			/*	GetNote			*/
+	N6510_GetNextNote,
 	N6510_GetProfile,
 	N6510_SetProfile,
     	N6510_GetFMStation,
      	N6510_SetFMStation,
  	N6510_ClearFMStations,
 	N6510_GetNextFileFolder,
 	N6510_GetFilePart,
 	N6510_AddFilePart,
 	N6510_GetFileSystemStatus,
 	N6510_DeleteFile,
 	N6510_AddFolder,
 	N6510_GetGPRSAccessPoint,
 	N6510_SetGPRSAccessPoint
 };
 
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/phone/nokia/dct4/n6510.h b/gammu/emb/common/phone/nokia/dct4/n6510.h
index 4717aeb..26623d6 100644
--- a/gammu/emb/common/phone/nokia/dct4/n6510.h
+++ b/gammu/emb/common/phone/nokia/dct4/n6510.h
@@ -13,48 +13,50 @@ typedef enum {
 	N6510_WAP_SETTINGS,
 	N6510_SYNCML_SETTINGS
 } N6510_Connection_Settings;
 
 typedef enum {
 	N6510_LIGHT_DISPLAY = 0x01,
 	N6510_LIGHT_KEYPAD  = 0x03,
 	N6510_LIGHT_TORCH   = 0x10
 } N6510_PHONE_LIGHTS;
 
 typedef struct {
 	int				LastCalendarYear;
 	int				LastCalendarPos;
 	GSM_NOKIACalToDoLocations	LastCalendar;
 	int				FirstCalendarPos;
 	unsigned char			CalendarIcons[10];
 	GSM_CalendarNoteType		CalendarIconsTypes[10];
 	int				CalendarIconsNum;
 
 	GSM_NOKIASMSFolder		LastSMSFolder;
 	GSM_SMSFolders			LastSMSFolders;
 
 	GSM_NOKIACalToDoLocations	LastToDo;
 
+	GSM_NOKIACalToDoLocations	LastNote;
+
 	unsigned char			RingtoneID;	/* When set with preview */
 
 	int				FilesLocations[1000];
 	int				FilesLevels[1000];
 	int				FilesLocationsUsed;
 	int				FilesLocationsCurrent;
 	int				FileToken;
 	int				ParentID;
 	int				FileCheckSum;
 
 	unsigned char			FMStatus[4000];
 	int				FMStatusLength;
 
 	unsigned char			GPRSPoints[4000];
 	int				GPRSPointsLength;
 
 	int				BearerNumber;
 
 	unsigned char			PhoneMode;
 } GSM_Phone_N6510Data;
 
 void N6510_EncodeFMFrequency(double freq, unsigned char *buff);
 void N6510_DecodeFMFrequency(double *freq, unsigned char *buff);