X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=common%2Fdata%2Fat-emulator.c;h=41445c844fe38d48665efd19cd48f7bfd9d8652a;hp=320b01bf3a83a3461178967d54af92a008657489;hb=a2dfc99dc499ea8600bf5178f8122125d7d7d557;hpb=3ffd063073b4fe33d61c74b767c93833dc5bd8e5

diff --git a/common/data/at-emulator.c b/common/data/at-emulator.c
index 320b01b..41445c8 100644
--- a/common/data/at-emulator.c
+++ b/common/data/at-emulator.c
@@ -6,32 +6,12 @@
 
   A Linux/Unix toolset and driver for Nokia mobile phones.
 
-  Copyright (C) 1999, 2000 Hugh Blemings & Pavel Janík ml.
-
   Released under the terms of the GNU GPL, see file COPYING for more details.
 
   This file provides a virtual modem or "AT" interface to the GSM phone by
   calling code in gsm-api.c. Inspired by and in places copied from the Linux
   kernel AT Emulator IDSN code by Fritz Elfert and others.
   
-  $Log$
-  Revision 1.1.1.2  2001/11/27 22:01:13  short
-  :pserver:cvs@pserver.samba.org:/cvsroot - gnokii - Tue Nov 27 22:58 CET 2001
-
-  Revision 1.6  2001/11/27 12:19:01  pkot
-  Cleanup, indentation, ANSI complaint preprocesor symbols (Jan Kratochvil, me)
-
-  Revision 1.5  2001/11/08 16:34:19  pkot
-  Updates to work with new libsms
-
-  Revision 1.4  2001/07/03 15:27:03  pkot
-  AT commands for SMS handling support (Tamas Bondar)
-  Small at-emulator code cleanup (me)
-
-  Revision 1.3  2001/02/21 19:56:59  chris
-  More fiddling with the directory layout
-
-
 */
 
 #define		__data_at_emulator_c
@@ -51,7 +31,7 @@
 
 #ifndef WIN32
 
-#  include <termios.h>
+  #include <termios.h>
 
 #endif
 
@@ -325,7 +305,7 @@ static GSM_Error ATEM_ReadSMS(int number, GSM_MemoryType type, GSM_SMSMessage *m
 	GSM_Error error;
 
 	message->MemoryType = type;
-	message->Number = number;
+	message->Location = number;
 	error = GSM->GetSMSMessage(message);
 
 	return error;
@@ -335,14 +315,13 @@ static void ATEM_PrintSMS(char *line, GSM_SMSMessage *message, int mode)
 {
 	switch (mode) {
 	case INTERACT_MODE:
-		gsprintf(line, MAX_LINE_LENGTH, _("\n\rDate/time: %d/%d/%d %d:%02d:%02d Sender: %s Msg Center: %s\n\rText: %s\n\r"), message->Time.Day, message->Time.Month, message->Time.Year, message->Time.Hour, message->Time.Minute, message->Time.Second, message->RemoteNumber.number, message->MessageCenter.Number, message->MessageText);
+		gsprintf(line, MAX_LINE_LENGTH, _("\n\rDate/time: %d/%d/%d %d:%02d:%02d Sender: %s Msg Center: %s\n\rText: %s\n\r"), message->Time.Day, message->Time.Month, message->Time.Year, message->Time.Hour, message->Time.Minute, message->Time.Second, message->Sender, message->MessageCenter.Number, message->MessageText);
 		break;
 	case TEXT_MODE:
-		if ((message->DCS.Type == SMS_GeneralDataCoding) &&
-		    (message->DCS.u.General.Alphabet == SMS_8bit))
-			gsprintf(line, MAX_LINE_LENGTH, _("\"%s\",\"%s\",,\"%02d/%02d/%02d,%02d:%02d:%02d+%02d\"\n\r%s"), (message->Status ? _("REC READ") : _("REC UNREAD")), message->RemoteNumber.number, message->Time.Year, message->Time.Month, message->Time.Day, message->Time.Hour, message->Time.Minute, message->Time.Second, message->Time.Timezone, _("<Not implemented>"));
+		if (message->Coding==GSM_Coding_8bit)
+			gsprintf(line, MAX_LINE_LENGTH, _("\"%s\",\"%s\",,\"%02d/%02d/%02d,%02d:%02d:%02d+%02d\"\n\r%s"), (message->Status ? _("REC READ") : _("REC UNREAD")), message->Sender, message->Time.Year, message->Time.Month, message->Time.Day, message->Time.Hour, message->Time.Minute, message->Time.Second, message->Time.Timezone, _("<Not implemented>"));
 		else
-			gsprintf(line, MAX_LINE_LENGTH, _("\"%s\",\"%s\",,\"%02d/%02d/%02d,%02d:%02d:%02d+%02d\"\n\r%s"), (message->Status ? _("REC READ") : _("REC UNREAD")), message->RemoteNumber.number, message->Time.Year, message->Time.Month, message->Time.Day, message->Time.Hour, message->Time.Minute, message->Time.Second, message->Time.Timezone, message->MessageText);
+			gsprintf(line, MAX_LINE_LENGTH, _("\"%s\",\"%s\",,\"%02d/%02d/%02d,%02d:%02d:%02d+%02d\"\n\r%s"), (message->Status ? _("REC READ") : _("REC UNREAD")), message->Sender, message->Time.Year, message->Time.Month, message->Time.Day, message->Time.Hour, message->Time.Minute, message->Time.Second, message->Time.Timezone, message->MessageText);
 		break;
 	case PDU_MODE:
 		gsprintf(line, MAX_LINE_LENGTH, _("<Not implemented>"));
@@ -357,7 +336,7 @@ static void ATEM_EraseSMS(int number, GSM_MemoryType type)
 {
 	GSM_SMSMessage message;
 	message.MemoryType = type;
-	message.Number = number;
+	message.Location = number;
 	if (GSM->DeleteSMSMessage(&message) == GE_NONE) {
 		ATEM_ModemResult(MR_OK);
 	} else {
@@ -573,12 +552,12 @@ bool	ATEM_CommandPlusC(char **buf)
 				strcasecmp(*buf, "3") == 0 ||
 				strcasecmp(*buf, "\"REC READ\"") == 0 ||
 				strcasecmp(*buf, "\"STO SENT\"") == 0) {
-				status = SMS_Sent;
+				status = GSS_SENTREAD;
 			} else if (strcasecmp(*buf, "0") == 0 ||
 				strcasecmp(*buf, "2") == 0 ||
 				strcasecmp(*buf, "\"REC UNREAD\"") == 0 ||
 				strcasecmp(*buf, "\"STO UNSENT\"") == 0) {
-				status = SMS_Unsent;
+				status = GSS_NOTSENTREAD;
 			} else if (strcasecmp(*buf, "4") == 0 ||
 				strcasecmp(*buf, "\"ALL\"") == 0) {
 				status = 4; /* ALL */