Initial revision

4 files changed, 4510 insertions, 0 deletions

diff --git a/gammu/emb/common/phone/at/atgen.c b/gammu/emb/common/phone/at/atgen.c
new file mode 100644
index 0000000..1834f15
--- a/dev/null
+++ b/gammu/emb/common/phone/at/atgen.c
@@ -0,0 +1,3669 @@
+/* (c) 2002-2004 by Marcin Wiacek and Michal Cihar */
+                                           
+#include "../../gsmstate.h"
+
+#ifdef GSM_ENABLE_ATGEN
+
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "../../gsmcomon.h"
+#include "../../misc/coding/coding.h"
+#include "../../service/sms/gsmsms.h"
+#include "../pfunc.h"
+#include "atgen.h"
+
+#ifdef GSM_ENABLE_ALCATEL
+extern GSM_Error ALCATEL_ProtocolVersionReply	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+#endif
+
+extern GSM_Error ATGEN_CMS35ReplyGetBitmap	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+extern GSM_Error ATGEN_CMS35ReplySetBitmap	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+extern GSM_Error ATGEN_CMS35ReplyGetRingtone	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+extern GSM_Error ATGEN_CMS35ReplySetRingtone	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+extern GSM_Error ATGEN_CMS35ReplyGetNextCal	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+extern GSM_Error ATGEN_CMS35ReplySetCalendar	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+extern GSM_Error ATGEN_CMS35ReplyDeleteCalendar	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+extern GSM_Error ATGEN_SL45ReplyGetMemory	(GSM_Protocol_Message msg, GSM_StateMachine *s);
+
+extern GSM_Error ATGEN_GetRingtone		(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone);
+extern GSM_Error ATGEN_SetRingtone		(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength);
+extern GSM_Error ATGEN_GetBitmap		(GSM_StateMachine *s, GSM_Bitmap *Bitmap);
+extern GSM_Error ATGEN_SetBitmap		(GSM_StateMachine *s, GSM_Bitmap *Bitmap);
+extern GSM_Error SIEMENS_GetNextCalendar	(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start);
+extern GSM_Error SIEMENS_AddCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
+extern GSM_Error SIEMENS_DelCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
+
+extern GSM_Error SONYERIC_GetNextCalendar	(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start);
+extern GSM_Error SONYERIC_GetNextToDo		(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start);
+extern GSM_Error SONYERIC_GetToDoStatus		(GSM_StateMachine *s, GSM_ToDoStatus *status);
+extern GSM_Error SONYERIC_AddCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
+extern GSM_Error SONYERIC_AddToDo		(GSM_StateMachine *s, GSM_ToDoEntry *ToDo);
+extern GSM_Error SONYERIC_DeleteAllToDo		(GSM_StateMachine *s);
+extern GSM_Error SONYERIC_DelCalendarNote	(GSM_StateMachine *s, GSM_CalendarEntry *Note);
+extern GSM_Error SONYERIC_GetCalendarStatus	(GSM_StateMachine *s, GSM_CalendarStatus *Status);
+
+typedef struct {
+	int     Number;
+	char    Text[60];
+} ATErrorCode;
+
+static ATErrorCode CMSErrorCodes[] = {
+	/*
+	 * Error codes not specified here were either undefined or reserved in my
+	 * copy of specifications, if you have newer one, please fill in the gaps.
+	 */
+	/* 0...127 from GSM 04.11 Annex E-2 */
+	{1,    "Unassigned (unallocated) number"},
+	{8,    "Operator determined barring"},
+	{10,   "Call barred"},
+	{21,   "Short message transfer rejected"},
+	{27,   "Destination out of service"},
+	{28,   "Unidentified subscriber"},
+	{29,   "Facility rejected"},
+	{30,   "Unknown subscriber"},
+	{38,   "Network out of order"},
+	{41,   "Temporary failure"},
+	{42,   "Congestion"},
+	{47,   "Resources unavailable, unspecified"},
+	{50,   "Requested facility not subscribed"},
+	{69,   "Requested facility not implemented"},
+	{81,   "Invalid short message transfer reference value"},
+	{95,   "Invalid message, unspecified"},
+	{96,   "Invalid mandatory information"},
+	{97,   "Message type non-existent or not implemented"},
+	{98,   "Message not compatible with short message protocol state"},
+	{99,   "Information element non-existent or not implemented"},
+	{111,  "Protocol error, unspecified"},
+	{127,  "Interworking, unspecified"},
+	/* 128...255 from GSM 03.40 subclause 9.2.3.22 */
+	{0x80, "Telematic interworking not supported"},
+	{0x81, "Short message Type 0 not supported"},
+	{0x82, "Cannot replace short message"},
+	{0x8F, "Unspecified TP-PID error"},
+	{0x90, "Data coding scheme (alphabet) not supported"},
+	{0x91, "Message class not supported"},
+	{0x9F, "Unspecified TP-DCS error"},
+	{0xA0, "Command cannot be actioned"},
+	{0xA1, "Command unsupported"},
+	{0xAF, "Unspecified TP-Command error"},
+	{0xB0, "TPDU not supported"},
+	{0xC0, "SC busy"},
+	{0xC1, "No SC subscription"},
+	{0xC2, "SC system failure"},
+	{0xC3, "Invalid SME address"},
+	{0xC4, "Destination SME barred"},
+	{0xC5, "SM Rejected-Duplicate SM"},
+	{0xC6, "TP-VPF not supported"},
+	{0xC7, "TP-VP not supported"},
+	{0xD0, "SIM SMS storage full"},
+	{0xD1, "No SMS storage capability in SIM"},
+	{0xD2, "Error in MS"},
+	{0xD3, "Memory Capacity Exceede"},
+	{0xD4, "SIM Application Toolkit Busy"},
+	{0xFF, "Unspecified error cause"},
+	/* 300...511 from GSM 07.05 subclause 3.2.5 */
+	{300,  "ME failure"},
+	{301,  "SMS service of ME reserved"},
+	{302,  "operation not allowed"},
+	{303,  "operation not supported"},
+	{304,  "invalid PDU mode parameter"},
+	{305,  "invalid text mode parameter"},
+	{310,  "SIM not inserted"},
+	{311,  "SIM PIN required"},
+	{312,  "PH-SIM PIN required"},
+	{313,  "SIM failure"},
+	{314,  "SIM busy"},
+	{315,  "SIM wrong"},
+	{316,  "SIM PUK required"},
+	{317,  "SIM PIN2 required"},
+	{318,  "SIM PUK2 required"},
+	{320,  "memory failure"},
+	{321,  "invalid memory index"},
+	{322,  "memory full"},
+	{330,  "SMSC address unknown"},
+	{331,  "no network service"},
+	{332,  "network timeout"},
+	{340,  "no CNMA acknowledgement expected"},
+	{500,  "unknown error"},
+	/* > 512 are manufacturer specific according to GSM 07.05 subclause 3.2.5 */
+	{-1,   ""}
+};
+
+static ATErrorCode CMEErrorCodes[] = {
+	/* CME Error codes from GSM 07.07 section 9.2 */
+	{0,   "phone failure"},
+	{1,   "no connection to phone"},
+	{2,   "phone-adaptor link reserved"},
+	{3,   "operation not allowed"},
+	{4,   "operation not supported"},
+	{5,   "PH-SIM PIN required"},
+	{10,  "SIM not inserted"},
+	{11,  "SIM PIN required"},
+	{12,  "SIM PUK required"},
+	{13,  "SIM failure"},
+	{14,  "SIM busy"},
+	{15,  "SIM wrong"},
+	{16,  "incorrect password"},
+	{17,  "SIM PIN2 required"},
+	{18,  "SIM PUK2 required"},
+	{20,  "memory full"},
+	{21,  "invalid index"},
+	{22,  "not found"},
+	{23,  "memory failure"},
+	{24,  "text string too long"},
+	{25,  "invalid characters in text string"},
+	{26,  "dial string too long"},
+	{27,  "invalid characters in dial string"},
+	{30,  "no network service"},
+	{31,  "network timeout"},
+	{100, "unknown"},
+};
+
+
+GSM_Error ATGEN_HandleCMEError(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->ErrorCode == 0) {
+		smprintf(s, "CME Error occured, but it's type not detected\n");
+	} else if (Priv->ErrorText == NULL) {
+		smprintf(s, "CME Error %i, no description available\n", Priv->ErrorCode);
+	} else {
+		smprintf(s, "CME Error %i: \"%s\"\n", Priv->ErrorCode, Priv->ErrorText);
+	}
+	/* For error codes descriptions see table a bit above */
+	switch (Priv->ErrorCode) {
+		case 3:
+			return ERR_PERMISSION;
+		case 4:
+			return ERR_NOTSUPPORTED;
+		case 5:
+		case 11:
+		case 12:
+		case 16:
+		case 17:
+		case 18:
+			return ERR_SECURITYERROR;
+		case 20:
+			return ERR_FULL;
+		case 21:
+			return ERR_INVALIDLOCATION;
+		case 22:
+			return ERR_EMPTY;
+		case 23:
+			return ERR_MEMORY;
+		case 24:
+		case 25:
+		case 26:
+		case 27:
+			return ERR_INVALIDDATA;
+		default:
+			return ERR_UNKNOWN;
+	}
+}
+
+GSM_Error ATGEN_HandleCMSError(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->ErrorCode == 0) {
+		smprintf(s, "CMS Error occured, but it's type not detected\n");
+	} else if (Priv->ErrorText == NULL) {
+		smprintf(s, "CMS Error %i, no description available\n", Priv->ErrorCode);
+	} else {
+		smprintf(s, "CMS Error %i: \"%s\"\n", Priv->ErrorCode, Priv->ErrorText);
+	}
+	/* For error codes descriptions see table a bit above */
+	switch (Priv->ErrorCode) {
+	case 304:
+            	return ERR_NOTSUPPORTED; 
+        case 305:
+            	return ERR_BUG; 
+        case 311:
+        case 312:
+        case 316:
+        case 317:
+        case 318:
+            	return ERR_SECURITYERROR;
+        case 322:
+            	return ERR_FULL;
+        case 321:
+            	return ERR_INVALIDLOCATION;
+        default:
+		return ERR_UNKNOWN;
+	}
+}
+
+/* FIXME: Function doesn't respect quoting of parameters and thus +FOO:
+ *        "ab","cd,ef" will consider as three arguments: "ab" >> "cd >> ef"
+ */
+int ATGEN_ExtractOneParameter(unsigned char *input, unsigned char *output)
+{
+	int position=0;
+
+	while (*input!=',' && *input!=0x0d && *input!=0x00) {
+		*output=*input;
+		input	++;
+		output	++;
+		position++;
+	}
+	*output=0;
+	position++;
+	return position;
+}
+
+void ATGEN_DecodeDateTime(GSM_DateTime *dt, unsigned char *input)
+{
+	dt->Year=2000+(*input-'0')*10;     input++;
+	dt->Year=dt->Year+(*input-'0');    input++;
+
+	input++;
+	dt->Month=(*input-'0')*10;         input++;
+	dt->Month=dt->Month+(*input-'0');  input++;
+
+	input++;
+	dt->Day=(*input-'0')*10;           input++;
+	dt->Day=dt->Day+(*input-'0');      input++;
+
+	input++;
+	dt->Hour=(*input-'0')*10;          input++;
+	dt->Hour=dt->Hour+(*input-'0');    input++;
+
+	input++;
+	dt->Minute=(*input-'0')*10;        input++;
+	dt->Minute=dt->Minute+(*input-'0');input++;
+
+	input++;
+	dt->Second=(*input-'0')*10;        input++;
+	dt->Second=dt->Second+(*input-'0');input++;
+
+	if (input!=NULL) {
+		input++;
+		dt->Timezone=(*input-'0')*10;          input++;
+		dt->Timezone=dt->Timezone+(*input-'0');input++;
+		input=input-2;
+		if (*input=='-') dt->Timezone=-dt->Timezone;
+	}
+}
+
+GSM_Error ATGEN_DispatchMessage(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv 	= &s->Phone.Data.Priv.ATGEN;
+	GSM_Protocol_Message	*msg	= s->Phone.Data.RequestMsg;
+	int 			i	= 0, j, k;
+	char                    *err, *line;
+	ATErrorCode		*ErrorCodes = NULL;
+
+	SplitLines(msg->Buffer, msg->Length, &Priv->Lines, "\x0D\x0A", 2, true);
+
+	/* Find number of lines */
+	while (Priv->Lines.numbers[i*2+1] != 0) {
+		/* FIXME: handle special chars correctly */
+		smprintf(s, "%i \"%s\"\n",i+1,GetLineString(msg->Buffer,Priv->Lines,i+1));
+		i++;
+	}
+
+	Priv->ReplyState 	= AT_Reply_Unknown;
+	Priv->ErrorText     	= NULL;
+	Priv->ErrorCode     	= 0;
+
+	line = GetLineString(msg->Buffer,Priv->Lines,i);
+	if (!strcmp(line,"OK"))		Priv->ReplyState = AT_Reply_OK;
+	if (!strcmp(line,"> "))		Priv->ReplyState = AT_Reply_SMSEdit;
+	if (!strcmp(line,"CONNECT"))	Priv->ReplyState = AT_Reply_Connect;
+	if (!strcmp(line,"ERROR"  ))	Priv->ReplyState = AT_Reply_Error;
+	if (!strncmp(line,"+CME ERROR:",11)) {
+		Priv->ReplyState = AT_Reply_CMEError;
+		ErrorCodes = CMEErrorCodes;
+	}
+	if (!strncmp(line,"+CMS ERROR:",11)) {
+		Priv->ReplyState = AT_Reply_CMSError;
+		ErrorCodes = CMSErrorCodes;
+	}
+	if (Priv->ReplyState == AT_Reply_CMEError || Priv->ReplyState == AT_Reply_CMSError) {
+	        j = 0;
+		/* One char behind +CM[SE] ERROR */
+		err = line + 12;
+		while (err[j] && !isalnum(err[j])) j++;
+		if (isdigit(err[j])) {
+			Priv->ErrorCode = atoi(&(err[j]));
+			k = 0;
+			while (ErrorCodes[k].Number != -1) {
+				if (ErrorCodes[k].Number == Priv->ErrorCode) {
+					Priv->ErrorText = (char *)&(ErrorCodes[k].Text);
+					break;
+				}
+				k++;
+			}
+		} else if (isalpha(err[j])) {
+			k = 0;
+			while (ErrorCodes[k].Number != -1) {
+				if (!strncmp(err + j, ErrorCodes[k].Text, strlen(ErrorCodes[k].Text))) {
+					Priv->ErrorCode = ErrorCodes[k].Number;
+					Priv->ErrorText = (char *)&(ErrorCodes[k].Text);
+					break;
+				}
+				k++;
+			}
+		}
+	}
+	return GSM_DispatchMessage(s);
+}
+
+GSM_Error ATGEN_GenericReply(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+		case AT_Reply_OK:
+		case AT_Reply_Connect:
+			return ERR_NONE;
+		case AT_Reply_Error:
+			return ERR_UNKNOWN;
+		case AT_Reply_CMSError:
+			return ATGEN_HandleCMSError(s);
+		case AT_Reply_CMEError:
+			return ATGEN_HandleCMEError(s);
+		default:
+			break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_ReplyGetModel(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Phone_Data		*Data = &s->Phone.Data;
+
+	if (s->Phone.Data.Priv.ATGEN.ReplyState != AT_Reply_OK) return ERR_NOTSUPPORTED;
+
+	if (strlen(GetLineString(msg.Buffer, Priv->Lines, 2)) <= MAX_MODEL_LENGTH) {
+		CopyLineString(Data->Model, msg.Buffer, Priv->Lines, 2);
+
+		/* Sometimes phone adds this before manufacturer (Sagem) */
+		if (strncmp("+CGMM: ", Data->Model, 7) == 0) {
+			memmove(Data->Model, Data->Model + 7, strlen(Data->Model + 7) + 1);
+		}
+
+		Data->ModelInfo = GetModelData(NULL,Data->Model,NULL);
+		if (Data->ModelInfo->number[0] == 0) Data->ModelInfo = GetModelData(NULL,NULL,Data->Model);
+		if (Data->ModelInfo->number[0] == 0) Data->ModelInfo = GetModelData(Data->Model,NULL,NULL);
+
+		if (Data->ModelInfo->number[0] != 0) strcpy(Data->Model,Data->ModelInfo->number);
+
+		if (strstr(msg.Buffer,"Nokia")) 	Priv->Manufacturer = AT_Nokia;
+		else if (strstr(msg.Buffer,"M20")) 	Priv->Manufacturer = AT_Siemens;
+		else if (strstr(msg.Buffer,"MC35")) 	Priv->Manufacturer = AT_Siemens;
+		else if (strstr(msg.Buffer, "iPAQ")) 	Priv->Manufacturer = AT_HP;
+
+		if (strstr(msg.Buffer,"M20")) 		strcpy(Data->Model,"M20");
+		else if (strstr(msg.Buffer,"MC35")) 	strcpy(Data->Model,"MC35");
+		else if (strstr(msg.Buffer, "iPAQ")) 	strcpy(Data->Model,"iPAQ");
+	} else {
+		smprintf(s, "WARNING: Model name too long, increase MAX_MODEL_LENGTH to at least %zd\n", strlen(GetLineString(msg.Buffer, Priv->Lines, 2)));
+	}
+
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_GetModel(GSM_StateMachine *s)
+{
+	GSM_Error error;
+
+	if (s->Phone.Data.Model[0] != 0) return ERR_NONE;
+
+	smprintf(s, "Getting model\n");
+	error=GSM_WaitFor (s, "AT+CGMM\r", 8, 0x00, 3, ID_GetModel);
+	if (error==ERR_NONE) {
+		if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL ||
+		    s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE) {
+			smprintf(s, "[Connected model  - \"%s\"]\n",s->Phone.Data.Model);
+		}
+	}
+	return error;
+}
+
+GSM_Error ATGEN_ReplyGetManufacturer(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Manufacturer info received\n");
+		Priv->Manufacturer = AT_Unknown;
+		if (strlen(GetLineString(msg.Buffer, Priv->Lines, 2)) <= MAX_MANUFACTURER_LENGTH) {
+			CopyLineString(s->Phone.Data.Manufacturer, msg.Buffer, Priv->Lines, 2);
+		} else {
+			smprintf(s, "WARNING: Manufacturer name too long, increase MAX_MANUFACTURER_LENGTH to at least %zd\n", strlen(GetLineString(msg.Buffer, Priv->Lines, 2)));
+			s->Phone.Data.Manufacturer[0] = 0;
+		}
+		/* Sometimes phone adds this before manufacturer (Sagem) */
+		if (strncmp("+CGMI: ", s->Phone.Data.Manufacturer, 7) == 0) {
+			memmove(s->Phone.Data.Manufacturer, s->Phone.Data.Manufacturer + 7, strlen(s->Phone.Data.Manufacturer + 7) + 1);
+		}
+		if (strstr(msg.Buffer,"Falcom")) {
+			smprintf(s, "Falcom\n");
+			strcpy(s->Phone.Data.Manufacturer,"Falcom");
+			Priv->Manufacturer = AT_Falcom;
+			if (strstr(msg.Buffer,"A2D")) {
+				strcpy(s->Phone.Data.Model,"A2D");
+				s->Phone.Data.ModelInfo = GetModelData(NULL,s->Phone.Data.Model,NULL);
+				smprintf(s, "Model A2D\n");
+			}
+		}
+		if (strstr(msg.Buffer,"Nokia")) {
+			smprintf(s, "Nokia\n");
+			strcpy(s->Phone.Data.Manufacturer,"Nokia");
+			Priv->Manufacturer = AT_Nokia;
+		}
+		if (strstr(msg.Buffer,"SIEMENS")) {
+			smprintf(s, "Siemens\n");
+			strcpy(s->Phone.Data.Manufacturer,"Siemens");
+			Priv->Manufacturer = AT_Siemens;
+		}
+		if (strstr(msg.Buffer,"ERICSSON")) {
+			smprintf(s, "Ericsson\n");
+			strcpy(s->Phone.Data.Manufacturer,"Ericsson");
+			Priv->Manufacturer = AT_Ericsson;
+		}
+		if (strstr(msg.Buffer,"iPAQ")) {
+			smprintf(s, "iPAQ\n");
+			strcpy(s->Phone.Data.Manufacturer,"HP");
+			Priv->Manufacturer = AT_HP;
+		}
+		if (strstr(msg.Buffer,"ALCATEL")) {
+			smprintf(s, "Alcatel\n");
+			strcpy(s->Phone.Data.Manufacturer,"Alcatel");
+			Priv->Manufacturer = AT_Alcatel;
+		}
+		if (strstr(msg.Buffer,"SAGEM")) {
+			smprintf(s, "Sagem\n");
+			strcpy(s->Phone.Data.Manufacturer,"Sagem");
+			Priv->Manufacturer = AT_Sagem;
+		}
+		return ERR_NONE;
+	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetManufacturer(GSM_StateMachine *s)
+{
+	if (s->Phone.Data.Manufacturer[0] != 0) return ERR_NONE;
+
+	return GSM_WaitFor (s, "AT+CGMI\r", 8, 0x00, 4, ID_GetManufacturer);
+}
+
+GSM_Error ATGEN_ReplyGetFirmwareCGMR(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	unsigned int		i = 0;
+
+	strcpy(s->Phone.Data.Version,"unknown");
+	s->Phone.Data.VerNum = 0;
+	if (Priv->ReplyState == AT_Reply_OK) {
+		CopyLineString(s->Phone.Data.Version, msg.Buffer, Priv->Lines, 2);
+		/* Sometimes phone adds this before manufacturer (Sagem) */
+		if (strncmp("+CGMR: ", s->Phone.Data.Version, 7) == 0) {
+			memmove(s->Phone.Data.Version, s->Phone.Data.Version + 7, strlen(s->Phone.Data.Version + 7) + 1);
+		}
+	}
+	if (Priv->Manufacturer == AT_Ericsson) {
+		while (1) {
+			if (s->Phone.Data.Version[i] == 0x20) {
+				s->Phone.Data.Version[i] = 0x00;
+				break;
+			}
+			if (i == strlen(s->Phone.Data.Version)) break;
+			i++;
+		}
+	}
+	smprintf(s, "Received firmware version: \"%s\"\n",s->Phone.Data.Version);
+	GSM_CreateFirmwareNumber(s);
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ReplyGetFirmwareATI(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+//		strcpy(Data->Version,"0.00");
+//		*Data->VersionNum=0;
+//		if (Data->Priv.ATGEN.ReplyState==AT_Reply_OK) {
+//			CopyLineString(Data->Version, msg.Buffer, Priv->Lines, 2);
+//		}
+//		smprintf(s, "Received firmware version: \"%s\"\n",Data->Version);
+//		GSM_CreateFirmwareNumber(Data);
+//		return ERR_NONE;
+	case AT_Reply_Error:
+		return ERR_NOTSUPPORTED;
+	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetFirmware(GSM_StateMachine *s)
+{
+	GSM_Error error;
+
+	if (s->Phone.Data.Version[0] != 0) return ERR_NONE;
+
+	error=ATGEN_GetManufacturer(s);
+	if (error != ERR_NONE) return error;
+
+//	smprintf(s, "Getting firmware - method 1\n");
+//	error=GSM_WaitFor (s, "ATI\r", 4, 0x00, 3, ID_GetFirmware);
+//	if (error != ERR_NONE) {
+		smprintf(s, "Getting firmware - method 2\n");
+		error=GSM_WaitFor (s, "AT+CGMR\r", 8, 0x00, 3, ID_GetFirmware);
+//	}
+	if (error==ERR_NONE) {
+		if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL ||
+		    s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE) {
+			smprintf(s, "[Firmware version - \"%s\"]\n",s->Phone.Data.Version);
+		}
+	}
+	return error;
+}
+
+GSM_Error ATGEN_Initialise(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData     *Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error               error;
+    	char                    buff[2];
+
+	Priv->SMSMode			= 0;
+	Priv->Manufacturer		= 0;
+	Priv->PhoneSMSMemory		= 0;
+	Priv->CanSaveSMS		= false;
+	Priv->SIMSMSMemory		= 0;
+	Priv->SMSMemory			= 0;
+	Priv->PBKMemory			= 0;
+	Priv->PBKSBNR			= 0;
+	Priv->PBKCharset		= 0;
+ 	Priv->UCS2CharsetFailed		= false;
+ 	Priv->NonUCS2CharsetFailed	= false;
+	Priv->PBKMemories[0]		= 0;
+	Priv->FirstCalendarPos		= 0;
+	Priv->NextMemoryEntry		= 0;
+	Priv->FirstMemoryEntry		= 0;
+	Priv->file.Used 		= 0;
+	Priv->file.Buffer 		= NULL;
+	Priv->OBEX			= false;
+	Priv->MemorySize		= 0;
+	Priv->TextLength		= 0;
+	Priv->NumberLength		= 0;
+
+	Priv->ErrorText			= NULL;
+
+	if (s->ConnectionType != GCT_IRDAAT && s->ConnectionType != GCT_BLUEAT) {
+		/* We try to escape AT+CMGS mode, at least Siemens M20
+		 * then needs to get some rest
+		 */
+		smprintf(s, "Escaping SMS mode\n");
+		error = s->Protocol.Functions->WriteMessage(s, "\x1B\r", 2, 0x00);
+		if (error!=ERR_NONE) return error;
+
+	    	/* Grab any possible garbage */
+	    	while (s->Device.Functions->ReadDevice(s, buff, 2) > 0) my_sleep(10);
+	}
+
+    	/* When some phones (Alcatel BE5) is first time connected, it needs extra
+     	 * time to react, sending just AT wakes up the phone and it then can react
+     	 * to ATE1. We don't need to check whether this fails as it is just to
+     	 * wake up the phone and does nothing.
+     	 */
+    	smprintf(s, "Sending simple AT command to wake up some devices\n");
+	GSM_WaitFor (s, "AT\r", 3, 0x00, 2, ID_IncomingFrame);
+
+	smprintf(s, "Enabling echo\n");
+	error = GSM_WaitFor (s, "ATE1\r", 5, 0x00, 3, ID_EnableEcho);
+	if (error != ERR_NONE) return error;
+	
+	smprintf(s, "Enabling CME errors\n");
+	/* Try numeric errors */
+	if (GSM_WaitFor (s, "AT+CMEE=1\r", 10, 0x00, 3, ID_EnableErrorInfo) != ERR_NONE) {
+		/* Try textual errors */
+		if (GSM_WaitFor (s, "AT+CMEE=2\r", 10, 0x00, 3, ID_EnableErrorInfo) != ERR_NONE) {
+			smprintf(s, "CME errors could not be enabled, some error types won't be detected.\n");
+		}
+	}
+
+	error = ATGEN_GetModel(s);
+	if (error != ERR_NONE) return error;
+
+	if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_SLOWWRITE)) {
+		s->Protocol.Data.AT.FastWrite = true;
+	}
+
+	return error;
+}
+
+GSM_Error ATGEN_SetSMSC(GSM_StateMachine *s, GSM_SMSC *smsc)
+{
+	unsigned char req[50];
+
+	if (smsc->Location!=1) return ERR_NOTSUPPORTED;
+
+	sprintf(req, "AT+CSCA=\"%s\"\r",DecodeUnicodeString(smsc->Number));
+
+	smprintf(s, "Setting SMSC\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_SetSMSC);
+}
+
+GSM_Error ATGEN_ReplyGetSMSMemories(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		/* Reply here is:
+		 * (memories for reading)[, (memories for writing)[, (memories for storing received messages)]]
+		 * each memory is in quotes, 
+		 * Example: ("SM"), ("SM"), ("SM")
+		 *
+		 * We need to get from this supported memories. For this case
+		 * we assume, that just appearence of memory makes it
+		 * available for everything. Then we need to find out whether
+		 * phone supports writing to memory. This is done by searching
+		 * for "), (", which will appear between lists.
+		 */
+		s->Phone.Data.Priv.ATGEN.CanSaveSMS = (strstr(msg.Buffer, "), (") != NULL);
+		if (strstr(msg.Buffer, "\"SM\"") != NULL) s->Phone.Data.Priv.ATGEN.SIMSMSMemory = AT_AVAILABLE;
+		else s->Phone.Data.Priv.ATGEN.SIMSMSMemory = AT_NOTAVAILABLE;
+		if (strstr(msg.Buffer, "\"ME\"") != NULL) s->Phone.Data.Priv.ATGEN.PhoneSMSMemory = AT_AVAILABLE;
+		else s->Phone.Data.Priv.ATGEN.PhoneSMSMemory = AT_NOTAVAILABLE;
+		smprintf(s, "Available SMS memories received, ME = %d, SM = %d\n", s->Phone.Data.Priv.ATGEN.PhoneSMSMemory, s->Phone.Data.Priv.ATGEN.SIMSMSMemory);
+		return ERR_NONE;
+	case AT_Reply_Error:
+	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+}
+
+GSM_Error ATGEN_GetSMSMemories(GSM_StateMachine *s)
+{
+	smprintf(s, "Getting available SMS memories\n");
+	return GSM_WaitFor (s, "AT+CPMS=?\r", 10, 0x00, 4, ID_GetSMSMemories);
+}
+
+GSM_Error ATGEN_SetSMSMemory(GSM_StateMachine *s, bool SIM)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	char 			req[] = "AT+CPMS=\"XX\",\"XX\"\r";
+	int			reqlen = 18;
+	GSM_Error		error;
+	
+	if ((SIM && Priv->SIMSMSMemory == 0) || (!SIM && Priv->PhoneSMSMemory == 0)) {
+		/* We silently ignore error here, because when this fails, we can try to setmemory anyway */
+		ATGEN_GetSMSMemories(s);
+	}
+	
+	/* If phone can not save SMS, don't try to set memory for saving */
+	if (!Priv->CanSaveSMS) {
+		req[12] = '\r';
+		reqlen = 13;
+	}
+	
+	if (SIM) {
+		if (Priv->SMSMemory == MEM_SM) return ERR_NONE;
+		if (Priv->SIMSMSMemory == AT_NOTAVAILABLE) return ERR_NOTSUPPORTED;
+
+		req[9]  = 'S'; req[10] = 'M';
+		req[14] = 'S'; req[15] = 'M';
+		
+		smprintf(s, "Setting SMS memory type to SM\n");
+		error=GSM_WaitFor (s, req, reqlen, 0x00, 3, ID_SetMemoryType);
+		if (Priv->SIMSMSMemory == 0 && error == ERR_NONE) {
+			Priv->SIMSMSMemory = AT_AVAILABLE;
+		}
+		if (error == ERR_NOTSUPPORTED) {
+			smprintf(s, "Can't access SIM card?\n");
+			return ERR_SECURITYERROR;
+		}
+		if (error != ERR_NONE) return error;
+		Priv->SMSMemory = MEM_SM;
+	} else {
+		if (Priv->SMSMemory == MEM_ME) return ERR_NONE;
+		if (Priv->PhoneSMSMemory == AT_NOTAVAILABLE) return ERR_NOTSUPPORTED;
+		
+		req[9]  = 'M'; req[10] = 'E';
+		req[14] = 'M'; req[15] = 'E';
+
+		smprintf(s, "Setting SMS memory type to ME\n");
+		error=GSM_WaitFor (s, req, reqlen, 0x00, 3, ID_SetMemoryType);
+		if (Priv->PhoneSMSMemory == 0 && error == ERR_NONE) {
+			Priv->PhoneSMSMemory = AT_AVAILABLE;
+		}
+		if (error == ERR_NONE) Priv->SMSMemory = MEM_ME;
+	}
+	return error;
+}
+
+GSM_Error ATGEN_GetSMSMode(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+  	GSM_Error 		error;
+
+	if (Priv->SMSMode != 0) return ERR_NONE;
+
+	smprintf(s, "Trying SMS PDU mode\n");
+	error=GSM_WaitFor (s, "AT+CMGF=0\r", 10, 0x00, 3, ID_GetSMSMode);
+	if (error==ERR_NONE) {
+		Priv->SMSMode = SMS_AT_PDU;
+		return ERR_NONE;
+	}
+
+	smprintf(s, "Trying SMS text mode\n");
+	error=GSM_WaitFor (s, "AT+CMGF=1\r", 10, 0x00, 3, ID_GetSMSMode);
+	if (error==ERR_NONE) {
+		smprintf(s, "Enabling displaying all parameters in text mode\n");
+		error=GSM_WaitFor (s, "AT+CSDH=1\r", 10, 0x00, 3, ID_GetSMSMode);
+		if (error == ERR_NONE) Priv->SMSMode = SMS_AT_TXT;
+	}
+
+	return error;
+}
+
+GSM_Error ATGEN_GetSMSLocation(GSM_StateMachine *s, GSM_SMSMessage *sms, unsigned char *folderid, int *location)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	int			ifolderid, maxfolder;
+	GSM_Error		error;
+
+	if (Priv->PhoneSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, false);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+	if (Priv->SIMSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, true);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+	
+	if (Priv->SIMSMSMemory != AT_AVAILABLE && Priv->PhoneSMSMemory != AT_AVAILABLE) {
+		/* No SMS memory at all */
+		return ERR_NOTSUPPORTED;
+	}
+	if (Priv->SIMSMSMemory == AT_AVAILABLE && Priv->PhoneSMSMemory == AT_AVAILABLE) {
+		/* Both available */
+		maxfolder = 2;
+	} else {
+		/* One available */
+		maxfolder = 1;
+	}
+
+	/* simulate flat SMS memory */
+	if (sms->Folder == 0x00) {
+		ifolderid = sms->Location / PHONE_MAXSMSINFOLDER;
+		if (ifolderid + 1 > maxfolder) return ERR_NOTSUPPORTED;
+		*folderid = ifolderid + 1;
+		*location = sms->Location - ifolderid * PHONE_MAXSMSINFOLDER;
+	} else {
+		if (sms->Folder > 2 * maxfolder) return ERR_NOTSUPPORTED;
+		*folderid = sms->Folder <= 2 ? 1 : 2;
+		*location = sms->Location;
+	}
+	smprintf(s, "SMS folder %i & location %i -> ATGEN folder %i & location %i\n",
+		sms->Folder,sms->Location,*folderid,*location);
+
+	if (Priv->SIMSMSMemory == AT_AVAILABLE && *folderid == 1) {
+		return ATGEN_SetSMSMemory(s, true);
+	} else {
+		return ATGEN_SetSMSMemory(s, false);
+	}
+}
+
+void ATGEN_SetSMSLocation(GSM_StateMachine *s, GSM_SMSMessage *sms, unsigned char folderid, int location)
+{
+	sms->Folder	= 0;
+	sms->Location	= (folderid - 1) * PHONE_MAXSMSINFOLDER + location;
+	smprintf(s, "ATGEN folder %i & location %i -> SMS folder %i & location %i\n",
+		folderid,location,sms->Folder,sms->Location);
+}
+
+GSM_Error ATGEN_ReplyGetSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv 	= &s->Phone.Data.Priv.ATGEN;
+	GSM_SMSMessage		*sms	= &s->Phone.Data.GetSMSMessage->SMS[0];
+	int 			current = 0, current2, i;
+	unsigned char 		buffer[300],smsframe[800];
+	unsigned char		firstbyte, TPDCS, TPUDL, TPStatus;
+	GSM_Error		error;
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+		if (Priv->Lines.numbers[4] == 0x00) return ERR_EMPTY;
+		s->Phone.Data.GetSMSMessage->Number 	 	= 1;
+		s->Phone.Data.GetSMSMessage->SMS[0].Name[0] 	= 0;
+		s->Phone.Data.GetSMSMessage->SMS[0].Name[1]	= 0;
+		switch (Priv->SMSMode) {
+		case SMS_AT_PDU:
+			CopyLineString(buffer, msg.Buffer, Priv->Lines, 2);
+			switch (buffer[7]) {
+				case '0': sms->State = SMS_UnRead; 	break;
+				case '1': sms->State = SMS_Read;	break;
+				case '2': sms->State = SMS_UnSent;	break;
+				default : sms->State = SMS_Sent;	break;//case '3'
+			}
+			DecodeHexBin (buffer, GetLineString(msg.Buffer,Priv->Lines,3), strlen(GetLineString(msg.Buffer,Priv->Lines,3)));
+			/* Siemens MC35 (only ?) */
+			if (strstr(msg.Buffer,"+CMGR: 0,,0")!=NULL) return ERR_EMPTY;
+			/* Siemens M20 */
+			if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_M20SMS)) {
+				if (buffer[1]!=NUMBER_UNKNOWN && buffer[1]!=NUMBER_INTERNATIONAL &&
+				    buffer[1]!=NUMBER_ALPHANUMERIC) {
+					/* Seems to be Delivery Report */
+					smprintf(s, "SMS type - status report (M20 style)\n");
+					sms->PDU 	 = SMS_Status_Report;
+					sms->Folder 	 = 1;	/*INBOX SIM*/
+					sms->InboxFolder = true;
+
+					smsframe[12]=buffer[current++];
+					smsframe[PHONE_SMSStatusReport.TPMR]=buffer[current++];
+					current2=((buffer[current])+1)/2+1;
+					for(i=0;i<current2+1;i++) smsframe[PHONE_SMSStatusReport.Number+i]=buffer[current++];
+					for(i=0;i<7;i++) smsframe[PHONE_SMSStatusReport.DateTime+i]=buffer[current++];
+					smsframe[0] = 0;
+					for(i=0;i<7;i++) smsframe[PHONE_SMSStatusReport.SMSCTime+i]=buffer[current++];
+					smsframe[PHONE_SMSStatusReport.TPStatus]=buffer[current];
+					GSM_DecodeSMSFrame(sms,smsframe,PHONE_SMSStatusReport);
+					return ERR_NONE;					
+				}
+			}
+			/* We use locations from SMS layouts like in ../phone2.c(h) */
+			for(i=0;i<buffer[0]+1;i++) smsframe[i]=buffer[current++];
+			smsframe[12]=buffer[current++];
+			/* See GSM 03.40 section 9.2.3.1 */
+			switch (smsframe[12] & 0x03) {
+			case 0x00:
+				smprintf(s, "SMS type - deliver\n");
+				sms->PDU 	 = SMS_Deliver;
+				if (Priv->SMSMemory == MEM_SM) {
+					sms->Folder = 1; /*INBOX SIM*/ 
+				} else {
+					sms->Folder = 3; /*INBOX ME*/ 
+				}
+				sms->InboxFolder = true;
+				current2=((buffer[current])+1)/2+1;
+				if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_M20SMS)) {
+					if (buffer[current+1]==NUMBER_ALPHANUMERIC) {
+						smprintf(s, "Trying to read alphanumeric number\n");
+						for(i=0;i<4;i++) smsframe[PHONE_SMSDeliver.Number+i]=buffer[current++];
+						current+=6;
+						for(i=0;i<current2-3;i++) smsframe[PHONE_SMSDeliver.Number+i+4]=buffer[current++];
+					} else {
+						for(i=0;i<current2+1;i++) smsframe[PHONE_SMSDeliver.Number+i]=buffer[current++];
+					}
+				} else {
+					for(i=0;i<current2+1;i++) smsframe[PHONE_SMSDeliver.Number+i]=buffer[current++];
+				}
+				smsframe[PHONE_SMSDeliver.TPPID] = buffer[current++];
+				smsframe[PHONE_SMSDeliver.TPDCS] = buffer[current++];
+				for(i=0;i<7;i++) smsframe[PHONE_SMSDeliver.DateTime+i]=buffer[current++];
+				smsframe[PHONE_SMSDeliver.TPUDL] = buffer[current++];
+				for(i=0;i<smsframe[PHONE_SMSDeliver.TPUDL];i++) smsframe[i+PHONE_SMSDeliver.Text]=buffer[current++];
+				GSM_DecodeSMSFrame(sms,smsframe,PHONE_SMSDeliver);
+				return ERR_NONE;
+			case 0x01:
+				smprintf(s, "SMS type - submit\n");
+				sms->PDU 	 = SMS_Submit;
+				if (Priv->SMSMemory == MEM_SM) {
+					sms->Folder = 2; /*OUTBOX SIM*/ 
+					smprintf(s, "Outbox SIM\n");
+				} else {
+					sms->Folder = 4; /*OUTBOX ME*/ 
+				}
+				sms->InboxFolder = false;
+				smsframe[PHONE_SMSSubmit.TPMR] = buffer[current++];
+				current2=((buffer[current])+1)/2+1;
+				if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_M20SMS)) {
+					if (buffer[current+1]==NUMBER_ALPHANUMERIC) {
+						smprintf(s, "Trying to read alphanumeric number\n");
+						for(i=0;i<4;i++) smsframe[PHONE_SMSSubmit.Number+i]=buffer[current++];
+						current+=6;
+						for(i=0;i<current2-3;i++) smsframe[PHONE_SMSSubmit.Number+i+4]=buffer[current++];
+					} else {
+						for(i=0;i<current2+1;i++) smsframe[PHONE_SMSSubmit.Number+i]=buffer[current++];
+					}
+				} else {
+					for(i=0;i<current2+1;i++) smsframe[PHONE_SMSSubmit.Number+i]=buffer[current++];
+				}
+				smsframe[PHONE_SMSSubmit.TPPID] = buffer[current++];
+				smsframe[PHONE_SMSSubmit.TPDCS] = buffer[current++];
+				/* See GSM 03.40 9.2.3.3 - TPVP can not exist in frame */
+				if ((smsframe[12] & 0x18)!=0) current++; //TPVP is ignored now
+				smsframe[PHONE_SMSSubmit.TPUDL] = buffer[current++];
+				for(i=0;i<smsframe[PHONE_SMSSubmit.TPUDL];i++) smsframe[i+PHONE_SMSSubmit.Text]=buffer[current++];
+				GSM_DecodeSMSFrame(sms,smsframe,PHONE_SMSSubmit);
+				return ERR_NONE;
+			case 0x02:
+				smprintf(s, "SMS type - status report\n");
+				sms->PDU 	 = SMS_Status_Report;
+				sms->Folder 	 = 1;	/*INBOX SIM*/
+				sms->InboxFolder = true;
+				smprintf(s, "TPMR is %02x\n",buffer[current]);
+				smsframe[PHONE_SMSStatusReport.TPMR] = buffer[current++];
+				current2=((buffer[current])+1)/2+1;
+				for(i=0;i<current2+1;i++) smsframe[PHONE_SMSStatusReport.Number+i]=buffer[current++];
+				for(i=0;i<7;i++) smsframe[PHONE_SMSStatusReport.DateTime+i]=buffer[current++];
+				for(i=0;i<7;i++) smsframe[PHONE_SMSStatusReport.SMSCTime+i]=buffer[current++];
+				smsframe[PHONE_SMSStatusReport.TPStatus]=buffer[current];
+				GSM_DecodeSMSFrame(sms,smsframe,PHONE_SMSStatusReport);
+				return ERR_NONE;
+			}
+			break;
+		case SMS_AT_TXT:
+			current = 0;
+			while (msg.Buffer[current]!='"') current++;
+			current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+			if (!strcmp(buffer,"\"0\"") || !strcmp(buffer,"\"REC UNREAD\"")) {
+				smprintf(s, "SMS type - deliver\n");
+				sms->State 	 = SMS_UnRead;
+				sms->PDU 	 = SMS_Deliver;
+				if (Priv->SMSMemory == MEM_SM) {
+					sms->Folder = 1; /*INBOX SIM*/ 
+				} else {
+					sms->Folder = 3; /*INBOX ME*/ 
+				}
+				sms->InboxFolder = true;
+			} else if (!strcmp(buffer,"\"1\"") || !strcmp(buffer,"\"REC READ\"")) {
+				smprintf(s, "SMS type - deliver\n");
+				sms->State 	 = SMS_Read;
+				sms->PDU 	 = SMS_Deliver;
+				if (Priv->SMSMemory == MEM_SM) {
+					sms->Folder = 1; /*INBOX SIM*/ 
+				} else {
+					sms->Folder = 3; /*INBOX ME*/ 
+				}
+				sms->InboxFolder = true;
+			} else if (!strcmp(buffer,"\"2\"") || !strcmp(buffer,"\"STO UNSENT\"")) {
+				smprintf(s, "SMS type - submit\n");
+				sms->State 	 = SMS_UnSent;
+				sms->PDU 	 = SMS_Submit;
+				if (Priv->SMSMemory == MEM_SM) {
+					sms->Folder = 2; /*OUTBOX SIM*/ 
+				} else {
+					sms->Folder = 4; /*OUTBOX ME*/ 
+				}
+				sms->InboxFolder = false;
+			} else if (!strcmp(buffer,"\"3\"") || !strcmp(buffer,"\"STO SENT\"")) {
+				smprintf(s, "SMS type - submit\n");
+				sms->State 	 = SMS_Sent;
+				sms->PDU 	 = SMS_Submit;
+				if (Priv->SMSMemory == MEM_SM) {
+					sms->Folder = 2; /*OUTBOX SIM*/ 
+				} else {
+					sms->Folder = 4; /*OUTBOX ME*/ 
+				}
+				sms->InboxFolder = false;
+			}
+			current += ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+			/* It's delivery report according to Nokia AT standards */
+			if (sms->Folder==1 && buffer[0]!=0 && buffer[0]!='"') {
+				/* ??? */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				/* format of sender number */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				/* Sender number */
+				/* FIXME: support for all formats */
+				EncodeUnicode(sms->Number,buffer+1,strlen(buffer)-2);
+				smprintf(s, "Sender \"%s\"\n",DecodeUnicodeString(sms->Number));
+				/* ??? */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				/* Sending datetime */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				i = strlen(buffer);
+				buffer[i] = ',';
+				i++;
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer+i);
+				smprintf(s, "\"%s\"\n",buffer);
+				ATGEN_DecodeDateTime(&sms->DateTime, buffer+1);
+				/* Date of SMSC response */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				i = strlen(buffer);
+				buffer[i] = ',';
+				i++;
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer+i);
+				smprintf(s, "\"%s\"\n",buffer);
+				ATGEN_DecodeDateTime(&sms->SMSCTime, buffer+1);
+				/* TPStatus */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				TPStatus=atoi(buffer);
+				buffer[PHONE_SMSStatusReport.TPStatus] = TPStatus;
+				error=GSM_DecodeSMSFrameStatusReportData(sms, buffer, PHONE_SMSStatusReport);
+				if (error!=ERR_NONE) return error;
+				/* NO SMSC number */
+				sms->SMSC.Number[0]=0;
+				sms->SMSC.Number[1]=0;
+				sms->PDU = SMS_Status_Report;
+				sms->ReplyViaSameSMSC=false;
+			} else {
+				/* Sender number */
+				/* FIXME: support for all formats */
+				EncodeUnicode(sms->Number,buffer+1,strlen(buffer)-2);
+				/* Sender number in alphanumeric format ? */
+				current += ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				if (strlen(buffer)!=0) EncodeUnicode(sms->Number,buffer+1,strlen(buffer)-2);
+				smprintf(s, "Sender \"%s\"\n",DecodeUnicodeString(sms->Number));
+				/* Sending datetime */
+				if (sms->Folder==1 || sms->Folder==3) {
+					current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+					/* FIXME: ATGEN_ExtractOneParameter() is broken as it doesn't respect
+					 * quoting of parameters and thus +FOO: "ab","cd,ef" will consider
+					 * as three arguments: "ab" >> "cd >> ef"
+					 */
+					if (*buffer=='"') {
+						i = strlen(buffer);
+						buffer[i] = ',';
+						i++;
+						current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer+i);
+					}
+					smprintf(s, "\"%s\"\n",buffer);
+					if (*buffer)
+						ATGEN_DecodeDateTime(&sms->DateTime, buffer+1);
+					else {
+						/* FIXME: What is the proper undefined GSM_DateTime ? */
+						memset(&sms->DateTime, 0, sizeof(sms->DateTime));
+					}
+					ATGEN_DecodeDateTime(&sms->DateTime, buffer+1);
+				}
+				/* Sender number format */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				/* First byte */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				firstbyte=atoi(buffer);
+				sms->ReplyViaSameSMSC=false;
+				/* GSM 03.40 section 9.2.3.17 (TP-Reply-Path) */
+				if ((firstbyte & 128)==128) sms->ReplyViaSameSMSC=true;
+				/* TP PID */        
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				sms->ReplaceMessage = 0;
+				if (atoi(buffer) > 0x40 && atoi(buffer) < 0x48) {
+					sms->ReplaceMessage = atoi(buffer) - 0x40;
+				}
+				smprintf(s, "TPPID: %02x %i\n",atoi(buffer),atoi(buffer));
+				/* TP DCS */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				TPDCS=atoi(buffer);
+				if (sms->Folder==2 || sms->Folder==4) {
+					/*TP VP */
+					current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				}
+				/* SMSC number */
+				/* FIXME: support for all formats */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				EncodeUnicode(sms->SMSC.Number,buffer+1,strlen(buffer)-2);
+				/* Format of SMSC number */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				/* TPUDL */
+				current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+				TPUDL=atoi(buffer);
+				current++;
+				sms->Coding = SMS_Coding_Default;
+				/* GSM 03.40 section 9.2.3.10 (TP-Data-Coding-Scheme)
+				 * and GSM 03.38 section 4
+				 */
+				if ((TPDCS & 0xf4) == 0xf4) sms->Coding=SMS_Coding_8bit;
+				if ((TPDCS & 0x08) == 0x08) sms->Coding=SMS_Coding_Unicode;
+				sms->Class = -1;
+				if ((TPDCS & 0xF3)==0xF0) sms->Class = 0;
+				if ((TPDCS & 0xF3)==0xF1) sms->Class = 1;
+				if ((TPDCS & 0xF3)==0xF2) sms->Class = 2;
+				if ((TPDCS & 0xF3)==0xF3) sms->Class = 3;
+				smprintf(s, "SMS class: %i\n",sms->Class);
+				switch (sms->Coding) {          
+				case SMS_Coding_Default:
+					/* GSM 03.40 section 9.2.3.23 (TP-User-Data-Header-Indicator) */
+					/* If not SMS with UDH, it's coded normal */
+					/* If UDH available, treat it as Unicode or 8 bit */
+					if ((firstbyte & 0x40)!=0x40) {
+						sms->UDH.Type	= UDH_NoUDH;
+						sms->Length	= TPUDL;
+						EncodeUnicode(sms->Text,msg.Buffer+Priv->Lines.numbers[2*2],TPUDL);
+						break;
+					}
+				case SMS_Coding_Unicode:
+				case SMS_Coding_8bit:
+					DecodeHexBin(buffer+PHONE_SMSDeliver.Text, msg.Buffer+current, TPUDL*2);
+					buffer[PHONE_SMSDeliver.firstbyte] 	= firstbyte;
+					buffer[PHONE_SMSDeliver.TPDCS] 		= TPDCS;
+					buffer[PHONE_SMSDeliver.TPUDL] 		= TPUDL;
+					return GSM_DecodeSMSFrameText(sms, buffer, PHONE_SMSDeliver);
+				}
+			}
+			return ERR_NONE;
+		default:
+			break;
+		}
+		break;
+	case AT_Reply_CMSError:
+		if (Priv->ErrorCode == 320 || Priv->ErrorCode == 500) {
+			return ERR_EMPTY;
+		} else {
+			return ATGEN_HandleCMSError(s);
+		}
+	case AT_Reply_CMEError:
+		return ATGEN_HandleCMEError(s);
+	case AT_Reply_Error:
+		/* A2D returns Error with empty location */
+		return ERR_EMPTY;
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetSMS(GSM_StateMachine *s, GSM_MultiSMSMessage *sms)
+{
+	unsigned char	req[20], folderid;
+	GSM_Error	error;
+	int		location, getfolder, add = 0;
+
+	error=ATGEN_GetSMSLocation(s,&sms->SMS[0], &folderid, &location);
+	if (error!=ERR_NONE) return error;
+	if (s->Phone.Data.Priv.ATGEN.SMSMemory == MEM_ME && IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_SMSME900)) add = 899;
+	sprintf(req, "AT+CMGR=%i\r", location + add);
+
+	error=ATGEN_GetSMSMode(s);
+	if (error != ERR_NONE) return error;
+
+	error=ATGEN_GetManufacturer(s);
+	if (error != ERR_NONE) return error;
+
+	s->Phone.Data.GetSMSMessage=sms;
+	smprintf(s, "Getting SMS\n");
+	error=GSM_WaitFor (s, req, strlen(req), 0x00, 5, ID_GetSMSMessage);
+	if (error==ERR_NONE) {
+		getfolder = sms->SMS[0].Folder;
+//		if (getfolder != 0 && getfolder != sms->SMS[0].Folder) return ERR_EMPTY;
+		ATGEN_SetSMSLocation(s, &sms->SMS[0], folderid, location);
+		sms->SMS[0].Folder = getfolder;
+		sms->SMS[0].Memory = MEM_SM;
+		if (getfolder > 2) sms->SMS[0].Memory = MEM_ME;
+	}
+	return error;
+}
+
+GSM_Error ATGEN_GetNextSMS(GSM_StateMachine *s, GSM_MultiSMSMessage *sms, bool start)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error 		error;
+	int			usedsms;
+
+	if (Priv->PhoneSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, false);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+	if (Priv->SIMSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, true);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+	if (Priv->SIMSMSMemory == AT_NOTAVAILABLE && Priv->PhoneSMSMemory == AT_NOTAVAILABLE) return ERR_NOTSUPPORTED;
+
+	if (start) {
+		error=s->Phone.Functions->GetSMSStatus(s,&Priv->LastSMSStatus);
+		if (error!=ERR_NONE) return error;
+		Priv->LastSMSRead		= 0;
+		sms->SMS[0].Location 		= 0;
+	}
+	while (true) {
+		sms->SMS[0].Location++;
+		if (sms->SMS[0].Location < PHONE_MAXSMSINFOLDER) {
+			if (Priv->SIMSMSMemory == AT_AVAILABLE) {
+				usedsms = Priv->LastSMSStatus.SIMUsed;
+			} else {
+				usedsms = Priv->LastSMSStatus.PhoneUsed;
+			}
+					
+			if (Priv->LastSMSRead >= usedsms) {
+				if (Priv->PhoneSMSMemory == AT_NOTAVAILABLE || Priv->LastSMSStatus.PhoneUsed==0) return ERR_EMPTY;
+				Priv->LastSMSRead	= 0;
+				sms->SMS[0].Location 	= PHONE_MAXSMSINFOLDER + 1;
+			}
+		} else {
+			if (Priv->PhoneSMSMemory == AT_NOTAVAILABLE) return ERR_EMPTY;
+			if (Priv->LastSMSRead>=Priv->LastSMSStatus.PhoneUsed) return ERR_EMPTY;
+		}
+		sms->SMS[0].Folder = 0;
+		error=s->Phone.Functions->GetSMS(s, sms);
+		if (error==ERR_NONE) {
+			Priv->LastSMSRead++;
+			break;
+		}
+		if (error != ERR_EMPTY && error != ERR_INVALIDLOCATION) return error;
+	}
+	return error;
+}
+
+GSM_Error ATGEN_ReplyGetSMSStatus(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_SMSMemoryStatus	*SMSStatus = s->Phone.Data.SMSStatus;
+	char 			*start;
+	int			current = 0;
+	unsigned char		buffer[50];
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "SMS status received\n");
+		start = strstr(msg.Buffer, "+CPMS: ") + 7;
+		if (strstr(msg.Buffer,"ME")!=NULL) {
+			SMSStatus->PhoneUsed 	= atoi(start);
+			current+=ATGEN_ExtractOneParameter(start+current, buffer);
+			current+=ATGEN_ExtractOneParameter(start+current, buffer);
+			SMSStatus->PhoneSize	= atoi(buffer);
+			smprintf(s, "Used : %i\n",SMSStatus->PhoneUsed);
+			smprintf(s, "Size : %i\n",SMSStatus->PhoneSize);
+		} else {
+			SMSStatus->SIMUsed 	= atoi(start);
+			current+=ATGEN_ExtractOneParameter(start+current, buffer);
+			current+=ATGEN_ExtractOneParameter(start+current, buffer);
+			SMSStatus->SIMSize	= atoi(buffer);
+			smprintf(s, "Used : %i\n",SMSStatus->SIMUsed);
+			smprintf(s, "Size : %i\n",SMSStatus->SIMSize);
+			if (SMSStatus->SIMSize == 0) {
+				smprintf(s, "Can't access SIM card\n");
+				return ERR_SECURITYERROR;
+			}
+		}
+		return ERR_NONE;
+	case AT_Reply_Error:
+		if (strstr(msg.Buffer,"SM")!=NULL) {
+			smprintf(s, "Can't access SIM card\n");
+			return ERR_SECURITYERROR;
+		}
+		return ERR_NOTSUPPORTED;
+ 	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetSMSStatus(GSM_StateMachine *s, GSM_SMSMemoryStatus *status)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error 		error;
+
+	/* No templates at all */
+	status->TemplatesUsed	= 0;
+
+	status->SIMUsed		= 0;
+	status->SIMUnRead 	= 0;
+	status->SIMSize		= 0;
+
+	s->Phone.Data.SMSStatus=status;
+	
+	if ((Priv->SIMSMSMemory == 0) || (Priv->PhoneSMSMemory == 0)) {
+		/* We silently ignore error here, because when this fails, we can try to setmemory anyway */
+		ATGEN_GetSMSMemories(s);
+	}
+	
+	if (Priv->PhoneSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, false);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+	if (Priv->SIMSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, true);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+
+	if (Priv->SIMSMSMemory == AT_AVAILABLE) {
+		smprintf(s, "Getting SIM SMS status\n");
+		if (Priv->CanSaveSMS) {
+			error=GSM_WaitFor (s, "AT+CPMS=\"SM\",\"SM\"\r", 18, 0x00, 4, ID_GetSMSStatus);
+		} else {
+			error=GSM_WaitFor (s, "AT+CPMS=\"SM\"\r", 13, 0x00, 4, ID_GetSMSStatus);
+		}
+		if (error!=ERR_NONE) return error;
+		Priv->SMSMemory = MEM_SM;
+	}
+
+	status->PhoneUsed	= 0;
+	status->PhoneUnRead 	= 0;
+	status->PhoneSize	= 0;
+	
+	if (Priv->PhoneSMSMemory == AT_AVAILABLE) {
+		smprintf(s, "Getting phone SMS status\n");
+		if (Priv->CanSaveSMS) {
+			error = GSM_WaitFor (s, "AT+CPMS=\"ME\",\"ME\"\r", 18, 0x00, 4, ID_GetSMSStatus);
+		} else {
+			error = GSM_WaitFor (s, "AT+CPMS=\"ME\"\r", 13, 0x00, 4, ID_GetSMSStatus);
+		}
+		if (error!=ERR_NONE) return error;
+		Priv->SMSMemory = MEM_ME;
+	}
+
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ReplyGetIMEI(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	CopyLineString(s->Phone.Data.IMEI, msg.Buffer, s->Phone.Data.Priv.ATGEN.Lines, 2);
+	smprintf(s, "Received IMEI %s\n",s->Phone.Data.IMEI);
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_GetIMEI (GSM_StateMachine *s)
+{
+	if (s->Phone.Data.IMEI[0] != 0) return ERR_NONE;
+	smprintf(s, "Getting IMEI\n");
+	return GSM_WaitFor (s, "AT+CGSN\r", 8, 0x00, 2, ID_GetIMEI);
+}
+
+GSM_Error ATGEN_ReplyAddSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	char 	*start;
+	int	i;
+
+	if (s->Protocol.Data.AT.EditMode) {
+		if (s->Phone.Data.Priv.ATGEN.ReplyState != AT_Reply_SMSEdit) {
+			return ATGEN_HandleCMSError(s);
+		}
+		s->Protocol.Data.AT.EditMode = false;
+		return ERR_NONE;
+	}
+
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "SMS saved OK\n");
+		for(i=0;i<msg.Length;i++) {
+			if (msg.Buffer[i] == 0x00) msg.Buffer[i] = 0x20;
+		}
+		start = strstr(msg.Buffer, "+CMGW: ");
+		if (start == NULL) return ERR_UNKNOWN;
+		s->Phone.Data.SaveSMSMessage->Location = atoi(start+7);
+		smprintf(s, "Saved at location %i\n",s->Phone.Data.SaveSMSMessage->Location);
+		return ERR_NONE;
+	case AT_Reply_Error:
+		smprintf(s, "Error\n");
+		return ERR_NOTSUPPORTED;
+	case AT_Reply_CMSError:
+		/* This error occurs in case that phone couldn't save SMS */
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_MakeSMSFrame(GSM_StateMachine *s, GSM_SMSMessage *message, unsigned char *hexreq, int *current, int *length2)
+{
+	GSM_Error 		error;
+	int			i, length;
+	unsigned char		req[1000], buffer[1000];
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_SMSC	 	SMSC;
+
+	error=ATGEN_GetSMSMode(s);
+	if (error != ERR_NONE) return error;
+
+	length 	 = 0;
+	*current = 0;
+	switch (Priv->SMSMode) {
+	case SMS_AT_PDU:
+		if (message->PDU == SMS_Deliver) {
+ 			smprintf(s, "SMS Deliver\n");
+			error=PHONE_EncodeSMSFrame(s,message,buffer,PHONE_SMSDeliver,&length,true);
+			if (error != ERR_NONE) return error;
+			length = length - PHONE_SMSDeliver.Text;
+			for (i=0;i<buffer[PHONE_SMSDeliver.SMSCNumber]+1;i++) {
+				req[(*current)++]=buffer[PHONE_SMSDeliver.SMSCNumber+i];
+			}
+			req[(*current)++]=buffer[PHONE_SMSDeliver.firstbyte];
+			for (i=0;i<((buffer[PHONE_SMSDeliver.Number]+1)/2+1)+1;i++) {
+				req[(*current)++]=buffer[PHONE_SMSDeliver.Number+i];
+			}
+			req[(*current)++]=buffer[PHONE_SMSDeliver.TPPID];
+			req[(*current)++]=buffer[PHONE_SMSDeliver.TPDCS];
+			for(i=0;i<7;i++) req[(*current)++]=buffer[PHONE_SMSDeliver.DateTime+i];
+			req[(*current)++]=buffer[PHONE_SMSDeliver.TPUDL];
+			for(i=0;i<length;i++) req[(*current)++]=buffer[PHONE_SMSDeliver.Text+i];
+			EncodeHexBin(hexreq, req, *current);
+			*length2 = *current * 2;
+			*current = *current - (req[PHONE_SMSDeliver.SMSCNumber]+1);
+		} else {
+			smprintf(s, "SMS Submit\n");
+			error=PHONE_EncodeSMSFrame(s,message,buffer,PHONE_SMSSubmit,&length,true);
+			if (error != ERR_NONE) return error;
+			length = length - PHONE_SMSSubmit.Text;
+			for (i=0;i<buffer[PHONE_SMSSubmit.SMSCNumber]+1;i++) {
+				req[(*current)++]=buffer[PHONE_SMSSubmit.SMSCNumber+i];
+			}
+			req[(*current)++]=buffer[PHONE_SMSSubmit.firstbyte];
+			req[(*current)++]=buffer[PHONE_SMSSubmit.TPMR];
+			for (i=0;i<((buffer[PHONE_SMSSubmit.Number]+1)/2+1)+1;i++) {
+				req[(*current)++]=buffer[PHONE_SMSSubmit.Number+i];
+			}
+			req[(*current)++]=buffer[PHONE_SMSSubmit.TPPID];
+			req[(*current)++]=buffer[PHONE_SMSSubmit.TPDCS];
+			req[(*current)++]=buffer[PHONE_SMSSubmit.TPVP];
+			req[(*current)++]=buffer[PHONE_SMSSubmit.TPUDL];
+			for(i=0;i<length;i++) req[(*current)++]=buffer[PHONE_SMSSubmit.Text+i];
+			EncodeHexBin(hexreq, req, *current);
+			*length2 = *current * 2;
+			*current = *current - (req[PHONE_SMSSubmit.SMSCNumber]+1);
+		}
+		break;
+	case SMS_AT_TXT:
+		if (Priv->Manufacturer == 0) {
+			error=ATGEN_GetManufacturer(s);
+			if (error != ERR_NONE) return error;
+		}
+		if (Priv->Manufacturer != AT_Nokia) {
+			if (message->Coding != SMS_Coding_Default) return ERR_NOTSUPPORTED;
+		}
+		error=PHONE_EncodeSMSFrame(s,message,req,PHONE_SMSDeliver,&i,true);
+		if (error != ERR_NONE) return error;
+		CopyUnicodeString(SMSC.Number,message->SMSC.Number);
+		SMSC.Location=1;
+		error=ATGEN_SetSMSC(s,&SMSC);
+		if (error!=ERR_NONE) return error;
+		sprintf(buffer, "AT+CSMP=%i,%i,%i,%i\r",
+			req[PHONE_SMSDeliver.firstbyte],
+			req[PHONE_SMSDeliver.TPVP],
+			req[PHONE_SMSDeliver.TPPID],
+			req[PHONE_SMSDeliver.TPDCS]);
+		error=GSM_WaitFor (s, buffer, strlen(buffer), 0x00, 4, ID_SetSMSParameters);
+		if (error==ERR_NOTSUPPORTED) {
+			/* Nokia Communicator 9000i doesn't support <vp> parameter */
+			sprintf(buffer, "AT+CSMP=%i,,%i,%i\r",
+				req[PHONE_SMSDeliver.firstbyte],
+				req[PHONE_SMSDeliver.TPPID],
+				req[PHONE_SMSDeliver.TPDCS]);
+			error=GSM_WaitFor (s, buffer, strlen(buffer), 0x00, 4, ID_SetSMSParameters);
+		}
+		if (error!=ERR_NONE) return error;
+		switch (message->Coding) {
+		case SMS_Coding_Default:
+			/* If not SMS with UDH, it's as normal text */
+			if (message->UDH.Type==UDH_NoUDH) {
+				strcpy(hexreq,DecodeUnicodeString(message->Text));
+				*length2 = UnicodeLength(message->Text);
+				break;
+			}
+	        case SMS_Coding_Unicode:        
+	        case SMS_Coding_8bit:
+			error=PHONE_EncodeSMSFrame(s,message,buffer,PHONE_SMSDeliver,current,true);
+			if (error != ERR_NONE) return error;
+			EncodeHexBin (hexreq, buffer+PHONE_SMSDeliver.Text, buffer[PHONE_SMSDeliver.TPUDL]);
+			*length2 = buffer[PHONE_SMSDeliver.TPUDL] * 2;
+			break;
+		}
+		break;
+	}
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_AddSMS(GSM_StateMachine *s, GSM_SMSMessage *sms)
+{
+	GSM_Error 		error, error2;
+	int			state,Replies,reply, current, current2;
+	unsigned char		buffer[1000], hexreq[1000];
+	GSM_Phone_Data		*Phone = &s->Phone.Data;
+	unsigned char		*statetxt;
+
+	/* This phone supports only sent/unsent messages on SIM */
+	if (IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_SMSONLYSENT)) {
+		if (sms->Folder != 2) {
+			smprintf(s, "This phone supports only folder = 2!\n");
+			return ERR_NOTSUPPORTED;
+		}
+	}
+	
+	sms->PDU = SMS_Submit;
+	switch (sms->Folder) {
+	case 1:  sms->PDU = SMS_Deliver;		/* Inbox SIM */
+		 error=ATGEN_SetSMSMemory(s, true);
+		 break;
+	case 2:  error=ATGEN_SetSMSMemory(s, true);	/* Outbox SIM */
+	 	 break;
+	case 3:  sms->PDU = SMS_Deliver;
+		 error=ATGEN_SetSMSMemory(s, false);	/* Inbox phone */
+		 break;
+	case 4:  error=ATGEN_SetSMSMemory(s, false);	/* Outbox phone */
+		 break;
+	default: return ERR_NOTSUPPORTED;
+	}
+	if (error!=ERR_NONE) return error;
+
+	error = ATGEN_MakeSMSFrame(s, sms, hexreq, &current, &current2);
+	if (error != ERR_NONE) return error;
+
+	switch (Phone->Priv.ATGEN.SMSMode) {
+	case SMS_AT_PDU:
+		if (sms->PDU == SMS_Deliver) {
+			state = 0;
+			if (sms->State == SMS_Read || sms->State == SMS_Sent) state = 1;
+		} else {
+			state = 2;
+			if (sms->State == SMS_Read || sms->State == SMS_Sent) state = 3;
+		}
+		/* Siemens M20 */
+		if (IsPhoneFeatureAvailable(Phone->ModelInfo, F_M20SMS)) {
+			/* No (good and 100% working) support for alphanumeric numbers */
+			if (sms->Number[1]!='+' && (sms->Number[1]<'0' || sms->Number[1]>'9')) {
+				EncodeUnicode(sms->Number,"123",3);
+				error = ATGEN_MakeSMSFrame(s, sms, hexreq, &current, &current2);
+				if (error != ERR_NONE) return error;
+			}
+		}
+		sprintf(buffer, "AT+CMGW=%i,%i\r",current,state);
+		break;
+	case SMS_AT_TXT:
+		if (sms->PDU == SMS_Deliver) {
+			statetxt = "REC UNREAD";
+			if (sms->State == SMS_Read || sms->State == SMS_Sent) statetxt = "REC READ";
+		} else {
+			statetxt = "STO UNSENT";
+			if (sms->State == SMS_Read || sms->State == SMS_Sent) statetxt = "STO SENT";
+		}
+		/* Siemens M20 */
+		if (IsPhoneFeatureAvailable(Phone->ModelInfo, F_M20SMS)) {
+			/* No (good and 100% working) support for alphanumeric numbers */
+			/* FIXME: Try to autodetect support for <stat> (statetxt) parameter although:
+			 * Siemens M20 supports +CMGW <stat> specification but on my model it just
+			 * reports ERROR (and <stat> is not respected).
+			 * Fortunately it will write "+CMGW: <index>\n" before and the message gets written
+			 */
+			if (sms->Number[1]!='+' && (sms->Number[1]<'0' || sms->Number[1]>'9')) {
+		        	sprintf(buffer, "AT+CMGW=\"123\",,\"%s\"\r",statetxt);
+			} else {
+		        	sprintf(buffer, "AT+CMGW=\"%s\",,\"%s\"\r",DecodeUnicodeString(sms->Number),statetxt);
+			}
+		} else {
+			sprintf(buffer, "AT+CMGW=\"%s\",,\"%s\"\r",DecodeUnicodeString(sms->Number),statetxt);
+		}
+	}
+
+	Phone->SaveSMSMessage = sms;
+	
+	for (reply=0;reply<s->ReplyNum;reply++) {
+		if (reply!=0) {
+			if (s->di.dl==DL_TEXT || s->di.dl==DL_TEXTALL || s->di.dl==DL_TEXTERROR ||
+			    s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE || s->di.dl==DL_TEXTERRORDATE) {
+			    smprintf(s, "[Retrying %i]\n", reply+1);
+			}
+		}
+		s->Protocol.Data.AT.EditMode 	= true;
+		Replies 			= s->ReplyNum;
+		s->ReplyNum			= 1;
+		smprintf(s,"Waiting for modem prompt\n");
+		error=GSM_WaitFor (s, buffer, strlen(buffer), 0x00, 3, ID_SaveSMSMessage);
+		s->ReplyNum			 = Replies;
+		if (error == ERR_NONE) {
+			Phone->DispatchError 	= ERR_TIMEOUT;
+			Phone->RequestID 	= ID_SaveSMSMessage;
+			smprintf(s, "Saving SMS\n");
+			error = s->Protocol.Functions->WriteMessage(s, hexreq, current2, 0x00);
+			if (error!=ERR_NONE) return error;
+			my_sleep(500);
+			/* CTRL+Z ends entering */
+			error = s->Protocol.Functions->WriteMessage(s, "\x1A", 1, 0x00);
+			if (error!=ERR_NONE) return error;
+			error = GSM_WaitForOnce(s, NULL, 0x00, 0x00, 4);
+			if (error != ERR_TIMEOUT) return error;
+		} else {
+			smprintf(s, "Escaping SMS mode\n");
+			error2 = s->Protocol.Functions->WriteMessage(s, "\x1B\r", 2, 0x00);
+			if (error2 != ERR_NONE) return error2;
+			return error;
+		}
+        }
+
+	return Phone->DispatchError;
+}
+
+GSM_Error ATGEN_ReplySendSMS(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	char			*start;
+
+	if (s->Protocol.Data.AT.EditMode) {
+		if (s->Phone.Data.Priv.ATGEN.ReplyState != AT_Reply_SMSEdit) {
+			return ERR_UNKNOWN;
+		}
+		s->Protocol.Data.AT.EditMode = false;
+		return ERR_NONE;
+	}
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+ 		smprintf(s, "SMS sent OK\n");
+ 		if (s->User.SendSMSStatus!=NULL) {
+			start = strstr(msg.Buffer, "+CMGW: ");
+			if (start != NULL) {
+				s->User.SendSMSStatus(s->CurrentConfig->Device,0,atoi(start+7));
+			} else {
+				s->User.SendSMSStatus(s->CurrentConfig->Device,0,0);
+			}
+		}
+		return ERR_NONE;
+	case AT_Reply_CMSError:
+ 		smprintf(s, "Error %i\n",Priv->ErrorCode);
+ 		if (s->User.SendSMSStatus!=NULL) s->User.SendSMSStatus(s->CurrentConfig->Device,Priv->ErrorCode,0);
+ 		return ATGEN_HandleCMSError(s);
+	case AT_Reply_Error:
+		return ERR_UNKNOWN;
+	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+}
+
+GSM_Error ATGEN_SendSMS(GSM_StateMachine *s, GSM_SMSMessage *sms)
+{
+	GSM_Error 		error,error2;
+	int			current, current2, Replies;
+	unsigned char		buffer[1000], hexreq[1000];
+	GSM_Phone_Data		*Phone = &s->Phone.Data;
+
+	if (sms->PDU == SMS_Deliver) sms->PDU = SMS_Submit;
+
+	error = ATGEN_MakeSMSFrame(s, sms, hexreq, &current, &current2);
+	if (error != ERR_NONE) return error;
+
+	switch (Phone->Priv.ATGEN.SMSMode) {
+	case SMS_AT_PDU:
+		sprintf(buffer, "AT+CMGS=%i\r",current);
+		break;
+	case SMS_AT_TXT:
+		sprintf(buffer, "AT+CMGS=\"%s\"\r",DecodeUnicodeString(sms->Number));
+	}
+
+	s->Protocol.Data.AT.EditMode 	= true;
+	Replies 			= s->ReplyNum;
+	s->ReplyNum			= 1;
+	smprintf(s,"Waiting for modem prompt\n");
+	error=GSM_WaitFor (s, buffer, strlen(buffer), 0x00, 3, ID_IncomingFrame);
+	s->ReplyNum			 = Replies;
+	if (error == ERR_NONE) {
+		smprintf(s, "Sending SMS\n");
+		error = s->Protocol.Functions->WriteMessage(s, hexreq, current2, 0x00);
+		if (error!=ERR_NONE) return error;
+		my_sleep(500);
+		/* CTRL+Z ends entering */
+		error=s->Protocol.Functions->WriteMessage(s, "\x1A", 1, 0x00);
+		my_sleep(100);
+		return error;
+	} else {
+		smprintf(s, "Escaping SMS mode\n");
+		error2=s->Protocol.Functions->WriteMessage(s, "\x1B\r", 2, 0x00);
+		if (error2 != ERR_NONE) return error2;
+	}
+	return error;
+}
+
+GSM_Error ATGEN_SendSavedSMS(GSM_StateMachine *s, int Folder, int Location)
+{
+	GSM_Error 	error;
+	int		location;
+	unsigned char	smsfolder;
+	unsigned char	req[100];
+	GSM_MultiSMSMessage	msms;
+
+	msms.Number = 0;
+	msms.SMS[0].Folder 	= Folder;
+	msms.SMS[0].Location 	= Location;
+
+	/* By reading SMS we check if it is really inbox/outbox */
+	error = ATGEN_GetSMS(s, &msms);
+	if (error != ERR_NONE) return error;
+
+	/* Can not send from other folder that outbox */
+	if (msms.SMS[0].Folder != 2 && msms.SMS[0].Folder != 4) return ERR_NOTSUPPORTED;
+
+	error=ATGEN_GetSMSLocation(s, &msms.SMS[0], &smsfolder, &location);
+	if (error != ERR_NONE) return error;
+
+	sprintf(req, "AT+CMSS=%i\r",location);	
+	return s->Protocol.Functions->WriteMessage(s, req, strlen(req), 0x00);
+}
+
+GSM_Error ATGEN_ReplyGetDateTime_Alarm(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	int 			current	= 19;
+	GSM_Phone_Data		*Data = &s->Phone.Data;
+
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		if (msg.Buffer[current]==0x0d || msg.Buffer[current-1]==0x0d) {
+			smprintf(s, "Not set in phone\n");
+			return ERR_EMPTY;
+		} else {
+			if (Data->RequestID == ID_GetDateTime) {
+				ATGEN_DecodeDateTime(Data->DateTime, msg.Buffer+current);
+			} else {
+				ATGEN_DecodeDateTime(&(Data->Alarm->DateTime), msg.Buffer+current);
+			}
+			return ERR_NONE;
+		}
+	case AT_Reply_Error:
+		return ERR_NOTSUPPORTED;
+	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetDateTime(GSM_StateMachine *s, GSM_DateTime *date_time)
+{
+	s->Phone.Data.DateTime=date_time;
+	smprintf(s, "Getting date & time\n");
+	return GSM_WaitFor (s, "AT+CCLK?\r", 9, 0x00, 4, ID_GetDateTime);
+}
+
+GSM_Error ATGEN_SetDateTime(GSM_StateMachine *s, GSM_DateTime *date_time)
+{
+	char req[128];
+
+	sprintf(req, "AT+CCLK=\"%02i/%02i/%02i,%02i:%02i:%02i+00\"\r",
+		     date_time->Year-2000,date_time->Month,date_time->Day,
+		     date_time->Hour,date_time->Minute,date_time->Second);
+
+	smprintf(s, "Setting date & time\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_SetDateTime);
+}
+
+GSM_Error ATGEN_GetAlarm(GSM_StateMachine *s, GSM_Alarm *alarm)
+{
+	if (alarm->Location != 1) return ERR_NOTSUPPORTED;
+
+	alarm->Repeating = true;
+	alarm->Text[0] = 0; alarm->Text[1] = 0;
+
+	s->Phone.Data.Alarm = alarm;
+	smprintf(s, "Getting alarm\n");
+	return GSM_WaitFor (s, "AT+CALA?\r", 9, 0x00, 4, ID_GetAlarm);
+}
+
+GSM_Error ATGEN_ReplyGetSMSC(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_SMSC		*SMSC = s->Phone.Data.SMSC;
+	int			current;
+	int			len;
+	unsigned char 		buffer[100];
+
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "SMSC info received\n");
+
+		current = 0;
+		while (msg.Buffer[current]!='"') current++;
+
+		/* SMSC number */
+		/* FIXME: support for all formats */
+		current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+		/* 
+		 * Some phones return this as unicode encoded when they are
+		 * switched to UCS2 mode, so we try to solve this correctly.
+		 */
+		len 		= strlen(buffer + 1) - 1;
+		buffer[len + 1] = 0;
+		if ((len > 20) && (len % 4 == 0) && (strchr(buffer + 1, '+') == NULL)) {
+			/* This is probably unicode encoded number */
+			DecodeHexUnicode(SMSC->Number,buffer + 1,len);
+		} else  {
+			EncodeUnicode(SMSC->Number,buffer + 1,len);
+		}
+		smprintf(s, "Number: \"%s\"\n",DecodeUnicodeString(SMSC->Number));
+
+		/* Format of SMSC number */
+		current+=ATGEN_ExtractOneParameter(msg.Buffer+current, buffer);
+		smprintf(s, "Format %s\n",buffer);
+		/* International number */
+		if (!strcmp(buffer,"145")) {
+			sprintf(buffer+1,"%s",DecodeUnicodeString(SMSC->Number));
+			if (strlen(buffer+1)!=0 && buffer[1] != '+') {
+				/* Sony Ericsson issue */
+				/* International number is without + */
+				buffer[0] = '+';
+				EncodeUnicode(SMSC->Number,buffer,strlen(buffer));
+			}
+		}
+		
+		SMSC->Format 		= SMS_FORMAT_Text;
+		SMSC->Validity.Format = SMS_Validity_RelativeFormat;
+		SMSC->Validity.Relative	= SMS_VALID_Max_Time;
+		SMSC->Name[0]		= 0;
+		SMSC->Name[1]		= 0;
+		SMSC->DefaultNumber[0]	= 0;
+		SMSC->DefaultNumber[1]	= 0;
+		return ERR_NONE;
+	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetSMSC(GSM_StateMachine *s, GSM_SMSC *smsc)
+{
+	if (smsc->Location==0x00 || smsc->Location!=0x01) return ERR_INVALIDLOCATION;
+	
+	s->Phone.Data.SMSC=smsc;
+	smprintf(s, "Getting SMSC\n");
+	return GSM_WaitFor (s, "AT+CSCA?\r", 9, 0x00, 4, ID_GetSMSC);
+}
+
+GSM_Error ATGEN_ReplyGetNetworkLAC_CID(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_NetworkInfo		*NetworkInfo = s->Phone.Data.NetworkInfo;
+	GSM_Lines		Lines;
+	int			i=0;
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	char			*answer;
+
+  	if (s->Phone.Data.RequestID == ID_IncomingFrame) {
+		smprintf(s, "Incoming LAC & CID info\n");
+		return ERR_NONE;
+	}
+
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		break;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+
+	SplitLines(GetLineString(msg.Buffer,Priv->Lines,2),
+		strlen(GetLineString(msg.Buffer,Priv->Lines,2)),
+		&Lines, ",", 1, true);
+
+	/* Find number of lines */
+	while (Lines.numbers[i*2+1] != 0) {
+		/* FIXME: handle special chars correctly */
+		smprintf(s, "%i \"%s\"\n",i+1,GetLineString(GetLineString(msg.Buffer,Priv->Lines,2),Lines,i+1));
+		i++;
+	}
+
+	smprintf(s, "Network LAC & CID & state received\n");
+	answer = GetLineString(GetLineString(msg.Buffer,Priv->Lines,2),Lines,2);
+	while (*answer == 0x20) answer++;
+#ifdef DEBUG
+	switch (answer[0]) {
+		case '0': smprintf(s, "Not registered into any network. Not searching for network\n"); 	  break;
+		case '1': smprintf(s, "Home network\n"); 						  break;
+		case '2': smprintf(s, "Not registered into any network. Searching for network\n"); 	  break;
+		case '3': smprintf(s, "Registration denied\n"); 					  break;
+		case '4': smprintf(s, "Unknown\n"); 							  break;
+		case '5': smprintf(s, "Registered in roaming network\n"); 				  break;
+		default : smprintf(s, "Unknown\n");
+	}
+#endif
+	switch (answer[0]) {
+		case '0': NetworkInfo->State = GSM_NoNetwork;		break;
+		case '1': NetworkInfo->State = GSM_HomeNetwork; 	break;
+		case '2': NetworkInfo->State = GSM_RequestingNetwork; 	break;
+		case '3': NetworkInfo->State = GSM_RegistrationDenied;	break;
+		case '4': NetworkInfo->State = GSM_NetworkStatusUnknown;break;
+		case '5': NetworkInfo->State = GSM_RoamingNetwork; 	break;
+		default : NetworkInfo->State = GSM_NetworkStatusUnknown;break;
+	}
+	if (NetworkInfo->State == GSM_HomeNetwork ||
+	    NetworkInfo->State == GSM_RoamingNetwork) {
+		memset(NetworkInfo->CID,0,4);
+		memset(NetworkInfo->LAC,0,4);
+
+		if (Lines.numbers[3*2+1]==0) return ERR_NONE;
+
+		answer = GetLineString(GetLineString(msg.Buffer,Priv->Lines,2),Lines,3);
+		while (*answer == 0x20) answer++;
+		sprintf(NetworkInfo->CID,	"%c%c%c%c", answer[1], answer[2], answer[3], answer[4]);
+
+		answer = GetLineString(GetLineString(msg.Buffer,Priv->Lines,2),Lines,4);
+		while (*answer == 0x20) answer++;
+		sprintf(NetworkInfo->LAC,	"%c%c%c%c", answer[1], answer[2], answer[3], answer[4]);
+
+		smprintf(s, "CID   : %s\n",NetworkInfo->CID);
+		smprintf(s, "LAC   : %s\n",NetworkInfo->LAC);
+	}
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ReplyGetNetworkCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_NetworkInfo		*NetworkInfo = s->Phone.Data.NetworkInfo;
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Network code received\n");
+		if (Priv->Manufacturer == AT_Falcom) {
+			NetworkInfo->NetworkCode[0] = msg.Buffer[22];
+			NetworkInfo->NetworkCode[1] = msg.Buffer[23];
+			NetworkInfo->NetworkCode[2] = msg.Buffer[24];
+			NetworkInfo->NetworkCode[3] = ' ';
+			NetworkInfo->NetworkCode[4] = msg.Buffer[25];
+			NetworkInfo->NetworkCode[5] = msg.Buffer[26];
+		} else {
+			NetworkInfo->NetworkCode[0] = msg.Buffer[23];
+			NetworkInfo->NetworkCode[1] = msg.Buffer[24];
+			NetworkInfo->NetworkCode[2] = msg.Buffer[25];
+			NetworkInfo->NetworkCode[3] = ' ';
+			NetworkInfo->NetworkCode[4] = msg.Buffer[26];
+			NetworkInfo->NetworkCode[5] = msg.Buffer[27];
+		}
+		NetworkInfo->NetworkCode[6] = 0;
+		smprintf(s, "   Network code              : %s\n", NetworkInfo->NetworkCode);
+		smprintf(s, "   Network name for Gammu    : %s ",
+			DecodeUnicodeString(GSM_GetNetworkName(NetworkInfo->NetworkCode)));
+		smprintf(s, "(%s)\n",DecodeUnicodeString(GSM_GetCountryName(NetworkInfo->NetworkCode)));
+		return ERR_NONE;
+	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetNetworkInfo(GSM_StateMachine *s, GSM_NetworkInfo *netinfo)
+{
+	GSM_Error error;
+
+	s->Phone.Data.NetworkInfo=netinfo;
+
+	netinfo->NetworkName[0] = 0;
+	netinfo->NetworkName[1] = 0;
+	netinfo->NetworkCode[0] = 0;
+
+	smprintf(s, "Enable full network info\n");
+	error=GSM_WaitFor(s, "AT+CREG=2\r", 10, 0x00, 4, ID_GetNetworkInfo);
+	if ((error != ERR_NONE) &&
+	    (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) &&
+	    (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Ericsson)) return error;
+
+	smprintf(s, "Getting network LAC and CID and state\n");
+	error=GSM_WaitFor(s, "AT+CREG?\r", 9, 0x00, 4, ID_GetNetworkInfo);
+	if (error != ERR_NONE) return error;
+
+	if (netinfo->State == GSM_HomeNetwork || netinfo->State == GSM_RoamingNetwork) {
+		smprintf(s, "Setting short network name format\n");
+		error=GSM_WaitFor(s, "AT+COPS=3,2\r", 12, 0x00, 4, ID_GetNetworkInfo);
+
+		error=ATGEN_GetManufacturer(s);
+		if (error != ERR_NONE) return error;
+
+		smprintf(s, "Getting network code\n");
+		error=GSM_WaitFor(s, "AT+COPS?\r", 9, 0x00, 4, ID_GetNetworkInfo);
+	}
+	return error;
+}
+
+GSM_Error ATGEN_ReplyGetPBKMemories(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "PBK memories received\n");
+	if (strlen(msg.Buffer) > AT_PBK_MAX_MEMORIES) {
+		smprintf(s, "ERROR: Too long phonebook memories information received! (Recevided %d, AT_PBK_MAX_MEMORIES is %d\n", strlen(msg.Buffer), AT_PBK_MAX_MEMORIES);
+		return ERR_MOREMEMORY;
+	}
+	memcpy(s->Phone.Data.Priv.ATGEN.PBKMemories,msg.Buffer,strlen(msg.Buffer));
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_SetPBKMemory(GSM_StateMachine *s, GSM_MemoryType MemType)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	char 			req[] = "AT+CPBS=\"XX\"\r";
+	GSM_Error		error;
+
+	if (Priv->PBKMemory == MemType) return ERR_NONE;
+
+	/* Zero values that are for actual memory */
+	Priv->MemorySize		= 0;
+	Priv->FirstMemoryEntry		= 0;
+	Priv->NextMemoryEntry		= 0;
+	Priv->TextLength		= 0;
+	Priv->NumberLength		= 0;
+
+	if (Priv->PBKMemories[0] == 0) {
+		error=GSM_WaitFor (s, "AT+CPBS=?\r", 10, 0x00, 3, ID_SetMemoryType);
+		if (error != ERR_NONE) return error;
+	}
+
+	switch (MemType) {
+		case MEM_SM:
+			req[9] = 'S'; req[10] = 'M';
+			break;
+		case MEM_ME: 
+		        if (strstr(Priv->PBKMemories,"ME")==NULL) return ERR_NOTSUPPORTED;
+			req[9] = 'M'; req[10] = 'E';
+			break;
+		case MEM_RC:
+		        if (strstr(Priv->PBKMemories,"RC")==NULL) return ERR_NOTSUPPORTED;
+			req[9] = 'R'; req[10] = 'C';
+			break;
+		case MEM_MC:
+		        if (strstr(Priv->PBKMemories,"MC")==NULL) return ERR_NOTSUPPORTED;
+			req[9] = 'M'; req[10] = 'C';
+			break;
+		case MEM_ON:
+		        if (strstr(Priv->PBKMemories,"ON")==NULL) return ERR_NOTSUPPORTED;
+			req[9] = 'O'; req[10] = 'N';
+			break;
+		case MEM_FD:
+		        if (strstr(Priv->PBKMemories,"FD")==NULL) return ERR_NOTSUPPORTED;
+			req[9] = 'F'; req[10] = 'D';
+			break;
+		case MEM_DC:
+			if (strstr(Priv->PBKMemories,"DC")!=NULL) {
+				req[9] = 'D'; req[10] = 'C';
+				break;
+			}
+			if (strstr(Priv->PBKMemories,"LD")!=NULL) {
+				req[9] = 'L'; req[10] = 'D';
+				break;
+			}
+			return ERR_NOTSUPPORTED;
+			break;
+		default:
+			return ERR_NOTSUPPORTED;
+	}
+
+	smprintf(s, "Setting memory type\n");
+	error=GSM_WaitFor (s, req, 13, 0x00, 3, ID_SetMemoryType);
+	if (error == ERR_NONE) Priv->PBKMemory = MemType;
+	return error;
+}
+
+GSM_Error ATGEN_ReplyGetCPBSMemoryStatus(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_MemoryStatus	*MemoryStatus = s->Phone.Data.MemoryStatus;
+	char 			*start;
+
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Memory status received\n");
+  		MemoryStatus->MemoryUsed = 0;
+		MemoryStatus->MemoryFree = 0;
+		start = strchr(msg.Buffer, ',');
+		if (start) {
+			start++;
+			MemoryStatus->MemoryUsed = atoi(start);
+			start = strchr(start, ',');
+			if (start) {
+				start++;
+				MemoryStatus->MemoryFree = atoi(start) - MemoryStatus->MemoryUsed;
+				return ERR_NONE;
+			} else return ERR_UNKNOWN;
+		} else return ERR_UNKNOWN;
+	case AT_Reply_CMSError:
+		return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_ReplyGetCPBRMemoryInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+ 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	char 			*pos;
+ 
+ 	switch (Priv->ReplyState) {
+ 	case AT_Reply_OK:
+		smprintf(s, "Memory info received\n");
+		/* Parse +CPBR: (first-last),max_number_len,max_name_len */ 
+
+		/* Parse first location */
+		pos = strchr(msg.Buffer, '(');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		Priv->FirstMemoryEntry = atoi(pos);
+
+		/* Parse last location*/
+		pos = strchr(pos, '-');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		Priv->MemorySize = atoi(pos) + 1 - Priv->FirstMemoryEntry;
+
+		/* Parse number length*/
+		pos = strchr(pos, ',');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		Priv->NumberLength = atoi(pos);
+
+		/* Parse text length*/
+		pos = strchr(pos, ',');
+		if (!pos) return ERR_UNKNOWN;
+		pos++;
+		Priv->TextLength = atoi(pos);
+
+		return ERR_NONE;
+	case AT_Reply_Error:
+		return ERR_UNKNOWN;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+ 	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+}
+
+GSM_Error ATGEN_ReplyGetCPBRMemoryStatus(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_MemoryStatus	*MemoryStatus = s->Phone.Data.MemoryStatus;
+	int			line=0;
+	char			*str;
+	int			cur;
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Memory entries received\n");
+		/* Walk through lines with +CPBR: */
+		while (Priv->Lines.numbers[line*2+1]!=0) {
+			str = GetLineString(msg.Buffer,Priv->Lines,line+1);
+			if (strncmp(str, "+CPBR: ", 7) == 0) {
+				MemoryStatus->MemoryUsed++;
+				if (sscanf(str, "+CPBR: %d,", &cur) == 1) {
+					cur -= Priv->FirstMemoryEntry - 1;
+					if (cur == Priv->NextMemoryEntry || Priv->NextMemoryEntry == 0)
+						Priv->NextMemoryEntry = cur + 1;
+				}
+			}
+			line++;
+		}
+		return ERR_NONE;
+	case AT_Reply_Error:
+		return ERR_UNKNOWN;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+}
+
+GSM_Error ATGEN_GetMemoryInfo(GSM_StateMachine *s, GSM_MemoryStatus *Status, GSM_AT_NeededMemoryInfo NeededInfo)
+{
+	GSM_Error		error;
+	char			req[20];
+	int			start;
+	int			end;
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	smprintf(s, "Getting memory information\n");
+	
+	Priv->MemorySize		= 0;
+	Priv->TextLength		= 0;
+	Priv->NumberLength		= 0;
+
+	error = GSM_WaitFor (s, "AT+CPBR=?\r", 10, 0x00, 4, ID_GetMemoryStatus);
+	if (error != ERR_NONE) return error;
+	if (NeededInfo == AT_Total || NeededInfo == AT_Sizes || NeededInfo == AT_First) return ERR_NONE;
+
+	smprintf(s, "Getting memory status by reading values\n");
+	
+	s->Phone.Data.MemoryStatus	= Status;
+	Status->MemoryUsed		= 0;
+	Status->MemoryFree		= 0;
+	start				= Priv->FirstMemoryEntry;
+	Priv->NextMemoryEntry		= 0;
+	while (1) {
+		end	= start + 20;
+		if (end > Priv->MemorySize) end = Priv->MemorySize;
+		sprintf(req, "AT+CPBR=%i,%i\r", start, end);
+		error	= GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetMemoryStatus);
+		if (error != ERR_NONE) return error;
+		if (NeededInfo == AT_NextEmpty && Priv->NextMemoryEntry != 0 && Priv->NextMemoryEntry != end + 1) return ERR_NONE;
+		if (end == Priv->MemorySize) {
+			Status->MemoryFree = Priv->MemorySize - Status->MemoryUsed;
+			return ERR_NONE;
+		}
+		start = end + 1;
+	}
+}
+
+GSM_Error ATGEN_GetMemoryStatus(GSM_StateMachine *s, GSM_MemoryStatus *Status)
+{
+	GSM_Error error;
+
+	error = ATGEN_SetPBKMemory(s, Status->MemoryType);
+	if (error != ERR_NONE) return error;
+
+	s->Phone.Data.MemoryStatus=Status;
+
+	/* in some phones doesn't work or doesn't return memory status inside */
+	/* Some workaround for buggy mobile, that hangs after "AT+CPBS?" for other
+	 * memory than SM.
+	 */
+	if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_BROKENCPBS) || (Status->MemoryType == MEM_SM)) {
+		smprintf(s, "Getting memory status\n");
+		error=GSM_WaitFor (s, "AT+CPBS?\r", 9, 0x00, 4, ID_GetMemoryStatus);
+		if (error == ERR_NONE) return ERR_NONE;
+	}
+
+	return ATGEN_GetMemoryInfo(s, Status, AT_Status);
+}
+
+GSM_Error ATGEN_SetPBKCharset(GSM_StateMachine *s, bool PreferUnicode)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error		error;
+
+	/* Have we already selected something? */
+	if (Priv->PBKCharset!=0) {
+		/* If we want unicode charset and we have it already or setting of it
+		 * failed, we have nothing to do. */
+		if (PreferUnicode  && (Priv->PBKCharset==AT_PBK_UCS2 || Priv->UCS2CharsetFailed)) return ERR_NONE;
+
+		/* If we don't need unicode charset and we have some (or have unicode
+		 * charset when other failed), we have nothing to do. */
+		if (!PreferUnicode && (Priv->PBKCharset!=AT_PBK_UCS2 || Priv->NonUCS2CharsetFailed)) return ERR_NONE;
+	}
+
+	error=ATGEN_GetManufacturer(s);
+	if (error != ERR_NONE) return error;
+
+	if (PreferUnicode && !Priv->UCS2CharsetFailed) {
+		smprintf(s, "Setting charset to UCS2\n");
+		error=GSM_WaitFor (s, "AT+CSCS=\"UCS2\"\r", 15, 0x00, 3, ID_SetMemoryCharset);
+		if (error == ERR_NONE) {
+			Priv->PBKCharset = AT_PBK_UCS2;
+			return ERR_NONE;
+		} else {
+			Priv->UCS2CharsetFailed = true;
+		}
+	}
+	
+	smprintf(s, "Setting charset to HEX\n");
+	error=GSM_WaitFor (s, "AT+CSCS=\"HEX\"\r", 14, 0x00, 3, ID_SetMemoryCharset);
+	/* Falcom replies OK for HEX mode and send everything
+	 * in normal format */
+	if (error == ERR_NONE && Priv->Manufacturer != AT_Falcom) {
+		Priv->PBKCharset = AT_PBK_HEX;
+		return ERR_NONE;
+	}
+
+	smprintf(s, "Setting charset to GSM\n");
+	error=GSM_WaitFor (s, "AT+CSCS=\"GSM\"\r", 14, 0x00, 3, ID_SetMemoryCharset);
+	if (error == ERR_NONE) {
+		Priv->PBKCharset = AT_PBK_GSM;
+		return ERR_NONE;
+	}
+
+	if (!Priv->UCS2CharsetFailed) {
+		Priv->NonUCS2CharsetFailed = true;
+		smprintf(s, "Setting charset to UCS2\n");
+		error=GSM_WaitFor (s, "AT+CSCS=\"UCS2\"\r", 15, 0x00, 3, ID_SetMemoryCharset);
+		if (error == ERR_NONE) {
+			Priv->PBKCharset = AT_PBK_UCS2;
+			return ERR_NONE;
+		} else {
+			Priv->UCS2CharsetFailed = true;
+		}
+	}
+
+	return error;	
+}
+
+GSM_Error ATGEN_ReplyGetMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+ 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+ 	GSM_MemoryEntry		*Memory = s->Phone.Data.Memory;
+	char			*pos;
+	unsigned char		buffer[500],buffer2[500];
+	int			len;
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+ 		smprintf(s, "Phonebook entry received\n");
+ 		Memory->EntriesNum = 0;
+		if (Priv->Lines.numbers[4]==0) return ERR_EMPTY;
+		pos = strstr(msg.Buffer, "+CPBR:");
+		if (pos == NULL) return ERR_UNKNOWN;
+		/* Go after +CPBR: */
+		pos += 6; 
+
+		/* Location */
+		while (*pos && !isdigit(*pos)) pos++;
+		Memory->Location = atoi(pos) + 1 - Priv->FirstMemoryEntry;
+ 		smprintf(s, "Location: %d\n", Memory->Location);
+			
+		/* Number */
+		while (*pos != '"') pos++;
+		pos += ATGEN_ExtractOneParameter(pos, buffer);
+ 		smprintf(s, "Number: %s\n",buffer);
+ 		Memory->EntriesNum++;
+ 		Memory->Entries[0].EntryType  = PBK_Number_General;
+ 		Memory->Entries[0].VoiceTag   = 0;
+ 		Memory->Entries[0].SMSList[0] = 0;
+
+		len = strlen(buffer + 1) - 1;
+		if (Priv->PBKCharset == AT_PBK_HEX && (len > 10) && (len % 2 == 0) && (strchr(buffer + 1, '+') == NULL)) {
+			/* This is probably hex encoded number */
+			DecodeHexBin(buffer2, buffer+1, len);
+			DecodeDefault(Memory->Entries[0].Text ,buffer2, strlen(buffer2), false, NULL);
+		} else if (Priv->PBKCharset == AT_PBK_UCS2 && (len > 20) && (len % 4 == 0) && (strchr(buffer + 1, '+') == NULL)) {
+			/* This is probably unicode encoded number */
+			DecodeHexUnicode(Memory->Entries[0].Text, buffer + 1,len);
+		} else  {
+	 		EncodeUnicode(Memory->Entries[0].Text, buffer + 1, len);
+		}
+		
+		/* Number format */
+		pos += ATGEN_ExtractOneParameter(pos, buffer);
+ 		smprintf(s, "Number format: %s\n",buffer);
+
+		/* International number */
+		if (!strcmp(buffer,"145")) {
+			sprintf(buffer+1,"%s",DecodeUnicodeString(Memory->Entries[0].Text));
+			if (strlen(buffer+1)!=0 && buffer[1] != '+') {
+				/* Sony Ericsson issue */
+				/* International number is without + */
+				buffer[0] = '+';
+				EncodeUnicode(Memory->Entries[0].Text,buffer,strlen(buffer));
+			}
+		}
+
+		/* Name */
+		pos += ATGEN_ExtractOneParameter(pos, buffer);
+ 		smprintf(s, "Name text: %s\n",buffer);
+ 		Memory->EntriesNum++;
+ 		Memory->Entries[1].EntryType=PBK_Text_Name;
+		switch (Priv->PBKCharset) {
+		case AT_PBK_HEX:
+			DecodeHexBin(buffer2,buffer+1,strlen(buffer)-2);
+ 			DecodeDefault(Memory->Entries[1].Text,buffer2,strlen(buffer2),false,NULL);
+			break;
+		case AT_PBK_GSM:
+ 			DecodeDefault(Memory->Entries[1].Text,buffer+1,strlen(buffer)-2,false,NULL);
+			break;			
+		case AT_PBK_UCS2:
+			DecodeHexUnicode(Memory->Entries[1].Text,buffer+1,strlen(buffer+1) - 1);
+			break;			
+		}
+		return ERR_NONE;
+	case AT_Reply_CMEError:
+		return ATGEN_HandleCMEError(s);
+	case AT_Reply_Error:
+ 		smprintf(s, "Error - too high location ?\n");
+		return ERR_INVALIDLOCATION;
+	case AT_Reply_CMSError:
+ 	        return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_PrivGetMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry, int endlocation)
+{
+	GSM_Error 		error;
+	unsigned char		req[20];
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (entry->Location==0x00) return ERR_INVALIDLOCATION;
+
+	if (entry->MemoryType == MEM_ME) {
+		if (Priv->PBKSBNR == 0) {
+			sprintf(req, "AT^SBNR=?\r");
+			smprintf(s, "Checking availablity of SBNR\n");
+			error=GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetMemory);
+			switch (error) {
+			case ERR_NONE:
+				Priv->PBKSBNR = AT_SBNR_AVAILABLE;
+				break;
+			case ERR_UNKNOWN:
+			case ERR_NOTSUPPORTED:
+				Priv->PBKSBNR = AT_SBNR_NOTAVAILABLE;
+				break;
+			default:
+				return error;
+			}
+		}
+		if (Priv->PBKSBNR == AT_SBNR_AVAILABLE) {
+			sprintf(req, "AT^SBNR=vcf,%i\r",entry->Location-1);
+			s->Phone.Data.Memory=entry;
+			smprintf(s, "Getting phonebook entry\n");
+			return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetMemory);
+		}
+	}
+
+	error=ATGEN_GetManufacturer(s);
+	if (error != ERR_NONE) return error;
+
+	error=ATGEN_SetPBKMemory(s, entry->MemoryType);
+	if (error != ERR_NONE) return error;
+
+	if (Priv->FirstMemoryEntry == 0) {
+		error = ATGEN_GetMemoryInfo(s, NULL, AT_First);
+		if (error != ERR_NONE) return error;
+	}
+
+
+	error=ATGEN_SetPBKCharset(s, true); /* For reading we prefer unicode */
+	if (error != ERR_NONE) return error;
+
+	if (endlocation == 0) {
+		sprintf(req, "AT+CPBR=%i\r", entry->Location + Priv->FirstMemoryEntry - 1);
+	} else {
+		sprintf(req, "AT+CPBR=%i,%i\r", entry->Location + Priv->FirstMemoryEntry - 1, endlocation + Priv->FirstMemoryEntry - 1);
+	}
+
+	s->Phone.Data.Memory=entry;
+	smprintf(s, "Getting phonebook entry\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetMemory);
+}
+
+GSM_Error ATGEN_GetMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry)
+{
+	return ATGEN_PrivGetMemory(s, entry, 0);
+}
+
+GSM_Error ATGEN_GetNextMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry, bool start)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error		error;
+	int			step = 0;
+
+	if (Priv->MemorySize == 0) {
+		error = ATGEN_GetMemoryInfo(s, NULL, AT_Total);
+		if (error != ERR_NONE) return error;
+	}
+
+	if (start) {
+		entry->Location = 1;
+	} else {
+		entry->Location++;
+	}
+	while ((error = ATGEN_PrivGetMemory(s, entry, step == 0 ? 0 : MIN(Priv->MemorySize, entry->Location + step))) == ERR_EMPTY) {
+		entry->Location += step + 1;
+		if (entry->Location > Priv->MemorySize) break;
+		/* SNBR works only for one location */
+		if (entry->MemoryType != MEM_ME || Priv->PBKSBNR != AT_SBNR_AVAILABLE) step = MIN(step + 2, 20);
+	}
+	if (error == ERR_INVALIDLOCATION) return ERR_EMPTY;
+	return error;
+}
+
+GSM_Error ATGEN_DeleteAllMemory(GSM_StateMachine *s, GSM_MemoryType type)
+{
+	GSM_Error 		error;
+	unsigned char		req[100];
+	int			i;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	error = ATGEN_SetPBKMemory(s, type);
+	if (error != ERR_NONE) return error;
+
+	if (Priv->MemorySize == 0) {
+		error = ATGEN_GetMemoryInfo(s, NULL, AT_Total);
+		if (error != ERR_NONE) return error;
+	}
+
+	if (Priv->FirstMemoryEntry == 0) {
+		error = ATGEN_GetMemoryInfo(s, NULL, AT_First);
+		if (error != ERR_NONE) return error;
+	}
+
+
+	smprintf(s, "Deleting all phonebook entries\n");
+	for (i = Priv->FirstMemoryEntry; i < Priv->FirstMemoryEntry + Priv->MemorySize; i++) {
+		sprintf(req, "AT+CPBW=%d\r",i);
+		error = GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_SetMemory);
+		if (error != ERR_NONE) return error;
+	}
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ReplyDialVoice(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Dial voice OK\n");
+		return ERR_NONE;
+	case AT_Reply_Error:
+		smprintf(s, "Dial voice error\n");
+		return ERR_UNKNOWN;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_DialVoice(GSM_StateMachine *s, char *number, GSM_CallShowNumber ShowNumber)
+{
+	char req[39] = "ATDT";  
+
+	if (ShowNumber != GSM_CALL_DefaultNumberPresence) return ERR_NOTSUPPORTED;
+	if (strlen(number) > 32) return (ERR_UNKNOWN);
+
+	strcat(req, number);
+	strcat(req, ";\r");
+
+	smprintf(s, "Making voice call\n");
+	return GSM_WaitFor (s, req, 4+2+strlen(number), 0x00, 5, ID_DialVoice);
+}
+
+GSM_Error ATGEN_ReplyEnterSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Security code was OK\n");
+		return ERR_NONE;
+	case AT_Reply_Error:
+		smprintf(s, "Incorrect security code\n");
+		return ERR_SECURITYERROR;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_EnterSecurityCode(GSM_StateMachine *s, GSM_SecurityCode Code)
+{
+	unsigned char req[50];
+
+	switch (Code.Type) {
+	case SEC_Pin :
+		sprintf(req, "AT+CPIN=\"%s\"\r" , Code.Code);
+		break;
+	case SEC_Pin2 : 
+		if (s->Phone.Data.Priv.ATGEN.Manufacturer == AT_Siemens) {
+			sprintf(req, "AT+CPIN2=\"%s\"\r", Code.Code);
+		} else {
+			sprintf(req, "AT+CPIN=\"%s\"\r" , Code.Code);
+		}
+		break;
+	default : return ERR_NOTIMPLEMENTED;
+	}
+
+	smprintf(s, "Entering security code\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 6, ID_EnterSecurityCode);
+}
+
+GSM_Error ATGEN_ReplyGetSecurityStatus(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_SecurityCodeType *Status = s->Phone.Data.SecurityStatus;
+
+	smprintf(s, "Security status received - ");
+	if (strstr(msg.Buffer,"READY")) {
+		*Status = SEC_None;
+		smprintf(s, "nothing to enter\n");
+		return ERR_NONE;
+	}
+	if (strstr(msg.Buffer,"PH_SIM PIN")) {
+		smprintf(s, "no SIM inside or other error\n");
+		return ERR_UNKNOWN;
+	}
+	if (strstr(msg.Buffer,"SIM PIN2")) {
+		*Status = SEC_Pin2;
+		smprintf(s, "waiting for PIN2\n");
+		return ERR_NONE;
+	}
+	if (strstr(msg.Buffer,"SIM PUK2")) {
+		*Status = SEC_Puk2;
+		smprintf(s, "waiting for PUK2\n");
+		return ERR_NONE;
+	}
+	if (strstr(msg.Buffer,"SIM PIN")) {
+		*Status = SEC_Pin;
+		smprintf(s, "waiting for PIN\n");
+		return ERR_NONE;
+	}
+	if (strstr(msg.Buffer,"SIM PUK")) {
+		*Status = SEC_Puk;
+		smprintf(s, "waiting for PUK\n");
+		return ERR_NONE;
+	}
+	smprintf(s, "unknown\n");
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetSecurityStatus(GSM_StateMachine *s, GSM_SecurityCodeType *Status)
+{
+	s->Phone.Data.SecurityStatus=Status;
+
+	smprintf(s, "Getting security code status\n");
+	/* Please note, that A2D doesn't return OK on the end.
+ 	 * Because of it ReplyGetSecurityStatus is called after receiving line
+	 * with +CPIN:
+	 */
+	return GSM_WaitFor (s, "AT+CPIN?\r", 9, 0x00, 4, ID_GetSecurityStatus);
+}
+
+GSM_Error ATGEN_AnswerCall(GSM_StateMachine *s, int ID, bool all)
+{
+	if (all) {
+		smprintf(s, "Answering all calls\n");
+		return GSM_WaitFor (s, "ATA\r", 4, 0x00, 4, ID_AnswerCall);
+	}
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_ReplyCancelCall(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Call call;
+
+	switch(s->Phone.Data.Priv.ATGEN.ReplyState) {
+        case AT_Reply_OK:
+     	    smprintf(s, "Calls canceled\n");
+            call.CallIDAvailable = false;
+            call.Status 	 = GSM_CALL_CallLocalEnd;
+            if (s->User.IncomingCall) s->User.IncomingCall(s->CurrentConfig->Device, call);
+ 
+            return ERR_NONE;
+    	case AT_Reply_CMSError:
+            return ATGEN_HandleCMSError(s);
+        default:
+    	    return ERR_UNKNOWN;
+	}
+}
+
+GSM_Error ATGEN_CancelCall(GSM_StateMachine *s, int ID, bool all)
+{
+	GSM_Error error;
+	
+	if (all) {
+		smprintf(s, "Dropping all calls\n");
+		error = GSM_WaitFor (s, "ATH\r", 4, 0x00, 4, ID_CancelCall);
+		if (error == ERR_UNKNOWN) {
+		    return GSM_WaitFor (s, "AT+CHUP\r", 8, 0x00, 4, ID_CancelCall);
+		}
+		return error;
+	}
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_ReplyReset(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Reset done\n");
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_Reset(GSM_StateMachine *s, bool hard)
+{
+	GSM_Error error;
+
+	if (!hard) return ERR_NOTSUPPORTED;
+
+	smprintf(s, "Resetting device\n");
+	/* Siemens 35 */
+	error=GSM_WaitFor (s, "AT+CFUN=1,1\r", 12, 0x00, 8, ID_Reset);
+	if (error != ERR_NONE) {
+		/* Siemens M20 */
+		error=GSM_WaitFor (s, "AT^SRESET\r", 10, 0x00, 8, ID_Reset);
+	}
+	return error;
+}
+
+GSM_Error ATGEN_ReplyResetPhoneSettings(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Reset done\n");
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ResetPhoneSettings(GSM_StateMachine *s, GSM_ResetSettingsType Type)
+{
+	smprintf(s, "Resetting settings to default\n");
+	return GSM_WaitFor (s, "AT&F\r", 5, 0x00, 4, ID_ResetPhoneSettings);
+}
+
+GSM_Error ATGEN_SetAutoNetworkLogin(GSM_StateMachine *s)
+{
+	smprintf(s, "Enabling automatic network login\n");
+	return GSM_WaitFor (s, "AT+COPS=0\r", 10, 0x00, 4, ID_SetAutoNetworkLogin);
+}
+
+GSM_Error ATGEN_SendDTMF(GSM_StateMachine *s, char *sequence)
+{
+	unsigned char 	req[80] = "AT+VTS=";
+	int 		n;
+
+	for (n = 0; n < 32; n++) {
+		if (sequence[n] == '\0') break;
+		if (n != 0) req[6 + 2 * n] = ',';
+		req[7 + 2 * n] = sequence[n];
+	}
+
+	strcat(req, ";\r");
+
+	smprintf(s, "Sending DTMF\n");
+	return GSM_WaitFor (s, req, 7+2+2*strlen(sequence), 0x00, 4, ID_SendDTMF);
+}
+
+GSM_Error ATGEN_ReplyDeleteSMSMessage(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "SMS deleted OK\n");
+		return ERR_NONE;
+	case AT_Reply_Error:
+		smprintf(s, "Invalid location\n");
+		return ERR_INVALIDLOCATION;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_DeleteSMS(GSM_StateMachine *s, GSM_SMSMessage *sms)
+{
+	unsigned char		req[20], folderid;
+	GSM_Error		error;
+	int			location;
+	GSM_MultiSMSMessage	msms;
+
+	msms.Number = 0;
+	msms.SMS[0] = *sms;
+
+	/* By reading SMS we check if it is really inbox/outbox */
+	error = ATGEN_GetSMS(s, &msms);
+	if (error != ERR_NONE) return error;
+
+	error = ATGEN_GetSMSLocation(s, sms, &folderid, &location);
+	if (error != ERR_NONE) return error;
+
+	sprintf(req, "AT+CMGD=%i\r",location);
+
+	smprintf(s, "Deleting SMS\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 5, ID_DeleteSMSMessage);
+}
+
+GSM_Error ATGEN_GetSMSFolders(GSM_StateMachine *s, GSM_SMSFolders *folders)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error 		error;
+	int			used = 0;
+
+	if (Priv->PhoneSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, false);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+	if (Priv->SIMSMSMemory == 0) {
+		error = ATGEN_SetSMSMemory(s, true);
+		if (error != ERR_NONE && error != ERR_NOTSUPPORTED) return error;
+	}
+
+	folders->Number = 0;
+	if (Priv->PhoneSMSMemory == AT_NOTAVAILABLE && Priv->SIMSMSMemory == AT_NOTAVAILABLE) {
+		return ERR_NONE;
+	}
+
+	PHONE_GetSMSFolders(s,folders);
+	
+	if (Priv->SIMSMSMemory == AT_AVAILABLE) {
+		used = 2;
+	}
+	
+	if (Priv->PhoneSMSMemory == AT_AVAILABLE) {
+		if (used != 0) {
+			CopyUnicodeString(folders->Folder[used    ].Name,folders->Folder[0].Name);
+			CopyUnicodeString(folders->Folder[used + 1].Name,folders->Folder[1].Name);
+			folders->Folder[used    ].InboxFolder 	= true;
+			folders->Folder[used + 1].InboxFolder 	= false;
+		}
+		folders->Folder[used    ].Memory 	= MEM_ME;
+		folders->Folder[used + 1].Memory 	= MEM_ME;
+		folders->Number += 2;
+		used += 2;
+	}
+
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ReplySetMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+	case AT_Reply_OK:
+		smprintf(s, "Phonebook entry written OK\n");
+		return ERR_NONE;
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	case AT_Reply_CMEError:
+	        return ATGEN_HandleCMEError(s);
+	case AT_Reply_Error:
+		return ERR_INVALIDDATA;
+	default:
+		return ERR_UNKNOWNRESPONSE;
+	}
+}
+
+GSM_Error ATGEN_DeleteMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
+{
+	GSM_Error 		error;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	unsigned char		req[100];
+
+	if (entry->Location < 1) return ERR_INVALIDLOCATION;
+
+	error = ATGEN_SetPBKMemory(s, entry->MemoryType);
+	if (error != ERR_NONE) return error;
+
+	if (Priv->FirstMemoryEntry == 0) {
+		error = ATGEN_GetMemoryInfo(s, NULL, AT_First);
+		if (error != ERR_NONE) return error;
+	}
+
+	sprintf(req, "AT+CPBW=%d\r",entry->Location + Priv->FirstMemoryEntry - 1);
+
+	smprintf(s, "Deleting phonebook entry\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_SetMemory);
+}
+
+GSM_Error ATGEN_PrivSetMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
+{
+	/* REQUEST_SIZE should be big enough to handle all possibl cases
+	 * correctly, especially with unicode entries */
+#define REQUEST_SIZE	((4 * GSM_PHONEBOOK_TEXT_LENGTH) + 30)
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	int			Group, Name, Number,NumberType=0, len;
+	GSM_Error 		error;
+	unsigned char		req[REQUEST_SIZE + 1];
+	unsigned char		name[2*(GSM_PHONEBOOK_TEXT_LENGTH + 1)];
+	unsigned char		uname[2*(GSM_PHONEBOOK_TEXT_LENGTH + 1)];
+	unsigned char		number[GSM_PHONEBOOK_TEXT_LENGTH + 1];
+	int			reqlen;
+	bool			PreferUnicode = false;
+
+	if (entry->Location == 0) return ERR_INVALIDLOCATION;
+
+	error = ATGEN_SetPBKMemory(s, entry->MemoryType);
+	if (error != ERR_NONE) return error;
+
+	GSM_PhonebookFindDefaultNameNumberGroup(entry, &Name, &Number, &Group);
+
+	name[0] = 0;
+	if (Name != -1) {
+		len = UnicodeLength(entry->Entries[Name].Text);
+
+		/* Compare if we would loose some information when not using
+		 * unicode */
+		EncodeDefault(name, entry->Entries[Name].Text, &len, true, NULL);
+		DecodeDefault(uname, name, len, true, NULL);
+		if (!mywstrncmp(uname, entry->Entries[Name].Text, len)) {
+			/* Get maximal text length */
+			if (Priv->TextLength == 0) {
+				ATGEN_GetMemoryInfo(s, NULL, AT_Sizes);
+			}
+			
+			/* I char stored in GSM alphabet takes 7 bits, one
+			 * unicode 16, if storing in unicode would truncate
+			 * text, do not use it, otherwise we will use it */
+			if ((Priv->TextLength != 0) && ((Priv->TextLength * 7 / 16) <= len)) {
+				PreferUnicode = false;
+			} else {
+				PreferUnicode = true;
+			}
+		}
+
+		error = ATGEN_SetPBKCharset(s, PreferUnicode);
+		if (error != ERR_NONE) return error;
+
+		switch (Priv->PBKCharset) {
+		case AT_PBK_HEX:
+			EncodeHexBin(name, DecodeUnicodeString(entry->Entries[Name].Text), UnicodeLength(entry->Entries[Name].Text));
+			len = strlen(name);
+			break;
+		case AT_PBK_GSM:
+			smprintf(s, "str: %s\n", DecodeUnicodeString(entry->Entries[Name].Text));
+			len = UnicodeLength(entry->Entries[Name].Text);
+			EncodeDefault(name, entry->Entries[Name].Text, &len, true, NULL);
+			break;
+		case AT_PBK_UCS2:
+			EncodeHexUnicode(name, entry->Entries[Name].Text, UnicodeLength(entry->Entries[Name].Text));
+			len = strlen(name);
+			break;
+		}
+	} else {
+		smprintf(s, "WARNING: No usable name found!\n");
+		len = 0;
+	}
+
+	if (Number != -1) {
+		GSM_PackSemiOctetNumber(entry->Entries[Number].Text, number, false);
+		NumberType = number[0];
+		sprintf(number,"%s",DecodeUnicodeString(entry->Entries[Number].Text));
+	} else {
+		smprintf(s, "WARNING: No usable number found!\n");
+		number[0] = 0;
+	}
+
+	if (Priv->FirstMemoryEntry == 0) {
+		error = ATGEN_GetMemoryInfo(s, NULL, AT_First);
+		if (error != ERR_NONE) return error;
+	}
+
+	/* We can't use here:
+	 * sprintf(req, "AT+CPBW=%d, \"%s\", %i, \"%s\"\r",
+	 *         entry->Location, number, NumberType, name);
+	 * because name can contain 0 when using GSM alphabet.
+	 */
+	sprintf(req, "AT+CPBW=%d, \"%s\", %i, \"", entry->Location + Priv->FirstMemoryEntry - 1, number, NumberType);
+	reqlen = strlen(req);
+	if (reqlen + len > REQUEST_SIZE - 2) {
+		smprintf(s, "WARNING: Text truncated to fit in buffer!\n");
+		len = REQUEST_SIZE - 2 - reqlen;
+	}
+	memcpy(req + reqlen, name, len);
+	reqlen += len;
+	memcpy(req + reqlen, "\"\r", 2);
+	reqlen += 2;
+
+	smprintf(s, "Writing phonebook entry\n");
+	return GSM_WaitFor (s, req, reqlen, 0x00, 4, ID_SetMemory);
+#undef REQUEST_SIZE
+}
+
+GSM_Error ATGEN_SetMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
+{
+	if (entry->Location == 0) return ERR_INVALIDLOCATION;
+	return ATGEN_PrivSetMemory(s, entry);
+}
+
+GSM_Error ATGEN_AddMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
+{
+	GSM_Error 		error;
+	GSM_MemoryStatus	Status;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	/* Find out empty location */
+	error = ATGEN_GetMemoryInfo(s, &Status, AT_NextEmpty);
+	if (error != ERR_NONE) return error;
+	if (Priv->NextMemoryEntry == 0) return ERR_FULL;
+	entry->Location = Priv->NextMemoryEntry;
+
+	return ATGEN_PrivSetMemory(s, entry);
+}
+
+/* Use ATGEN_ExtractOneParameter ?? */
+void Extract_CLIP_number(char *dest, char *buf)
+{
+	char 	*start, *stop;
+	int 	i = 0;
+
+	stop = strstr(buf, ",");
+        if (stop != NULL) {
+        	start = strstr(buf, ":");
+	        if (start != NULL) { 
+			for (start = start + 2; start + i < stop;  i++)
+			dest[i] = start[i];
+       		}
+	}
+	dest[i] = 0; /* end the number */
+	
+	return;
+}
+
+GSM_Error ATGEN_ReplyIncomingCallInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	char 			num[128];
+	GSM_Call 		call;
+
+	smprintf(s, "Incoming call info\n");
+	if (s->Phone.Data.EnableIncomingCall && s->User.IncomingCall!=NULL) {
+		call.CallIDAvailable 	= false;
+		num[0] 			= 0;
+		if (strstr(msg.Buffer, "RING")) {
+			call.Status = GSM_CALL_IncomingCall;
+			Extract_CLIP_number(num, msg.Buffer);
+		} else if (strstr(msg.Buffer, "NO CARRIER")) {
+			call.Status = GSM_CALL_CallEnd;
+		} else if (strstr(msg.Buffer, "COLP:")) {
+			call.Status = GSM_CALL_CallStart;
+			Extract_CLIP_number(num, msg.Buffer);
+		} else {
+			smprintf(s, "CLIP: error\n");
+			return ERR_NONE;
+		}
+		EncodeUnicode(call.PhoneNumber, num, strlen(num));
+
+		s->User.IncomingCall(s->CurrentConfig->Device, call);
+	}
+
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_IncomingGPRS(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	/* "+CGREG: 1,1" */
+	smprintf(s, "GPRS change\n");
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_IncomingBattery(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	int 	level = 0;
+	char 	*p;
+	
+	/* "_OBS: 92,1" */
+	p = strstr(msg.Buffer, "_OBS:");
+	if (p) level = atoi(p + 5);
+	smprintf(s, "Battery level changed to %d\n", level);
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_IncomingNetworkLevel(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	int 	level = 0;
+	char 	*p;
+
+	/* "_OSIGQ: 12,0" */
+	p = strstr(msg.Buffer, "_OSIGQ: ");
+	if (p) level = atoi(p + 7);
+	smprintf(s, "Network level changed to %d\n", level);
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ReplyGetSIMIMSI(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Phone_Data		*Data = &s->Phone.Data;
+	char 			*c;
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+		CopyLineString(Data->PhoneString, msg.Buffer, Priv->Lines, 2);
+
+        	/* Read just IMSI also on phones that prepend it by "<IMSI>:" (Alcatel BE5) */
+		c = strstr(Data->PhoneString, "<IMSI>:");
+		if (c != NULL) {
+			c += 7;
+			memmove(Data->PhoneString, c, strlen(c) + 1);
+		}
+
+		smprintf(s, "Received IMSI %s\n",Data->PhoneString);
+		return ERR_NONE;
+	case AT_Reply_Error:
+		smprintf(s, "No access to SIM card or not supported by device\n");
+		return ERR_SECURITYERROR;
+	case AT_Reply_CMEError:
+	        return ATGEN_HandleCMEError(s);
+	case AT_Reply_CMSError:
+	        return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetSIMIMSI(GSM_StateMachine *s, char *IMSI)
+{
+	s->Phone.Data.PhoneString = IMSI;
+	smprintf(s, "Getting SIM IMSI\n");
+	return GSM_WaitFor (s, "AT+CIMI\r", 8, 0x00, 4, ID_GetSIMIMSI);
+}
+
+GSM_Error ATGEN_GetDisplayStatus(GSM_StateMachine *s, GSM_DisplayFeatures *features)
+{
+	return ERR_NOTSUPPORTED;
+
+	s->Phone.Data.DisplayFeatures = features;
+	smprintf(s, "Getting display status\n");
+	return GSM_WaitFor (s, "AT+CIND?\r",9, 0x00, 4, ID_GetDisplayStatus);
+}
+
+GSM_Error ATGEN_IncomingSMSCInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_ReplyGetBatteryCharge(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+    GSM_Phone_Data		*Data = &s->Phone.Data;
+    int 			i;
+    
+    Data->BatteryCharge->BatteryPercent = -1;
+    Data->BatteryCharge->ChargeState 	= 0;
+        
+    switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+        case AT_Reply_OK:
+            smprintf(s, "Battery level received\n");
+            Data->BatteryCharge->BatteryPercent = atoi(msg.Buffer+17);
+            i = atoi(msg.Buffer+14);
+            if (i >= 0 && i <= 3) { 
+                Data->BatteryCharge->ChargeState = i + 1;
+            }
+            return ERR_NONE;
+        case AT_Reply_Error:
+            smprintf(s, "Can't get battery level\n");
+            return ERR_UNKNOWN;
+        case AT_Reply_CMSError:
+            smprintf(s, "Can't get battery level\n");
+            return ATGEN_HandleCMSError(s);
+        default:
+            break;
+    }
+    return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetBatteryCharge(GSM_StateMachine *s, GSM_BatteryCharge *bat)
+{
+	s->Phone.Data.BatteryCharge = bat;
+	smprintf(s, "Getting battery charge\n");
+	return GSM_WaitFor (s, "AT+CBC\r", 7, 0x00, 4, ID_GetBatteryCharge);
+}
+
+GSM_Error ATGEN_ReplyGetSignalQuality(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_SignalQuality	*Signal = s->Phone.Data.SignalQuality;
+	int 			i;
+	char 			*pos;
+
+	Signal->SignalStrength 	= -1;
+	Signal->SignalPercent 	= -1;
+	Signal->BitErrorRate 	= -1;
+    
+	switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
+        case AT_Reply_OK:
+            smprintf(s, "Signal quality info received\n");
+            i = atoi(msg.Buffer+15);
+            if (i != 99) {
+                /* from GSM 07.07 section 8.5 */
+                Signal->SignalStrength = 2 * i - 113;
+
+                /* FIXME: this is wild guess and probably will be phone dependant */
+                Signal->SignalPercent = 15 * i;
+                if (Signal->SignalPercent > 100) Signal->SignalPercent = 100;
+            }
+            pos = strchr(msg.Buffer + 15, ',');
+            if (pos != NULL) {
+                i = atoi(pos + 1);
+                /* from GSM 05.08 section 8.2.4 */
+                switch (i) {
+                    case 0: Signal->BitErrorRate =  0; break; /* 0.14 */
+                    case 1: Signal->BitErrorRate =  0; break; /* 0.28 */
+                    case 2: Signal->BitErrorRate =  1; break; /* 0.57 */
+                    case 3: Signal->BitErrorRate =  1; break; /* 1.13 */
+                    case 4: Signal->BitErrorRate =  2; break; /* 2.26 */
+                    case 5: Signal->BitErrorRate =  5; break; /* 4.53 */
+                    case 6: Signal->BitErrorRate =  9; break; /* 9.05 */
+                    case 7: Signal->BitErrorRate = 18; break; /* 18.10 */
+                }
+            }
+            return ERR_NONE;
+        case AT_Reply_CMSError:
+            return ATGEN_HandleCMSError(s);
+        default:
+            break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+}
+
+GSM_Error ATGEN_GetSignalQuality(GSM_StateMachine *s, GSM_SignalQuality *sig)
+{
+	s->Phone.Data.SignalQuality = sig;
+	smprintf(s, "Getting signal quality info\n");
+	return GSM_WaitFor (s, "AT+CSQ\r", 7, 0x00, 4, ID_GetSignalQuality);
+}
+
+/* When use AT+CPIN?, A2D returns it without OK and because of it Gammu
+   parses answer without it.
+   MC35 and other return OK after answer for AT+CPIN?. Here we handle it.
+   Any better idea ?
+ */
+GSM_Error ATGEN_ReplyOK(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	return ERR_NONE;
+}
+
+static GSM_Error ATGEN_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	
+	if (Priv->Manufacturer==AT_Siemens ) return SIEMENS_GetNextCalendar(s,Note,start);
+	if (Priv->Manufacturer==AT_Ericsson) return SONYERIC_GetNextCalendar(s,Note,start);
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_Terminate(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
+
+	free(Priv->file.Buffer);
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
+{
+	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer==AT_Siemens)  return SIEMENS_AddCalendarNote(s, Note);
+	if (Priv->Manufacturer==AT_Ericsson) return SONYERIC_AddCalendarNote(s, Note);
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
+{
+	GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer==AT_Siemens)  return SIEMENS_DelCalendarNote(s, Note);
+	if (Priv->Manufacturer==AT_Ericsson) return SONYERIC_DelCalendarNote(s, Note);
+	return ERR_NOTSUPPORTED;
+}
+
+GSM_Error ATGEN_PressKey(GSM_StateMachine *s, GSM_KeyCode Key, bool Press)
+{
+	GSM_Error	error;
+	unsigned char 	Frame[] = "AT+CKPD=\"?\"\r";
+
+	if (Press) {
+		switch (Key) {
+			case GSM_KEY_1 			: Frame[9] = '1'; break;
+			case GSM_KEY_2			: Frame[9] = '2'; break;
+			case GSM_KEY_3			: Frame[9] = '3'; break;
+			case GSM_KEY_4			: Frame[9] = '4'; break;
+			case GSM_KEY_5			: Frame[9] = '5'; break;
+			case GSM_KEY_6			: Frame[9] = '6'; break;
+			case GSM_KEY_7			: Frame[9] = '7'; break;
+			case GSM_KEY_8			: Frame[9] = '8'; break;
+			case GSM_KEY_9			: Frame[9] = '9'; break;
+			case GSM_KEY_0			: Frame[9] = '0'; break;
+			case GSM_KEY_HASH		: Frame[9] = '#'; break;
+			case GSM_KEY_ASTERISK		: Frame[9] = '*'; break;
+			case GSM_KEY_POWER		: return ERR_NOTSUPPORTED;
+			case GSM_KEY_GREEN		: Frame[9] = 'S'; break;
+			case GSM_KEY_RED		: Frame[9] = 'E'; break;
+			case GSM_KEY_INCREASEVOLUME	: Frame[9] = 'U'; break;
+			case GSM_KEY_DECREASEVOLUME	: Frame[9] = 'D'; break;
+			case GSM_KEY_UP			: Frame[9] = '^'; break;
+			case GSM_KEY_DOWN		: Frame[9] = 'V'; break;
+			case GSM_KEY_MENU		: Frame[9] = 'F'; break;
+			case GSM_KEY_NAMES		: Frame[9] = 'C'; break;
+			default				: return ERR_NOTSUPPORTED;
+		}
+		smprintf(s, "Pressing key\n");
+		error = GSM_WaitFor (s, Frame, 12, 0x00, 4, ID_PressKey);
+		if (error != ERR_NONE) return error;
+
+		/* Strange. My T310 needs it */
+		return GSM_WaitFor (s, "ATE1\r", 5, 0x00, 4, ID_EnableEcho);
+	} else {
+		return ERR_NONE;
+	}
+}
+
+#ifdef GSM_ENABLE_CELLBROADCAST
+
+GSM_Error ATGEN_ReplyIncomingCB(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_CBMessage 	CB;
+	int		i,j;
+	char		Buffer[300],Buffer2[300];
+
+	smprintf(s, "CB received\n");
+	return ERR_NONE;
+
+	DecodeHexBin (Buffer,msg.Buffer+6,msg.Length-6);
+	DumpMessage(stdout, di.dl ,Buffer,msg.Length-6);
+
+	CB.Channel = Buffer[4];
+
+	for (j=0;j<msg.Length;j++) {
+	smprintf(s, "j=%i\n",j);
+	i=GSM_UnpackEightBitsToSeven(0, msg.Buffer[6], msg.Buffer[6], msg.Buffer+j, Buffer2);
+//	i = msg.Buffer[6] - 1;
+//	while (i!=0) {
+//		if (Buffer[i] == 13) i = i - 1; else break;
+//	}
+	DecodeDefault(CB.Text, Buffer2, msg.Buffer[6], false, NULL);
+	smprintf(s, "Channel %i, text \"%s\"\n",CB.Channel,DecodeUnicodeString(CB.Text));
+	}
+	if (s->Phone.Data.EnableIncomingCB && s->User.IncomingCB!=NULL) {
+		s->User.IncomingCB(s->CurrentConfig->Device,CB);
+	}
+	return ERR_NONE;
+}
+
+#endif
+
+GSM_Error ATGEN_SetIncomingCB(GSM_StateMachine *s, bool enable)
+{
+#ifdef GSM_ENABLE_CELLBROADCAST
+	if (s->Phone.Data.EnableIncomingCB!=enable) {
+		s->Phone.Data.EnableIncomingCB 	= enable;
+		if (enable) {
+			smprintf(s, "Enabling incoming CB\n");
+			return GSM_WaitFor(s, "AT+CNMI=3,,2\r", 13, 0x00, 4, ID_SetIncomingCB);
+		} else {
+			smprintf(s, "Disabling incoming CB\n");
+			return GSM_WaitFor(s, "AT+CNMI=3,,0\r", 13, 0x00, 4, ID_SetIncomingCB);
+		}
+	}
+	return ERR_NONE;
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error ATGEN_IncomingSMSInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Incoming SMS\n");
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_IncomingSMSDeliver(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_Data		*Data = &s->Phone.Data;
+	GSM_SMSMessage 		sms;
+	int 			current = 0, current2, i=0;
+	unsigned char 		buffer[300],smsframe[800];
+
+	smprintf(s, "Incoming SMS received (Deliver)\n");
+	if (Data->EnableIncomingSMS && s->User.IncomingSMS!=NULL) {
+		sms.State 	 = SMS_UnRead;
+		sms.InboxFolder  = true;
+		sms.PDU 	 = SMS_Deliver;
+
+		/* T310 with larger SMS goes crazy and mix this incoming
+                 * frame with normal answers. PDU is always last frame
+		 * We find its' number and parse it */
+		while (Data->Priv.ATGEN.Lines.numbers[i*2+1] != 0) {
+			/* FIXME: handle special chars correctly */
+			i++;
+		}
+		DecodeHexBin (buffer,
+			GetLineString(msg.Buffer,Data->Priv.ATGEN.Lines,i),
+			strlen(GetLineString(msg.Buffer,Data->Priv.ATGEN.Lines,i)));
+
+		/* We use locations from SMS layouts like in ../phone2.c(h) */
+		for(i=0;i<buffer[0]+1;i++) smsframe[i]=buffer[current++];
+		smsframe[12]=buffer[current++];
+
+		current2=((buffer[current])+1)/2+1;
+		for(i=0;i<current2+1;i++) smsframe[PHONE_SMSDeliver.Number+i]=buffer[current++];
+		smsframe[PHONE_SMSDeliver.TPPID] = buffer[current++];
+		smsframe[PHONE_SMSDeliver.TPDCS] = buffer[current++];
+		for(i=0;i<7;i++) smsframe[PHONE_SMSDeliver.DateTime+i]=buffer[current++];
+		smsframe[PHONE_SMSDeliver.TPUDL] = buffer[current++];
+		for(i=0;i<smsframe[PHONE_SMSDeliver.TPUDL];i++) smsframe[i+PHONE_SMSDeliver.Text]=buffer[current++];
+		GSM_DecodeSMSFrame(&sms,smsframe,PHONE_SMSDeliver);
+
+		s->User.IncomingSMS(s->CurrentConfig->Device,sms);
+	}
+	return ERR_NONE;
+}
+
+/* I don't have phone able to do it and can't fill it */
+GSM_Error ATGEN_IncomingSMSReport(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	smprintf(s, "Incoming SMS received (Report)\n");
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_SetIncomingSMS(GSM_StateMachine *s, bool enable)
+{
+	/* Nokia returns OK, but doesn't return anything */
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer == AT_Nokia) return ERR_NOTSUPPORTED;
+
+	if (s->Phone.Data.EnableIncomingSMS!=enable) {
+		s->Phone.Data.EnableIncomingSMS = enable;
+		if (enable) {
+			smprintf(s, "Enabling incoming SMS\n");
+
+			/* Delivery reports */
+			GSM_WaitFor(s, "AT+CNMI=3,,,1\r", 14, 0x00, 4, ID_SetIncomingSMS);
+
+			/* SMS deliver */
+			return GSM_WaitFor(s, "AT+CNMI=3,3\r", 12, 0x00, 4, ID_SetIncomingSMS);
+		} else {
+			smprintf(s, "Disabling incoming SMS\n");
+			return GSM_WaitFor(s, "AT+CNMI=3,0\r", 12, 0x00, 4, ID_SetIncomingSMS);
+		}
+	}
+	return ERR_NONE;
+}
+
+GSM_Reply_Function ATGENReplyFunctions[] = {
+{ATGEN_GenericReply,		"AT\r"			,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_GenericReply,		"ATE1" 	 		,0x00,0x00,ID_EnableEcho	 },
+{ATGEN_GenericReply,		"AT+CMEE=" 		,0x00,0x00,ID_EnableErrorInfo	 },
+{ATGEN_GenericReply,		"AT+CKPD="		,0x00,0x00,ID_PressKey		 },
+{ATGEN_ReplyGetSIMIMSI,		"AT+CIMI" 	 	,0x00,0x00,ID_GetSIMIMSI	 },
+{ATGEN_GenericReply,		"AT*EOBEX"		,0x00,0x00,ID_SetOBEX		 },
+
+#ifdef GSM_ENABLE_CELLBROADCAST
+{ATGEN_ReplyIncomingCB,		"+CBM:" 	 	,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_GenericReply,		"AT+CNMI"		,0x00,0x00,ID_SetIncomingCB	 },
+#endif
+
+{ATGEN_IncomingBattery,		"_OBS:"		 	,0x00,0x00,ID_IncomingFrame      },
+{ATGEN_ReplyGetBatteryCharge,	"AT+CBC"		,0x00,0x00,ID_GetBatteryCharge	 },
+
+{ATGEN_ReplyGetModel,		"AT+CGMM"		,0x00,0x00,ID_GetModel           },
+{ATGEN_ReplyGetManufacturer,	"AT+CGMI"		,0x00,0x00,ID_GetManufacturer	 },
+{ATGEN_ReplyGetFirmwareCGMR,	"AT+CGMR"		,0x00,0x00,ID_GetFirmware	 },
+{ATGEN_ReplyGetFirmwareATI,	"ATI"			,0x00,0x00,ID_GetFirmware	 },
+{ATGEN_ReplyGetIMEI,		"AT+CGSN"		,0x00,0x00,ID_GetIMEI	 	 },
+
+{ATGEN_ReplySendSMS,		"AT+CMGS"		,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_ReplySendSMS,		"AT+CMSS"		,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_GenericReply,		"AT+CNMI"		,0x00,0x00,ID_SetIncomingSMS	 },
+{ATGEN_GenericReply,		"AT+CMGF"		,0x00,0x00,ID_GetSMSMode	 },
+{ATGEN_GenericReply,		"AT+CSDH"		,0x00,0x00,ID_GetSMSMode	 },
+{ATGEN_ReplyGetSMSMessage,	"AT+CMGR"		,0x00,0x00,ID_GetSMSMessage	 },
+{ATGEN_GenericReply,		"AT+CPMS"		,0x00,0x00,ID_SetMemoryType	 },
+{ATGEN_ReplyGetSMSStatus,	"AT+CPMS"		,0x00,0x00,ID_GetSMSStatus	 },
+{ATGEN_ReplyGetSMSMemories,	"AT+CPMS=?"		,0x00,0x00,ID_GetSMSMemories	 },
+{ATGEN_ReplyAddSMSMessage,	"AT+CMGW"		,0x00,0x00,ID_SaveSMSMessage	 },
+{ATGEN_GenericReply,		"AT+CSMP"		,0x00,0x00,ID_SetSMSParameters	 },
+{ATGEN_GenericReply,		"AT+CSCA"		,0x00,0x00,ID_SetSMSC		 },
+{ATGEN_ReplyGetSMSC,		"AT+CSCA?"		,0x00,0x00,ID_GetSMSC		 },
+{ATGEN_ReplyDeleteSMSMessage,	"AT+CMGD"		,0x00,0x00,ID_DeleteSMSMessage	 },
+{ATGEN_GenericReply,		"ATE1"			,0x00,0x00,ID_SetSMSParameters	 },
+{ATGEN_GenericReply,		"\x1b\x0D"		,0x00,0x00,ID_SetSMSParameters	 },
+{ATGEN_IncomingSMSInfo,		"+CMTI:" 	 	,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_IncomingSMSDeliver,	"+CMT:" 	 	,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_IncomingSMSReport,	"+CDS:" 	 	,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_IncomingSMSCInfo,	"^SCN:"			,0x00,0x00,ID_IncomingFrame	 },
+
+{ATGEN_ReplyGetDateTime_Alarm,	"AT+CCLK?"		,0x00,0x00,ID_GetDateTime	 },
+{ATGEN_GenericReply,		"AT+CCLK="		,0x00,0x00,ID_SetDateTime	 },
+{ATGEN_ReplyGetDateTime_Alarm,	"AT+CALA?"		,0x00,0x00,ID_GetAlarm		 },
+
+{ATGEN_ReplyGetNetworkLAC_CID,	"AT+CREG?"		,0x00,0x00,ID_GetNetworkInfo	 },
+{ATGEN_GenericReply,		"AT+CREG=2"		,0x00,0x00,ID_GetNetworkInfo	 },
+{ATGEN_GenericReply,		"AT+COPS="		,0x00,0x00,ID_GetNetworkInfo	 },
+{ATGEN_GenericReply,		"AT+COPS="		,0x00,0x00,ID_SetAutoNetworkLogin},
+{ATGEN_ReplyGetNetworkCode,	"AT+COPS"		,0x00,0x00,ID_GetNetworkInfo	 },
+{ATGEN_ReplyGetSignalQuality,	"AT+CSQ"		,0x00,0x00,ID_GetSignalQuality	 },
+{ATGEN_IncomingNetworkLevel,	"_OSIGQ:"	 	,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_IncomingGPRS,		"+CGREG:"	 	,0x00,0x00,ID_IncomingFrame      },
+{ATGEN_ReplyGetNetworkLAC_CID,	"+CREG:"		,0x00,0x00,ID_IncomingFrame	 },
+
+{ATGEN_ReplyGetPBKMemories,	"AT+CPBS=?"		,0x00,0x00,ID_SetMemoryType	 },
+{ATGEN_GenericReply,		"AT+CPBS="		,0x00,0x00,ID_SetMemoryType	 },
+{ATGEN_ReplyGetCPBSMemoryStatus,"AT+CPBS?"		,0x00,0x00,ID_GetMemoryStatus	 },
+{ATGEN_ReplyGetCPBRMemoryInfo,	"AT+CPBR=?"		,0x00,0x00,ID_GetMemoryStatus	 },
+{ATGEN_ReplyGetCPBRMemoryStatus,"AT+CPBR="		,0x00,0x00,ID_GetMemoryStatus	 },
+{ATGEN_GenericReply,		"AT+CSCS="		,0x00,0x00,ID_SetMemoryCharset	 },
+{ATGEN_ReplyGetMemory,		"AT+CPBR="		,0x00,0x00,ID_GetMemory		 },
+{ATGEN_GenericReply,		"AT^SBNR=?"		,0x00,0x00,ID_GetMemory		 },
+{ATGEN_SL45ReplyGetMemory,	"AT^SBNR"		,0x00,0x00,ID_GetMemory		 },
+{ATGEN_ReplySetMemory,		"AT+CPBW"		,0x00,0x00,ID_SetMemory		 },
+
+{ATGEN_CMS35ReplyGetBitmap,	"AT^SBNR=\"bmp\""	,0x00,0x00,ID_GetBitmap	 	 },
+{ATGEN_CMS35ReplySetBitmap,	"AT^SBNW=\"bmp\""	,0x00,0x00,ID_SetBitmap	 	 },
+
+{ATGEN_CMS35ReplyGetRingtone,	"AT^SBNR=\"mid\""	,0x00,0x00,ID_GetRingtone	 },
+{ATGEN_CMS35ReplySetRingtone,	"AT^SBNW=\"mid\""	,0x00,0x00,ID_SetRingtone	 },
+
+{ATGEN_CMS35ReplyGetNextCal,	"AT^SBNR=\"vcs\""	,0x00,0x00,ID_GetCalendarNote	 },
+{ATGEN_CMS35ReplySetCalendar,	"AT^SBNW=\"vcs\""	,0x00,0x00,ID_SetCalendarNote	 },
+{ATGEN_CMS35ReplyDeleteCalendar,"AT^SBNW=\"vcs\""	,0x00,0x00,ID_DeleteCalendarNote },
+
+{ATGEN_ReplyEnterSecurityCode,	"AT+CPIN="		,0x00,0x00,ID_EnterSecurityCode	 },
+{ATGEN_ReplyEnterSecurityCode,	"AT+CPIN2="		,0x00,0x00,ID_EnterSecurityCode	 },
+{ATGEN_ReplyGetSecurityStatus,	"AT+CPIN?"		,0x00,0x00,ID_GetSecurityStatus	 },
+{ATGEN_ReplyOK,			"OK"			,0x00,0x00,ID_IncomingFrame	 },
+
+{ATGEN_GenericReply, 		"AT+VTS"		,0x00,0x00,ID_SendDTMF		 },
+{ATGEN_ReplyCancelCall,		"AT+CHUP"		,0x00,0x00,ID_CancelCall	 },
+{ATGEN_ReplyDialVoice,		"ATDT"			,0x00,0x00,ID_DialVoice		 },
+{ATGEN_ReplyCancelCall,		"ATH"			,0x00,0x00,ID_CancelCall	 },
+{ATGEN_GenericReply,            "AT+CLIP=1"      	,0x00,0x00,ID_IncomingFrame      },
+{ATGEN_ReplyIncomingCallInfo,	"+CLIP"			,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_ReplyIncomingCallInfo,	"+COLP"    		,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_ReplyIncomingCallInfo,	"RING"			,0x00,0x00,ID_IncomingFrame	 },
+{ATGEN_ReplyIncomingCallInfo,	"NO CARRIER"		,0x00,0x00,ID_IncomingFrame	 },
+
+{ATGEN_ReplyReset,		"AT^SRESET"		,0x00,0x00,ID_Reset		 },
+{ATGEN_ReplyReset,		"AT+CFUN=1,1"		,0x00,0x00,ID_Reset		 },
+{ATGEN_ReplyResetPhoneSettings, "AT&F"			,0x00,0x00,ID_ResetPhoneSettings },
+
+#ifdef GSM_ENABLE_ALCATEL
+/*  Why do I give Alcatel specific things here? It's simple, Alcatel needs
+ *  some AT commands to start it's binary mode, so this needs to be in AT
+ *  related stuff. 
+ *
+ *  XXX: AT+IFC could later move outside this ifdef, because it is not Alcatel
+ *  specific and it's part of ETSI specifications 
+ */
+{ATGEN_GenericReply,		"AT+IFC" 	 	,0x00,0x00,ID_SetFlowControl  	 },
+{ALCATEL_ProtocolVersionReply,	"AT+CPROT=?" 	 	,0x00,0x00,ID_AlcatelProtocol    },
+{ATGEN_GenericReply,		"AT+CPROT" 	 	,0x00,0x00,ID_AlcatelConnect	 },
+#endif
+
+{NULL,				"\x00"			,0x00,0x00,ID_None		 }
+};                                                                                      
+
+GSM_Phone_Functions ATGENPhone = {
+	"A2D|iPAQ|at|M20|S25|MC35|C35i|5110|5130|5190|5210|6110|6130|6150|6190|6210|6250|6310|6310i|6510|7110|8210|8250|8290|8310|8390|8850|8855|8890|8910|9110|9210",
+	ATGENReplyFunctions,
+	ATGEN_Initialise,
+	ATGEN_Terminate,
+	ATGEN_DispatchMessage,
+	NOTSUPPORTED,			/* 	ShowStartInfo		*/
+	ATGEN_GetManufacturer,
+	ATGEN_GetModel,
+	ATGEN_GetFirmware,
+	ATGEN_GetIMEI,
+	NOTSUPPORTED,			/*	GetOriginalIMEI		*/
+	NOTSUPPORTED,			/*	GetManufactureMonth	*/
+	NOTSUPPORTED,			/*	GetProductCode		*/
+	NOTSUPPORTED,			/*	GetHardware		*/
+	NOTSUPPORTED,			/*	GetPPM			*/
+	ATGEN_GetSIMIMSI,
+	ATGEN_GetDateTime,
+	ATGEN_SetDateTime,
+	ATGEN_GetAlarm,
+	NOTIMPLEMENTED,			/*	SetAlarm		*/
+	NOTSUPPORTED,			/* 	GetLocale		*/
+	NOTSUPPORTED,			/* 	SetLocale		*/
+	ATGEN_PressKey,
+	ATGEN_Reset,
+	ATGEN_ResetPhoneSettings,
+	ATGEN_EnterSecurityCode,
+	ATGEN_GetSecurityStatus,
+	ATGEN_GetDisplayStatus,
+	ATGEN_SetAutoNetworkLogin,
+	ATGEN_GetBatteryCharge,
+	ATGEN_GetSignalQuality,
+	ATGEN_GetNetworkInfo,
+ 	NOTSUPPORTED,       		/*  	GetCategory 		*/
+ 	NOTSUPPORTED,       		/*  	AddCategory 		*/
+ 	NOTSUPPORTED,        		/*  	GetCategoryStatus 	*/
+	ATGEN_GetMemoryStatus,
+	ATGEN_GetMemory,
+	ATGEN_GetNextMemory,
+	ATGEN_SetMemory,
+	ATGEN_AddMemory,
+	ATGEN_DeleteMemory,
+	ATGEN_DeleteAllMemory,
+	NOTSUPPORTED,			/*	GetSpeedDial		*/
+	NOTSUPPORTED,			/*	SetSpeedDial		*/
+	ATGEN_GetSMSC,
+	ATGEN_SetSMSC,
+	ATGEN_GetSMSStatus,
+	ATGEN_GetSMS,
+	ATGEN_GetNextSMS,
+	NOTSUPPORTED,			/*	SetSMS			*/
+	ATGEN_AddSMS,
+	ATGEN_DeleteSMS,
+	ATGEN_SendSMS,
+	ATGEN_SendSavedSMS,
+	ATGEN_SetIncomingSMS,
+	ATGEN_SetIncomingCB,
+	ATGEN_GetSMSFolders,
+ 	NOTSUPPORTED,			/* 	AddSMSFolder		*/
+ 	NOTSUPPORTED,			/* 	DeleteSMSFolder		*/
+	ATGEN_DialVoice,
+	ATGEN_AnswerCall,
+	ATGEN_CancelCall,
+ 	NOTSUPPORTED,			/* 	HoldCall 		*/
+ 	NOTSUPPORTED,			/* 	UnholdCall 		*/
+ 	NOTSUPPORTED,			/* 	ConferenceCall 		*/
+ 	NOTSUPPORTED,			/* 	SplitCall		*/
+ 	NOTSUPPORTED,			/* 	TransferCall		*/
+ 	NOTSUPPORTED,			/* 	SwitchCall		*/
+ 	NOTSUPPORTED,			/* 	GetCallDivert		*/
+ 	NOTSUPPORTED,			/* 	SetCallDivert		*/
+ 	NOTSUPPORTED,			/* 	CancelAllDiverts	*/
+	NONEFUNCTION,			/*	SetIncomingCall		*/
+	NOTSUPPORTED,			/* 	SetIncomingUSSD		*/
+	ATGEN_SendDTMF,
+	ATGEN_GetRingtone,
+	ATGEN_SetRingtone,
+	NOTSUPPORTED,			/*	GetRingtonesInfo	*/
+	NOTSUPPORTED,			/* 	DeleteUserRingtones	*/
+	NOTSUPPORTED,			/*	PlayTone		*/
+	NOTSUPPORTED,			/* 	GetWAPBookmark		*/
+	NOTSUPPORTED,			/* 	SetWAPBookmark 		*/
+	NOTSUPPORTED,	 		/* 	DeleteWAPBookmark 	*/
+	NOTSUPPORTED,			/* 	GetWAPSettings 		*/
+	NOTSUPPORTED,			/* 	SetWAPSettings 		*/
+	NOTSUPPORTED,			/* 	GetMMSSettings		*/
+	NOTSUPPORTED,			/* 	SetMMSSettings		*/
+	NOTSUPPORTED,			/*	GetSyncMLSettings	*/
+	NOTSUPPORTED,			/*	SetSyncMLSettings	*/
+	NOTSUPPORTED,			/*	GetChatSettings		*/
+	NOTSUPPORTED,			/*	SetChatSettings		*/
+	ATGEN_GetBitmap,		/* 	GetBitmap		*/
+	ATGEN_SetBitmap,		/*	SetBitmap		*/
+	SONYERIC_GetToDoStatus,
+	NOTSUPPORTED,			/*	GetToDo			*/
+	SONYERIC_GetNextToDo,
+	NOTSUPPORTED,			/*	SetToDo			*/
+	SONYERIC_AddToDo,
+	NOTSUPPORTED,			/*	DeleteToDo		*/
+	SONYERIC_DeleteAllToDo,
+	SONYERIC_GetCalendarStatus,
+	NOTIMPLEMENTED,			/*	GetCalendar		*/
+    	ATGEN_GetNextCalendar,
+	NOTIMPLEMENTED,			/*	SetCalendar		*/
+	ATGEN_AddCalendarNote,
+	ATGEN_DelCalendarNote,
+	NOTIMPLEMENTED,			/*	DeleteAllCalendar	*/
+	NOTSUPPORTED,			/* 	GetCalendarSettings	*/
+	NOTSUPPORTED,			/* 	SetCalendarSettings	*/
+	NOTSUPPORTED,			/*	GetNote			*/
+	NOTSUPPORTED, 			/*	GetProfile		*/
+	NOTSUPPORTED, 			/*	SetProfile		*/
+    	NOTSUPPORTED,			/*  	GetFMStation        	*/
+    	NOTSUPPORTED,			/* 	SetFMStation        	*/
+    	NOTSUPPORTED,			/* 	ClearFMStations       	*/
+	NOTSUPPORTED,			/* 	GetNextFileFolder	*/
+	NOTSUPPORTED,			/* 	GetFilePart		*/
+	NOTSUPPORTED,			/* 	AddFile			*/
+	NOTSUPPORTED, 			/* 	GetFileSystemStatus	*/
+	NOTSUPPORTED,			/* 	DeleteFile		*/
+	NOTSUPPORTED,			/* 	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/at/atgen.h b/gammu/emb/common/phone/at/atgen.h
new file mode 100644
index 0000000..0e08ee4
--- a/dev/null
+++ b/gammu/emb/common/phone/at/atgen.h
@@ -0,0 +1,110 @@
+/* (c) 2002-2004 by Marcin Wiacek and Michal Cihar */
+
+#ifndef atgen_h
+#define atgen_h
+
+#include "../../gsmcomon.h"
+#include "../../gsmstate.h"
+#include "../../service/sms/gsmsms.h"
+
+#ifndef GSM_USED_AT
+#  define GSM_USED_AT
+#endif
+#ifndef GSM_USED_BLUEAT
+#  define GSM_USED_BLUEAT
+#endif
+#ifndef GSM_USED_IRDAAT
+#  define GSM_USED_IRDAAT
+#endif
+
+#define MAX_VCALENDAR_LOCATION 50
+
+typedef enum {
+	SMS_AT_PDU = 1,
+	SMS_AT_TXT
+} GSM_AT_SMS_Modes;
+
+typedef enum {
+	AT_Reply_OK = 1,
+	AT_Reply_Connect,
+	AT_Reply_Error,
+	AT_Reply_Unknown,
+	AT_Reply_CMSError,
+	AT_Reply_CMEError,
+	AT_Reply_SMSEdit
+} GSM_AT_Reply_State;
+
+typedef enum {
+	AT_Nokia = 1,
+	AT_Alcatel,
+	AT_Siemens,
+	AT_HP,
+	AT_Falcom,
+	AT_Ericsson,
+	AT_Sagem,
+	AT_Unknown
+} GSM_AT_Manufacturer;
+
+typedef enum {
+	AT_PBK_HEX = 1,
+	AT_PBK_GSM,
+	AT_PBK_UCS2
+} GSM_AT_PBK_Charset;
+
+typedef enum {
+	AT_AVAILABLE = 1,
+	AT_NOTAVAILABLE
+} GSM_AT_SMSMemory;
+
+typedef enum {
+	AT_SBNR_AVAILABLE = 1,
+	AT_SBNR_NOTAVAILABLE
+} GSM_AT_SBNR;
+
+typedef enum {
+	AT_Status,
+	AT_NextEmpty,
+	AT_Total,
+	AT_First,
+	AT_Sizes
+} GSM_AT_NeededMemoryInfo;
+
+#define AT_PBK_MAX_MEMORIES	200
+
+typedef struct {
+	GSM_AT_Manufacturer	Manufacturer;	  	/* Who is manufacturer						*/
+	GSM_Lines		Lines;		  	/* Allow to simply get each line in response 			*/
+	GSM_AT_Reply_State	ReplyState;	  	/* What response type - error, OK, etc. 			*/
+	int			ErrorCode;	  	/* Error codes from responses					*/
+    	char			*ErrorText;    	  	/* Error description 						*/
+
+	GSM_MemoryType		PBKMemory;	  	/* Last read PBK memory				 		*/
+	char			PBKMemories[AT_PBK_MAX_MEMORIES + 1]; /* Supported by phone PBK memories 		*/
+	int			NextMemoryEntry;  	/* Next empty memory entry					*/
+	int			FirstMemoryEntry;	/* First memory entry to be read				*/
+	GSM_AT_PBK_Charset	PBKCharset;	  	/* Last read PBK charset					*/
+	bool			UCS2CharsetFailed;	/* Whether setting of UCS2 charset has already failed 		*/
+	bool			NonUCS2CharsetFailed;	/* Whether setting of non-UCS2 charset has already failed 	*/
+	GSM_AT_SBNR		PBKSBNR;
+	int			NumberLength;
+	int			TextLength;
+	int			MemorySize;
+
+	GSM_SMSMemoryStatus	LastSMSStatus;
+	int			LastSMSRead;
+	int			FirstCalendarPos;
+	bool			CanSaveSMS;
+	GSM_AT_SMSMemory	PhoneSMSMemory;	  	/* Is phone SMS memory available ? 				*/
+	GSM_AT_SMSMemory	SIMSMSMemory;	  	/* Is SIM SMS memory available ? 				*/
+	GSM_MemoryType		SMSMemory;	  	/* Last read SMS memory 					*/
+	GSM_AT_SMS_Modes	SMSMode;	  	/* PDU or TEXT mode for SMS ? 					*/
+
+	bool			OBEX;
+	GSM_File		file;
+} GSM_Phone_ATGENData;
+
+#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/at/siemens.c b/gammu/emb/common/phone/at/siemens.c
new file mode 100644
index 0000000..ab7dd2c
--- a/dev/null
+++ b/gammu/emb/common/phone/at/siemens.c
@@ -0,0 +1,320 @@
+/* (c) 2002-2003 by Walek */
+                                           
+#include "../../gsmstate.h"
+
+#ifdef GSM_ENABLE_ATGEN
+
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "../../misc/coding/coding.h"
+#include "../../gsmcomon.h"
+#include "../../service/sms/gsmsms.h"
+#include "../pfunc.h"
+
+extern GSM_Error ATGEN_HandleCMSError(GSM_StateMachine *s);
+
+GSM_Error ATGEN_CMS35ReplySetFunction (GSM_Protocol_Message msg, GSM_StateMachine *s,char *function)
+{
+	if (s->Protocol.Data.AT.EditMode) {
+	    s->Protocol.Data.AT.EditMode = false;
+	    return ERR_NONE;
+	}
+	dbgprintf ("Written %s",function);
+  	if (s->Phone.Data.Priv.ATGEN.ReplyState == AT_Reply_OK){
+  		dbgprintf (" - OK\n");
+  		return ERR_NONE;
+	} else {
+  		dbgprintf (" - error\n");
+  		return ERR_UNKNOWN;
+	}
+}
+
+GSM_Error GetSiemensFrame(GSM_Protocol_Message msg, GSM_StateMachine *s, char *templ,
+			    unsigned char *buffer, int *len)
+{
+	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+	int			i=2, pos=0, length=0;
+	unsigned char 		buf[512];
+
+	if (strstr(GetLineString(msg.Buffer,Priv->Lines,2),"OK")) return ERR_EMPTY;
+        if (!strstr(GetLineString(msg.Buffer,Priv->Lines,2),templ)) return ERR_UNKNOWN;
+
+	while (1) {
+		if (Priv->Lines.numbers[i*2+1]==0) break;
+		if ((!strstr(GetLineString(msg.Buffer,Priv->Lines,i+1),templ)) && 
+	            (strstr(GetLineString(msg.Buffer,Priv->Lines,i),templ))){
+			length = strlen(GetLineString(msg.Buffer,Priv->Lines,i+1));
+			DecodeHexBin(buf, GetLineString(msg.Buffer,Priv->Lines,i+1),length);
+			length = length/2;
+			memcpy (buffer+pos,buf,length);
+			pos+=length;
+		} 
+		i++;
+	}
+	*len = pos;
+       return ERR_NONE;	
+}
+
+GSM_Error SetSiemensFrame (GSM_StateMachine *s, unsigned char *buff, char *templ,
+			    int Location, GSM_Phone_RequestID RequestID, int len)
+{
+	GSM_Phone_Data		*Phone = &s->Phone.Data;
+	GSM_Error		error;
+	unsigned char 		req[20],req1[512],hexreq[2096];
+	int			MaxFrame,CurrentFrame,size,sz,pos=0;
+
+	EncodeHexBin(hexreq,buff,len);
+	size	 = len * 2;
+	MaxFrame = size / 352;
+	if (size % 352) MaxFrame++;
+
+	for (CurrentFrame=0;CurrentFrame<MaxFrame;CurrentFrame++) {
+		pos=CurrentFrame*352;
+	 	if (pos+352 < size) sz = 352; else sz = size - pos;
+		sprintf(req, "AT^SBNW=\"%s\",%i,%i,%i\r",templ,Location,CurrentFrame+1,MaxFrame);
+		s->Protocol.Data.AT.EditMode = true;
+		error = GSM_WaitFor (s, req, strlen(req), 0x00, 3, RequestID);
+		s->Phone.Data.DispatchError=ERR_TIMEOUT;
+		s->Phone.Data.RequestID=RequestID;
+	     	if (error!=ERR_NONE) return error;
+	 	memcpy (req1,hexreq+pos,sz);
+	 	error = s->Protocol.Functions->WriteMessage(s, req1, sz, 0x00);
+	 	if (error!=ERR_NONE) return error;
+		error = s->Protocol.Functions->WriteMessage(s,"\x1A", 1, 0x00);
+	 	if (error!=ERR_NONE) return error;
+		error = GSM_WaitForOnce(s, NULL, 0x00, 0x00, 4);
+	 	if (error == ERR_TIMEOUT) return error;
+	 }
+	 return Phone->DispatchError;
+}
+
+GSM_Error ATGEN_CMS35ReplyGetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	unsigned char 		buffer[4096];
+	int			length;
+	GSM_Error		error;
+	
+	error = GetSiemensFrame(msg,s,"bmp",buffer,&length);
+	if (error!=ERR_NONE) return error;
+	dbgprintf ("Operator logo received lenght=%i\n",length);
+	error = BMP2Bitmap (buffer,NULL,s->Phone.Data.Bitmap);
+	if (error==ERR_NONE) return error;
+	else return ERR_UNKNOWN;
+}
+
+GSM_Error ATGEN_CMS35ReplySetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+    return ATGEN_CMS35ReplySetFunction (msg, s, "Operator Logo");
	
+}
+
+GSM_Error ATGEN_GetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+{
+	unsigned char req[32];
+
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
+	if (Bitmap->Type!=GSM_OperatorLogo) return ERR_NOTSUPPORTED;
+	if (Bitmap->Location-1 < 0) Bitmap->Location++;
+	s->Phone.Data.Bitmap=Bitmap;
+	sprintf(req, "AT^SBNR=\"bmp\",%i\r", Bitmap->Location-1);
+	smprintf(s, "Getting Bitmap\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetBitmap);
+}
+
+GSM_Error ATGEN_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+{
+	unsigned char 	buffer[4096];
+	int 		length;
+	GSM_Error	error;
+	
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
+	if (Bitmap->Type!=GSM_OperatorLogo) return ERR_NOTSUPPORTED;
+
+	error = Bitmap2BMP (buffer,NULL,Bitmap);
+	if (error!=ERR_NONE) return error;
+	length = 0x100 * buffer[3] + buffer[2];
+	buffer[58]=0xff; buffer[59]=0xff; buffer[60]=0xff;
+	if (Bitmap->Location-1 < 0) Bitmap->Location++;
+	s->Phone.Data.Bitmap=Bitmap;
+	return SetSiemensFrame(s, buffer,"bmp",Bitmap->Location-1,
+				ID_SetBitmap,length);
+}
+
+GSM_Error ATGEN_CMS35ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	unsigned char 		buffer[32];
+	int			length;
+	GSM_Error		error;
+
+        error = GetSiemensFrame(msg,s,"mid",s->Phone.Data.Ringtone->NokiaBinary.Frame,&length);
+	if (error!=ERR_NONE) return error;
+	dbgprintf ("Midi ringtone received\n");
+	
+	s->Phone.Data.Ringtone->Format			= RING_MIDI;
+	s->Phone.Data.Ringtone->NokiaBinary.Length	= length;
+	sprintf(buffer,"Individual");
+	EncodeUnicode (s->Phone.Data.Ringtone->Name,buffer,strlen(buffer));
+	return ERR_NONE;
+}
+
+GSM_Error ATGEN_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone)
+{
+	unsigned char req[32];
+
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
+	
+	s->Phone.Data.Ringtone=Ringtone;
+	sprintf(req, "AT^SBNR=\"mid\",%i\r", Ringtone->Location-1);
+	smprintf(s, "Getting RingTone\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetRingtone);
+}
+
+GSM_Error ATGEN_CMS35ReplySetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	return ATGEN_CMS35ReplySetFunction (msg, s, "Ringtone");
+}
+  
+GSM_Error ATGEN_SetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength)
+{
+	GSM_Phone_Data *Phone = &s->Phone.Data;
+	 
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
+
+	if (Ringtone->Location==255) Ringtone->Location=1; 
+	if (Ringtone->Location-1 > 1) return ERR_INVALIDLOCATION;
+
+	s->Phone.Data.Ringtone	= Ringtone;
+ 	Phone->Ringtone		= Ringtone;
+	return SetSiemensFrame(s, Ringtone->NokiaBinary.Frame,"mid",Ringtone->Location-1,
+				ID_SetRingtone,Ringtone->NokiaBinary.Length);
+}
+
+GSM_Error ATGEN_CMS35ReplyGetNextCal(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_Data		*Data = &s->Phone.Data;
+	GSM_CalendarEntry	*Calendar = Data->Cal;
+	GSM_ToDoEntry		ToDo;
+	GSM_Error		error;
+	unsigned char 		buffer[354];
+	int			len, pos=0;
+
+	if (Data->Priv.ATGEN.ReplyState != AT_Reply_OK) return ERR_UNKNOWN;
+
+	error = GetSiemensFrame(msg,s,"vcs",buffer,&len);
+	if (error!=ERR_NONE) return error;
+	error=GSM_DecodeVCALENDAR_VTODO(buffer,&pos,Calendar,&ToDo,Siemens_VCalendar,0);
+	
+ 	return error;
+}
+
+GSM_Error SIEMENS_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error		error;
+	unsigned char 		req[32];
+	int			Location;
+
+	if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
+	
+	if (start) Note->Location=Priv->FirstCalendarPos;
+	s->Phone.Data.Cal 	= Note;
+	Note->EntriesNum 	= 0;
+	smprintf(s, "Getting VCALENDAR\n");
+	Location = Note->Location;
+	while (1){
+		Location++;
+		sprintf(req, "AT^SBNR=\"vcs\",%i\r",Location);  
+		error = GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_GetCalendarNote);
+		if ((error!=ERR_NONE) && (error!=ERR_EMPTY)) return ERR_INVALIDLOCATION;
+		Note->Location 		= Location;
+		Priv->FirstCalendarPos 	= Location;
+		if (Location > MAX_VCALENDAR_LOCATION) return ERR_EMPTY;
+		if (error==ERR_NONE) return error;
+	}
+	return error;
+}
+
+GSM_Error ATGEN_CMS35ReplySetCalendar(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+    return ATGEN_CMS35ReplySetFunction (msg, s, "Calendar Note");
+}
+
+GSM_Error ATGEN_CMS35ReplyDeleteCalendar(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+	GSM_Phone_Data *Data = &s->Phone.Data;
+	
+	if (Data->Cal->Location > MAX_VCALENDAR_LOCATION) return ERR_UNKNOWN;
+	
+	if (Data->Priv.ATGEN.ReplyState== AT_Reply_OK) {
+		smprintf(s, "Calendar note deleted\n");
+		return ERR_NONE;
+	} else {
+		smprintf(s, "Can't delete calendar note\n");
+		return ERR_UNKNOWN;
+	}
+}
+
+GSM_Error SIEMENS_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
+{
+	unsigned char req[32];
+
+	if (s->Phone.Data.Priv.ATGEN.Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
+	s->Phone.Data.Cal = Note;
+	sprintf(req, "AT^SBNW=\"vcs\",%i,0\r",Note->Location);
+	smprintf(s, "Deleting calendar note\n");
+	return GSM_WaitFor (s, req, strlen(req), 0x00, 4, ID_DeleteCalendarNote);
+}
+
+GSM_Error SIEMENS_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error		error;
+	unsigned char 		req[500];
+	int			size=0;
+
+	if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
+//	if (Note->Location==0x00) return ERR_INVALIDLOCATION;	
+
+	s->Phone.Data.Cal = Note;
+	error=GSM_EncodeVCALENDAR(req,&size,Note,true,Siemens_VCalendar);
+		
+	return SetSiemensFrame (s,req,"vcs",Note->Location,ID_SetCalendarNote,size);
+}
+
+/* (c) by Timo Teras */
+GSM_Error ATGEN_SL45ReplyGetMemory(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+#ifndef ENABLE_LGPL
+ 	GSM_Phone_ATGENData 	*Priv = &s->Phone.Data.Priv.ATGEN;
+ 	GSM_MemoryEntry		*Memory = s->Phone.Data.Memory;
+	unsigned char		buffer[500],buffer2[500];
+
+	switch (Priv->ReplyState) {
+	case AT_Reply_OK:
+ 		smprintf(s, "Phonebook entry received\n");
+		CopyLineString(buffer, msg.Buffer, Priv->Lines, 3);
+		DecodeHexBin(buffer2,buffer,strlen(buffer));
+ 		Memory->EntriesNum = 0;
+                DecodeVCARD21Text(buffer2, Memory);
+		if (Memory->EntriesNum == 0) return ERR_EMPTY;
+		return ERR_NONE;
+	case AT_Reply_Error:
+                smprintf(s, "Error - too high location ?\n");
+                return ERR_INVALIDLOCATION;
+	case AT_Reply_CMSError:
+ 	        return ATGEN_HandleCMSError(s);
+	default:
+		break;
+	}
+	return ERR_UNKNOWNRESPONSE;
+#else
+	return ERR_NOTIMPLEMENTED;
+#endif
+}
+
+#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/at/sonyeric.c b/gammu/emb/common/phone/at/sonyeric.c
new file mode 100644
index 0000000..4b2670a
--- a/dev/null
+++ b/gammu/emb/common/phone/at/sonyeric.c
@@ -0,0 +1,411 @@
+/* (c) 2003 by Marcin Wiacek */
+                                           
+#include "../../gsmstate.h"
+
+#ifdef GSM_ENABLE_ATGEN
+
+#include <string.h>
+#include <time.h>
+#include <ctype.h>
+
+#include "../../gsmcomon.h"
+#include "../../misc/coding/coding.h"
+
+extern GSM_Reply_Function 		ATGENReplyFunctions[];
+extern GSM_Error ATGEN_DispatchMessage	(GSM_StateMachine *s);
+
+#ifdef GSM_ENABLE_OBEXGEN
+
+extern GSM_Reply_Function 		OBEXGENReplyFunctions[];
+extern GSM_Error OBEXGEN_GetFilePart	(GSM_StateMachine *s, GSM_File *File);
+extern GSM_Error OBEXGEN_AddFilePart	(GSM_StateMachine *s, GSM_File *File, int *Pos);
+extern GSM_Error OBEXGEN_Disconnect	(GSM_StateMachine *s);
+
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+
+static GSM_Error SONYERIC_SetOBEXMode(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error		error;
+
+	if (Priv->OBEX) return ERR_NONE;
+
+	dbgprintf ("Changing to OBEX\n");
+
+	error=GSM_WaitFor (s, "AT*EOBEX\r", 9, 0x00, 4, ID_SetOBEX);
+	if (error != ERR_NONE) return error;
+
+	error = s->Protocol.Functions->Terminate(s);
+	if (error != ERR_NONE) return error;
+
+	s->Protocol.Functions = &OBEXProtocol;
+	error = s->Protocol.Functions->Initialise(s);
+	if (error != ERR_NONE) {
+		s->Protocol.Functions = &ATProtocol;
+		return error;
+	}
+	strcpy(s->CurrentConfig->Model,"seobex");
+	s->Phone.Data.Priv.OBEXGEN.Service 	= 0;
+	s->Phone.Functions->DispatchMessage	= GSM_DispatchMessage;
+	s->Phone.Functions->ReplyFunctions	= OBEXGENReplyFunctions;
+	Priv->OBEX				= true;
+	return ERR_NONE;
+}
+
+static GSM_Error SONYERIC_SetATMode(GSM_StateMachine *s)
+{
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	GSM_Error		error;
+
+	if (!Priv->OBEX) return ERR_NONE;
+
+	dbgprintf ("Changing to AT\n");
+
+	error = OBEXGEN_Disconnect(s);
+	if (error != ERR_NONE) return error;
+
+	error = s->Protocol.Functions->Terminate(s);
+	if (error != ERR_NONE) return error;
+
+	s->Protocol.Functions = &ATProtocol;
+	error = s->Protocol.Functions->Initialise(s);
+	if (error != ERR_NONE) {
+		s->Protocol.Functions = &OBEXProtocol;
+		return error;
+	}
+	strcpy(s->CurrentConfig->Model,"at");
+	s->Phone.Functions->DispatchMessage	= ATGEN_DispatchMessage;
+	s->Phone.Functions->ReplyFunctions	= ATGENReplyFunctions;
+	Priv->OBEX				= false;
+	return ERR_NONE;
+}
+
+static GSM_Error SONYERIC_GetFile(GSM_StateMachine *s, GSM_File *File, unsigned char *FileName)
+{
+	GSM_Error error;
+
+	strcpy(File->ID_FullName,FileName);
+	File->Used 	= 0;
+	if (File->Buffer != NULL) free(File->Buffer);
+	File->Buffer 	= NULL;
+
+	error = SONYERIC_SetOBEXMode(s);
+	if (error != ERR_NONE) return error;
+
+	error = ERR_NONE;
+	while (error == ERR_NONE) error = OBEXGEN_GetFilePart(s,File);
+	if (error != ERR_EMPTY) return error;
+
+	return SONYERIC_SetATMode(s);
+}
+
+static GSM_Error SONYERIC_SetFile(GSM_StateMachine *s, unsigned char *FileName, unsigned char *Buffer, int Length)
+{
+	GSM_Error	error;
+	GSM_File 	File;
+	int		Pos = 0;
+
+	error = SONYERIC_SetOBEXMode(s);
+	if (error != ERR_NONE) return error;
+
+	strcpy(File.ID_FullName,FileName);
+	EncodeUnicode(File.Name,FileName,strlen(FileName));
+	File.Used 	= Length;
+	File.Buffer 	= malloc(Length);
+	memcpy(File.Buffer,Buffer,Length);
+
+	error = ERR_NONE;
+	while (error == ERR_NONE) error = OBEXGEN_AddFilePart(s,&File,&Pos);
+	free(File.Buffer);
+	if (error != ERR_EMPTY) return error;
+
+	return SONYERIC_SetATMode(s);
+}
+
+#endif
+
+GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	GSM_Error		error;
+	GSM_ToDoEntry		ToDo;
+	int			Pos, num, Loc;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (start) {
+		error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
+		if (error != ERR_NONE) return error;
+
+		Note->Location = 1;
+	} else {
+		Note->Location++;
+	}
+	smprintf(s, "Getting calendar note %i\n",Note->Location);
+
+	Loc = Note->Location;
+	Pos = 0;
+	num = 0;
+	while (1) {
+		error = GSM_DecodeVCALENDAR_VTODO(Priv->file.Buffer, &Pos, Note, &ToDo, SonyEricsson_VCalendar, SonyEricsson_VToDo);
+		if (error == ERR_EMPTY) break;
+		if (error != ERR_NONE) return error;
+		if (Note->EntriesNum != 0) {			
+			num++;
+			if (num == Loc) return ERR_NONE;
+		}
+	}
+	return ERR_EMPTY;
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	GSM_Error		error;
+	GSM_CalendarEntry	Calendar;
+	int			Pos, num, Loc;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
+
+	if (start) {
+		error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
+		if (error != ERR_NONE) return error;
+
+		ToDo->Location = 1;
+	} else {
+		ToDo->Location++;
+	}
+	smprintf(s,"Getting ToDo %i\n",ToDo->Location);
+
+	Loc = ToDo->Location;	
+	Pos = 0;
+	num = 0;
+	while (1) {
+		error = GSM_DecodeVCALENDAR_VTODO(Priv->file.Buffer, &Pos, &Calendar, ToDo, SonyEricsson_VCalendar, SonyEricsson_VToDo);
+		if (error == ERR_EMPTY) break;
+		if (error != ERR_NONE) return error;
+		if (ToDo->EntriesNum != 0) {			
+			num++;
+			if (num == Loc) return ERR_NONE;
+		}
+	}
+
+	return ERR_EMPTY;
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	GSM_Error		error;
+	GSM_ToDoEntry		ToDo;
+	GSM_CalendarEntry 	Calendar;
+	int			Pos;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
+
+	smprintf(s,"Getting ToDo status\n");
+
+	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
+	if (error != ERR_NONE) return error;
+
+	status->Used 	= 0;
+	Pos 		= 0;
+	while (1) {
+		error = GSM_DecodeVCALENDAR_VTODO(Priv->file.Buffer, &Pos, &Calendar, &ToDo, SonyEricsson_VCalendar, SonyEricsson_VToDo);
+		if (error == ERR_EMPTY) break;
+		if (error != ERR_NONE) return error;
+		if (ToDo.EntriesNum != 0) status->Used++;
+	}
+	
+	return ERR_NONE;
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	unsigned char 		req[5000];
+	int			size=0;
+
+	smprintf(s,"Adding calendar note\n");
+
+	GSM_EncodeVCALENDAR(req,&size,Note,true,SonyEricsson_VCalendar);
+
+	return SONYERIC_SetFile(s, "telecom/cal/luid/.vcs", req, size);
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	unsigned char 		req[5000];
+	int			size=0;
+
+	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
+
+	smprintf(s,"Adding ToDo\n");
+
+	GSM_EncodeVTODO(req,&size,ToDo,true,SonyEricsson_VToDo);
+
+	return SONYERIC_SetFile(s, "telecom/cal/luid/.vcs", req, size);
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	GSM_Error		error;
+	int			Pos,Level = 0,Used;
+	unsigned char		*Buf;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	unsigned char 		Line[2000];
+
+	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
+
+	smprintf(s,"Deleting all ToDo\n");
+
+	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
+	if (error != ERR_NONE) return error;
+
+	Pos  = 0;
+	Buf  = NULL;
+	Used = 0;
+	while (1) {
+		MyGetLine(Priv->file.Buffer, &Pos, Line, Priv->file.Used);
+		if (strlen(Line) == 0) break;
+		dbgprintf("Line is %s,%i,%i\n",Line,Priv->file.Used,Pos);
+		switch (Level) {
+		case 0:
+			if (strstr(Line,"BEGIN:VTODO")) {
+				Level = 2;
+				break;
+			}
+			Buf=(unsigned char *)realloc(Buf,Used+strlen(Line)+3);
+			strcpy(Buf+Used,Line);
+			Used=Used+strlen(Line)+3;
+			Buf[Used-3] = 13;
+			Buf[Used-2] = 10;
+			Buf[Used-1] = 0x00;
+			break;
+		case 2: /* ToDo note */
+			if (strstr(Line,"END:VTODO")) {
+				Level = 0;
+			}
+			break;
+		}
+	}
+
+	error = SONYERIC_SetFile(s, "telecom/cal.vcs", Buf, Used);
+//	if (Buf != NULL) free(Buf);
+	return error;
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	GSM_Error		error;
+	int			Pos,Level = 0,Loc=0,Used;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+	unsigned char 		Line[2000];
+	unsigned char		*Buf;
+
+	smprintf(s, "Deleting calendar note %i\n",Note->Location);
+
+	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
+	if (error != ERR_NONE) return error;
+
+	Pos  = 0;
+	Buf  = NULL;
+	Used = 0;
+	while (1) {
+		MyGetLine(Priv->file.Buffer, &Pos, Line, Priv->file.Used);
+		if (strlen(Line) == 0) break;
+		dbgprintf("Line is %s,%i,%i\n",Line,Priv->file.Used,Pos);
+		switch (Level) {
+		case 0:
+			if (strstr(Line,"BEGIN:VEVENT")) {
+				Loc++;
+				if (Loc == Note->Location) {
+					Level = 1;
+					break;
+				}
+			}
+			Buf=(unsigned char *)realloc(Buf,Used+strlen(Line)+3);
+			strcpy(Buf+Used,Line);
+			Used=Used+strlen(Line)+3;
+			Buf[Used-3] = 13;
+			Buf[Used-2] = 10;
+			Buf[Used-1] = 0x00;
+			break;
+		case 1: /* Calendar note */
+			if (strstr(Line,"END:VEVENT")) {
+				Level = 0;
+			}
+			break;
+		}
+	}
+
+	DumpMessage(s->di.df, s->di.dl, Buf, Used);
+
+	error = SONYERIC_SetFile(s, "telecom/cal.vcs", Buf, Used);
+	if (Buf != NULL) free(Buf);
+	return error;
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+GSM_Error SONYERIC_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *Status)
+{
+#if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX)
+	GSM_Error		error;
+	GSM_ToDoEntry		ToDo;
+	GSM_CalendarEntry 	Calendar;
+	int			Pos;
+	GSM_Phone_ATGENData	*Priv = &s->Phone.Data.Priv.ATGEN;
+
+	if (Priv->Manufacturer!=AT_Ericsson) return ERR_NOTSUPPORTED;
+
+	smprintf(s, "Getting calendar status\n");
+
+	error = SONYERIC_GetFile(s, &Priv->file, "telecom/cal.vcs");
+	if (error != ERR_NONE) return error;
+
+	Status->Used 	= 0;
+	Pos  		= 0;
+	while (1) {
+		error = GSM_DecodeVCALENDAR_VTODO(Priv->file.Buffer, &Pos, &Calendar, &ToDo, SonyEricsson_VCalendar, SonyEricsson_VToDo);
+		if (error == ERR_EMPTY) break;
+		if (error != ERR_NONE) return error;
+		if (Calendar.EntriesNum != 0) Status->Used++;
+	}
+	
+	return ERR_NONE;
+#else
+	return ERR_SOURCENOTAVAILABLE;
+#endif
+}
+
+#endif
+#endif
+
+/* How should editor hadle tabs in this file? Add editor commands here.
+ * vim: noexpandtab sw=8 ts=8 sts=8:
+ */