summaryrefslogtreecommitdiffabout
path: root/gammu/emb/common/phone/at/siemens.c
Side-by-side diff
Diffstat (limited to 'gammu/emb/common/phone/at/siemens.c') (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/phone/at/siemens.c74
1 files changed, 35 insertions, 39 deletions
diff --git a/gammu/emb/common/phone/at/siemens.c b/gammu/emb/common/phone/at/siemens.c
index ab7dd2c..7f66cf8 100644
--- a/gammu/emb/common/phone/at/siemens.c
+++ b/gammu/emb/common/phone/at/siemens.c
@@ -4,43 +4,29 @@
#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);
+#include "atgen.h"
+#include "siemens.h"
-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,
+static 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)) &&
@@ -48,25 +34,25 @@ GSM_Error GetSiemensFrame(GSM_Protocol_Message msg, GSM_StateMachine *s, char *t
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,
+static 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++;
@@ -81,125 +67,135 @@ GSM_Error SetSiemensFrame (GSM_StateMachine *s, unsigned char *buff, char *templ
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)
+GSM_Error SIEMENS_ReplyGetBitmap(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)
+GSM_Error SIEMENS_ReplySetFunction (GSM_Protocol_Message msg, GSM_StateMachine *s,char *function)
{
- return ATGEN_CMS35ReplySetFunction (msg, s, "Operator Logo");
+ 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 ATGEN_GetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap)
+GSM_Error SIEMENS_ReplySetBitmap(GSM_Protocol_Message msg, GSM_StateMachine *s)
+{
+ return SIEMENS_ReplySetFunction (msg, s, "Operator Logo");
+}
+
+GSM_Error SIEMENS_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)
+GSM_Error SIEMENS_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)
+GSM_Error SIEMENS_ReplyGetRingtone(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)
+GSM_Error SIEMENS_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)
+GSM_Error SIEMENS_ReplySetRingtone(GSM_Protocol_Message msg, GSM_StateMachine *s)
{
- return ATGEN_CMS35ReplySetFunction (msg, s, "Ringtone");
+ return SIEMENS_ReplySetFunction (msg, s, "Ringtone");
}
-GSM_Error ATGEN_SetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, int *maxlength)
+GSM_Error SIEMENS_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_Error SIEMENS_ReplyGetNextCalendar(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;
@@ -226,30 +222,30 @@ GSM_Error SIEMENS_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note,
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)
+GSM_Error SIEMENS_ReplyAddCalendarNote(GSM_Protocol_Message msg, GSM_StateMachine *s)
{
- return ATGEN_CMS35ReplySetFunction (msg, s, "Calendar Note");
+ return SIEMENS_ReplySetFunction (msg, s, "Calendar Note");
}
-GSM_Error ATGEN_CMS35ReplyDeleteCalendar(GSM_Protocol_Message msg, GSM_StateMachine *s)
+GSM_Error SIEMENS_ReplyDelCalendarNote(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;
}
@@ -274,25 +270,25 @@ GSM_Error SIEMENS_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note)
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)
+GSM_Error SIEMENS_ReplyGetMemory(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;