summaryrefslogtreecommitdiffabout
path: root/gammu
authorzautrix <zautrix>2006-02-24 19:41:06 (UTC)
committer zautrix <zautrix>2006-02-24 19:41:06 (UTC)
commit4e2553b95b2787ed7917073f6b628819b1f017c3 (patch) (unidiff)
treeda5cb746bf3373cb2a368afda082999e6c22751f /gammu
parent08605356c77351d64e14e0fdd69bdb769f933909 (diff)
downloadkdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.zip
kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.tar.gz
kdepimpi-4e2553b95b2787ed7917073f6b628819b1f017c3.tar.bz2
gcc4 fixes
Diffstat (limited to 'gammu') (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/phone/alcatel/alcatel.c2
-rw-r--r--gammu/emb/gammu/depend/nokia/dct3.c2
-rw-r--r--gammu/emb/gammu/depend/nokia/dct3trac/wmx.c2
-rw-r--r--gammu/emb/gammu/depend/nokia/dct4.c2
-rw-r--r--gammu/emb/gammu/depend/siemens/dsiemens.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/gammu/emb/common/phone/alcatel/alcatel.c b/gammu/emb/common/phone/alcatel/alcatel.c
index b75077f..718d91e 100644
--- a/gammu/emb/common/phone/alcatel/alcatel.c
+++ b/gammu/emb/common/phone/alcatel/alcatel.c
@@ -1,1595 +1,1595 @@
1/* (c) 2002-2004 by Michal Cihar */ 1/* (c) 2002-2004 by Michal Cihar */
2 2
3/* 3/*
4 * High level functions for communication with Alcatel One Touch 501 and 4 * High level functions for communication with Alcatel One Touch 501 and
5 * compatible mobile phone. 5 * compatible mobile phone.
6 * 6 *
7 * This code implements functions to communicate with Alcatel phones, 7 * This code implements functions to communicate with Alcatel phones,
8 * currently seem to work: 8 * currently seem to work:
9 * - BE5 series (501/701) 9 * - BE5 series (501/701)
10 * - BF5 series (715) 10 * - BF5 series (715)
11 * - BH4 series (535/735) 11 * - BH4 series (535/735)
12 * For some functions it uses normal AT mode (not implemented here, look at 12 * For some functions it uses normal AT mode (not implemented here, look at
13 * ../at/atgen.[ch]) for others it switches into binary mode and initialises 13 * ../at/atgen.[ch]) for others it switches into binary mode and initialises
14 * underlaying protocol (see ../../protocol/alcatel/alcabus.[ch]) and 14 * underlaying protocol (see ../../protocol/alcatel/alcabus.[ch]) and
15 * communicates over it. Don't ask me why Alcatel uses such silly thing... 15 * communicates over it. Don't ask me why Alcatel uses such silly thing...
16 * 16 *
17 * Notes for future features: 17 * Notes for future features:
18 * - max phone number length is 61 (BE5) 18 * - max phone number length is 61 (BE5)
19 * - max name length is 50 (BE5) 19 * - max name length is 50 (BE5)
20 */ 20 */
21 21
22#include "../../gsmstate.h" 22#include "../../gsmstate.h"
23 23
24#ifdef GSM_ENABLE_ALCATEL 24#ifdef GSM_ENABLE_ALCATEL
25#ifdef GSM_ENABLE_ATGEN 25#ifdef GSM_ENABLE_ATGEN
26 26
27#include <string.h> 27#include <string.h>
28#include <time.h> 28#include <time.h>
29 29
30#include "../../gsmcomon.h" 30#include "../../gsmcomon.h"
31#include "../../misc/coding/coding.h" 31#include "../../misc/coding/coding.h"
32#include "../../misc/misc.h" 32#include "../../misc/misc.h"
33#include "../../service/sms/gsmsms.h" 33#include "../../service/sms/gsmsms.h"
34#include "../pfunc.h" 34#include "../pfunc.h"
35#include "alcatel.h" 35#include "alcatel.h"
36 36
37/* Timeout for GSM_WaitFor calls. */ 37/* Timeout for GSM_WaitFor calls. */
38 #define ALCATEL_TIMEOUT 64 38 #define ALCATEL_TIMEOUT 64
39 39
40/* Some magic numbers for protocol follow */ 40/* Some magic numbers for protocol follow */
41 41
42/* synchronisation types (for everything except begin transfer): */ 42/* synchronisation types (for everything except begin transfer): */
43 #define ALCATEL_SYNC_TYPE_CALENDAR0x64 43 #define ALCATEL_SYNC_TYPE_CALENDAR0x64
44 #define ALCATEL_SYNC_TYPE_TODO 0x68 44 #define ALCATEL_SYNC_TYPE_TODO 0x68
45 #define ALCATEL_SYNC_TYPE_CONTACTS0x6C 45 #define ALCATEL_SYNC_TYPE_CONTACTS0x6C
46 46
47/* synchronisation types (for begin transfer): */ 47/* synchronisation types (for begin transfer): */
48 #define ALCATEL_BEGIN_SYNC_CALENDAR0x00 48 #define ALCATEL_BEGIN_SYNC_CALENDAR0x00
49 #define ALCATEL_BEGIN_SYNC_TODO 0x02 49 #define ALCATEL_BEGIN_SYNC_TODO 0x02
50 #define ALCATEL_BEGIN_SYNC_CONTACTS0x01 50 #define ALCATEL_BEGIN_SYNC_CONTACTS0x01
51 51
52/* category types */ 52/* category types */
53 #define ALCATEL_LIST_TODO_CAT 0x9B 53 #define ALCATEL_LIST_TODO_CAT 0x9B
54 #define ALCATEL_LIST_CONTACTS_CAT0x96 54 #define ALCATEL_LIST_CONTACTS_CAT0x96
55 55
56 56
57/* We need lot of ATGEN functions, because Alcatel is an AT device. */ 57/* We need lot of ATGEN functions, because Alcatel is an AT device. */
58 58
59extern GSM_Reply_Function ALCATELReplyFunctions[]; 59static GSM_Reply_Function ALCATELReplyFunctions[];
60extern GSM_Reply_Function ATGENReplyFunctions[]; 60extern GSM_Reply_Function ATGENReplyFunctions[];
61 61
62 extern GSM_Error ATGEN_Initialise (GSM_StateMachine *s); 62 extern GSM_Error ATGEN_Initialise (GSM_StateMachine *s);
63 extern GSM_Error ATGEN_Terminate (GSM_StateMachine *s); 63 extern GSM_Error ATGEN_Terminate (GSM_StateMachine *s);
64 extern GSM_Error ATGEN_GetIMEI (GSM_StateMachine *s); 64 extern GSM_Error ATGEN_GetIMEI (GSM_StateMachine *s);
65 extern GSM_Error ATGEN_GetFirmware (GSM_StateMachine *s); 65 extern GSM_Error ATGEN_GetFirmware (GSM_StateMachine *s);
66 extern GSM_Error ATGEN_GetModel (GSM_StateMachine *s); 66 extern GSM_Error ATGEN_GetModel (GSM_StateMachine *s);
67 extern GSM_Error ATGEN_GetDateTime (GSM_StateMachine *s, GSM_DateTime *date_time); 67 extern GSM_Error ATGEN_GetDateTime (GSM_StateMachine *s, GSM_DateTime *date_time);
68 extern GSM_Error ATGEN_GetMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry); 68 extern GSM_Error ATGEN_GetMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry);
69 extern GSM_Error ATGEN_GetNextMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry, bool start); 69 extern GSM_Error ATGEN_GetNextMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry, bool start);
70 extern GSM_Error ATGEN_SetMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry); 70 extern GSM_Error ATGEN_SetMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry);
71 extern GSM_Error ATGEN_AddMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry); 71 extern GSM_Error ATGEN_AddMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry);
72 extern GSM_Error ATGEN_DeleteMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry); 72 extern GSM_Error ATGEN_DeleteMemory (GSM_StateMachine *s, GSM_MemoryEntry *entry);
73 extern GSM_Error ATGEN_GetMemoryStatus (GSM_StateMachine *s, GSM_MemoryStatus *Status); 73 extern GSM_Error ATGEN_GetMemoryStatus (GSM_StateMachine *s, GSM_MemoryStatus *Status);
74 extern GSM_Error ATGEN_GetSMSC (GSM_StateMachine *s, GSM_SMSC *smsc); 74 extern GSM_Error ATGEN_GetSMSC (GSM_StateMachine *s, GSM_SMSC *smsc);
75 extern GSM_Error ATGEN_SetSMSC (GSM_StateMachine *s, GSM_SMSC *smsc); 75 extern GSM_Error ATGEN_SetSMSC (GSM_StateMachine *s, GSM_SMSC *smsc);
76 extern GSM_Error ATGEN_GetSMSFolders (GSM_StateMachine *s, GSM_SMSFolders *folders); 76 extern GSM_Error ATGEN_GetSMSFolders (GSM_StateMachine *s, GSM_SMSFolders *folders);
77 extern GSM_Error ATGEN_GetSMSStatus (GSM_StateMachine *s, GSM_SMSMemoryStatus *status); 77 extern GSM_Error ATGEN_GetSMSStatus (GSM_StateMachine *s, GSM_SMSMemoryStatus *status);
78 extern GSM_Error ATGEN_GetSMS (GSM_StateMachine *s, GSM_MultiSMSMessage *sms); 78 extern GSM_Error ATGEN_GetSMS (GSM_StateMachine *s, GSM_MultiSMSMessage *sms);
79 extern GSM_Error ATGEN_GetNextSMS (GSM_StateMachine *s, GSM_MultiSMSMessage *sms, bool start); 79 extern GSM_Error ATGEN_GetNextSMS (GSM_StateMachine *s, GSM_MultiSMSMessage *sms, bool start);
80 extern GSM_Error ATGEN_SendSavedSMS (GSM_StateMachine *s, int Folder, int Location); 80 extern GSM_Error ATGEN_SendSavedSMS (GSM_StateMachine *s, int Folder, int Location);
81 extern GSM_Error ATGEN_SendSMS (GSM_StateMachine *s, GSM_SMSMessage *sms); 81 extern GSM_Error ATGEN_SendSMS (GSM_StateMachine *s, GSM_SMSMessage *sms);
82 extern GSM_Error ATGEN_DeleteSMS (GSM_StateMachine *s, GSM_SMSMessage *sms); 82 extern GSM_Error ATGEN_DeleteSMS (GSM_StateMachine *s, GSM_SMSMessage *sms);
83 extern GSM_Error ATGEN_AddSMS (GSM_StateMachine *s, GSM_SMSMessage *sms); 83 extern GSM_Error ATGEN_AddSMS (GSM_StateMachine *s, GSM_SMSMessage *sms);
84 extern GSM_Error ATGEN_GetBatteryCharge (GSM_StateMachine *s, GSM_BatteryCharge *bat); 84 extern GSM_Error ATGEN_GetBatteryCharge (GSM_StateMachine *s, GSM_BatteryCharge *bat);
85 extern GSM_Error ATGEN_GetSignalQuality (GSM_StateMachine *s, GSM_SignalQuality *sig); 85 extern GSM_Error ATGEN_GetSignalQuality (GSM_StateMachine *s, GSM_SignalQuality *sig);
86 extern GSM_Error ATGEN_DialVoice (GSM_StateMachine *s, char *number, GSM_CallShowNumber ShowNumber); 86 extern GSM_Error ATGEN_DialVoice (GSM_StateMachine *s, char *number, GSM_CallShowNumber ShowNumber);
87 extern GSM_Error ATGEN_AnswerCall (GSM_StateMachine *s, int ID, bool all); 87 extern GSM_Error ATGEN_AnswerCall (GSM_StateMachine *s, int ID, bool all);
88 extern GSM_Error ATGEN_CancelCall (GSM_StateMachine *s, int ID, bool all); 88 extern GSM_Error ATGEN_CancelCall (GSM_StateMachine *s, int ID, bool all);
89 extern GSM_Error ATGEN_SetDateTime (GSM_StateMachine *s, GSM_DateTime *date_time); 89 extern GSM_Error ATGEN_SetDateTime (GSM_StateMachine *s, GSM_DateTime *date_time);
90 extern GSM_Error ATGEN_EnterSecurityCode(GSM_StateMachine *s, GSM_SecurityCode Code); 90 extern GSM_Error ATGEN_EnterSecurityCode(GSM_StateMachine *s, GSM_SecurityCode Code);
91 extern GSM_Error ATGEN_GetSecurityStatus(GSM_StateMachine *s, GSM_SecurityCodeType *Status); 91 extern GSM_Error ATGEN_GetSecurityStatus(GSM_StateMachine *s, GSM_SecurityCodeType *Status);
92 extern GSM_Error ATGEN_ResetPhoneSettings(GSM_StateMachine *s, GSM_ResetSettingsType Type); 92 extern GSM_Error ATGEN_ResetPhoneSettings(GSM_StateMachine *s, GSM_ResetSettingsType Type);
93 extern GSM_Error ATGEN_SendDTMF (GSM_StateMachine *s, char *sequence); 93 extern GSM_Error ATGEN_SendDTMF (GSM_StateMachine *s, char *sequence);
94 extern GSM_Error ATGEN_GetSIMIMSI (GSM_StateMachine *s, char *IMSI); 94 extern GSM_Error ATGEN_GetSIMIMSI (GSM_StateMachine *s, char *IMSI);
95 extern GSM_Error ATGEN_HandleCMSError (GSM_StateMachine *s); 95 extern GSM_Error ATGEN_HandleCMSError (GSM_StateMachine *s);
96 extern GSM_Error ATGEN_GetNetworkInfo (GSM_StateMachine *s, GSM_NetworkInfo *netinfo); 96 extern GSM_Error ATGEN_GetNetworkInfo (GSM_StateMachine *s, GSM_NetworkInfo *netinfo);
97 extern GSM_Error ATGEN_Reset (GSM_StateMachine *s, bool hard); 97 extern GSM_Error ATGEN_Reset (GSM_StateMachine *s, bool hard);
98 extern GSM_Error ATGEN_PressKey (GSM_StateMachine *s, GSM_KeyCode Key, bool Press); 98 extern GSM_Error ATGEN_PressKey (GSM_StateMachine *s, GSM_KeyCode Key, bool Press);
99 extern GSM_Error ATGEN_GetDisplayStatus (GSM_StateMachine *s, GSM_DisplayFeatures *features); 99 extern GSM_Error ATGEN_GetDisplayStatus (GSM_StateMachine *s, GSM_DisplayFeatures *features);
100 extern GSM_Error ATGEN_SetAutoNetworkLogin(GSM_StateMachine *s); 100 extern GSM_Error ATGEN_SetAutoNetworkLogin(GSM_StateMachine *s);
101 extern GSM_Error ATGEN_DeleteAllMemory (GSM_StateMachine *s, GSM_MemoryType type); 101 extern GSM_Error ATGEN_DeleteAllMemory (GSM_StateMachine *s, GSM_MemoryType type);
102 102
103 extern GSM_Error ATGEN_DispatchMessage (GSM_StateMachine *s); 103 extern GSM_Error ATGEN_DispatchMessage (GSM_StateMachine *s);
104 extern GSM_Error ATGEN_SetFastSMSSending(GSM_StateMachine *s, bool enable); 104 extern GSM_Error ATGEN_SetFastSMSSending(GSM_StateMachine *s, bool enable);
105 extern GSM_Error ATGEN_SetIncomingCB (GSM_StateMachine *s, bool enable); 105 extern GSM_Error ATGEN_SetIncomingCB (GSM_StateMachine *s, bool enable);
106 extern GSM_Error ATGEN_SetIncomingSMS (GSM_StateMachine *s, bool enable); 106 extern GSM_Error ATGEN_SetIncomingSMS (GSM_StateMachine *s, bool enable);
107 107
108/** 108/**
109 * Alcatel uses some 8-bit characters in contacts, calendar etc.. This table 109 * Alcatel uses some 8-bit characters in contacts, calendar etc.. This table
110 * attempts to decode it, it is probably not complete, here are just chars 110 * attempts to decode it, it is probably not complete, here are just chars
111 * that I found... 111 * that I found...
112 */ 112 */
113unsigned char GSM_AlcatelAlphabet[] = 113unsigned char GSM_AlcatelAlphabet[] =
114{ 114{
115 /* in phone unicode description*/ 115 /* in phone unicode description*/
116 0x80, 0x00,0x20, /* empty */ 116 0x80, 0x00,0x20, /* empty */
117 0x81, 0x00,0x20, /* empty*/ 117 0x81, 0x00,0x20, /* empty*/
118 0x82, 0x00,0x20, /* empty*/ 118 0x82, 0x00,0x20, /* empty*/
119 0x83, 0x00,0x20, /* empty*/ 119 0x83, 0x00,0x20, /* empty*/
120 120
121 0x84, 0x00,0xe7, /* c cedilla*/ 121 0x84, 0x00,0xe7, /* c cedilla*/
122 0x85, 0x20,0x26, /* ... */ 122 0x85, 0x20,0x26, /* ... */
123 0x86, 0x03,0xc0, /* pi */ 123 0x86, 0x03,0xc0, /* pi */
124 0x87, 0x01,0x3e, /* l caron*/ 124 0x87, 0x01,0x3e, /* l caron*/
125 0x88, 0x00,0xc0, /* A grave*/ 125 0x88, 0x00,0xc0, /* A grave*/
126 0x89, 0x00,0xc1, /* A acute*/ 126 0x89, 0x00,0xc1, /* A acute*/
127 0x8a, 0x00,0xc2, /* A circumflex*/ 127 0x8a, 0x00,0xc2, /* A circumflex*/
128 0x8b, 0x00,0xc3, /* A tilde*/ 128 0x8b, 0x00,0xc3, /* A tilde*/
129 0x8c, 0x00,0xc8, /* E grave*/ 129 0x8c, 0x00,0xc8, /* E grave*/
130 0x8d, 0x00,0xca, /* E circumflex*/ 130 0x8d, 0x00,0xca, /* E circumflex*/
131 0x8e, 0x00,0xcb, /* E diaresis*/ 131 0x8e, 0x00,0xcb, /* E diaresis*/
132 0x8f, 0x00,0xcc, /* I grave*/ 132 0x8f, 0x00,0xcc, /* I grave*/
133 0x90, 0x00,0xcd, /* I acute*/ 133 0x90, 0x00,0xcd, /* I acute*/
134 0x91, 0x00,0xd0, /* ETH */ 134 0x91, 0x00,0xd0, /* ETH */
135 0x92, 0x00,0xd2, /* O grave*/ 135 0x92, 0x00,0xd2, /* O grave*/
136 0x93, 0x00,0xd3, /* O acute*/ 136 0x93, 0x00,0xd3, /* O acute*/
137 0x94, 0x00,0xd4, /* O circumflex*/ 137 0x94, 0x00,0xd4, /* O circumflex*/
138 0x95, 0x00,0xd5, /* O tilde*/ 138 0x95, 0x00,0xd5, /* O tilde*/
139 0x96, 0x00,0xd9, /* U grave*/ 139 0x96, 0x00,0xd9, /* U grave*/
140 0x97, 0x00,0xda, /* U acute*/ 140 0x97, 0x00,0xda, /* U acute*/
141 0x98, 0x00,0xe1, /* a acute*/ 141 0x98, 0x00,0xe1, /* a acute*/
142 0x99, 0x00,0xe2, /* a circumflex*/ 142 0x99, 0x00,0xe2, /* a circumflex*/
143 0x9a, 0x00,0xe3, /* a tilde*/ 143 0x9a, 0x00,0xe3, /* a tilde*/
144 0x9b, 0x00,0xea, /* e circumflex*/ 144 0x9b, 0x00,0xea, /* e circumflex*/
145 0x9c, 0x00,0xeb, /* e diaresis*/ 145 0x9c, 0x00,0xeb, /* e diaresis*/
146 0x9d, 0x00,0xed, /* i acute*/ 146 0x9d, 0x00,0xed, /* i acute*/
147 0x9e, 0x00,0xee, /* i circumflex*/ 147 0x9e, 0x00,0xee, /* i circumflex*/
148 0x9f, 0x00,0xef, /* i diaresis*/ 148 0x9f, 0x00,0xef, /* i diaresis*/
149 0xa0, 0x00,0xf3, /* o acute*/ 149 0xa0, 0x00,0xf3, /* o acute*/
150 0xa1, 0x00,0xf4, /* o circumflex*/ 150 0xa1, 0x00,0xf4, /* o circumflex*/
151 0xa2, 0x00,0xf5, /* o tilde*/ 151 0xa2, 0x00,0xf5, /* o tilde*/
152 0xa3, 0x00,0xfa, /* u acute*/ 152 0xa3, 0x00,0xfa, /* u acute*/
153 0xa4, 0x00,0xa2, /* cent */ 153 0xa4, 0x00,0xa2, /* cent */
154 0xa5, 0x00,0x5b, /* [ */ 154 0xa5, 0x00,0x5b, /* [ */
155 0xa6, 0x01,0x59, /* r caron*/ 155 0xa6, 0x01,0x59, /* r caron*/
156 0xa7, 0x01,0x0d, /* c caron*/ 156 0xa7, 0x01,0x0d, /* c caron*/
157 0xa8, 0x01,0x61, /* s caron*/ 157 0xa8, 0x01,0x61, /* s caron*/
158 0xa9, 0x01,0x1b, /* e caron*/ 158 0xa9, 0x01,0x1b, /* e caron*/
159 0xaa, 0x01,0x6f, /* u ring*/ 159 0xaa, 0x01,0x6f, /* u ring*/
160 0xab, 0x00,0xfd, /* y acute*/ 160 0xab, 0x00,0xfd, /* y acute*/
161 0xac, 0x00,0xf0, /* eth */ 161 0xac, 0x00,0xf0, /* eth */
162 0xad, 0x01,0x07, /* c acute*/ 162 0xad, 0x01,0x07, /* c acute*/
163 0xae, 0x01,0x19, /* e ogonek*/ 163 0xae, 0x01,0x19, /* e ogonek*/
164 0xaf, 0x01,0x05, /* a ogonek*/ 164 0xaf, 0x01,0x05, /* a ogonek*/
165 0xb0, 0x01,0x7c, /* z dot*/ 165 0xb0, 0x01,0x7c, /* z dot*/
166 0xb1, 0x01,0x7a, /* z acute*/ 166 0xb1, 0x01,0x7a, /* z acute*/
167 0xb2, 0x01,0x5b, /* s acute*/ 167 0xb2, 0x01,0x5b, /* s acute*/
168 0xb3, 0x01,0x44, /* n acute*/ 168 0xb3, 0x01,0x44, /* n acute*/
169 0xb4, 0x01,0x42, /* l stroke*/ 169 0xb4, 0x01,0x42, /* l stroke*/
170 170
171 0xb5, 0x00,0x20, /* empty*/ 171 0xb5, 0x00,0x20, /* empty*/
172 172
173 0xb6, 0x01,0x48, /* n caron*/ 173 0xb6, 0x01,0x48, /* n caron*/
174 0xb7, 0x01,0x65, /* t caron*/ 174 0xb7, 0x01,0x65, /* t caron*/
175 175
176 0xb8, 0x00,0x20, /* empty*/ 176 0xb8, 0x00,0x20, /* empty*/
177 177
178 0xb9, 0x01,0x7e, /* z caron*/ 178 0xb9, 0x01,0x7e, /* z caron*/
179 0xba, 0x01,0xe7, /* g caron*/ 179 0xba, 0x01,0xe7, /* g caron*/
180 180
181 0xbb, 0x00,0x20, /* empty*/ 181 0xbb, 0x00,0x20, /* empty*/
182 0xbc, 0x00,0x20, /* empty*/ 182 0xbc, 0x00,0x20, /* empty*/
183 183
184 0xbd, 0x1e,0x20, /* G macron*/ 184 0xbd, 0x1e,0x20, /* G macron*/
185 0xbe, 0x1e,0x21, /* g macron*/ 185 0xbe, 0x1e,0x21, /* g macron*/
186 0xbf, 0x01,0x5e, /* S cedilla*/ 186 0xbf, 0x01,0x5e, /* S cedilla*/
187 0xc0, 0x01,0x5f, /* s cedilla*/ 187 0xc0, 0x01,0x5f, /* s cedilla*/
188 0xc1, 0x01,0x2f, /* i ogonek*/ /* FIXME: not sure with this, it look like normal i */ 188 0xc1, 0x01,0x2f, /* i ogonek*/ /* FIXME: not sure with this, it look like normal i */
189 0xc2, 0x01,0x31, /* i dotless*/ 189 0xc2, 0x01,0x31, /* i dotless*/
190 0xc3, 0x01,0x68, /* U tilde*/ 190 0xc3, 0x01,0x68, /* U tilde*/
191 0xc4, 0x01,0x50, /* O dbl acute*/ 191 0xc4, 0x01,0x50, /* O dbl acute*/
192 0xc5, 0x01,0x69, /* u tilde*/ 192 0xc5, 0x01,0x69, /* u tilde*/
193 0xc6, 0x01,0x51, /* o dbl acute*/ 193 0xc6, 0x01,0x51, /* o dbl acute*/
194 0xc7, 0x27,0xa9, /* => */ 194 0xc7, 0x27,0xa9, /* => */
195 0xc8, 0x27,0xa8, /* filled =>*/ 195 0xc8, 0x27,0xa8, /* filled =>*/
196 0xc9, 0x00,0xd7, /* x */ 196 0xc9, 0x00,0xd7, /* x */
197 0xca, 0x00,0x5d, /* ] */ 197 0xca, 0x00,0x5d, /* ] */
198 0xcb, 0x26,0x0f, /* phone*/ 198 0xcb, 0x26,0x0f, /* phone*/
199 0xcc, 0x01,0x0f, /* d caron*/ 199 0xcc, 0x01,0x0f, /* d caron*/
200 200
201 0xcd, 0x00,0x20, /* empty*/ 201 0xcd, 0x00,0x20, /* empty*/
202 202
203 0xce, 0x00,0x7e, /* ~ */ 203 0xce, 0x00,0x7e, /* ~ */
204 0xcf, 0x00,0x5c, /* \ */ 204 0xcf, 0x00,0x5c, /* \ */
205 0xd0, 0x00,0x5e, /* ^ */ 205 0xd0, 0x00,0x5e, /* ^ */
206 206
207 0xd1, 0x00,0x20, /* empty*/ 207 0xd1, 0x00,0x20, /* empty*/
208 208
209 0xd2, 0x00,0x7b, /* { */ 209 0xd2, 0x00,0x7b, /* { */
210 0xd3, 0x00,0x7c, /* | */ 210 0xd3, 0x00,0x7c, /* | */
211 0xd4, 0x00,0x7d, /* } */ 211 0xd4, 0x00,0x7d, /* } */
212 212
213 0xd5, 0x00,0x20, /* empty*/ 213 0xd5, 0x00,0x20, /* empty*/
214 214
215 0xd6, 0x01,0x63, /* t cedilla*/ 215 0xd6, 0x01,0x63, /* t cedilla*/
216 216
217 0xd7, 0x00,0x20, /* empty*/ 217 0xd7, 0x00,0x20, /* empty*/
218 0xd8, 0x00,0x20, /* empty*/ 218 0xd8, 0x00,0x20, /* empty*/
219 0xd9, 0x00,0x20, /* empty*/ 219 0xd9, 0x00,0x20, /* empty*/
220 0xda, 0x00,0x20, /* empty*/ 220 0xda, 0x00,0x20, /* empty*/
221 0xdb, 0x00,0x20, /* empty*/ 221 0xdb, 0x00,0x20, /* empty*/
222 0xdc, 0x00,0x20, /* empty*/ 222 0xdc, 0x00,0x20, /* empty*/
223 0xdd, 0x00,0x20, /* empty*/ 223 0xdd, 0x00,0x20, /* empty*/
224 0xde, 0x00,0x20, /* empty*/ 224 0xde, 0x00,0x20, /* empty*/
225 0xdf, 0x00,0x20, /* empty*/ 225 0xdf, 0x00,0x20, /* empty*/
226 0xe0, 0x00,0x20, /* empty*/ 226 0xe0, 0x00,0x20, /* empty*/
227 227
228 0xe1, 0x00,0x20, /* two candles*/ /* FIXME */ 228 0xe1, 0x00,0x20, /* two candles*/ /* FIXME */
229 229
230 0xe2, 0x00,0x20, /* empty*/ 230 0xe2, 0x00,0x20, /* empty*/
231 0xe3, 0x00,0x20, /* empty*/ 231 0xe3, 0x00,0x20, /* empty*/
232 0xe4, 0x00,0x20, /* empty*/ 232 0xe4, 0x00,0x20, /* empty*/
233 233
234 0xe5, 0x01,0xce, /* a caron*/ 234 0xe5, 0x01,0xce, /* a caron*/
235 0xe6, 0x01,0x01, /* a macron*/ 235 0xe6, 0x01,0x01, /* a macron*/
236 0xe7, 0x01,0x13, /* e macron*/ 236 0xe7, 0x01,0x13, /* e macron*/
237 0xe8, 0x01,0x2b, /* i macron*/ 237 0xe8, 0x01,0x2b, /* i macron*/
238 0xe9, 0x01,0x4d, /* o macron*/ 238 0xe9, 0x01,0x4d, /* o macron*/
239 0xea, 0x01,0x6b, /* u macron*/ 239 0xea, 0x01,0x6b, /* u macron*/
240 0xeb, 0x00,0x41, /* A */ 240 0xeb, 0x00,0x41, /* A */
241 0xec, 0x00,0x40, /* @ */ 241 0xec, 0x00,0x40, /* @ */
242 0xed, 0x00,0x20,/* some strange char :-) */ /* FIXME */ 242 0xed, 0x00,0x20,/* some strange char :-) */ /* FIXME */
243 243
244 0xee, 0x00,0x20, /* big key stroken*/ /* FIXME */ 244 0xee, 0x00,0x20, /* big key stroken*/ /* FIXME */
245 0xef, 0x00,0x20, /* big key*/ /* FIXME */ 245 0xef, 0x00,0x20, /* big key*/ /* FIXME */
246 246
247 0xf0, 0x00,0x20, /* empty*/ 247 0xf0, 0x00,0x20, /* empty*/
248 248
249 0xf1, 0x00,0x31, /* 1 */ 249 0xf1, 0x00,0x31, /* 1 */
250 0xf2, 0x00,0x21, /* bold !*/ 250 0xf2, 0x00,0x21, /* bold !*/
251 0xf3, 0x26,0x0e, /* black phone*/ 251 0xf3, 0x26,0x0e, /* black phone*/
252 0xf4, 0x00,0x26, /* & */ 252 0xf4, 0x00,0x26, /* & */
253 0xf5, 0x23,0x7e, /* bell */ 253 0xf5, 0x23,0x7e, /* bell */
254 0xf6, 0x26,0x6a, /* note */ 254 0xf6, 0x26,0x6a, /* note */
255 255
256 0xf7, 0x27,0x13, /* okay inv*/ /* FIXME */ 256 0xf7, 0x27,0x13, /* okay inv*/ /* FIXME */
257 0xf8, 0x27,0x13, /* okay */ 257 0xf8, 0x27,0x13, /* okay */
258 258
259 0xf9, 0x00,0x20, /* empty*/ 259 0xf9, 0x00,0x20, /* empty*/
260 260
261 0xfa, 0x00,0x20, /* key */ /* FIXME */ 261 0xfa, 0x00,0x20, /* key */ /* FIXME */
262 262
263 0xfb, 0x00,0x20, /* empty*/ 263 0xfb, 0x00,0x20, /* empty*/
264 264
265 0xfc, 0x20,0xac, /* Euro */ 265 0xfc, 0x20,0xac, /* Euro */
266 0xfd, 0x21,0x97, /* NE arrow*/ 266 0xfd, 0x21,0x97, /* NE arrow*/
267 0xfe, 0x21,0x98, /* SE arrow*/ 267 0xfe, 0x21,0x98, /* SE arrow*/
268 268
269 0xff, 0x00,0x20, /* empty*/ 269 0xff, 0x00,0x20, /* empty*/
270 270
271 0x00, 0x00,0x00 271 0x00, 0x00,0x00
272}; 272};
273 273
274/* This is being called from atgen */ 274/* This is being called from atgen */
275 GSM_Error ALCATEL_ProtocolVersionReply(GSM_Protocol_Message msg, GSM_StateMachine *s) 275 GSM_Error ALCATEL_ProtocolVersionReply(GSM_Protocol_Message msg, GSM_StateMachine *s)
276{ 276{
277 char *str, *str2; 277 char *str, *str2;
278/* 278/*
279 * Reply received here looks like: 279 * Reply received here looks like:
280 * 1 "AT+CPROT=?" 280 * 1 "AT+CPROT=?"
281 * 2 "+CPROT: 0,"V1.0",1" 281 * 2 "+CPROT: 0,"V1.0",1"
282 * 3 "+CPROT: 16,"V1.1",16" 282 * 3 "+CPROT: 16,"V1.1",16"
283 * 4 "OK" 283 * 4 "OK"
284 */ 284 */
285 switch (s->Phone.Data.Priv.ATGEN.ReplyState) { 285 switch (s->Phone.Data.Priv.ATGEN.ReplyState) {
286 case AT_Reply_OK: 286 case AT_Reply_OK:
287 str = strstr(msg.Buffer, "\"V"); 287 str = strstr(msg.Buffer, "\"V");
288 if (str == NULL) return ERR_UNKNOWNRESPONSE; 288 if (str == NULL) return ERR_UNKNOWNRESPONSE;
289 str += 2; 289 str += 2;
290 while((str2 = strstr(str, "\"V")) != NULL) str = str2 + 2; 290 while((str2 = strstr(str, "\"V")) != NULL) str = str2 + 2;
291 if (strncmp(str, "1.0", 3) == 0) { 291 if (strncmp(str, "1.0", 3) == 0) {
292 s->Phone.Data.Priv.ALCATEL.ProtocolVersion = V_1_0; 292 s->Phone.Data.Priv.ALCATEL.ProtocolVersion = V_1_0;
293 } else if (strncmp(str, "1.1", 3) == 0) { 293 } else if (strncmp(str, "1.1", 3) == 0) {
294 s->Phone.Data.Priv.ALCATEL.ProtocolVersion = V_1_1; 294 s->Phone.Data.Priv.ALCATEL.ProtocolVersion = V_1_1;
295 } else { 295 } else {
296 smprintf(s, "Unknown protocol version. Please send debug log and phone info to author.\n"); 296 smprintf(s, "Unknown protocol version. Please send debug log and phone info to author.\n");
297 return ERR_NOTIMPLEMENTED; 297 return ERR_NOTIMPLEMENTED;
298 } 298 }
299 return ERR_NONE; 299 return ERR_NONE;
300 case AT_Reply_Error: 300 case AT_Reply_Error:
301 case AT_Reply_CMSError: 301 case AT_Reply_CMSError:
302 return ATGEN_HandleCMSError(s); 302 return ATGEN_HandleCMSError(s);
303 default: 303 default:
304 return ERR_UNKNOWNRESPONSE; 304 return ERR_UNKNOWNRESPONSE;
305 } 305 }
306} 306}
307 307
308static GSM_Error ALCATEL_SetBinaryMode(GSM_StateMachine *s) 308static GSM_Error ALCATEL_SetBinaryMode(GSM_StateMachine *s)
309{ 309{
310 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 310 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
311 GSM_Error error; 311 GSM_Error error;
312 312
313 if (Priv->Mode == ModeBinary) return ERR_NONE; 313 if (Priv->Mode == ModeBinary) return ERR_NONE;
314 314
315 dbgprintf ("Changing to binary mode\n"); 315 dbgprintf ("Changing to binary mode\n");
316 316
317 error=GSM_WaitFor (s, "AT+IFC=2,2\r", 11, 0x02, 4, ID_SetFlowControl); 317 error=GSM_WaitFor (s, "AT+IFC=2,2\r", 11, 0x02, 4, ID_SetFlowControl);
318 if (error != ERR_NONE) return error; 318 if (error != ERR_NONE) return error;
319 319
320 error=GSM_WaitFor (s, "AT+CPROT=?\r", 11, 0x02, 4, ID_AlcatelProtocol); 320 error=GSM_WaitFor (s, "AT+CPROT=?\r", 11, 0x02, 4, ID_AlcatelProtocol);
321 if (error != ERR_NONE) return error; 321 if (error != ERR_NONE) return error;
322 322
323 if (Priv->ProtocolVersion == V_1_0) { 323 if (Priv->ProtocolVersion == V_1_0) {
324 error=GSM_WaitFor (s, "AT+CPROT=16,\"V1.0\",16\r", 22, 0x00, 4, ID_AlcatelConnect); 324 error=GSM_WaitFor (s, "AT+CPROT=16,\"V1.0\",16\r", 22, 0x00, 4, ID_AlcatelConnect);
325 } else { 325 } else {
326 error=GSM_WaitFor (s, "AT+CPROT=16,\"V1.1\",16\r", 22, 0x00, 4, ID_AlcatelConnect); 326 error=GSM_WaitFor (s, "AT+CPROT=16,\"V1.1\",16\r", 22, 0x00, 4, ID_AlcatelConnect);
327 } 327 }
328 328
329 if (error == ERR_TIMEOUT && s->Speed != 19200) { 329 if (error == ERR_TIMEOUT && s->Speed != 19200) {
330 smprintf(s, "HINT: Try changing speed to 19200, it is sometimes needed for Alcatel binary mode.\n"); 330 smprintf(s, "HINT: Try changing speed to 19200, it is sometimes needed for Alcatel binary mode.\n");
331 } 331 }
332 332
333 if (error != ERR_NONE) return error; 333 if (error != ERR_NONE) return error;
334 334
335 dbgprintf ("Changing protocol to Alcabus\n"); 335 dbgprintf ("Changing protocol to Alcabus\n");
336 336
337 s->Protocol.Functions = &ALCABUSProtocol; 337 s->Protocol.Functions = &ALCABUSProtocol;
338 error = s->Protocol.Functions->Initialise(s); 338 error = s->Protocol.Functions->Initialise(s);
339 if (error != ERR_NONE) { 339 if (error != ERR_NONE) {
340 s->Protocol.Functions = &ATProtocol; 340 s->Protocol.Functions = &ATProtocol;
341 return error; 341 return error;
342 } 342 }
343 s->Phone.Functions->ReplyFunctions= ALCATELReplyFunctions; 343 s->Phone.Functions->ReplyFunctions= ALCATELReplyFunctions;
344 Priv->Mode = ModeBinary; 344 Priv->Mode = ModeBinary;
345 Priv->BinaryItem = 0; 345 Priv->BinaryItem = 0;
346 Priv->BinaryType = 0; 346 Priv->BinaryType = 0;
347 Priv->BinaryState = StateAttached; 347 Priv->BinaryState = StateAttached;
348 return ERR_NONE; 348 return ERR_NONE;
349} 349}
350 350
351static GSM_Error ALCATEL_GoToBinaryState(GSM_StateMachine *s, GSM_Alcatel_BinaryState state, GSM_Alcatel_BinaryType type, int item) { 351static GSM_Error ALCATEL_GoToBinaryState(GSM_StateMachine *s, GSM_Alcatel_BinaryState state, GSM_Alcatel_BinaryType type, int item) {
352 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 352 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
353 GSM_Error error; 353 GSM_Error error;
354 unsigned char attach_buffer[] = {0x00, 0x00, 0x7C ,0x20}; 354 unsigned char attach_buffer[] = {0x00, 0x00, 0x7C ,0x20};
355 unsigned char detach_buffer[] = {0x00, 0x01, 0x7C ,0x00}; 355 unsigned char detach_buffer[] = {0x00, 0x01, 0x7C ,0x00};
356 unsigned char start_buffer[] = 356 unsigned char start_buffer[] =
357 {0x00, 0x04, 0x7C, 0x80, /* 4 byte database id follows */ 357 {0x00, 0x04, 0x7C, 0x80, /* 4 byte database id follows */
358 0x12, 0x34, 0x56, 0x78}; 358 0x12, 0x34, 0x56, 0x78};
359 unsigned char end_buffer[] = 359 unsigned char end_buffer[] =
360 {0x00, 0x04, 0x7C, 0x82, 360 {0x00, 0x04, 0x7C, 0x82,
361 0x00, /* type */ 361 0x00, /* type */
362 0x00, 0x00, 0x00, 0x00}; /* TimeStamp */ 362 0x00, 0x00, 0x00, 0x00}; /* TimeStamp */
363 unsigned char close_buffer[] = 363 unsigned char close_buffer[] =
364 {0x00, 0x04, 364 {0x00, 0x04,
365 0x00, /*type */ 365 0x00, /*type */
366 0x23, 0x01}; 366 0x23, 0x01};
367 unsigned char select1_buffer[] = 367 unsigned char select1_buffer[] =
368 {0x00, 0x00, 368 {0x00, 0x00,
369 0x00, /*type */ 369 0x00, /*type */
370 0x20}; 370 0x20};
371 unsigned char select2_buffer[] = 371 unsigned char select2_buffer[] =
372 {0x00, 0x04, 372 {0x00, 0x04,
373 0x00, /*type */ 373 0x00, /*type */
374 0x22, 0x01, 0x00}; 374 0x22, 0x01, 0x00};
375 unsigned char begin_buffer[] = 375 unsigned char begin_buffer[] =
376 {0x00, 0x04, 0x7C, 0x81, 376 {0x00, 0x04, 0x7C, 0x81,
377 0x00, /*type */ 377 0x00, /*type */
378 0x00, 0x85, 0x00}; 378 0x00, 0x85, 0x00};
379 unsigned char commit_buffer[] = 379 unsigned char commit_buffer[] =
380 {0x00, 0x04, 380 {0x00, 0x04,
381 0x00, /*type */ 381 0x00, /*type */
382 0x20, 0x01}; 382 0x20, 0x01};
383 383
384 smprintf(s, "Alcatel state switcher: %d -> %d, %d -> %d, %d -> %d\n", Priv->BinaryState, state, Priv->BinaryType, type, Priv->BinaryItem, item); 384 smprintf(s, "Alcatel state switcher: %d -> %d, %d -> %d, %d -> %d\n", Priv->BinaryState, state, Priv->BinaryType, type, Priv->BinaryItem, item);
385 error = ALCATEL_SetBinaryMode(s); 385 error = ALCATEL_SetBinaryMode(s);
386 if (error != ERR_NONE) return error; 386 if (error != ERR_NONE) return error;
387 387
388 /* Do we need to do anything? */ 388 /* Do we need to do anything? */
389 if ((state == Priv->BinaryState) && (type == Priv->BinaryType) && (item == Priv->BinaryItem)) return ERR_NONE; 389 if ((state == Priv->BinaryState) && (type == Priv->BinaryType) && (item == Priv->BinaryItem)) return ERR_NONE;
390 390
391 /* We're editing, but the next state is not the same. so commit editing */ 391 /* We're editing, but the next state is not the same. so commit editing */
392 if (Priv->BinaryState == StateEdit) { 392 if (Priv->BinaryState == StateEdit) {
393 /* Something has changed, we will have to reread fields! */ 393 /* Something has changed, we will have to reread fields! */
394 Priv->CurrentFieldsItem = -1; 394 Priv->CurrentFieldsItem = -1;
395 switch (Priv->BinaryType) { 395 switch (Priv->BinaryType) {
396 case TypeCalendar: 396 case TypeCalendar:
397 commit_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 397 commit_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
398 break; 398 break;
399 case TypeContacts: 399 case TypeContacts:
400 commit_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 400 commit_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
401 break; 401 break;
402 case TypeToDo: 402 case TypeToDo:
403 commit_buffer[2] = ALCATEL_SYNC_TYPE_TODO; 403 commit_buffer[2] = ALCATEL_SYNC_TYPE_TODO;
404 break; 404 break;
405 } 405 }
406 dbgprintf ("Commiting edited record\n"); 406 dbgprintf ("Commiting edited record\n");
407 error=GSM_WaitFor (s, commit_buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelCommit); 407 error=GSM_WaitFor (s, commit_buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelCommit);
408 if (error != ERR_NONE) return error; 408 if (error != ERR_NONE) return error;
409 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelCommit2); 409 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelCommit2);
410 if (error != ERR_NONE) return error; 410 if (error != ERR_NONE) return error;
411 Priv->BinaryState = StateSession; 411 Priv->BinaryState = StateSession;
412 Priv->BinaryItem = 0; 412 Priv->BinaryItem = 0;
413 } 413 }
414 414
415 /* Do we want to edit something of same type? */ 415 /* Do we want to edit something of same type? */
416 if ((state == StateEdit) && (type == Priv->BinaryType)) { 416 if ((state == StateEdit) && (type == Priv->BinaryType)) {
417 /* Edit state doesn't need any switching, it is needed only for 417 /* Edit state doesn't need any switching, it is needed only for
418 * indication that e have to commit record before we switch to other 418 * indication that e have to commit record before we switch to other
419 * mode. 419 * mode.
420 */ 420 */
421 Priv->BinaryState = StateEdit; 421 Priv->BinaryState = StateEdit;
422 Priv->BinaryItem = item; 422 Priv->BinaryItem = item;
423 return ERR_NONE; 423 return ERR_NONE;
424 } 424 }
425 425
426 /* Now we can be only in Attached or Session state, so if states and types matches, just keep them as they are */ 426 /* Now we can be only in Attached or Session state, so if states and types matches, just keep them as they are */
427 if ((state == Priv->BinaryState) && (type == Priv->BinaryType)) { 427 if ((state == Priv->BinaryState) && (type == Priv->BinaryType)) {
428 return ERR_NONE; 428 return ERR_NONE;
429 } 429 }
430 430
431 /* Do we need to close session? */ 431 /* Do we need to close session? */
432 if (Priv->BinaryState == StateSession) { 432 if (Priv->BinaryState == StateSession) {
433 dbgprintf ("Ending session\n"); 433 dbgprintf ("Ending session\n");
434 switch (Priv->BinaryType) { 434 switch (Priv->BinaryType) {
435 case TypeCalendar: 435 case TypeCalendar:
436 end_buffer[4] = ALCATEL_BEGIN_SYNC_CALENDAR; 436 end_buffer[4] = ALCATEL_BEGIN_SYNC_CALENDAR;
437 break; 437 break;
438 case TypeContacts: 438 case TypeContacts:
439 end_buffer[4] = ALCATEL_BEGIN_SYNC_CONTACTS; 439 end_buffer[4] = ALCATEL_BEGIN_SYNC_CONTACTS;
440 break; 440 break;
441 case TypeToDo: 441 case TypeToDo:
442 end_buffer[4] = ALCATEL_BEGIN_SYNC_TODO; 442 end_buffer[4] = ALCATEL_BEGIN_SYNC_TODO;
443 break; 443 break;
444 } 444 }
445 error=GSM_WaitFor (s, end_buffer, 9, 0x02, ALCATEL_TIMEOUT, ID_AlcatelEnd); 445 error=GSM_WaitFor (s, end_buffer, 9, 0x02, ALCATEL_TIMEOUT, ID_AlcatelEnd);
446 if (error != ERR_NONE) return error; 446 if (error != ERR_NONE) return error;
447 447
448 switch (Priv->BinaryType) { 448 switch (Priv->BinaryType) {
449 case TypeCalendar: 449 case TypeCalendar:
450 close_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 450 close_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
451 break; 451 break;
452 case TypeContacts: 452 case TypeContacts:
453 close_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 453 close_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
454 break; 454 break;
455 case TypeToDo: 455 case TypeToDo:
456 close_buffer[2] = ALCATEL_SYNC_TYPE_TODO; 456 close_buffer[2] = ALCATEL_SYNC_TYPE_TODO;
457 break; 457 break;
458 } 458 }
459 dbgprintf ("Closing session\n"); 459 dbgprintf ("Closing session\n");
460 error=GSM_WaitFor (s, close_buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelClose); 460 error=GSM_WaitFor (s, close_buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelClose);
461 if (error != ERR_NONE) return error; 461 if (error != ERR_NONE) return error;
462 462
463 dbgprintf ("Detaching binary mode\n"); 463 dbgprintf ("Detaching binary mode\n");
464 GSM_WaitFor (s, detach_buffer, 4, 0x02, ALCATEL_TIMEOUT, ID_AlcatelDetach); 464 GSM_WaitFor (s, detach_buffer, 4, 0x02, ALCATEL_TIMEOUT, ID_AlcatelDetach);
465 465
466 Priv->BinaryState = StateAttached; 466 Priv->BinaryState = StateAttached;
467 Priv->BinaryType = 0; 467 Priv->BinaryType = 0;
468 } 468 }
469 469
470 /* Do we need to open session? */ 470 /* Do we need to open session? */
471 if (state == StateSession || state == StateEdit) { 471 if (state == StateSession || state == StateEdit) {
472 dbgprintf ("Starting session for %s\n", 472 dbgprintf ("Starting session for %s\n",
473 (type == TypeCalendar ? "Calendar" : 473 (type == TypeCalendar ? "Calendar" :
474 (type == TypeToDo ? "Todo" : 474 (type == TypeToDo ? "Todo" :
475 (type == TypeContacts ? "Contacts" : 475 (type == TypeContacts ? "Contacts" :
476 "Unknown!")))); 476 "Unknown!"))));
477 /* Fill up buffers */ 477 /* Fill up buffers */
478 switch (type) { 478 switch (type) {
479 case TypeCalendar: 479 case TypeCalendar:
480 select1_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 480 select1_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
481 select2_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 481 select2_buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
482 begin_buffer[4] = ALCATEL_BEGIN_SYNC_CALENDAR; 482 begin_buffer[4] = ALCATEL_BEGIN_SYNC_CALENDAR;
483 break; 483 break;
484 case TypeContacts: 484 case TypeContacts:
485 select1_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 485 select1_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
486 select2_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 486 select2_buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
487 begin_buffer[4] = ALCATEL_BEGIN_SYNC_CONTACTS; 487 begin_buffer[4] = ALCATEL_BEGIN_SYNC_CONTACTS;
488 break; 488 break;
489 case TypeToDo: 489 case TypeToDo:
490 select1_buffer[2] = ALCATEL_SYNC_TYPE_TODO; 490 select1_buffer[2] = ALCATEL_SYNC_TYPE_TODO;
491 select2_buffer[2] = ALCATEL_SYNC_TYPE_TODO; 491 select2_buffer[2] = ALCATEL_SYNC_TYPE_TODO;
492 begin_buffer[4] = ALCATEL_BEGIN_SYNC_TODO; 492 begin_buffer[4] = ALCATEL_BEGIN_SYNC_TODO;
493 break; 493 break;
494 } 494 }
495 dbgprintf ("Attaching in binary mode\n"); 495 dbgprintf ("Attaching in binary mode\n");
496 496
497 /* Communicate */ 497 /* Communicate */
498 error=GSM_WaitFor (s, attach_buffer, 4, 0x02, ALCATEL_TIMEOUT, ID_AlcatelAttach); 498 error=GSM_WaitFor (s, attach_buffer, 4, 0x02, ALCATEL_TIMEOUT, ID_AlcatelAttach);
499 if (error != ERR_NONE) return error; 499 if (error != ERR_NONE) return error;
500 500
501 smprintf(s,"Start session\n"); 501 smprintf(s,"Start session\n");
502 error=GSM_WaitFor (s, start_buffer, 8, 0x02, ALCATEL_TIMEOUT, ID_AlcatelStart); 502 error=GSM_WaitFor (s, start_buffer, 8, 0x02, ALCATEL_TIMEOUT, ID_AlcatelStart);
503 if (error != ERR_NONE) return error; 503 if (error != ERR_NONE) return error;
504 504
505 smprintf(s,"Select type\n"); 505 smprintf(s,"Select type\n");
506 error=GSM_WaitFor (s, select1_buffer, 4, 0x02, ALCATEL_TIMEOUT, ID_AlcatelSelect1); 506 error=GSM_WaitFor (s, select1_buffer, 4, 0x02, ALCATEL_TIMEOUT, ID_AlcatelSelect1);
507 if (error != ERR_NONE) return error; 507 if (error != ERR_NONE) return error;
508 error=GSM_WaitFor (s, select2_buffer, 6, 0x02, ALCATEL_TIMEOUT, ID_AlcatelSelect2); 508 error=GSM_WaitFor (s, select2_buffer, 6, 0x02, ALCATEL_TIMEOUT, ID_AlcatelSelect2);
509 if (error != ERR_NONE) return error; 509 if (error != ERR_NONE) return error;
510 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelSelect3); 510 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelSelect3);
511 if (error != ERR_NONE) return error; 511 if (error != ERR_NONE) return error;
512 512
513 smprintf(s,"Begin transfer\n"); 513 smprintf(s,"Begin transfer\n");
514 error=GSM_WaitFor (s, begin_buffer, 8, 0x02, ALCATEL_TIMEOUT, ID_AlcatelBegin1); 514 error=GSM_WaitFor (s, begin_buffer, 8, 0x02, ALCATEL_TIMEOUT, ID_AlcatelBegin1);
515 if (error != ERR_NONE) return error; 515 if (error != ERR_NONE) return error;
516 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelBegin2); 516 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelBegin2);
517 if (error != ERR_NONE) return error; 517 if (error != ERR_NONE) return error;
518 518
519 Priv->BinaryState = StateSession; 519 Priv->BinaryState = StateSession;
520 Priv->BinaryType = type; 520 Priv->BinaryType = type;
521 /* Do we want to edit something of same type? */ 521 /* Do we want to edit something of same type? */
522 if ((state == StateEdit) && (type == Priv->BinaryType)) { 522 if ((state == StateEdit) && (type == Priv->BinaryType)) {
523 Priv->BinaryState = StateEdit; 523 Priv->BinaryState = StateEdit;
524 Priv->BinaryItem = item; 524 Priv->BinaryItem = item;
525 return ERR_NONE; 525 return ERR_NONE;
526 } 526 }
527 } 527 }
528 return ERR_NONE; 528 return ERR_NONE;
529} 529}
530 530
531static GSM_Error ALCATEL_SetATMode(GSM_StateMachine *s) 531static GSM_Error ALCATEL_SetATMode(GSM_StateMachine *s)
532{ 532{
533 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 533 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
534 GSM_Error error; 534 GSM_Error error;
535 535
536 if (Priv->Mode == ModeAT) return ERR_NONE; 536 if (Priv->Mode == ModeAT) return ERR_NONE;
537 537
538 error = ALCATEL_GoToBinaryState(s, StateAttached, 0, 0); 538 error = ALCATEL_GoToBinaryState(s, StateAttached, 0, 0);
539 if (error != ERR_NONE) return error; 539 if (error != ERR_NONE) return error;
540 540
541 error = s->Protocol.Functions->Terminate(s); 541 error = s->Protocol.Functions->Terminate(s);
542 if (error != ERR_NONE) return error; 542 if (error != ERR_NONE) return error;
543 543
544 dbgprintf ("Changing protocol to AT\n"); 544 dbgprintf ("Changing protocol to AT\n");
545 s->Protocol.Functions = &ATProtocol; 545 s->Protocol.Functions = &ATProtocol;
546 s->Phone.Functions->ReplyFunctions= ATGENReplyFunctions; 546 s->Phone.Functions->ReplyFunctions= ATGENReplyFunctions;
547 Priv->Mode = ModeAT; 547 Priv->Mode = ModeAT;
548 s->Phone.Data.Priv.ATGEN.PBKCharset= 0; 548 s->Phone.Data.Priv.ATGEN.PBKCharset= 0;
549 s->Phone.Data.Priv.ATGEN.PBKMemory= 0; 549 s->Phone.Data.Priv.ATGEN.PBKMemory= 0;
550 550
551 my_sleep(100); 551 my_sleep(100);
552 552
553 /* In case we don't send AT command short after closing binary mode, 553 /* In case we don't send AT command short after closing binary mode,
554 * phone takes VERY long to react next time. The error code in 554 * phone takes VERY long to react next time. The error code in
555 * intetionally ignored. 555 * intetionally ignored.
556 */ 556 */
557 GSM_WaitFor (s, "AT\r", 3, 0x00, 0, ID_IncomingFrame); 557 GSM_WaitFor (s, "AT\r", 3, 0x00, 0, ID_IncomingFrame);
558 558
559 return ERR_NONE; 559 return ERR_NONE;
560} 560}
561 561
562static GSM_Error ALCATEL_Initialise(GSM_StateMachine *s) 562static GSM_Error ALCATEL_Initialise(GSM_StateMachine *s)
563{ 563{
564 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 564 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
565 GSM_Error error; 565 GSM_Error error;
566 566
567 Priv->Mode = ModeAT; 567 Priv->Mode = ModeAT;
568 568
569 Priv->CalendarItems = NULL; 569 Priv->CalendarItems = NULL;
570 Priv->ContactsItems = NULL; 570 Priv->ContactsItems = NULL;
571 Priv->ToDoItems = NULL; 571 Priv->ToDoItems = NULL;
572 Priv->CalendarItemsCount = 0; 572 Priv->CalendarItemsCount = 0;
573 Priv->ToDoItemsCount = 0; 573 Priv->ToDoItemsCount = 0;
574 Priv->ContactsItemsCount = 0; 574 Priv->ContactsItemsCount = 0;
575 Priv->CurrentFields[0] = 0; 575 Priv->CurrentFields[0] = 0;
576 Priv->CurrentFieldsCount = 0; 576 Priv->CurrentFieldsCount = 0;
577 Priv->CurrentFieldsItem = 0; 577 Priv->CurrentFieldsItem = 0;
578 Priv->CurrentFieldsType = 0; 578 Priv->CurrentFieldsType = 0;
579 Priv->ProtocolVersion = V_1_0; 579 Priv->ProtocolVersion = V_1_0;
580 Priv->CurrentFieldsItem = -1; 580 Priv->CurrentFieldsItem = -1;
581 581
582 Priv->CurrentCategoriesCount = 0; 582 Priv->CurrentCategoriesCount = 0;
583 Priv->CurrentCategoriesType = 0; 583 Priv->CurrentCategoriesType = 0;
584 584
585 s->Protocol.Functions = &ATProtocol; 585 s->Protocol.Functions = &ATProtocol;
586 s->Phone.Functions->ReplyFunctions= ATGENReplyFunctions; 586 s->Phone.Functions->ReplyFunctions= ATGENReplyFunctions;
587 587
588 if (ATGEN_Initialise(s) != ERR_NONE || GSM_WaitFor (s, "AT\r", 3, 0x00, 2, ID_IncomingFrame) != ERR_NONE) { 588 if (ATGEN_Initialise(s) != ERR_NONE || GSM_WaitFor (s, "AT\r", 3, 0x00, 2, ID_IncomingFrame) != ERR_NONE) {
589 smprintf(s,"AT initialisation failed, trying to stop binary mode...\n"); 589 smprintf(s,"AT initialisation failed, trying to stop binary mode...\n");
590 s->Protocol.Functions = &ALCABUSProtocol; 590 s->Protocol.Functions = &ALCABUSProtocol;
591 error = s->Protocol.Functions->Terminate(s); 591 error = s->Protocol.Functions->Terminate(s);
592 s->Protocol.Functions = &ATProtocol; 592 s->Protocol.Functions = &ATProtocol;
593 593
594 error = ATGEN_Initialise(s); 594 error = ATGEN_Initialise(s);
595 if (error != ERR_NONE) return error; 595 if (error != ERR_NONE) return error;
596 } 596 }
597 597
598 return ERR_NONE; 598 return ERR_NONE;
599} 599}
600 600
601static GSM_Error ALCATEL_Terminate(GSM_StateMachine *s) 601static GSM_Error ALCATEL_Terminate(GSM_StateMachine *s)
602{ 602{
603 GSM_Error error; 603 GSM_Error error;
604 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 604 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
605 605
606 free(Priv->CalendarItems); 606 free(Priv->CalendarItems);
607 free(Priv->ContactsItems); 607 free(Priv->ContactsItems);
608 free(Priv->ToDoItems); 608 free(Priv->ToDoItems);
609 error = ALCATEL_SetATMode(s); 609 error = ALCATEL_SetATMode(s);
610 return ATGEN_Terminate(s); 610 return ATGEN_Terminate(s);
611} 611}
612 612
613/* finds whether id is set in the phone */ 613/* finds whether id is set in the phone */
614static GSM_Error ALCATEL_IsIdAvailable(GSM_StateMachine *s, int id) { 614static GSM_Error ALCATEL_IsIdAvailable(GSM_StateMachine *s, int id) {
615 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 615 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
616 int i; 616 int i;
617 617
618 if (id > ALCATEL_MAX_LOCATION) return ERR_INVALIDLOCATION; 618 if (id > ALCATEL_MAX_LOCATION) return ERR_INVALIDLOCATION;
619 619
620 switch (Priv->BinaryType) { 620 switch (Priv->BinaryType) {
621 case TypeCalendar: 621 case TypeCalendar:
622 Priv->CurrentList = &(Priv->CalendarItems); 622 Priv->CurrentList = &(Priv->CalendarItems);
623 Priv->CurrentCount = &(Priv->CalendarItemsCount); 623 Priv->CurrentCount = &(Priv->CalendarItemsCount);
624 break; 624 break;
625 case TypeContacts: 625 case TypeContacts:
626 Priv->CurrentList = &(Priv->ContactsItems); 626 Priv->CurrentList = &(Priv->ContactsItems);
627 Priv->CurrentCount = &(Priv->ContactsItemsCount); 627 Priv->CurrentCount = &(Priv->ContactsItemsCount);
628 break; 628 break;
629 case TypeToDo: 629 case TypeToDo:
630 Priv->CurrentList = &(Priv->ToDoItems); 630 Priv->CurrentList = &(Priv->ToDoItems);
631 Priv->CurrentCount = &(Priv->ToDoItemsCount); 631 Priv->CurrentCount = &(Priv->ToDoItemsCount);
632 break; 632 break;
633 } 633 }
634 634
635 for (i=0; i<*Priv->CurrentCount; i++) { 635 for (i=0; i<*Priv->CurrentCount; i++) {
636 if ((*Priv->CurrentList)[i] == id) return ERR_NONE; 636 if ((*Priv->CurrentList)[i] == id) return ERR_NONE;
637 } 637 }
638 638
639 return ERR_EMPTY; 639 return ERR_EMPTY;
640} 640}
641 641
642/* finds next id that is available in the phone */ 642/* finds next id that is available in the phone */
643static GSM_Error ALCATEL_GetNextId(GSM_StateMachine *s, int *id) { 643static GSM_Error ALCATEL_GetNextId(GSM_StateMachine *s, int *id) {
644 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 644 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
645 int i = 0; 645 int i = 0;
646 int next = ALCATEL_MAX_LOCATION; 646 int next = ALCATEL_MAX_LOCATION;
647 647
648 switch (Priv->BinaryType) { 648 switch (Priv->BinaryType) {
649 case TypeCalendar: 649 case TypeCalendar:
650 Priv->CurrentList = &(Priv->CalendarItems); 650 Priv->CurrentList = &(Priv->CalendarItems);
651 Priv->CurrentCount = &(Priv->CalendarItemsCount); 651 Priv->CurrentCount = &(Priv->CalendarItemsCount);
652 break; 652 break;
653 case TypeContacts: 653 case TypeContacts:
654 Priv->CurrentList = &(Priv->ContactsItems); 654 Priv->CurrentList = &(Priv->ContactsItems);
655 Priv->CurrentCount = &(Priv->ContactsItemsCount); 655 Priv->CurrentCount = &(Priv->ContactsItemsCount);
656 break; 656 break;
657 case TypeToDo: 657 case TypeToDo:
658 Priv->CurrentList = &(Priv->ToDoItems); 658 Priv->CurrentList = &(Priv->ToDoItems);
659 Priv->CurrentCount = &(Priv->ToDoItemsCount); 659 Priv->CurrentCount = &(Priv->ToDoItemsCount);
660 break; 660 break;
661 } 661 }
662 662
663 for (i=0; i<*Priv->CurrentCount; i++) { 663 for (i=0; i<*Priv->CurrentCount; i++) {
664 if (((*Priv->CurrentList)[i] > *id) && ((*Priv->CurrentList)[i] < next )) { 664 if (((*Priv->CurrentList)[i] > *id) && ((*Priv->CurrentList)[i] < next )) {
665 next = (*Priv->CurrentList)[i]; 665 next = (*Priv->CurrentList)[i];
666 } 666 }
667 } 667 }
668 if (next == ALCATEL_MAX_LOCATION) { 668 if (next == ALCATEL_MAX_LOCATION) {
669 return ERR_EMPTY; 669 return ERR_EMPTY;
670 } else { 670 } else {
671 *id = next; 671 *id = next;
672 return ERR_NONE; 672 return ERR_NONE;
673 } 673 }
674} 674}
675 675
676static GSM_Error ALCATEL_ReplyGetIds(GSM_Protocol_Message msg, GSM_StateMachine *s) 676static GSM_Error ALCATEL_ReplyGetIds(GSM_Protocol_Message msg, GSM_StateMachine *s)
677{ 677{
678 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL; 678 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL;
679 int count,i,pos; 679 int count,i,pos;
680 680
681 count = msg.Buffer[10]; 681 count = msg.Buffer[10];
682 *Priv->CurrentCount += count; 682 *Priv->CurrentCount += count;
683 683
684 *Priv->CurrentList = (int *)realloc(*Priv->CurrentList, (*Priv->CurrentCount + 1)* sizeof(int)); 684 *Priv->CurrentList = (int *)realloc(*Priv->CurrentList, (*Priv->CurrentCount + 1)* sizeof(int));
685 if (*Priv->CurrentList == NULL) return ERR_MOREMEMORY; 685 if (*Priv->CurrentList == NULL) return ERR_MOREMEMORY;
686 686
687 for (i = 0; i < count; i++) { 687 for (i = 0; i < count; i++) {
688 pos = 11 + (4 * i); 688 pos = 11 + (4 * i);
689 (*Priv->CurrentList)[*Priv->CurrentCount - count + i] = msg.Buffer[pos + 3] + 689 (*Priv->CurrentList)[*Priv->CurrentCount - count + i] = msg.Buffer[pos + 3] +
690 (msg.Buffer[pos + 2] << 8) + 690 (msg.Buffer[pos + 2] << 8) +
691 (msg.Buffer[pos + 1] << 16) + 691 (msg.Buffer[pos + 1] << 16) +
692 (msg.Buffer[pos] << 24); 692 (msg.Buffer[pos] << 24);
693 } 693 }
694 (*Priv->CurrentList)[*Priv->CurrentCount] = 0; 694 (*Priv->CurrentList)[*Priv->CurrentCount] = 0;
695 695
696 /* If last byte is 0, then we transmitted all items */ 696 /* If last byte is 0, then we transmitted all items */
697 Priv->TransferCompleted = msg.Buffer[4 + msg.Buffer[4]] == 0; 697 Priv->TransferCompleted = msg.Buffer[4 + msg.Buffer[4]] == 0;
698 return ERR_NONE; 698 return ERR_NONE;
699} 699}
700 700
701static GSM_Error ALCATEL_GetAvailableIds(GSM_StateMachine *s, bool refresh) 701static GSM_Error ALCATEL_GetAvailableIds(GSM_StateMachine *s, bool refresh)
702{ 702{
703 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 703 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
704 GSM_Error error; 704 GSM_Error error;
705 int i; 705 int i;
706 unsigned char buffer[] = 706 unsigned char buffer[] =
707 {0x00, 0x04, 707 {0x00, 0x04,
708 0x00, /*type */ 708 0x00, /*type */
709 0x2F, 0x01}; 709 0x2F, 0x01};
710 710
711 if (Priv->BinaryState != StateSession) return ERR_UNKNOWN; 711 if (Priv->BinaryState != StateSession) return ERR_UNKNOWN;
712 712
713 switch (Priv->BinaryType) { 713 switch (Priv->BinaryType) {
714 case TypeCalendar: 714 case TypeCalendar:
715 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 715 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
716 Priv->CurrentList= &(Priv->CalendarItems); 716 Priv->CurrentList= &(Priv->CalendarItems);
717 Priv->CurrentCount= &(Priv->CalendarItemsCount); 717 Priv->CurrentCount= &(Priv->CalendarItemsCount);
718 break; 718 break;
719 case TypeContacts: 719 case TypeContacts:
720 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 720 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
721 Priv->CurrentList= &(Priv->ContactsItems); 721 Priv->CurrentList= &(Priv->ContactsItems);
722 Priv->CurrentCount= &(Priv->ContactsItemsCount); 722 Priv->CurrentCount= &(Priv->ContactsItemsCount);
723 break; 723 break;
724 case TypeToDo: 724 case TypeToDo:
725 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 725 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
726 Priv->CurrentList= &(Priv->ToDoItems); 726 Priv->CurrentList= &(Priv->ToDoItems);
727 Priv->CurrentCount= &(Priv->ToDoItemsCount); 727 Priv->CurrentCount= &(Priv->ToDoItemsCount);
728 break; 728 break;
729 } 729 }
730 730
731 if (*Priv->CurrentList != NULL) { 731 if (*Priv->CurrentList != NULL) {
732 if (!refresh) return ERR_NONE; 732 if (!refresh) return ERR_NONE;
733 free(*Priv->CurrentList); 733 free(*Priv->CurrentList);
734 *Priv->CurrentList = NULL; 734 *Priv->CurrentList = NULL;
735 } 735 }
736 smprintf(s,"Reading items list\n"); 736 smprintf(s,"Reading items list\n");
737 737
738 *Priv->CurrentCount = 0; 738 *Priv->CurrentCount = 0;
739 Priv->TransferCompleted = false; 739 Priv->TransferCompleted = false;
740 740
741 error=GSM_WaitFor (s, buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetIds1); 741 error=GSM_WaitFor (s, buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetIds1);
742 if (error != ERR_NONE) return error; 742 if (error != ERR_NONE) return error;
743 743
744 while (!Priv->TransferCompleted) { 744 while (!Priv->TransferCompleted) {
745 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetIds2); 745 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetIds2);
746 if (error != ERR_NONE) return error; 746 if (error != ERR_NONE) return error;
747 } 747 }
748 748
749 i = 0; 749 i = 0;
750 smprintf(s,"Received %d ids: ", *Priv->CurrentCount); 750 smprintf(s,"Received %d ids: ", *Priv->CurrentCount);
751 for (i=0; i < *Priv->CurrentCount; i++) { 751 for (i=0; i < *Priv->CurrentCount; i++) {
752 smprintf(s,"%x ", (*Priv->CurrentList)[i]); 752 smprintf(s,"%x ", (*Priv->CurrentList)[i]);
753 } 753 }
754 smprintf(s,"\n"); 754 smprintf(s,"\n");
755 755
756 return ERR_NONE; 756 return ERR_NONE;
757} 757}
758 758
759static GSM_Error ALCATEL_ReplyGetFields(GSM_Protocol_Message msg, GSM_StateMachine *s) 759static GSM_Error ALCATEL_ReplyGetFields(GSM_Protocol_Message msg, GSM_StateMachine *s)
760{ 760{
761 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL; 761 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL;
762 int i; 762 int i;
763 763
764 if (msg.Buffer[14] > GSM_PHONEBOOK_ENTRIES) { 764 if (msg.Buffer[14] > GSM_PHONEBOOK_ENTRIES) {
765 smprintf(s, "WARNING: Field list truncated, you should increase GSM_PHONEBOOK_ENTRIES to at least %d\n", msg.Buffer[14]); 765 smprintf(s, "WARNING: Field list truncated, you should increase GSM_PHONEBOOK_ENTRIES to at least %d\n", msg.Buffer[14]);
766 Priv->CurrentFieldsCount = GSM_PHONEBOOK_ENTRIES; 766 Priv->CurrentFieldsCount = GSM_PHONEBOOK_ENTRIES;
767 } else { 767 } else {
768 Priv->CurrentFieldsCount = msg.Buffer[14]; 768 Priv->CurrentFieldsCount = msg.Buffer[14];
769 } 769 }
770 770
771 Priv->CurrentFields[Priv->CurrentFieldsCount] = 0; 771 Priv->CurrentFields[Priv->CurrentFieldsCount] = 0;
772 772
773 for (i = 0; i < Priv->CurrentFieldsCount; i++) { 773 for (i = 0; i < Priv->CurrentFieldsCount; i++) {
774 Priv->CurrentFields[i] = msg.Buffer[15 + i]; 774 Priv->CurrentFields[i] = msg.Buffer[15 + i];
775 } 775 }
776 776
777 return ERR_NONE; 777 return ERR_NONE;
778} 778}
779 779
780static GSM_Error ALCATEL_GetFields(GSM_StateMachine *s, int id) { 780static GSM_Error ALCATEL_GetFields(GSM_StateMachine *s, int id) {
781 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 781 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
782 GSM_Error error; 782 GSM_Error error;
783 int i; 783 int i;
784 unsigned char buffer[] = 784 unsigned char buffer[] =
785 {0x00, 0x04, 785 {0x00, 0x04,
786 0x00, /* type */ 786 0x00, /* type */
787 0x30, 0x01, 787 0x30, 0x01,
788 0x00, 0x00, 0x00, 0x00}; /* item */ 788 0x00, 0x00, 0x00, 0x00}; /* item */
789 789
790 if (Priv->BinaryState != StateSession) return ERR_UNKNOWN; 790 if (Priv->BinaryState != StateSession) return ERR_UNKNOWN;
791 if ((Priv->CurrentFieldsItem == id) && (Priv->CurrentFieldsType == Priv->BinaryType)) return ERR_NONE; 791 if ((Priv->CurrentFieldsItem == id) && (Priv->CurrentFieldsType == Priv->BinaryType)) return ERR_NONE;
792 792
793 smprintf(s,"Reading item fields (%d)\n", id); 793 smprintf(s,"Reading item fields (%d)\n", id);
794 794
795 buffer[5] = (id >> 24); 795 buffer[5] = (id >> 24);
796 buffer[6] = ((id >> 16) & 0xff); 796 buffer[6] = ((id >> 16) & 0xff);
797 buffer[7] = ((id >> 8) & 0xff); 797 buffer[7] = ((id >> 8) & 0xff);
798 buffer[8] = (id & 0xff); 798 buffer[8] = (id & 0xff);
799 799
800 switch (Priv->BinaryType) { 800 switch (Priv->BinaryType) {
801 case TypeCalendar: 801 case TypeCalendar:
802 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 802 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
803 break; 803 break;
804 case TypeContacts: 804 case TypeContacts:
805 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 805 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
806 break; 806 break;
807 case TypeToDo: 807 case TypeToDo:
808 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 808 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
809 break; 809 break;
810 } 810 }
811 811
812 Priv->CurrentFieldsItem = id; 812 Priv->CurrentFieldsItem = id;
813 Priv->CurrentFieldsType = Priv->BinaryType; 813 Priv->CurrentFieldsType = Priv->BinaryType;
814 814
815 error=GSM_WaitFor (s, buffer, 9, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetFields1); 815 error=GSM_WaitFor (s, buffer, 9, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetFields1);
816 if (error != ERR_NONE) return error; 816 if (error != ERR_NONE) return error;
817 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetFields2); 817 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetFields2);
818 if (error != ERR_NONE) return error; 818 if (error != ERR_NONE) return error;
819 819
820 i = 0; 820 i = 0;
821 smprintf(s,"Received %d fields: ", Priv->CurrentFieldsCount); 821 smprintf(s,"Received %d fields: ", Priv->CurrentFieldsCount);
822 for (i=0; i < Priv->CurrentFieldsCount; i++) { 822 for (i=0; i < Priv->CurrentFieldsCount; i++) {
823 smprintf(s,"%x ", Priv->CurrentFields[i]); 823 smprintf(s,"%x ", Priv->CurrentFields[i]);
824 } 824 }
825 smprintf(s,"\n"); 825 smprintf(s,"\n");
826 826
827 return ERR_NONE; 827 return ERR_NONE;
828} 828}
829 829
830static GSM_Error ALCATEL_ReplyGetFieldValue(GSM_Protocol_Message msg, GSM_StateMachine *s) 830static GSM_Error ALCATEL_ReplyGetFieldValue(GSM_Protocol_Message msg, GSM_StateMachine *s)
831{ 831{
832 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL; 832 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL;
833 unsigned char *buffer = &(msg.Buffer[16]); 833 unsigned char *buffer = &(msg.Buffer[16]);
834 834
835 if (buffer[1] == 0x05 && buffer[2] == 0x67) { 835 if (buffer[1] == 0x05 && buffer[2] == 0x67) {
836 /* date */ 836 /* date */
837 Priv->ReturnType = Alcatel_date; 837 Priv->ReturnType = Alcatel_date;
838 Priv->ReturnDateTime.Day= buffer[4]; 838 Priv->ReturnDateTime.Day= buffer[4];
839 Priv->ReturnDateTime.Month= buffer[5]; 839 Priv->ReturnDateTime.Month= buffer[5];
840 Priv->ReturnDateTime.Year= buffer[7] + (buffer[6] << 8); 840 Priv->ReturnDateTime.Year= buffer[7] + (buffer[6] << 8);
841 Priv->ReturnDateTime.Timezone= 0; /* FIXME: how to acquire this? */ 841 Priv->ReturnDateTime.Timezone= 0; /* FIXME: how to acquire this? */
842 842
843 Priv->ReturnDateTime.Hour= 0; 843 Priv->ReturnDateTime.Hour= 0;
844 Priv->ReturnDateTime.Minute= 0; 844 Priv->ReturnDateTime.Minute= 0;
845 Priv->ReturnDateTime.Second= 0; 845 Priv->ReturnDateTime.Second= 0;
846 } else if (buffer[1] == 0x06 && buffer[2] == 0x68) { 846 } else if (buffer[1] == 0x06 && buffer[2] == 0x68) {
847 /* time */ 847 /* time */
848 Priv->ReturnType = Alcatel_time; 848 Priv->ReturnType = Alcatel_time;
849 Priv->ReturnDateTime.Hour= buffer[4]; 849 Priv->ReturnDateTime.Hour= buffer[4];
850 Priv->ReturnDateTime.Minute= buffer[5]; 850 Priv->ReturnDateTime.Minute= buffer[5];
851 Priv->ReturnDateTime.Second= buffer[6]; 851 Priv->ReturnDateTime.Second= buffer[6];
852 852
853 Priv->ReturnDateTime.Day= 0; 853 Priv->ReturnDateTime.Day= 0;
854 Priv->ReturnDateTime.Month= 0; 854 Priv->ReturnDateTime.Month= 0;
855 Priv->ReturnDateTime.Year= 0; 855 Priv->ReturnDateTime.Year= 0;
856 Priv->ReturnDateTime.Timezone= 0; 856 Priv->ReturnDateTime.Timezone= 0;
857 } else if (buffer[1] == 0x08 && buffer[2] == 0x3C) { 857 } else if (buffer[1] == 0x08 && buffer[2] == 0x3C) {
858 /* string */ 858 /* string */
859 Priv->ReturnType = Alcatel_string; 859 Priv->ReturnType = Alcatel_string;
860 if (GSM_PHONEBOOK_TEXT_LENGTH < buffer[3]) 860 if (GSM_PHONEBOOK_TEXT_LENGTH < buffer[3])
861 smprintf(s, "WARNING: Text truncated, you should increase GSM_PHONEBOOK_TEXT_LENGTH to at least %d\n", buffer[3] + 1); 861 smprintf(s, "WARNING: Text truncated, you should increase GSM_PHONEBOOK_TEXT_LENGTH to at least %d\n", buffer[3] + 1);
862 if (Priv->ProtocolVersion == V_1_0) { 862 if (Priv->ProtocolVersion == V_1_0) {
863 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet); 863 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet);
864 } else if(Priv->ProtocolVersion == V_1_1 && (buffer[4] & 0x80)) { 864 } else if(Priv->ProtocolVersion == V_1_1 && (buffer[4] & 0x80)) {
865 memcpy(Priv->ReturnString, buffer + 5, buffer[3]); 865 memcpy(Priv->ReturnString, buffer + 5, buffer[3]);
866 Priv->ReturnString[buffer[3] + 1] = 0; 866 Priv->ReturnString[buffer[3] + 1] = 0;
867 Priv->ReturnString[buffer[3] + 2] = 0; 867 Priv->ReturnString[buffer[3] + 2] = 0;
868 ReverseUnicodeString(Priv->ReturnString); 868 ReverseUnicodeString(Priv->ReturnString);
869 } else { 869 } else {
870 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet); 870 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet);
871 } 871 }
872 } else if (buffer[1] == 0x07 && buffer[2] == 0x3C) { 872 } else if (buffer[1] == 0x07 && buffer[2] == 0x3C) {
873 /* phone */ 873 /* phone */
874 Priv->ReturnType = Alcatel_phone; 874 Priv->ReturnType = Alcatel_phone;
875 if (GSM_PHONEBOOK_TEXT_LENGTH < buffer[3]) 875 if (GSM_PHONEBOOK_TEXT_LENGTH < buffer[3])
876 smprintf(s, "WARNING: Text truncated, you should increase GSM_PHONEBOOK_TEXT_LENGTH to at least %d\n", buffer[3] + 1); 876 smprintf(s, "WARNING: Text truncated, you should increase GSM_PHONEBOOK_TEXT_LENGTH to at least %d\n", buffer[3] + 1);
877 if (Priv->ProtocolVersion == V_1_0) { 877 if (Priv->ProtocolVersion == V_1_0) {
878 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet); 878 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet);
879 } else if(Priv->ProtocolVersion == V_1_1 && (buffer[4] & 0x80)) { 879 } else if(Priv->ProtocolVersion == V_1_1 && (buffer[4] & 0x80)) {
880 memcpy(Priv->ReturnString, buffer + 5, buffer[3]); 880 memcpy(Priv->ReturnString, buffer + 5, buffer[3]);
881 Priv->ReturnString[buffer[3] + 1] = 0; 881 Priv->ReturnString[buffer[3] + 1] = 0;
882 Priv->ReturnString[buffer[3] + 2] = 0; 882 Priv->ReturnString[buffer[3] + 2] = 0;
883 ReverseUnicodeString(Priv->ReturnString); 883 ReverseUnicodeString(Priv->ReturnString);
884 } else { 884 } else {
885 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet); 885 DecodeDefault( Priv->ReturnString, buffer + 4, MIN(GSM_PHONEBOOK_TEXT_LENGTH, buffer[3]), false, GSM_AlcatelAlphabet);
886 } 886 }
887 } else if (buffer[1] == 0x03 && buffer[2] == 0x3B) { 887 } else if (buffer[1] == 0x03 && buffer[2] == 0x3B) {
888 /* boolean */ 888 /* boolean */
889 Priv->ReturnType = Alcatel_bool; 889 Priv->ReturnType = Alcatel_bool;
890 Priv->ReturnInt = buffer[3]; 890 Priv->ReturnInt = buffer[3];
891 } else if (buffer[1] == 0x02 && buffer[2] == 0x3A) { 891 } else if (buffer[1] == 0x02 && buffer[2] == 0x3A) {
892 /* integer */ 892 /* integer */
893 Priv->ReturnType = Alcatel_int; 893 Priv->ReturnType = Alcatel_int;
894 Priv->ReturnInt = buffer[6] + (buffer[5] << 8) + (buffer[4] << 16) + (buffer[3] << 24); 894 Priv->ReturnInt = buffer[6] + (buffer[5] << 8) + (buffer[4] << 16) + (buffer[3] << 24);
895 } else if (buffer[1] == 0x04 && buffer[2] == 0x38) { 895 } else if (buffer[1] == 0x04 && buffer[2] == 0x38) {
896 /* enumeration */ 896 /* enumeration */
897 Priv->ReturnType = Alcatel_enum; 897 Priv->ReturnType = Alcatel_enum;
898 Priv->ReturnInt = buffer[3]; 898 Priv->ReturnInt = buffer[3];
899 } else if (buffer[1] == 0x00 && buffer[2] == 0x38) { 899 } else if (buffer[1] == 0x00 && buffer[2] == 0x38) {
900 /* byte */ 900 /* byte */
901 Priv->ReturnType = Alcatel_byte; 901 Priv->ReturnType = Alcatel_byte;
902 Priv->ReturnInt = buffer[3]; 902 Priv->ReturnInt = buffer[3];
903 } else { 903 } else {
904 smprintf(s, "WARNING: Uknown data type received (%02X,%02X)\n", buffer[1], buffer[2]); 904 smprintf(s, "WARNING: Uknown data type received (%02X,%02X)\n", buffer[1], buffer[2]);
905 return ERR_UNKNOWNRESPONSE; 905 return ERR_UNKNOWNRESPONSE;
906 } 906 }
907 return ERR_NONE; 907 return ERR_NONE;
908} 908}
909 909
910static GSM_Error ALCATEL_GetFieldValue(GSM_StateMachine *s, int id, int field) 910static GSM_Error ALCATEL_GetFieldValue(GSM_StateMachine *s, int id, int field)
911{ 911{
912 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 912 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
913 GSM_Error error; 913 GSM_Error error;
914 unsigned char buffer[] = 914 unsigned char buffer[] =
915 {0x00, 0x04, 915 {0x00, 0x04,
916 0x00, /* type */ 916 0x00, /* type */
917 0x1f, 0x01, 917 0x1f, 0x01,
918 0x00, 0x00, 0x00, 0x00,/* here follows 4byte id */ 918 0x00, 0x00, 0x00, 0x00,/* here follows 4byte id */
919 0x00}; /* field */ 919 0x00}; /* field */
920 920
921 smprintf(s,"Reading item value (%08x.%02x)\n", id, field); 921 smprintf(s,"Reading item value (%08x.%02x)\n", id, field);
922 922
923 switch (Priv->BinaryType) { 923 switch (Priv->BinaryType) {
924 case TypeCalendar: 924 case TypeCalendar:
925 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 925 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
926 break; 926 break;
927 case TypeContacts: 927 case TypeContacts:
928 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 928 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
929 break; 929 break;
930 case TypeToDo: 930 case TypeToDo:
931 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 931 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
932 break; 932 break;
933 } 933 }
934 934
935 buffer[5] = (id >> 24); 935 buffer[5] = (id >> 24);
936 buffer[6] = ((id >> 16) & 0xff); 936 buffer[6] = ((id >> 16) & 0xff);
937 buffer[7] = ((id >> 8) & 0xff); 937 buffer[7] = ((id >> 8) & 0xff);
938 buffer[8] = (id & 0xff); 938 buffer[8] = (id & 0xff);
939 buffer[9] = (field & 0xff); 939 buffer[9] = (field & 0xff);
940 940
941 error=GSM_WaitFor (s, buffer, 10, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetFieldValue1); 941 error=GSM_WaitFor (s, buffer, 10, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetFieldValue1);
942 if (error != ERR_NONE) return error; 942 if (error != ERR_NONE) return error;
943 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetFieldValue2); 943 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetFieldValue2);
944 if (error != ERR_NONE) return error; 944 if (error != ERR_NONE) return error;
945 945
946 return ERR_NONE; 946 return ERR_NONE;
947} 947}
948 948
949static GSM_Error ALCATEL_ReplyGetCategories(GSM_Protocol_Message msg, GSM_StateMachine *s) 949static GSM_Error ALCATEL_ReplyGetCategories(GSM_Protocol_Message msg, GSM_StateMachine *s)
950{ 950{
951 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL; 951 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL;
952 int i; 952 int i;
953 953
954 /* Did we get any category? */ 954 /* Did we get any category? */
955 if (msg.Buffer[4] == 6) { 955 if (msg.Buffer[4] == 6) {
956 Priv->CurrentCategoriesCount = 0; 956 Priv->CurrentCategoriesCount = 0;
957 return ERR_NONE; 957 return ERR_NONE;
958 } 958 }
959 if (msg.Buffer[12] > ALCATEL_MAX_CATEGORIES) { 959 if (msg.Buffer[12] > ALCATEL_MAX_CATEGORIES) {
960 smprintf(s, "WARNING: Field list truncated, you should increase ALCATEL_MAX_CATEGORIES to at least %d\n", msg.Buffer[12]); 960 smprintf(s, "WARNING: Field list truncated, you should increase ALCATEL_MAX_CATEGORIES to at least %d\n", msg.Buffer[12]);
961 Priv->CurrentCategoriesCount = ALCATEL_MAX_CATEGORIES; 961 Priv->CurrentCategoriesCount = ALCATEL_MAX_CATEGORIES;
962 } else { 962 } else {
963 Priv->CurrentCategoriesCount = msg.Buffer[12]; 963 Priv->CurrentCategoriesCount = msg.Buffer[12];
964 } 964 }
965 965
966 for (i = 0; i < Priv->CurrentCategoriesCount; i++) { 966 for (i = 0; i < Priv->CurrentCategoriesCount; i++) {
967 Priv->CurrentCategories[i] = msg.Buffer[13 + i]; 967 Priv->CurrentCategories[i] = msg.Buffer[13 + i];
968 Priv->CurrentCategoriesCache[i][0] = '\000'; 968 Priv->CurrentCategoriesCache[i][0] = '\000';
969 Priv->CurrentCategoriesCache[i][1] = '\000'; 969 Priv->CurrentCategoriesCache[i][1] = '\000';
970 } 970 }
971 971
972 return ERR_NONE; 972 return ERR_NONE;
973} 973}
974 974
975static GSM_Error ALCATEL_GetAvailableCategoryIds(GSM_StateMachine *s) { 975static GSM_Error ALCATEL_GetAvailableCategoryIds(GSM_StateMachine *s) {
976 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 976 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
977 GSM_Error error; 977 GSM_Error error;
978 int i; 978 int i;
979 unsigned char buffer[] = 979 unsigned char buffer[] =
980 {0x00, 0x04, 980 {0x00, 0x04,
981 0x00 /*type */, 981 0x00 /*type */,
982 0x0b, 982 0x0b,
983 0x00 /* list */}; 983 0x00 /* list */};
984 984
985 if (Priv->BinaryState != StateSession) return ERR_UNKNOWN; 985 if (Priv->BinaryState != StateSession) return ERR_UNKNOWN;
986 if (Priv->CurrentCategoriesType == Priv->BinaryType) return ERR_NONE; 986 if (Priv->CurrentCategoriesType == Priv->BinaryType) return ERR_NONE;
987 switch (Priv->BinaryType) { 987 switch (Priv->BinaryType) {
988 case TypeContacts: 988 case TypeContacts:
989 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 989 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
990 buffer[4] = ALCATEL_LIST_CONTACTS_CAT; 990 buffer[4] = ALCATEL_LIST_CONTACTS_CAT;
991 break; 991 break;
992 case TypeToDo: 992 case TypeToDo:
993 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 993 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
994 buffer[4] = ALCATEL_LIST_TODO_CAT; 994 buffer[4] = ALCATEL_LIST_TODO_CAT;
995 break; 995 break;
996 default: 996 default:
997 return ERR_NOTSUPPORTED; 997 return ERR_NOTSUPPORTED;
998 } 998 }
999 999
1000 Priv->CurrentCategoriesType = Priv->BinaryType; 1000 Priv->CurrentCategoriesType = Priv->BinaryType;
1001 1001
1002 smprintf(s,"Reading category list\n"); 1002 smprintf(s,"Reading category list\n");
1003 1003
1004 error=GSM_WaitFor (s, buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetCategories1); 1004 error=GSM_WaitFor (s, buffer, 5, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetCategories1);
1005 if (error != ERR_NONE) return error; 1005 if (error != ERR_NONE) return error;
1006 1006
1007 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetCategories2); 1007 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetCategories2);
1008 if (error != ERR_NONE) return error; 1008 if (error != ERR_NONE) return error;
1009 1009
1010 i = 0; 1010 i = 0;
1011 smprintf(s,"Received %d ids: ", Priv->CurrentCategoriesCount); 1011 smprintf(s,"Received %d ids: ", Priv->CurrentCategoriesCount);
1012 for (i=0; i < Priv->CurrentCategoriesCount; i++) { 1012 for (i=0; i < Priv->CurrentCategoriesCount; i++) {
1013 smprintf(s,"%i ", Priv->CurrentCategories[i]); 1013 smprintf(s,"%i ", Priv->CurrentCategories[i]);
1014 } 1014 }
1015 smprintf(s,"\n"); 1015 smprintf(s,"\n");
1016 1016
1017 return ERR_NONE; 1017 return ERR_NONE;
1018} 1018}
1019 1019
1020static GSM_Error ALCATEL_IsCategoryIdAvailable(GSM_StateMachine *s, int id) { 1020static GSM_Error ALCATEL_IsCategoryIdAvailable(GSM_StateMachine *s, int id) {
1021 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1021 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1022 int i = 0; 1022 int i = 0;
1023 1023
1024 if (Priv->CurrentCategoriesType != Priv->BinaryType) return ERR_UNKNOWN; 1024 if (Priv->CurrentCategoriesType != Priv->BinaryType) return ERR_UNKNOWN;
1025 1025
1026 for (i = 0; i< Priv->CurrentCategoriesCount; i++) { 1026 for (i = 0; i< Priv->CurrentCategoriesCount; i++) {
1027 if (Priv->CurrentCategories[i] == id) return ERR_NONE; 1027 if (Priv->CurrentCategories[i] == id) return ERR_NONE;
1028 } 1028 }
1029 return ERR_EMPTY; 1029 return ERR_EMPTY;
1030} 1030}
1031 1031
1032static GSM_Error ALCATEL_ReplyAddCategoryText(GSM_Protocol_Message msg, GSM_StateMachine *s) 1032static GSM_Error ALCATEL_ReplyAddCategoryText(GSM_Protocol_Message msg, GSM_StateMachine *s)
1033{ 1033{
1034 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL; 1034 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL;
1035 1035
1036 Priv->ReturnInt = msg.Buffer[12]; 1036 Priv->ReturnInt = msg.Buffer[12];
1037 1037
1038 return ERR_NONE; 1038 return ERR_NONE;
1039} 1039}
1040 1040
1041static GSM_Error ALCATEL_AddCategoryText(GSM_StateMachine *s, const unsigned char *str) { 1041static GSM_Error ALCATEL_AddCategoryText(GSM_StateMachine *s, const unsigned char *str) {
1042 unsigned char buffer[200] = {0x00, 0x04, 0x00 /*type*/, 0x0d, 0x00 /*list*/, 0x0b }; 1042 unsigned char buffer[200] = {0x00, 0x04, 0x00 /*type*/, 0x0d, 0x00 /*list*/, 0x0b };
1043 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1043 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1044 GSM_Error error; 1044 GSM_Error error;
1045 int len; 1045 int len;
1046 1046
1047 smprintf(s,"Creating category\n"); 1047 smprintf(s,"Creating category\n");
1048 len = UnicodeLength(str); 1048 len = UnicodeLength(str);
1049 EncodeDefault(buffer + 8, str, &len, true, GSM_AlcatelAlphabet); 1049 EncodeDefault(buffer + 8, str, &len, true, GSM_AlcatelAlphabet);
1050 buffer[6] = len + 1; 1050 buffer[6] = len + 1;
1051 buffer[7] = len; 1051 buffer[7] = len;
1052 1052
1053 switch (Priv->BinaryType) { 1053 switch (Priv->BinaryType) {
1054 case TypeContacts: 1054 case TypeContacts:
1055 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 1055 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
1056 buffer[4] = ALCATEL_LIST_CONTACTS_CAT; 1056 buffer[4] = ALCATEL_LIST_CONTACTS_CAT;
1057 break; 1057 break;
1058 case TypeToDo: 1058 case TypeToDo:
1059 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 1059 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
1060 buffer[4] = ALCATEL_LIST_TODO_CAT; 1060 buffer[4] = ALCATEL_LIST_TODO_CAT;
1061 break; 1061 break;
1062 default: 1062 default:
1063 return ERR_NOTSUPPORTED; 1063 return ERR_NOTSUPPORTED;
1064 } 1064 }
1065 1065
1066 error=GSM_WaitFor (s, buffer, 8 + len, 0x02, ALCATEL_TIMEOUT, ID_AlcatelAddCategoryText1); 1066 error=GSM_WaitFor (s, buffer, 8 + len, 0x02, ALCATEL_TIMEOUT, ID_AlcatelAddCategoryText1);
1067 if (error != ERR_NONE) return error; 1067 if (error != ERR_NONE) return error;
1068 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelAddCategoryText2); 1068 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelAddCategoryText2);
1069 if (error != ERR_NONE) return error; 1069 if (error != ERR_NONE) return error;
1070 1070
1071 /* Refresh list */ 1071 /* Refresh list */
1072 Priv->CurrentCategoriesType = 0; 1072 Priv->CurrentCategoriesType = 0;
1073 return ALCATEL_GetAvailableCategoryIds(s); 1073 return ALCATEL_GetAvailableCategoryIds(s);
1074} 1074}
1075 1075
1076static GSM_Error ALCATEL_ReplyGetCategoryText(GSM_Protocol_Message msg, GSM_StateMachine *s) 1076static GSM_Error ALCATEL_ReplyGetCategoryText(GSM_Protocol_Message msg, GSM_StateMachine *s)
1077{ 1077{
1078 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL; 1078 GSM_Phone_ALCATELData *Priv = &s->Phone.Data.Priv.ALCATEL;
1079 int len; 1079 int len;
1080 1080
1081 len = msg.Buffer[14]; 1081 len = msg.Buffer[14];
1082 if (len > GSM_MAX_CATEGORY_NAME_LENGTH) { 1082 if (len > GSM_MAX_CATEGORY_NAME_LENGTH) {
1083 smprintf(s, "WARNING: Category name truncated, you should increase GSM_MAX_CATEGORY_NAME_LENGTH to at least %d\n", len); 1083 smprintf(s, "WARNING: Category name truncated, you should increase GSM_MAX_CATEGORY_NAME_LENGTH to at least %d\n", len);
1084 } 1084 }
1085 if (Priv->ProtocolVersion == V_1_0) { 1085 if (Priv->ProtocolVersion == V_1_0) {
1086 DecodeDefault( Priv->ReturnString, msg.Buffer + 15, MIN(GSM_MAX_CATEGORY_NAME_LENGTH, len), false, GSM_AlcatelAlphabet); 1086 DecodeDefault( Priv->ReturnString, msg.Buffer + 15, MIN(GSM_MAX_CATEGORY_NAME_LENGTH, len), false, GSM_AlcatelAlphabet);
1087 } else if(Priv->ProtocolVersion == V_1_1 && (msg.Buffer[15] & 0x80)) { 1087 } else if(Priv->ProtocolVersion == V_1_1 && (msg.Buffer[15] & 0x80)) {
1088 memcpy(Priv->ReturnString, msg.Buffer + 16, len); 1088 memcpy(Priv->ReturnString, msg.Buffer + 16, len);
1089 Priv->ReturnString[len + 1] = 0; 1089 Priv->ReturnString[len + 1] = 0;
1090 Priv->ReturnString[len + 2] = 0; 1090 Priv->ReturnString[len + 2] = 0;
1091 ReverseUnicodeString(Priv->ReturnString); 1091 ReverseUnicodeString(Priv->ReturnString);
1092 } else { 1092 } else {
1093 DecodeDefault( Priv->ReturnString, msg.Buffer + 15, MIN(GSM_MAX_CATEGORY_NAME_LENGTH, len), false, GSM_AlcatelAlphabet); 1093 DecodeDefault( Priv->ReturnString, msg.Buffer + 15, MIN(GSM_MAX_CATEGORY_NAME_LENGTH, len), false, GSM_AlcatelAlphabet);
1094 } 1094 }
1095 return ERR_NONE; 1095 return ERR_NONE;
1096} 1096}
1097 1097
1098static GSM_Error ALCATEL_GetCategoryText(GSM_StateMachine *s, int id) { 1098static GSM_Error ALCATEL_GetCategoryText(GSM_StateMachine *s, int id) {
1099 unsigned char buffer[] = {0x00, 0x04, 0x00 /*type*/, 0x0c, 0x00 /*list*/, 0x0A, 0x01, 0x00 /*item*/ }; 1099 unsigned char buffer[] = {0x00, 0x04, 0x00 /*type*/, 0x0c, 0x00 /*list*/, 0x0A, 0x01, 0x00 /*item*/ };
1100 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1100 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1101 GSM_Error error; 1101 GSM_Error error;
1102 1102
1103 if (Priv->CurrentCategoriesCache[id][0] != '\000' || Priv->CurrentCategoriesCache[id][1] != '\000') { 1103 if (Priv->CurrentCategoriesCache[id][0] != '\000' || Priv->CurrentCategoriesCache[id][1] != '\000') {
1104 CopyUnicodeString(Priv->ReturnString, Priv->CurrentCategoriesCache[id]); 1104 CopyUnicodeString(Priv->ReturnString, Priv->CurrentCategoriesCache[id]);
1105 return ERR_NONE; 1105 return ERR_NONE;
1106 } 1106 }
1107 1107
1108 smprintf(s,"Reading category %d\n", id); 1108 smprintf(s,"Reading category %d\n", id);
1109 1109
1110 switch (Priv->BinaryType) { 1110 switch (Priv->BinaryType) {
1111 case TypeContacts: 1111 case TypeContacts:
1112 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 1112 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
1113 buffer[4] = ALCATEL_LIST_CONTACTS_CAT; 1113 buffer[4] = ALCATEL_LIST_CONTACTS_CAT;
1114 break; 1114 break;
1115 case TypeToDo: 1115 case TypeToDo:
1116 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 1116 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
1117 buffer[4] = ALCATEL_LIST_TODO_CAT; 1117 buffer[4] = ALCATEL_LIST_TODO_CAT;
1118 break; 1118 break;
1119 default: 1119 default:
1120 return ERR_NOTSUPPORTED; 1120 return ERR_NOTSUPPORTED;
1121 } 1121 }
1122 1122
1123 buffer[7] = (id & 0xff); 1123 buffer[7] = (id & 0xff);
1124 1124
1125 error=GSM_WaitFor (s, buffer, 8, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetCategoryText1); 1125 error=GSM_WaitFor (s, buffer, 8, 0x02, ALCATEL_TIMEOUT, ID_AlcatelGetCategoryText1);
1126 if (error != ERR_NONE) return error; 1126 if (error != ERR_NONE) return error;
1127 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetCategoryText2); 1127 error=GSM_WaitFor (s, 0, 0, 0x00, ALCATEL_TIMEOUT, ID_AlcatelGetCategoryText2);
1128 if (error != ERR_NONE) return error; 1128 if (error != ERR_NONE) return error;
1129 1129
1130 CopyUnicodeString(Priv->CurrentCategoriesCache[id], Priv->ReturnString); 1130 CopyUnicodeString(Priv->CurrentCategoriesCache[id], Priv->ReturnString);
1131 1131
1132 return ERR_NONE; 1132 return ERR_NONE;
1133} 1133}
1134 1134
1135static GSM_Error ALCATEL_DeleteField(GSM_StateMachine *s, int id, int field) { 1135static GSM_Error ALCATEL_DeleteField(GSM_StateMachine *s, int id, int field) {
1136 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1136 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1137 GSM_Error error; 1137 GSM_Error error;
1138 unsigned char buffer[] = 1138 unsigned char buffer[] =
1139 {0x00, 0x04, 1139 {0x00, 0x04,
1140 0x00, /* type */ 1140 0x00, /* type */
1141 0x26, 0x01, 1141 0x26, 0x01,
1142 0x00, 0x00, 0x00, 0x00,/* here follows 4byte id */ 1142 0x00, 0x00, 0x00, 0x00,/* here follows 4byte id */
1143 0x65, 0x01, 1143 0x65, 0x01,
1144 0x00, /* field */ 1144 0x00, /* field */
1145 0x01}; 1145 0x01};
1146 1146
1147 smprintf(s,"Deleting field (%08x.%02x)\n", id, field); 1147 smprintf(s,"Deleting field (%08x.%02x)\n", id, field);
1148 1148
1149 switch (Priv->BinaryType) { 1149 switch (Priv->BinaryType) {
1150 case TypeCalendar: 1150 case TypeCalendar:
1151 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 1151 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
1152 break; 1152 break;
1153 case TypeContacts: 1153 case TypeContacts:
1154 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 1154 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
1155 break; 1155 break;
1156 case TypeToDo: 1156 case TypeToDo:
1157 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 1157 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
1158 break; 1158 break;
1159 } 1159 }
1160 1160
1161 buffer[5] = (id >> 24); 1161 buffer[5] = (id >> 24);
1162 buffer[6] = ((id >> 16) & 0xff); 1162 buffer[6] = ((id >> 16) & 0xff);
1163 buffer[7] = ((id >> 8) & 0xff); 1163 buffer[7] = ((id >> 8) & 0xff);
1164 buffer[8] = (id & 0xff); 1164 buffer[8] = (id & 0xff);
1165 buffer[11] = (field & 0xff); 1165 buffer[11] = (field & 0xff);
1166 1166
1167 error=GSM_WaitFor (s, buffer, 13, 0x02, ALCATEL_TIMEOUT, ID_AlcatelDeleteField); 1167 error=GSM_WaitFor (s, buffer, 13, 0x02, ALCATEL_TIMEOUT, ID_AlcatelDeleteField);
1168 if (error != ERR_NONE) return error; 1168 if (error != ERR_NONE) return error;
1169 1169
1170 return ERR_NONE; 1170 return ERR_NONE;
1171} 1171}
1172 1172
1173static GSM_Error ALCATEL_DeleteItem(GSM_StateMachine *s, int id) { 1173static GSM_Error ALCATEL_DeleteItem(GSM_StateMachine *s, int id) {
1174 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1174 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1175 GSM_Error error; 1175 GSM_Error error;
1176 unsigned char buffer[] = 1176 unsigned char buffer[] =
1177 {0x00, 0x04, 1177 {0x00, 0x04,
1178 0x00, /* type */ 1178 0x00, /* type */
1179 0x27, 0x01, 1179 0x27, 0x01,
1180 0x00, 0x00, 0x00, 0x00,/* here follows 4byte id */ 1180 0x00, 0x00, 0x00, 0x00,/* here follows 4byte id */
1181 0x42}; 1181 0x42};
1182 1182
1183 smprintf(s,"Deleting item (%08x)\n", id); 1183 smprintf(s,"Deleting item (%08x)\n", id);
1184 1184
1185 switch (Priv->BinaryType) { 1185 switch (Priv->BinaryType) {
1186 case TypeCalendar: 1186 case TypeCalendar:
1187 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 1187 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
1188 break; 1188 break;
1189 case TypeContacts: 1189 case TypeContacts:
1190 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 1190 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
1191 break; 1191 break;
1192 case TypeToDo: 1192 case TypeToDo:
1193 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 1193 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
1194 break; 1194 break;
1195 } 1195 }
1196 1196
1197 buffer[5] = (id >> 24); 1197 buffer[5] = (id >> 24);
1198 buffer[6] = ((id >> 16) & 0xff); 1198 buffer[6] = ((id >> 16) & 0xff);
1199 buffer[7] = ((id >> 8) & 0xff); 1199 buffer[7] = ((id >> 8) & 0xff);
1200 buffer[8] = (id & 0xff); 1200 buffer[8] = (id & 0xff);
1201 1201
1202 error=GSM_WaitFor (s, buffer, 10, 0x02, ALCATEL_TIMEOUT, ID_AlcatelDeleteItem1); 1202 error=GSM_WaitFor (s, buffer, 10, 0x02, ALCATEL_TIMEOUT, ID_AlcatelDeleteItem1);
1203 if (error != ERR_NONE) return error; 1203 if (error != ERR_NONE) return error;
1204 1204
1205 error=GSM_WaitFor (s, 0, 0, 0x0, ALCATEL_TIMEOUT, ID_AlcatelDeleteItem2); 1205 error=GSM_WaitFor (s, 0, 0, 0x0, ALCATEL_TIMEOUT, ID_AlcatelDeleteItem2);
1206 if (error != ERR_NONE) return error; 1206 if (error != ERR_NONE) return error;
1207 1207
1208 return ERR_NONE; 1208 return ERR_NONE;
1209} 1209}
1210 1210
1211static GSM_Error ALCATEL_ReplyDeleteItem(GSM_Protocol_Message msg, GSM_StateMachine *s) 1211static GSM_Error ALCATEL_ReplyDeleteItem(GSM_Protocol_Message msg, GSM_StateMachine *s)
1212{ 1212{
1213 if (msg.Buffer[8] != 0x25) return ERR_UNKNOWNRESPONSE; 1213 if (msg.Buffer[8] != 0x25) return ERR_UNKNOWNRESPONSE;
1214 return ERR_NONE; 1214 return ERR_NONE;
1215} 1215}
1216 1216
1217static GSM_Error ALCATEL_BuildWriteBuffer(unsigned char * buffer, GSM_Alcatel_FieldType type, int field, void *data) { 1217static GSM_Error ALCATEL_BuildWriteBuffer(unsigned char * buffer, GSM_Alcatel_FieldType type, int field, void *data) {
1218 int len; 1218 int len;
1219 1219
1220 buffer[1] = field & 0xff; 1220 buffer[1] = field & 0xff;
1221 1221
1222 switch(type) { 1222 switch(type) {
1223 case Alcatel_date: 1223 case Alcatel_date:
1224 if (!CheckDate((GSM_DateTime *)data)) return ERR_INVALIDDATETIME; 1224 if (!CheckDate((GSM_DateTime *)data)) return ERR_INVALIDDATETIME;
1225 1225
1226 buffer[3] = 0x05; 1226 buffer[3] = 0x05;
1227 buffer[4] = 0x67; 1227 buffer[4] = 0x67;
1228 1228
1229 buffer[0] = 0x09; 1229 buffer[0] = 0x09;
1230 buffer[5] = 0x04; 1230 buffer[5] = 0x04;
1231 buffer[6] = ((GSM_DateTime *)data)->Day & 0xff; 1231 buffer[6] = ((GSM_DateTime *)data)->Day & 0xff;
1232 buffer[7] = ((GSM_DateTime *)data)->Month & 0xff; 1232 buffer[7] = ((GSM_DateTime *)data)->Month & 0xff;
1233 buffer[8] = ((GSM_DateTime *)data)->Year >> 8; 1233 buffer[8] = ((GSM_DateTime *)data)->Year >> 8;
1234 buffer[9] = ((GSM_DateTime *)data)->Year & 0xff; 1234 buffer[9] = ((GSM_DateTime *)data)->Year & 0xff;
1235 buffer[10] = 0x00; 1235 buffer[10] = 0x00;
1236 break; 1236 break;
1237 case Alcatel_time: 1237 case Alcatel_time:
1238 if (!CheckTime((GSM_DateTime *)data)) return ERR_INVALIDDATETIME; 1238 if (!CheckTime((GSM_DateTime *)data)) return ERR_INVALIDDATETIME;
1239 1239
1240 buffer[3] = 0x06; 1240 buffer[3] = 0x06;
1241 buffer[4] = 0x68; 1241 buffer[4] = 0x68;
1242 1242
1243 buffer[0] = 0x08; 1243 buffer[0] = 0x08;
1244 buffer[5] = 0x03; 1244 buffer[5] = 0x03;
1245 buffer[6] = ((GSM_DateTime *)data)->Hour & 0xff; 1245 buffer[6] = ((GSM_DateTime *)data)->Hour & 0xff;
1246 buffer[7] = ((GSM_DateTime *)data)->Minute & 0xff; 1246 buffer[7] = ((GSM_DateTime *)data)->Minute & 0xff;
1247 buffer[8] = ((GSM_DateTime *)data)->Second & 0xff; 1247 buffer[8] = ((GSM_DateTime *)data)->Second & 0xff;
1248 buffer[9] = 0x00; 1248 buffer[9] = 0x00;
1249 break; 1249 break;
1250 case Alcatel_string: 1250 case Alcatel_string:
1251 buffer[3] = 0x08; 1251 buffer[3] = 0x08;
1252 buffer[4] = 0x3c; 1252 buffer[4] = 0x3c;
1253 1253
1254 len = MIN(UnicodeLength((char *)data),62); 1254 len = MIN(UnicodeLength((char *)data),62);
1255 EncodeDefault(buffer + 6, (char *)data, &len, true, GSM_AlcatelAlphabet); 1255 EncodeDefault(buffer + 6, (char *)data, &len, true, GSM_AlcatelAlphabet);
1256 buffer[5] = len; 1256 buffer[5] = len;
1257 buffer[0] = 5 + len; 1257 buffer[0] = 5 + len;
1258 buffer[6 + len] = 0x00; 1258 buffer[6 + len] = 0x00;
1259 break; 1259 break;
1260 case Alcatel_phone: 1260 case Alcatel_phone:
1261 buffer[3] = 0x07; 1261 buffer[3] = 0x07;
1262 buffer[4] = 0x3c; 1262 buffer[4] = 0x3c;
1263 1263
1264 len = MIN(UnicodeLength((char *)data),50); 1264 len = MIN(UnicodeLength((char *)data),50);
1265 EncodeDefault(buffer + 6, (char *)data, &len, true, GSM_AlcatelAlphabet); 1265 EncodeDefault(buffer + 6, (char *)data, &len, true, GSM_AlcatelAlphabet);
1266 buffer[5] = len; 1266 buffer[5] = len;
1267 buffer[0] = 5 + len; 1267 buffer[0] = 5 + len;
1268 buffer[6 + len] = 0x00; 1268 buffer[6 + len] = 0x00;
1269 break; 1269 break;
1270 case Alcatel_enum: 1270 case Alcatel_enum:
1271 buffer[3] = 0x04; 1271 buffer[3] = 0x04;
1272 buffer[4] = 0x38; 1272 buffer[4] = 0x38;
1273 1273
1274 buffer[0] = 0x05; 1274 buffer[0] = 0x05;
1275 buffer[5] = *(int *)data & 0xff; 1275 buffer[5] = *(int *)data & 0xff;
1276 buffer[6] = 0x00; 1276 buffer[6] = 0x00;
1277 break; 1277 break;
1278 case Alcatel_bool: 1278 case Alcatel_bool:
1279 buffer[3] = 0x03; 1279 buffer[3] = 0x03;
1280 buffer[4] = 0x3b; 1280 buffer[4] = 0x3b;
1281 1281
1282 buffer[0] = 0x05; 1282 buffer[0] = 0x05;
1283 buffer[5] = *(int *)data & 0xff; 1283 buffer[5] = *(int *)data & 0xff;
1284 buffer[6] = 0x00; 1284 buffer[6] = 0x00;
1285 break; 1285 break;
1286 case Alcatel_int: 1286 case Alcatel_int:
1287 buffer[3] = 0x02; 1287 buffer[3] = 0x02;
1288 buffer[4] = 0x3a; 1288 buffer[4] = 0x3a;
1289 1289
1290 buffer[0] = 0x08; 1290 buffer[0] = 0x08;
1291 buffer[5] = *(unsigned int *)data >> 24; 1291 buffer[5] = *(unsigned int *)data >> 24;
1292 buffer[6] = (*(unsigned int *)data >> 16) & 0xff; 1292 buffer[6] = (*(unsigned int *)data >> 16) & 0xff;
1293 buffer[7] = (*(unsigned int *)data >> 8) & 0xff; 1293 buffer[7] = (*(unsigned int *)data >> 8) & 0xff;
1294 buffer[8] = *(unsigned int *)data & 0xff; 1294 buffer[8] = *(unsigned int *)data & 0xff;
1295 buffer[9] = 0x00; 1295 buffer[9] = 0x00;
1296 break; 1296 break;
1297 case Alcatel_byte: 1297 case Alcatel_byte:
1298 buffer[3] = 0x00; 1298 buffer[3] = 0x00;
1299 buffer[4] = 0x38; 1299 buffer[4] = 0x38;
1300 1300
1301 buffer[0] = 0x05; 1301 buffer[0] = 0x05;
1302 buffer[5] = *(int *)data & 0xff; 1302 buffer[5] = *(int *)data & 0xff;
1303 buffer[6] = 0x00; 1303 buffer[6] = 0x00;
1304 break; 1304 break;
1305 } 1305 }
1306 return ERR_NONE; 1306 return ERR_NONE;
1307} 1307}
1308 1308
1309static GSM_Error ALCATEL_CreateField(GSM_StateMachine *s, GSM_Alcatel_FieldType type, int field, void *data) { 1309static GSM_Error ALCATEL_CreateField(GSM_StateMachine *s, GSM_Alcatel_FieldType type, int field, void *data) {
1310 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1310 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1311 GSM_Error error; 1311 GSM_Error error;
1312 unsigned char buffer[200] = 1312 unsigned char buffer[200] =
1313 {0x00, 0x04, 1313 {0x00, 0x04,
1314 0x00, /* type */ 1314 0x00, /* type */
1315 0x25, 0x01, 0x65, 1315 0x25, 0x01, 0x65,
1316 0x00, /* length of remaining part */ 1316 0x00, /* length of remaining part */
1317 0x00, /* field */ 1317 0x00, /* field */
1318 0x37}; /* data follows here */ 1318 0x37}; /* data follows here */
1319 1319
1320 smprintf(s,"Creating field (%02x)\n", field); 1320 smprintf(s,"Creating field (%02x)\n", field);
1321 1321
1322 switch (Priv->BinaryType) { 1322 switch (Priv->BinaryType) {
1323 case TypeCalendar: 1323 case TypeCalendar:
1324 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 1324 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
1325 break; 1325 break;
1326 case TypeContacts: 1326 case TypeContacts:
1327 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 1327 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
1328 break; 1328 break;
1329 case TypeToDo: 1329 case TypeToDo:
1330 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 1330 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
1331 break; 1331 break;
1332 } 1332 }
1333 error = ALCATEL_BuildWriteBuffer(buffer + 6, type, field, data); 1333 error = ALCATEL_BuildWriteBuffer(buffer + 6, type, field, data);
1334 if (error != ERR_NONE) return error; 1334 if (error != ERR_NONE) return error;
1335 1335
1336 error = GSM_WaitFor (s, buffer, 8 + buffer[6], 0x02, ALCATEL_TIMEOUT, ID_AlcatelCreateField); 1336 error = GSM_WaitFor (s, buffer, 8 + buffer[6], 0x02, ALCATEL_TIMEOUT, ID_AlcatelCreateField);
1337 if (error != ERR_NONE) return error; 1337 if (error != ERR_NONE) return error;
1338 1338
1339 return ERR_NONE; 1339 return ERR_NONE;
1340} 1340}
1341 1341
1342static GSM_Error ALCATEL_UpdateField(GSM_StateMachine *s, GSM_Alcatel_FieldType type, int id, int field, void *data) { 1342static GSM_Error ALCATEL_UpdateField(GSM_StateMachine *s, GSM_Alcatel_FieldType type, int id, int field, void *data) {
1343 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1343 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1344 GSM_Error error; 1344 GSM_Error error;
1345 unsigned char buffer[200] = 1345 unsigned char buffer[200] =
1346 {0x00, 0x04, 1346 {0x00, 0x04,
1347 0x00, /* type */ 1347 0x00, /* type */
1348 0x26, 0x01, 1348 0x26, 0x01,
1349 0x00, 0x00, 0x00, 0x00,/* id */ 1349 0x00, 0x00, 0x00, 0x00,/* id */
1350 0x65, 1350 0x65,
1351 0x00, /* length of remaining part */ 1351 0x00, /* length of remaining part */
1352 0x00, /* field */ 1352 0x00, /* field */
1353 0x37}; /* data follows here */ 1353 0x37}; /* data follows here */
1354 1354
1355 smprintf(s,"Updating field (%08x.%02x)\n", id, field); 1355 smprintf(s,"Updating field (%08x.%02x)\n", id, field);
1356 1356
1357 buffer[5] = (id >> 24); 1357 buffer[5] = (id >> 24);
1358 buffer[6] = ((id >> 16) & 0xff); 1358 buffer[6] = ((id >> 16) & 0xff);
1359 buffer[7] = ((id >> 8) & 0xff); 1359 buffer[7] = ((id >> 8) & 0xff);
1360 buffer[8] = (id & 0xff); 1360 buffer[8] = (id & 0xff);
1361 1361
1362 switch (Priv->BinaryType) { 1362 switch (Priv->BinaryType) {
1363 case TypeCalendar: 1363 case TypeCalendar:
1364 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR; 1364 buffer[2] = ALCATEL_SYNC_TYPE_CALENDAR;
1365 break; 1365 break;
1366 case TypeContacts: 1366 case TypeContacts:
1367 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS; 1367 buffer[2] = ALCATEL_SYNC_TYPE_CONTACTS;
1368 break; 1368 break;
1369 case TypeToDo: 1369 case TypeToDo:
1370 buffer[2] = ALCATEL_SYNC_TYPE_TODO; 1370 buffer[2] = ALCATEL_SYNC_TYPE_TODO;
1371 break; 1371 break;
1372 } 1372 }
1373 error = ALCATEL_BuildWriteBuffer(buffer + 10, type, field, data); 1373 error = ALCATEL_BuildWriteBuffer(buffer + 10, type, field, data);
1374 if (error != ERR_NONE) return error; 1374 if (error != ERR_NONE) return error;
1375 1375
1376 error = GSM_WaitFor (s, buffer, 12 + buffer[10], 0x02, ALCATEL_TIMEOUT, ID_AlcatelUpdateField); 1376 error = GSM_WaitFor (s, buffer, 12 + buffer[10], 0x02, ALCATEL_TIMEOUT, ID_AlcatelUpdateField);
1377 if (error != ERR_NONE) return error; 1377 if (error != ERR_NONE) return error;
1378 1378
1379 return ERR_NONE; 1379 return ERR_NONE;
1380} 1380}
1381 1381
1382static GSM_Error ALCATEL_GetManufacturer(GSM_StateMachine *s) 1382static GSM_Error ALCATEL_GetManufacturer(GSM_StateMachine *s)
1383{ 1383{
1384 strcpy(s->Phone.Data.Manufacturer, "Alcatel"); 1384 strcpy(s->Phone.Data.Manufacturer, "Alcatel");
1385 return ERR_NONE; 1385 return ERR_NONE;
1386} 1386}
1387 1387
1388static GSM_Error ALCATEL_GetIMEI (GSM_StateMachine *s) 1388static GSM_Error ALCATEL_GetIMEI (GSM_StateMachine *s)
1389{ 1389{
1390 GSM_Error error; 1390 GSM_Error error;
1391 1391
1392 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error; 1392 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error;
1393 return ATGEN_GetIMEI(s); 1393 return ATGEN_GetIMEI(s);
1394} 1394}
1395 1395
1396static GSM_Error ALCATEL_GetFirmware(GSM_StateMachine *s) 1396static GSM_Error ALCATEL_GetFirmware(GSM_StateMachine *s)
1397{ 1397{
1398 GSM_Error error; 1398 GSM_Error error;
1399 1399
1400 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error; 1400 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error;
1401 return ATGEN_GetFirmware(s); 1401 return ATGEN_GetFirmware(s);
1402} 1402}
1403 1403
1404static GSM_Error ALCATEL_GetModel(GSM_StateMachine *s) 1404static GSM_Error ALCATEL_GetModel(GSM_StateMachine *s)
1405{ 1405{
1406 GSM_Error error; 1406 GSM_Error error;
1407 1407
1408 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error; 1408 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error;
1409 return ATGEN_GetModel(s); 1409 return ATGEN_GetModel(s);
1410} 1410}
1411 1411
1412static GSM_Error ALCATEL_GetDateTime(GSM_StateMachine *s, GSM_DateTime *date_time) 1412static GSM_Error ALCATEL_GetDateTime(GSM_StateMachine *s, GSM_DateTime *date_time)
1413{ 1413{
1414 GSM_Error error; 1414 GSM_Error error;
1415 1415
1416 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error; 1416 if ((error = ALCATEL_SetATMode(s))!= ERR_NONE) return error;
1417 return ATGEN_GetDateTime(s, date_time); 1417 return ATGEN_GetDateTime(s, date_time);
1418} 1418}
1419 1419
1420static GSM_Error ALCATEL_GetMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry) 1420static GSM_Error ALCATEL_GetMemory(GSM_StateMachine *s, GSM_MemoryEntry *entry)
1421{ 1421{
1422 GSM_Error error; 1422 GSM_Error error;
1423 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL; 1423 GSM_Phone_ALCATELData*Priv = &s->Phone.Data.Priv.ALCATEL;
1424 int i; 1424 int i;
1425 int j = 0; 1425 int j = 0;
1426 1426
1427 if (entry->MemoryType == MEM_ME) { 1427 if (entry->MemoryType == MEM_ME) {
1428 if ((error = ALCATEL_GoToBinaryState(s, StateSession, TypeContacts, 0))!= ERR_NONE) return error; 1428 if ((error = ALCATEL_GoToBinaryState(s, StateSession, TypeContacts, 0))!= ERR_NONE) return error;
1429 if ((error = ALCATEL_GetAvailableIds(s, false))!= ERR_NONE) return error; 1429 if ((error = ALCATEL_GetAvailableIds(s, false))!= ERR_NONE) return error;
1430 if ((error = ALCATEL_IsIdAvailable(s, entry->Location))!= ERR_NONE) { 1430 if ((error = ALCATEL_IsIdAvailable(s, entry->Location))!= ERR_NONE) {
1431 entry->EntriesNum = 0; 1431 entry->EntriesNum = 0;
1432 return error; 1432 return error;
1433 } 1433 }
1434 if ((error = ALCATEL_GetFields(s, entry->Location))!= ERR_NONE) return error; 1434 if ((error = ALCATEL_GetFields(s, entry->Location))!= ERR_NONE) return error;
1435 1435
1436 entry->EntriesNum = Priv->CurrentFieldsCount; 1436 entry->EntriesNum = Priv->CurrentFieldsCount;
1437 1437
1438 for (i=0; i<Priv->CurrentFieldsCount; i++) { 1438 for (i=0; i<Priv->CurrentFieldsCount; i++) {
1439 if ((error = ALCATEL_GetFieldValue(s, entry->Location, Priv->CurrentFields[i]))!= ERR_NONE) return error; 1439 if ((error = ALCATEL_GetFieldValue(s, entry->Location, Priv->CurrentFields[i]))!= ERR_NONE) return error;
1440 entry->Entries[i].VoiceTag = 0; 1440 entry->Entries[i].VoiceTag = 0;
1441 entry->Entries[i].SMSList[0] = 0; 1441 entry->Entries[i].SMSList[0] = 0;
1442 switch (Priv->CurrentFields[i]) { 1442 switch (Priv->CurrentFields[i]) {
1443 case 0: 1443 case 0:
1444 if (Priv->ReturnType != Alcatel_string) { 1444 if (Priv->ReturnType != Alcatel_string) {
1445 smprintf(s,"WARNING: Received unexpected type %02X for field 0, ignoring\n", Priv->ReturnType); 1445 smprintf(s,"WARNING: Received unexpected type %02X for field 0, ignoring\n", Priv->ReturnType);
1446 entry->EntriesNum--; 1446 entry->EntriesNum--;
1447 j++; 1447 j++;
1448 break; 1448 break;
1449 } 1449 }
1450 entry->Entries[i - j].EntryType = PBK_Text_LastName; 1450 entry->Entries[i - j].EntryType = PBK_Text_LastName;
1451 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1451 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1452 break; 1452 break;
1453 case 1: 1453 case 1:
1454 if (Priv->ReturnType != Alcatel_string) { 1454 if (Priv->ReturnType != Alcatel_string) {
1455 smprintf(s,"WARNING: Received unexpected type %02X for field 1, ignoring\n", Priv->ReturnType); 1455 smprintf(s,"WARNING: Received unexpected type %02X for field 1, ignoring\n", Priv->ReturnType);
1456 entry->EntriesNum--; 1456 entry->EntriesNum--;
1457 j++; 1457 j++;
1458 break; 1458 break;
1459 } 1459 }
1460 entry->Entries[i - j].EntryType = PBK_Text_FirstName; 1460 entry->Entries[i - j].EntryType = PBK_Text_FirstName;
1461 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1461 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1462 break; 1462 break;
1463 case 2: 1463 case 2:
1464 if (Priv->ReturnType != Alcatel_string) { 1464 if (Priv->ReturnType != Alcatel_string) {
1465 smprintf(s,"WARNING: Received unexpected type %02X for field 2, ignoring\n", Priv->ReturnType); 1465 smprintf(s,"WARNING: Received unexpected type %02X for field 2, ignoring\n", Priv->ReturnType);
1466 entry->EntriesNum--; 1466 entry->EntriesNum--;
1467 j++; 1467 j++;
1468 break; 1468 break;
1469 } 1469 }
1470 entry->Entries[i - j].EntryType = PBK_Text_Company; 1470 entry->Entries[i - j].EntryType = PBK_Text_Company;
1471 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1471 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1472 break; 1472 break;
1473 case 3: 1473 case 3:
1474 if (Priv->ReturnType != Alcatel_string) { 1474 if (Priv->ReturnType != Alcatel_string) {
1475 smprintf(s,"WARNING: Received unexpected type %02X for field 3, ignoring\n", Priv->ReturnType); 1475 smprintf(s,"WARNING: Received unexpected type %02X for field 3, ignoring\n", Priv->ReturnType);
1476 entry->EntriesNum--; 1476 entry->EntriesNum--;
1477 j++; 1477 j++;
1478 break; 1478 break;
1479 } 1479 }
1480 entry->Entries[i - j].EntryType = PBK_Text_JobTitle; 1480 entry->Entries[i - j].EntryType = PBK_Text_JobTitle;
1481 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1481 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1482 break; 1482 break;
1483 case 4: 1483 case 4:
1484 if (Priv->ReturnType != Alcatel_string) { 1484 if (Priv->ReturnType != Alcatel_string) {
1485 smprintf(s,"WARNING: Received unexpected type %02X for field 4, ignoring\n", Priv->ReturnType); 1485 smprintf(s,"WARNING: Received unexpected type %02X for field 4, ignoring\n", Priv->ReturnType);
1486 entry->EntriesNum--; 1486 entry->EntriesNum--;
1487 j++; 1487 j++;
1488 break; 1488 break;
1489 } 1489 }
1490 entry->Entries[i - j].EntryType = PBK_Text_Note; 1490 entry->Entries[i - j].EntryType = PBK_Text_Note;
1491 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1491 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1492 break; 1492 break;
1493 case 5: 1493 case 5:
1494 if (Priv->ReturnType != Alcatel_byte) { 1494 if (Priv->ReturnType != Alcatel_byte) {
1495 smprintf(s,"WARNING: Received unexpected type %02X for field 5, ignoring\n", Priv->ReturnType); 1495 smprintf(s,"WARNING: Received unexpected type %02X for field 5, ignoring\n", Priv->ReturnType);
1496 entry->EntriesNum--; 1496 entry->EntriesNum--;
1497 j++; 1497 j++;
1498 break; 1498 break;
1499 } 1499 }
1500 entry->Entries[i - j].EntryType = PBK_Category; 1500 entry->Entries[i - j].EntryType = PBK_Category;
1501 entry->Entries[i - j].Number = Priv->ReturnInt; 1501 entry->Entries[i - j].Number = Priv->ReturnInt;
1502 break; 1502 break;
1503 case 6: 1503 case 6:
1504 if (Priv->ReturnType != Alcatel_bool) { 1504 if (Priv->ReturnType != Alcatel_bool) {
1505 smprintf(s,"WARNING: Received unexpected type %02X for field 6, ignoring\n", Priv->ReturnType); 1505 smprintf(s,"WARNING: Received unexpected type %02X for field 6, ignoring\n", Priv->ReturnType);
1506 entry->EntriesNum--; 1506 entry->EntriesNum--;
1507 j++; 1507 j++;
1508 break; 1508 break;
1509 } 1509 }
1510 entry->Entries[i - j].EntryType = PBK_Private; 1510 entry->Entries[i - j].EntryType = PBK_Private;
1511 entry->Entries[i - j].Number = Priv->ReturnInt; 1511 entry->Entries[i - j].Number = Priv->ReturnInt;
1512 break; 1512 break;
1513 case 7: 1513 case 7:
1514 if (Priv->ReturnType != Alcatel_phone) { 1514 if (Priv->ReturnType != Alcatel_phone) {
1515 smprintf(s,"WARNING: Received unexpected type %02X for field 7, ignoring\n", Priv->ReturnType); 1515 smprintf(s,"WARNING: Received unexpected type %02X for field 7, ignoring\n", Priv->ReturnType);
1516 entry->EntriesNum--; 1516 entry->EntriesNum--;
1517 j++; 1517 j++;
1518 break; 1518 break;
1519 } 1519 }
1520 entry->Entries[i - j].EntryType = PBK_Number_Work; 1520 entry->Entries[i - j].EntryType = PBK_Number_Work;
1521 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1521 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1522 break; 1522 break;
1523 case 8: 1523 case 8:
1524 if (Priv->ReturnType != Alcatel_phone) { 1524 if (Priv->ReturnType != Alcatel_phone) {
1525 smprintf(s,"WARNING: Received unexpected type %02X for field 8, ignoring\n", Priv->ReturnType); 1525 smprintf(s,"WARNING: Received unexpected type %02X for field 8, ignoring\n", Priv->ReturnType);
1526 entry->EntriesNum--; 1526 entry->EntriesNum--;
1527 j++; 1527 j++;
1528 break; 1528 break;
1529 } 1529 }
1530 entry->Entries[i - j].EntryType = PBK_Number_General; 1530 entry->Entries[i - j].EntryType = PBK_Number_General;
1531 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1531 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1532 break; 1532 break;
1533 case 9: 1533 case 9:
1534 if (Priv->ReturnType != Alcatel_phone) { 1534 if (Priv->ReturnType != Alcatel_phone) {
1535 smprintf(s,"WARNING: Received unexpected type %02X for field 9, ignoring\n", Priv->ReturnType); 1535 smprintf(s,"WARNING: Received unexpected type %02X for field 9, ignoring\n", Priv->ReturnType);
1536 entry->EntriesNum--; 1536 entry->EntriesNum--;
1537 j++; 1537 j++;
1538 break; 1538 break;
1539 } 1539 }
1540 entry->Entries[i - j].EntryType = PBK_Number_Fax; 1540 entry->Entries[i - j].EntryType = PBK_Number_Fax;
1541 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1541 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1542 break; 1542 break;
1543 case 10: 1543 case 10:
1544 if (Priv->ReturnType != Alcatel_phone) { 1544 if (Priv->ReturnType != Alcatel_phone) {
1545 smprintf(s,"WARNING: Received unexpected type %02X for field 10, ignoring\n", Priv->ReturnType); 1545 smprintf(s,"WARNING: Received unexpected type %02X for field 10, ignoring\n", Priv->ReturnType);
1546 entry->EntriesNum--; 1546 entry->EntriesNum--;
1547 j++; 1547 j++;
1548 break; 1548 break;
1549 } 1549 }
1550 entry->Entries[i - j].EntryType = PBK_Number_Other; 1550 entry->Entries[i - j].EntryType = PBK_Number_Other;
1551 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1551 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1552 break; 1552 break;
1553 case 11: 1553 case 11:
1554 if (Priv->ReturnType != Alcatel_phone) { 1554 if (Priv->ReturnType != Alcatel_phone) {
1555 smprintf(s,"WARNING: Received unexpected type %02X for field 11, ignoring\n", Priv->ReturnType); 1555 smprintf(s,"WARNING: Received unexpected type %02X for field 11, ignoring\n", Priv->ReturnType);
1556 entry->EntriesNum--; 1556 entry->EntriesNum--;
1557 j++; 1557 j++;
1558 break; 1558 break;
1559 } 1559 }
1560 entry->Entries[i - j].EntryType = PBK_Number_Pager; 1560 entry->Entries[i - j].EntryType = PBK_Number_Pager;
1561 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1561 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1562 break; 1562 break;
1563 case 12: 1563 case 12:
1564 if (Priv->ReturnType != Alcatel_phone) { 1564 if (Priv->ReturnType != Alcatel_phone) {
1565 smprintf(s,"WARNING: Received unexpected type %02X for field 12, ignoring\n", Priv->ReturnType); 1565 smprintf(s,"WARNING: Received unexpected type %02X for field 12, ignoring\n", Priv->ReturnType);
1566 entry->EntriesNum--; 1566 entry->EntriesNum--;
1567 j++; 1567 j++;
1568 break; 1568 break;
1569 } 1569 }
1570 entry->Entries[i - j].EntryType = PBK_Number_Mobile; 1570 entry->Entries[i - j].EntryType = PBK_Number_Mobile;
1571 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1571 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1572 break; 1572 break;
1573 case 13: 1573 case 13:
1574 if (Priv->ReturnType != Alcatel_phone) { 1574 if (Priv->ReturnType != Alcatel_phone) {
1575 smprintf(s,"WARNING: Received unexpected type %02X for field 13, ignoring\n", Priv->ReturnType); 1575 smprintf(s,"WARNING: Received unexpected type %02X for field 13, ignoring\n", Priv->ReturnType);
1576 entry->EntriesNum--; 1576 entry->EntriesNum--;
1577 j++; 1577 j++;
1578 break; 1578 break;
1579 } 1579 }
1580 entry->Entries[i - j].EntryType = PBK_Number_Home; 1580 entry->Entries[i - j].EntryType = PBK_Number_Home;
1581 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1581 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1582 break; 1582 break;
1583 case 14: 1583 case 14:
1584 if (Priv->ReturnType != Alcatel_string) { 1584 if (Priv->ReturnType != Alcatel_string) {
1585 smprintf(s,"WARNING: Received unexpected type %02X for field 14, ignoring\n", Priv->ReturnType); 1585 smprintf(s,"WARNING: Received unexpected type %02X for field 14, ignoring\n", Priv->ReturnType);
1586 entry->EntriesNum--; 1586 entry->EntriesNum--;
1587 j++; 1587 j++;
1588 break; 1588 break;
1589 } 1589 }
1590 entry->Entries[i - j].EntryType = PBK_Text_Email; 1590 entry->Entries[i - j].EntryType = PBK_Text_Email;
1591 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString); 1591 CopyUnicodeString(entry->Entries[i - j].Text, Priv->ReturnString);
1592 break; 1592 break;
1593 case 15: 1593 case 15:
1594 if (Priv->ReturnType != Alcatel_string) { 1594 if (Priv->ReturnType != Alcatel_string) {
1595 smprintf(s,"WARNING: Received unexpected type %02X for field 15, ignoring\n", Priv->ReturnType); 1595 smprintf(s,"WARNING: Received unexpected type %02X for field 15, ignoring\n", Priv->ReturnType);
diff --git a/gammu/emb/gammu/depend/nokia/dct3.c b/gammu/emb/gammu/depend/nokia/dct3.c
index b9e47ea..bda7532 100644
--- a/gammu/emb/gammu/depend/nokia/dct3.c
+++ b/gammu/emb/gammu/depend/nokia/dct3.c
@@ -1,807 +1,807 @@
1/* (c) 2002-2004 by Marcin Wiacek */ 1/* (c) 2002-2004 by Marcin Wiacek */
2/* MSID by Walek */ 2/* MSID by Walek */
3 3
4#include "../../../common/gsmstate.h" 4#include "../../../common/gsmstate.h"
5 5
6#ifdef GSM_ENABLE_NOKIA_DCT3 6#ifdef GSM_ENABLE_NOKIA_DCT3
7 7
8#include <string.h> 8#include <string.h>
9#include <signal.h> 9#include <signal.h>
10 10
11#include "../../../common/misc/coding/coding.h" 11#include "../../../common/misc/coding/coding.h"
12#include "../../../common/gsmcomon.h" 12#include "../../../common/gsmcomon.h"
13#include "../../../common/service/gsmpbk.h" 13#include "../../../common/service/gsmpbk.h"
14#include "../../../common/phone/nokia/dct3/dct3func.h" 14#include "../../../common/phone/nokia/dct3/dct3func.h"
15#include "../../../common/phone/pfunc.h" 15#include "../../../common/phone/pfunc.h"
16#include "../../gammu.h" 16#include "../../gammu.h"
17 17
18extern GSM_Reply_Function UserReplyFunctions3[]; 18static GSM_Reply_Function UserReplyFunctions3[];
19 19
20/* ------- some usefull functions ----------------------------------------- */ 20/* ------- some usefull functions ----------------------------------------- */
21 21
22GSM_Error CheckDCT3Only() 22GSM_Error CheckDCT3Only()
23{ 23{
24 bool found = false; 24 bool found = false;
25 25
26 /* Checking if phone is DCT3 */ 26 /* Checking if phone is DCT3 */
27#ifdef GSM_ENABLE_NOKIA6110 27#ifdef GSM_ENABLE_NOKIA6110
28 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true; 28 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
29#endif 29#endif
30#ifdef GSM_ENABLE_NOKIA7110 30#ifdef GSM_ENABLE_NOKIA7110
31 if (strstr(N7110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true; 31 if (strstr(N7110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
32#endif 32#endif
33#ifdef GSM_ENABLE_NOKIA9210 33#ifdef GSM_ENABLE_NOKIA9210
34 if (strstr(N9210Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true; 34 if (strstr(N9210Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
35#endif 35#endif
36 if (!found) return ERR_NOTSUPPORTED; 36 if (!found) return ERR_NOTSUPPORTED;
37 37
38 if (s.ConnectionType!=GCT_MBUS2 && s.ConnectionType!=GCT_FBUS2 && 38 if (s.ConnectionType!=GCT_MBUS2 && s.ConnectionType!=GCT_FBUS2 &&
39 s.ConnectionType!=GCT_FBUS2DLR3 && s.ConnectionType!=GCT_FBUS2BLUE && 39 s.ConnectionType!=GCT_FBUS2DLR3 && s.ConnectionType!=GCT_FBUS2BLUE &&
40 s.ConnectionType!=GCT_FBUS2IRDA && s.ConnectionType!=GCT_IRDAPHONET && 40 s.ConnectionType!=GCT_FBUS2IRDA && s.ConnectionType!=GCT_IRDAPHONET &&
41 s.ConnectionType!=GCT_BLUEFBUS2) { 41 s.ConnectionType!=GCT_BLUEFBUS2) {
42 return ERR_OTHERCONNECTIONREQUIRED; 42 return ERR_OTHERCONNECTIONREQUIRED;
43 } 43 }
44 return ERR_NONE; 44 return ERR_NONE;
45} 45}
46 46
47static void CheckDCT3() 47static void CheckDCT3()
48{ 48{
49 GSM_Error error; 49 GSM_Error error;
50 50
51 error = CheckDCT3Only(); 51 error = CheckDCT3Only();
52 switch (error) { 52 switch (error) {
53 case ERR_NOTSUPPORTED: 53 case ERR_NOTSUPPORTED:
54 Print_Error(ERR_NOTSUPPORTED); 54 Print_Error(ERR_NOTSUPPORTED);
55 break; 55 break;
56 case ERR_OTHERCONNECTIONREQUIRED: 56 case ERR_OTHERCONNECTIONREQUIRED:
57 printf("Can't do it with current phone protocol\n"); 57 printf("Can't do it with current phone protocol\n");
58 GSM_TerminateConnection(&s); 58 GSM_TerminateConnection(&s);
59 exit(-1); 59 exit(-1);
60 default: 60 default:
61 break; 61 break;
62 } 62 }
63} 63}
64 64
65static bool answer_yes3(char *text) 65static bool answer_yes3(char *text)
66{ 66{
67 int len; 67 int len;
68 char ans[99]; 68 char ans[99];
69 69
70 while (1) { 70 while (1) {
71 printf("%s (yes/no) ? ",text); 71 printf("%s (yes/no) ? ",text);
72 len=GetLine(stdin, ans, 99); 72 len=GetLine(stdin, ans, 99);
73 if (len==-1) exit(-1); 73 if (len==-1) exit(-1);
74 if (mystrncasecmp(ans, "yes",0)) return true; 74 if (mystrncasecmp(ans, "yes",0)) return true;
75 if (mystrncasecmp(ans, "no" ,0)) return false; 75 if (mystrncasecmp(ans, "no" ,0)) return false;
76 } 76 }
77} 77}
78 78
79/* ------------------- functions ------------------------------------------- */ 79/* ------------------- functions ------------------------------------------- */
80 80
81static FILE *DCT3T9File; 81static FILE *DCT3T9File;
82 82
83static GSM_Error DCT3_ReplyGetT9(GSM_Protocol_Message msg, GSM_StateMachine *s) 83static GSM_Error DCT3_ReplyGetT9(GSM_Protocol_Message msg, GSM_StateMachine *s)
84{ 84{
85 int DCT3T9Size; 85 int DCT3T9Size;
86 86
87 DCT3T9Size = msg.Length - 6; 87 DCT3T9Size = msg.Length - 6;
88 fwrite(msg.Buffer+6,1,DCT3T9Size,DCT3T9File); 88 fwrite(msg.Buffer+6,1,DCT3T9Size,DCT3T9File);
89 return ERR_NONE; 89 return ERR_NONE;
90} 90}
91 91
92void DCT3GetT9(int argc, char *argv[]) 92void DCT3GetT9(int argc, char *argv[])
93{ 93{
94 int i; 94 int i;
95 unsigned char req[] = {0x00, 0x01, 0xAE, 0x02, 0x00, 95 unsigned char req[] = {0x00, 0x01, 0xAE, 0x02, 0x00,
96 0x00};/* Part number */ 96 0x00};/* Part number */
97 97
98//"00 01 AE 00" gets some control values 98//"00 01 AE 00" gets some control values
99 99
100 if (CheckDCT3Only()!=ERR_NONE) return; 100 if (CheckDCT3Only()!=ERR_NONE) return;
101 101
102 DCT3T9File = fopen("T9", "w"); 102 DCT3T9File = fopen("T9", "w");
103 if (DCT3T9File == NULL) return; 103 if (DCT3T9File == NULL) return;
104 104
105 s.User.UserReplyFunctions=UserReplyFunctions3; 105 s.User.UserReplyFunctions=UserReplyFunctions3;
106 106
107 for (i=0;i<5;i++) { 107 for (i=0;i<5;i++) {
108 req[5] = i; 108 req[5] = i;
109 error=GSM_WaitFor (&s, req, 6, 0x40, 4, ID_User3); 109 error=GSM_WaitFor (&s, req, 6, 0x40, 4, ID_User3);
110 Print_Error(error); 110 Print_Error(error);
111 } 111 }
112 112
113 fclose(DCT3T9File); 113 fclose(DCT3T9File);
114} 114}
115 115
116void DCT3VibraTest(int argc, char *argv[]) 116void DCT3VibraTest(int argc, char *argv[])
117{ 117{
118 unsigned char ans[200]; 118 unsigned char ans[200];
119 unsigned char SetLevel[4] = {0x00, 0x01, 0xA3, 119 unsigned char SetLevel[4] = {0x00, 0x01, 0xA3,
120 0xff};/* Level */ 120 0xff};/* Level */
121 121
122 if (CheckDCT3Only()!=ERR_NONE) return; 122 if (CheckDCT3Only()!=ERR_NONE) return;
123 123
124 s.User.UserReplyFunctions=UserReplyFunctions3; 124 s.User.UserReplyFunctions=UserReplyFunctions3;
125 125
126 error=DCT3_EnableSecurity (&s, 0x01); 126 error=DCT3_EnableSecurity (&s, 0x01);
127 Print_Error(error); 127 Print_Error(error);
128 128
129 error=GSM_WaitFor (&s, SetLevel, 4, 0x40, 4, ID_User3); 129 error=GSM_WaitFor (&s, SetLevel, 4, 0x40, 4, ID_User3);
130 Print_Error(error); 130 Print_Error(error);
131 131
132 printf("Press any key to continue...\n"); 132 printf("Press any key to continue...\n");
133 GetLine(stdin, ans, 99); 133 GetLine(stdin, ans, 99);
134 134
135 SetLevel[3] = 0x00; 135 SetLevel[3] = 0x00;
136 error=GSM_WaitFor (&s, SetLevel, 4, 0x40, 4, ID_User3); 136 error=GSM_WaitFor (&s, SetLevel, 4, 0x40, 4, ID_User3);
137} 137}
138 138
139static GSM_Error DCT3_ReplyPhoneTests(GSM_Protocol_Message msg, GSM_StateMachine *s) 139static GSM_Error DCT3_ReplyPhoneTests(GSM_Protocol_Message msg, GSM_StateMachine *s)
140{ 140{
141 int i; 141 int i;
142 142
143 for (i=0;i<msg.Buffer[3];i++) { 143 for (i=0;i<msg.Buffer[3];i++) {
144 switch (i) { 144 switch (i) {
145 case 0: printf("Unknown(%02i) ",i);break; 145 case 0: printf("Unknown(%02i) ",i);break;
146 case 1: printf("MCU ROM checksum (startup)");break; 146 case 1: printf("MCU ROM checksum (startup)");break;
147 case 2: printf("MCU RAM interface (startup)");break; 147 case 2: printf("MCU RAM interface (startup)");break;
148 case 3: printf("MCU RAM component ");break; 148 case 3: printf("MCU RAM component ");break;
149 case 4: printf("MCU EEPROM interface (startup)");break; 149 case 4: printf("MCU EEPROM interface (startup)");break;
150 case 5: printf("MCU EEPROM component ");break; 150 case 5: printf("MCU EEPROM component ");break;
151 case 6: printf("Real Time Clock battery (startup)");break; 151 case 6: printf("Real Time Clock battery (startup)");break;
152 case 7: printf("CCONT interface (startup)");break; 152 case 7: printf("CCONT interface (startup)");break;
153 case 8: printf("AD converter (startup)");break; 153 case 8: printf("AD converter (startup)");break;
154 case 9: printf("SW Reset ");break; 154 case 9: printf("SW Reset ");break;
155 case 10:printf("Power Off ");break; 155 case 10:printf("Power Off ");break;
156 case 11:printf("Security Data ");break; 156 case 11:printf("Security Data ");break;
157 case 12:printf("EEPROM Tune checksum (startup)");break; 157 case 12:printf("EEPROM Tune checksum (startup)");break;
158 case 13:printf("PPM checksum (startup)");break; 158 case 13:printf("PPM checksum (startup)");break;
159 case 14:printf("MCU download DSP (startup)");break; 159 case 14:printf("MCU download DSP (startup)");break;
160 case 15:printf("DSP alive (startup)");break; 160 case 15:printf("DSP alive (startup)");break;
161 case 16:printf("COBBA serial (startup)");break; 161 case 16:printf("COBBA serial (startup)");break;
162 case 17:printf("COBBA paraller (startup)");break; 162 case 17:printf("COBBA paraller (startup)");break;
163 case 18:printf("EEPROM security checksum (startup)");break; 163 case 18:printf("EEPROM security checksum (startup)");break;
164 case 19:printf("PPM validity (startup)");break; 164 case 19:printf("PPM validity (startup)");break;
165 case 20:printf("Warranty state (startup)");break; 165 case 20:printf("Warranty state (startup)");break;
166 case 21:printf("Simlock check/SW version (startup)");break; 166 case 21:printf("Simlock check/SW version (startup)");break;
167 case 22:printf("IMEI check? ");break;/*from PC-Locals1.3.is OK?*/ 167 case 22:printf("IMEI check? ");break;/*from PC-Locals1.3.is OK?*/
168 default:printf("Unknown(%02i) ",i);break; 168 default:printf("Unknown(%02i) ",i);break;
169 } 169 }
170 switch (msg.Buffer[4+i]) { 170 switch (msg.Buffer[4+i]) {
171 case 0: printf(" : passed"); break; 171 case 0: printf(" : passed"); break;
172 case 0xff:printf(" : not executed"); break; 172 case 0xff:printf(" : not executed"); break;
173 case 254: printf(" : fail"); break; 173 case 254: printf(" : fail"); break;
174 default: printf(" : result unknown(%i)",msg.Buffer[4+i]);break; 174 default: printf(" : result unknown(%i)",msg.Buffer[4+i]);break;
175 } 175 }
176 printf("\n"); 176 printf("\n");
177 } 177 }
178 178
179 return ERR_NONE; 179 return ERR_NONE;
180} 180}
181 181
182void DCT3SelfTests(int argc, char *argv[]) 182void DCT3SelfTests(int argc, char *argv[])
183{ 183{
184 unsigned char buffer[3] = {0x00,0x01,0xcf}; 184 unsigned char buffer[3] = {0x00,0x01,0xcf};
185 unsigned char buffer3[8] = {0x00,0x01,0xce,0x1d,0xfe,0x23,0x00,0x00}; 185 unsigned char buffer3[8] = {0x00,0x01,0xce,0x1d,0xfe,0x23,0x00,0x00};
186 int i; 186 int i;
187 187
188 if (CheckDCT3Only()!=ERR_NONE) return; 188 if (CheckDCT3Only()!=ERR_NONE) return;
189 189
190 error=DCT3_EnableSecurity (&s, 0x01); 190 error=DCT3_EnableSecurity (&s, 0x01);
191 Print_Error(error); 191 Print_Error(error);
192 192
193 if (answer_yes3("Run all tests now ?")) { 193 if (answer_yes3("Run all tests now ?")) {
194 /* make almost all tests */ 194 /* make almost all tests */
195 error = s.Protocol.Functions->WriteMessage(&s, buffer3, 8, 0x40); 195 error = s.Protocol.Functions->WriteMessage(&s, buffer3, 8, 0x40);
196 Print_Error(error); 196 Print_Error(error);
197 197
198 GSM_Terminate(); 198 GSM_Terminate();
199 199
200 while (!false) { 200 while (!false) {
201 GSM_Init(false); 201 GSM_Init(false);
202 if (error==ERR_NONE) break; 202 if (error==ERR_NONE) break;
203 GSM_Terminate(); 203 GSM_Terminate();
204 } 204 }
205 205
206 my_sleep(400); 206 my_sleep(400);
207 } 207 }
208 208
209 s.User.UserReplyFunctions=UserReplyFunctions3; 209 s.User.UserReplyFunctions=UserReplyFunctions3;
210 210
211 for (i=0;i<10;i++) { 211 for (i=0;i<10;i++) {
212 error=GSM_WaitFor (&s, buffer, 3, 0x40, 4, ID_User1); 212 error=GSM_WaitFor (&s, buffer, 3, 0x40, 4, ID_User1);
213 if (error == ERR_NONE) break; 213 if (error == ERR_NONE) break;
214 } 214 }
215} 215}
216 216
217struct DCT3ADCInfo { 217struct DCT3ADCInfo {
218 char *name; 218 char *name;
219 char *unit; 219 char *unit;
220 int x; 220 int x;
221 intpos1; 221 intpos1;
222 intpos2; 222 intpos2;
223}; 223};
224 224
225static struct DCT3ADCInfo DCT3ADC[] = { 225static struct DCT3ADCInfo DCT3ADC[] = {
226 {"Battery voltage:", "mV", 1, 3, 2}, 226 {"Battery voltage:", "mV", 1, 3, 2},
227 // {"Charger voltage:", "mV", 1, -1, 7}, 227 // {"Charger voltage:", "mV", 1, -1, 7},
228 // {"Charger current:", "mA", 1, -1, 5}, 228 // {"Charger current:", "mA", 1, -1, 5},
229 {"Battery type:", "mAh", 1, 4, 3}, 229 {"Battery type:", "mAh", 1, 4, 3},
230 {"Battery temperature:", "mK", 10, 5, 4}, 230 {"Battery temperature:", "mK", 10, 5, 4},
231 // {"Accessory detection:", "mV", 1, -1, -1}, 231 // {"Accessory detection:", "mV", 1, -1, -1},
232 {"RSSI:", "", 1, 2, -1}, 232 {"RSSI:", "", 1, 2, -1},
233 // {"VCXO temperature:", "mV", 1, -1, -1}, 233 // {"VCXO temperature:", "mV", 1, -1, -1},
234 // {"Hook information:", "mV", 1, -1, -1}, 234 // {"Hook information:", "mV", 1, -1, -1},
235 235
236 {"", "", 1, -1, -1} 236 {"", "", 1, -1, -1}
237}; 237};
238 238
239 unsigned char DCT3ADCBuf[200]; 239 unsigned char DCT3ADCBuf[200];
240 int DCT3ADCInt; 240 int DCT3ADCInt;
241 241
242static GSM_Error DCT3_ReplyGetADC(GSM_Protocol_Message msg, GSM_StateMachine *s) 242static GSM_Error DCT3_ReplyGetADC(GSM_Protocol_Message msg, GSM_StateMachine *s)
243{ 243{
244 switch (msg.Buffer[2]) { 244 switch (msg.Buffer[2]) {
245 case 0x68: 245 case 0x68:
246 memcpy(DCT3ADCBuf,msg.Buffer+4,msg.Length-4); 246 memcpy(DCT3ADCBuf,msg.Buffer+4,msg.Length-4);
247 return ERR_NONE; 247 return ERR_NONE;
248 case 0x91: 248 case 0x91:
249 DCT3ADCInt = msg.Buffer[4]*256+msg.Buffer[5]; 249 DCT3ADCInt = msg.Buffer[4]*256+msg.Buffer[5];
250 return ERR_NONE; 250 return ERR_NONE;
251 } 251 }
252 return ERR_UNKNOWNRESPONSE; 252 return ERR_UNKNOWNRESPONSE;
253} 253}
254 254
255void DCT3GetADC(int argc, char *argv[]) 255void DCT3GetADC(int argc, char *argv[])
256{ 256{
257 int i = 0; 257 int i = 0;
258 unsigned charGetRaw[] = {0x00, 0x01, 0x68}; 258 unsigned charGetRaw[] = {0x00, 0x01, 0x68};
259 unsigned charGetUnit[] = {0x00, 0x01, 0x91, 259 unsigned charGetUnit[] = {0x00, 0x01, 0x91,
260 0x02}; /* Test number */ 260 0x02}; /* Test number */
261 261
262 if (CheckDCT3Only()!=ERR_NONE) return; 262 if (CheckDCT3Only()!=ERR_NONE) return;
263 263
264 s.User.UserReplyFunctions=UserReplyFunctions3; 264 s.User.UserReplyFunctions=UserReplyFunctions3;
265 265
266 error=DCT3_EnableSecurity (&s, 0x02); 266 error=DCT3_EnableSecurity (&s, 0x02);
267 Print_Error(error); 267 Print_Error(error);
268 268
269 error=GSM_WaitFor (&s, GetRaw, 3, 0x40, 6, ID_User3); 269 error=GSM_WaitFor (&s, GetRaw, 3, 0x40, 6, ID_User3);
270 Print_Error(error); 270 Print_Error(error);
271 271
272 while (1) { 272 while (1) {
273 printf(" %30s ",DCT3ADC[i].name); 273 printf(" %30s ",DCT3ADC[i].name);
274 if (DCT3ADC[i].pos1 != -1) { 274 if (DCT3ADC[i].pos1 != -1) {
275 printf("raw "); 275 printf("raw ");
276 printf("%10i ", 276 printf("%10i ",
277 DCT3ADCBuf[(DCT3ADC[i].pos1-1)*2]*256+ 277 DCT3ADCBuf[(DCT3ADC[i].pos1-1)*2]*256+
278 DCT3ADCBuf[(DCT3ADC[i].pos1-1)*2+1]); 278 DCT3ADCBuf[(DCT3ADC[i].pos1-1)*2+1]);
279 } 279 }
280 if (DCT3ADC[i].pos2 != -1) { 280 if (DCT3ADC[i].pos2 != -1) {
281 printf("unit result "); 281 printf("unit result ");
282 GetUnit[3] = DCT3ADC[i].pos2; 282 GetUnit[3] = DCT3ADC[i].pos2;
283 error=GSM_WaitFor (&s, GetUnit, 6, 0x40, 4, ID_User3); 283 error=GSM_WaitFor (&s, GetUnit, 6, 0x40, 4, ID_User3);
284 Print_Error(error); 284 Print_Error(error);
285 printf("%10i ",DCT3ADCInt*DCT3ADC[i].x); 285 printf("%10i ",DCT3ADCInt*DCT3ADC[i].x);
286 printf("%s\n",DCT3ADC[i].unit); 286 printf("%s\n",DCT3ADC[i].unit);
287 } 287 }
288 i++; 288 i++;
289 if (DCT3ADC[i].name[0] == 0x00) break; 289 if (DCT3ADC[i].name[0] == 0x00) break;
290 } 290 }
291 291
292 error=DCT3_EnableSecurity (&s, 0x01); 292 error=DCT3_EnableSecurity (&s, 0x01);
293 Print_Error(error); 293 Print_Error(error);
294} 294}
295 295
296void DCT3DisplayTest(int argc, char *argv[]) 296void DCT3DisplayTest(int argc, char *argv[])
297{ 297{
298 unsigned char ans[200]; 298 unsigned char ans[200];
299 unsigned char req[] = {0x00, 0x01, 0xD3, 299 unsigned char req[] = {0x00, 0x01, 0xD3,
300 0x03, /* 3=set, 2=clear */ 300 0x03, /* 3=set, 2=clear */
301 0x03}; /* test number */ 301 0x03}; /* test number */
302 302
303 if (CheckDCT3Only()!=ERR_NONE) return; 303 if (CheckDCT3Only()!=ERR_NONE) return;
304 304
305 if (atoi(argv[2]) != 1 && atoi(argv[2]) != 2) { 305 if (atoi(argv[2]) != 1 && atoi(argv[2]) != 2) {
306 printf("Give 1 or 2 as test number\n"); 306 printf("Give 1 or 2 as test number\n");
307 } 307 }
308 308
309 s.User.UserReplyFunctions=UserReplyFunctions3; 309 s.User.UserReplyFunctions=UserReplyFunctions3;
310 310
311 req[4] = atoi(argv[2]); 311 req[4] = atoi(argv[2]);
312 s.Protocol.Functions->WriteMessage(&s, req, 5, 0x40); 312 s.Protocol.Functions->WriteMessage(&s, req, 5, 0x40);
313 313
314 printf("Press any key to continue...\n"); 314 printf("Press any key to continue...\n");
315 GetLine(stdin, ans, 99); 315 GetLine(stdin, ans, 99);
316 316
317 req[3] = 0x02; 317 req[3] = 0x02;
318 req[4] = 0x03; 318 req[4] = 0x03;
319 s.Protocol.Functions->WriteMessage(&s, req, 5, 0x40); 319 s.Protocol.Functions->WriteMessage(&s, req, 5, 0x40);
320 320
321 error=DCT3_EnableSecurity (&s, 0x03); 321 error=DCT3_EnableSecurity (&s, 0x03);
322 Print_Error(error); 322 Print_Error(error);
323} 323}
324 324
325void DCT3netmonitor(int argc, char *argv[]) 325void DCT3netmonitor(int argc, char *argv[])
326{ 326{
327 char value[100]; 327 char value[100];
328 328
329 GSM_Init(true); 329 GSM_Init(true);
330 330
331 CheckDCT3(); 331 CheckDCT3();
332 332
333 error=DCT3_Netmonitor(&s, atoi(argv[2]), value); 333 error=DCT3_Netmonitor(&s, atoi(argv[2]), value);
334 Print_Error(error); 334 Print_Error(error);
335 335
336 printf("%s\n",value); 336 printf("%s\n",value);
337#ifdef GSM_ENABLE_BEEP 337#ifdef GSM_ENABLE_BEEP
338 if (atoi(argv[2]) == 243) GSM_PhoneBeep(); 338 if (atoi(argv[2]) == 243) GSM_PhoneBeep();
339#endif 339#endif
340 GSM_Terminate(); 340 GSM_Terminate();
341} 341}
342 342
343static GSM_Error DCT3_ReplyGetMSID(GSM_Protocol_Message msg, GSM_StateMachine *s) 343static GSM_Error DCT3_ReplyGetMSID(GSM_Protocol_Message msg, GSM_StateMachine *s)
344{ 344{
345 int i; 345 int i;
346 346
347 printf("MSID : "); 347 printf("MSID : ");
348 for (i=5;i<18;i++) printf("%02x",msg.Buffer[i]); 348 for (i=5;i<18;i++) printf("%02x",msg.Buffer[i]);
349 printf("\n"); 349 printf("\n");
350 return ERR_NONE; 350 return ERR_NONE;
351} 351}
352 352
353static GSM_Error DCT3_ReplyGetDSPROM(GSM_Protocol_Message msg, GSM_StateMachine *s) 353static GSM_Error DCT3_ReplyGetDSPROM(GSM_Protocol_Message msg, GSM_StateMachine *s)
354{ 354{
355 printf("DSP ROM : %c\n",msg.Buffer[5]); 355 printf("DSP ROM : %c\n",msg.Buffer[5]);
356 return ERR_NONE; 356 return ERR_NONE;
357} 357}
358 358
359static GSM_Error DCT3_ReplySimlockInfo(GSM_Protocol_Message msg, GSM_StateMachine *s) 359static GSM_Error DCT3_ReplySimlockInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
360{ 360{
361 inti, j; 361 inti, j;
362 charuni[100], buffer[50]; 362 charuni[100], buffer[50];
363 363
364 j=0; 364 j=0;
365 for (i=0; i < 12; i++) { 365 for (i=0; i < 12; i++) {
366 if (j<24) { 366 if (j<24) {
367 uni[j]='0' + (msg.Buffer[9+i] >> 4); 367 uni[j]='0' + (msg.Buffer[9+i] >> 4);
368 j++; 368 j++;
369 } 369 }
370 if (j!=15) { 370 if (j!=15) {
371 if (j<24) { 371 if (j<24) {
372 uni[j]='0' + (msg.Buffer[9+i] & 0x0f); 372 uni[j]='0' + (msg.Buffer[9+i] & 0x0f);
373 j++; 373 j++;
374 } 374 }
375 } else j++; 375 } else j++;
376 } 376 }
377 377
378 strncpy(buffer,uni,5); 378 strncpy(buffer,uni,5);
379 buffer[5]=0; 379 buffer[5]=0;
380 printf("Simlock 1 : MCC+MNC %10s, %s, %s, counter %i\n", 380 printf("Simlock 1 : MCC+MNC %10s, %s, %s, counter %i\n",
381 buffer, 381 buffer,
382 ((msg.Buffer[6] & 1) == 1)==0?"opened":"CLOSED", 382 ((msg.Buffer[6] & 1) == 1)==0?"opened":"CLOSED",
383 ((msg.Buffer[5] & 1) != 1)==0?"user ":"factory", 383 ((msg.Buffer[5] & 1) != 1)==0?"user ":"factory",
384 msg.Buffer[21]); 384 msg.Buffer[21]);
385 385
386 strncpy(buffer,uni+16,4); 386 strncpy(buffer,uni+16,4);
387 buffer[4]=0; 387 buffer[4]=0;
388 printf("Simlock 2 : GID1 %10s, %s, %s, counter %i\n", 388 printf("Simlock 2 : GID1 %10s, %s, %s, counter %i\n",
389 buffer, 389 buffer,
390 ((msg.Buffer[6] & 4) == 4)==0?"opened":"CLOSED", 390 ((msg.Buffer[6] & 4) == 4)==0?"opened":"CLOSED",
391 ((msg.Buffer[5] & 4) != 4)==0?"user ":"factory", 391 ((msg.Buffer[5] & 4) != 4)==0?"user ":"factory",
392 msg.Buffer[23]); 392 msg.Buffer[23]);
393 393
394 strncpy(buffer,uni+20,4); 394 strncpy(buffer,uni+20,4);
395 buffer[4]=0; 395 buffer[4]=0;
396 printf("Simlock 3 : GID2 %10s, %s, %s, counter %i\n", 396 printf("Simlock 3 : GID2 %10s, %s, %s, counter %i\n",
397 buffer, 397 buffer,
398 ((msg.Buffer[6] & 8) == 8)==0?"opened":"CLOSED", 398 ((msg.Buffer[6] & 8) == 8)==0?"opened":"CLOSED",
399 ((msg.Buffer[5] & 8) != 8)==0?"user ":"factory", 399 ((msg.Buffer[5] & 8) != 8)==0?"user ":"factory",
400 msg.Buffer[24]); 400 msg.Buffer[24]);
401 401
402 strncpy(buffer,uni+5,10); 402 strncpy(buffer,uni+5,10);
403 buffer[10]=0; 403 buffer[10]=0;
404 printf("Simlock 4 : MSIN %10s, %s, %s, counter %i\n", 404 printf("Simlock 4 : MSIN %10s, %s, %s, counter %i\n",
405 buffer, 405 buffer,
406 ((msg.Buffer[6] & 2) == 2)==0?"opened":"CLOSED", 406 ((msg.Buffer[6] & 2) == 2)==0?"opened":"CLOSED",
407 ((msg.Buffer[5] & 2) != 2)==0?"user ":"factory", 407 ((msg.Buffer[5] & 2) != 2)==0?"user ":"factory",
408 msg.Buffer[22]); 408 msg.Buffer[22]);
409 409
410 return ERR_NONE; 410 return ERR_NONE;
411} 411}
412 412
413static GSM_Error DCT3_ReplyGetMCUchkSum(GSM_Protocol_Message msg, GSM_StateMachine *s) 413static GSM_Error DCT3_ReplyGetMCUchkSum(GSM_Protocol_Message msg, GSM_StateMachine *s)
414{ 414{
415 int i; 415 int i;
416 416
417 if (msg.Buffer[3] == 0x12) printf("Language Pack: %c\n",msg.Buffer[5]); 417 if (msg.Buffer[3] == 0x12) printf("Language Pack: %c\n",msg.Buffer[5]);
418 if (msg.Buffer[3] == 0x02) { 418 if (msg.Buffer[3] == 0x02) {
419 printf("MCU checksum : "); 419 printf("MCU checksum : ");
420 for (i=5;i<9;i++) printf("%c",msg.Buffer[i]); 420 for (i=5;i<9;i++) printf("%c",msg.Buffer[i]);
421 printf("\n"); 421 printf("\n");
422 } 422 }
423 return ERR_NONE; 423 return ERR_NONE;
424} 424}
425 425
426static unsigned char MSID1; 426static unsigned char MSID1;
427 427
428GSM_Error DCT3_ReplyEnableSecurity2(GSM_Protocol_Message msg, GSM_StateMachine *s) 428GSM_Error DCT3_ReplyEnableSecurity2(GSM_Protocol_Message msg, GSM_StateMachine *s)
429{ 429{
430 smprintf(s, "State of security commands set\n"); 430 smprintf(s, "State of security commands set\n");
431 MSID1 = msg.Buffer[5]; 431 MSID1 = msg.Buffer[5];
432 return ERR_NONE; 432 return ERR_NONE;
433} 433}
434 434
435void DCT3Info(int argc, char *argv[]) 435void DCT3Info(int argc, char *argv[])
436{ 436{
437 unsigned char req[] = {0x00, 0x01, 0x8A, 0x00}; /* Get simlock info */ 437 unsigned char req[] = {0x00, 0x01, 0x8A, 0x00}; /* Get simlock info */
438 unsigned char req2[] = {0x00, 0x01, 0xb4, 0x00, 0x00}; /* Get MSID */ 438 unsigned char req2[] = {0x00, 0x01, 0xb4, 0x00, 0x00}; /* Get MSID */
439 unsigned char req3[] = {0x00, 0x01, 0xc8, 0x02}; /* Get MCU chksum */ 439 unsigned char req3[] = {0x00, 0x01, 0xc8, 0x02}; /* Get MCU chksum */
440 unsigned char req4[] = {0x00, 0x01, 0xc8, 0x09}; /* Get DSP ROM */ 440 unsigned char req4[] = {0x00, 0x01, 0xc8, 0x09}; /* Get DSP ROM */
441 441
442 if (CheckDCT3Only()!=ERR_NONE) return; 442 if (CheckDCT3Only()!=ERR_NONE) return;
443 443
444 s.User.UserReplyFunctions=UserReplyFunctions3; 444 s.User.UserReplyFunctions=UserReplyFunctions3;
445 445
446 error=DCT3_EnableSecurity (&s, 0x01); 446 error=DCT3_EnableSecurity (&s, 0x01);
447 Print_Error(error); 447 Print_Error(error);
448 448
449 error=GSM_WaitFor (&s, req, 4, 0x40, 4, ID_User3); 449 error=GSM_WaitFor (&s, req, 4, 0x40, 4, ID_User3);
450 Print_Error(error); 450 Print_Error(error);
451 451
452 req2[3] = MSID1; 452 req2[3] = MSID1;
453 req2[4] = req2[2] + req2[3]; 453 req2[4] = req2[2] + req2[3];
454 error=GSM_WaitFor (&s, req2, 5, 0x40, 4, ID_User8); 454 error=GSM_WaitFor (&s, req2, 5, 0x40, 4, ID_User8);
455 Print_Error(error); 455 Print_Error(error);
456 456
457 error=GSM_WaitFor (&s, req3, 4, 0x40, 4, ID_User9); 457 error=GSM_WaitFor (&s, req3, 4, 0x40, 4, ID_User9);
458 Print_Error(error); 458 Print_Error(error);
459 459
460 error=GSM_WaitFor (&s, req4, 4, 0x40, 4, ID_User10); 460 error=GSM_WaitFor (&s, req4, 4, 0x40, 4, ID_User10);
461 Print_Error(error); 461 Print_Error(error);
462} 462}
463 463
464static GSM_Error DCT3_ReplyResetTest36(GSM_Protocol_Message msg, GSM_StateMachine *s) 464static GSM_Error DCT3_ReplyResetTest36(GSM_Protocol_Message msg, GSM_StateMachine *s)
465{ 465{
466 printf("Netmonitor test 36 cleaned OK\n"); 466 printf("Netmonitor test 36 cleaned OK\n");
467 return ERR_NONE; 467 return ERR_NONE;
468} 468}
469 469
470void DCT3ResetTest36(int argc, char *argv[]) 470void DCT3ResetTest36(int argc, char *argv[])
471{ 471{
472 unsigned char req[] = {0x00, 0x01, 0x65, 0x40, 0x00}; /* Reset test 36 in netmon */ 472 unsigned char req[] = {0x00, 0x01, 0x65, 0x40, 0x00}; /* Reset test 36 in netmon */
473 473
474 GSM_Init(true); 474 GSM_Init(true);
475 475
476 CheckDCT3(); 476 CheckDCT3();
477 477
478 error=DCT3_EnableSecurity (&s, 0x01); 478 error=DCT3_EnableSecurity (&s, 0x01);
479 Print_Error(error); 479 Print_Error(error);
480 480
481 s.User.UserReplyFunctions=UserReplyFunctions3; 481 s.User.UserReplyFunctions=UserReplyFunctions3;
482 482
483 error=GSM_WaitFor (&s, req, 5, 0x40, 4, ID_User2); 483 error=GSM_WaitFor (&s, req, 5, 0x40, 4, ID_User2);
484 Print_Error(error); 484 Print_Error(error);
485 485
486#ifdef GSM_ENABLE_BEEP 486#ifdef GSM_ENABLE_BEEP
487 GSM_PhoneBeep(); 487 GSM_PhoneBeep();
488#endif 488#endif
489 GSM_Terminate(); 489 GSM_Terminate();
490} 490}
491 491
492static unsigned char PPS[32]; /* Product Profile Settings */ 492static unsigned char PPS[32]; /* Product Profile Settings */
493 493
494static GSM_Error DCT3_ReplyGetPPS(GSM_Protocol_Message msg, GSM_StateMachine *s) 494static GSM_Error DCT3_ReplyGetPPS(GSM_Protocol_Message msg, GSM_StateMachine *s)
495{ 495{
496 int i,j,z; 496 int i,j,z;
497 497
498#ifdef DEBUG 498#ifdef DEBUG
499 dbgprintf("Product Profile Settings received -"); 499 dbgprintf("Product Profile Settings received -");
500 for (i=0;i<4;i++) dbgprintf(" %02x",msg.Buffer[3+i]); 500 for (i=0;i<4;i++) dbgprintf(" %02x",msg.Buffer[3+i]);
501 dbgprintf("\n"); 501 dbgprintf("\n");
502#endif 502#endif
503 j=128;z=0; 503 j=128;z=0;
504 for (i=0;i<32;i++) { 504 for (i=0;i<32;i++) {
505 PPS[i]='0'; 505 PPS[i]='0';
506 if (msg.Buffer[z+3]&j) PPS[i]='1'; 506 if (msg.Buffer[z+3]&j) PPS[i]='1';
507 if (j==1) { 507 if (j==1) {
508 j=128; 508 j=128;
509 z++; 509 z++;
510 } else j=j/2; 510 } else j=j/2;
511 } 511 }
512#ifdef DEBUG 512#ifdef DEBUG
513 dbgprintf("After decoding: "); 513 dbgprintf("After decoding: ");
514 for (i=0;i<32;i++) dbgprintf("%c",PPS[i]); 514 for (i=0;i<32;i++) dbgprintf("%c",PPS[i]);
515 dbgprintf("\n"); 515 dbgprintf("\n");
516#endif 516#endif
517 return ERR_NONE; 517 return ERR_NONE;
518} 518}
519 519
520static GSM_Error DCT3_ReplySetPPS(GSM_Protocol_Message msg, GSM_StateMachine *s) 520static GSM_Error DCT3_ReplySetPPS(GSM_Protocol_Message msg, GSM_StateMachine *s)
521{ 521{
522 printf("Setting done OK\n"); 522 printf("Setting done OK\n");
523 return ERR_NONE; 523 return ERR_NONE;
524} 524}
525 525
526void DCT3SetPhoneMenus(int argc, char *argv[]) 526void DCT3SetPhoneMenus(int argc, char *argv[])
527{ 527{
528 char value[100]; 528 char value[100];
529 int i,j,z; 529 int i,j,z;
530 unsigned char reqGet[] = {0x00, 0x01, 0x6a}; 530 unsigned char reqGet[] = {0x00, 0x01, 0x6a};
531 unsigned char reqSet[] = { 531 unsigned char reqSet[] = {
532 0x00, 0x01, 0x6b, 532 0x00, 0x01, 0x6b,
533 0x00, 0x00, 0x00, 0x00 }; /* bytes with Product Profile Setings */ 533 0x00, 0x00, 0x00, 0x00 }; /* bytes with Product Profile Setings */
534 534
535 if (CheckDCT3Only()!=ERR_NONE) return; 535 if (CheckDCT3Only()!=ERR_NONE) return;
536 536
537 error=DCT3_EnableSecurity (&s, 0x01); 537 error=DCT3_EnableSecurity (&s, 0x01);
538 Print_Error(error); 538 Print_Error(error);
539 539
540 s.User.UserReplyFunctions=UserReplyFunctions3; 540 s.User.UserReplyFunctions=UserReplyFunctions3;
541 541
542 error=GSM_WaitFor (&s, reqGet, 3, 0x40, 4, ID_User4); 542 error=GSM_WaitFor (&s, reqGet, 3, 0x40, 4, ID_User4);
543 Print_Error(error); 543 Print_Error(error);
544 544
545 printf("ALS : enabling menu\n"); 545 printf("ALS : enabling menu\n");
546 PPS[10] = '1'; 546 PPS[10] = '1';
547 547
548 if (!strcmp(s.Phone.Data.ModelInfo->model,"3310") && s.Phone.Data.VerNum>5.87) { 548 if (!strcmp(s.Phone.Data.ModelInfo->model,"3310") && s.Phone.Data.VerNum>5.87) {
549 printf("3310: enabling control of SMS charsets\n"); 549 printf("3310: enabling control of SMS charsets\n");
550 PPS[11] = '0';//0 = ON, 1 = OFF 550 PPS[11] = '0';//0 = ON, 1 = OFF
551 } 551 }
552 if (!strcmp(s.Phone.Data.ModelInfo->model,"6150")) { 552 if (!strcmp(s.Phone.Data.ModelInfo->model,"6150")) {
553 printf("6150: enabling WellMate menu\n"); 553 printf("6150: enabling WellMate menu\n");
554 PPS[18] = '1'; 554 PPS[18] = '1';
555 } 555 }
556 /* FIXME */ 556 /* FIXME */
557 if (!strcmp(s.Phone.Data.ModelInfo->model,"3210")) { 557 if (!strcmp(s.Phone.Data.ModelInfo->model,"3210")) {
558 printf("3210: enabling vibra menu\n"); 558 printf("3210: enabling vibra menu\n");
559 PPS[24] = '1'; 559 PPS[24] = '1';
560 } 560 }
561 if (!strcmp(s.Phone.Data.ModelInfo->model,"3310") && s.Phone.Data.VerNum>5.13) { 561 if (!strcmp(s.Phone.Data.ModelInfo->model,"3310") && s.Phone.Data.VerNum>5.13) {
562 printf("3310: enabling 3315 features\n"); 562 printf("3310: enabling 3315 features\n");
563 PPS[25] = '1'; 563 PPS[25] = '1';
564 } 564 }
565 /* FIXME */ 565 /* FIXME */
566 if (!strcmp(s.Phone.Data.ModelInfo->model,"3210") && s.Phone.Data.VerNum>=5.31) { 566 if (!strcmp(s.Phone.Data.ModelInfo->model,"3210") && s.Phone.Data.VerNum>=5.31) {
567 printf("3210: enabling React and Logic game\n"); 567 printf("3210: enabling React and Logic game\n");
568 PPS[26] = '1'; 568 PPS[26] = '1';
569 } 569 }
570 570
571#ifdef DEBUG 571#ifdef DEBUG
572 dbgprintf("After settings: "); 572 dbgprintf("After settings: ");
573 for (i=0;i<32;i++) dbgprintf("%c",PPS[i]); 573 for (i=0;i<32;i++) dbgprintf("%c",PPS[i]);
574 dbgprintf("\n"); 574 dbgprintf("\n");
575#endif 575#endif
576 576
577 j=128;z=0; 577 j=128;z=0;
578 for (i=0;i<32;i++) { 578 for (i=0;i<32;i++) {
579 if (PPS[i]=='1') reqSet[z+3]=reqSet[z+3]+j; 579 if (PPS[i]=='1') reqSet[z+3]=reqSet[z+3]+j;
580 if (j==1) { 580 if (j==1) {
581 j=128; 581 j=128;
582 z++; 582 z++;
583 } else j=j/2; 583 } else j=j/2;
584 } 584 }
585 585
586 //reqSet[3]=0xe7; 586 //reqSet[3]=0xe7;
587 //reqSet[4]=0x25; 587 //reqSet[4]=0x25;
588 //reqSet[5]=0x00; 588 //reqSet[5]=0x00;
589 //reqSet[6]=0xe0; 589 //reqSet[6]=0xe0;
590 590
591 error=GSM_WaitFor (&s, reqSet, 7, 0x40, 4, ID_User4); 591 error=GSM_WaitFor (&s, reqSet, 7, 0x40, 4, ID_User4);
592 Print_Error(error); 592 Print_Error(error);
593 593
594 printf("Enabling netmonitor\n"); 594 printf("Enabling netmonitor\n");
595 error=DCT3_Netmonitor(&s, 243, value); 595 error=DCT3_Netmonitor(&s, 243, value);
596 Print_Error(error); 596 Print_Error(error);
597} 597}
598 598
599static GSM_Error DCT3_Reply61GetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s) 599static GSM_Error DCT3_Reply61GetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
600{ 600{
601 printf("Security Code is \"%s\"\n",msg.Buffer+5); 601 printf("Security Code is \"%s\"\n",msg.Buffer+5);
602 return ERR_NONE; 602 return ERR_NONE;
603} 603}
604 604
605static GSM_Error DCT3_Reply7191GetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s) 605static GSM_Error DCT3_Reply7191GetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
606{ 606{
607 printf("Security Code is \"%s\"\n",msg.Buffer+6); 607 printf("Security Code is \"%s\"\n",msg.Buffer+6);
608 return ERR_NONE; 608 return ERR_NONE;
609} 609}
610 610
611void DCT3GetSecurityCode(int argc, char *argv[]) 611void DCT3GetSecurityCode(int argc, char *argv[])
612{ 612{
613#ifdef GSM_ENABLE_NOKIA6110 613#ifdef GSM_ENABLE_NOKIA6110
614 unsigned char req6110[] = {0x00, 0x01, 0x6e, 614 unsigned char req6110[] = {0x00, 0x01, 0x6e,
615 0x01};/* Code type */ 615 0x01};/* Code type */
616#endif 616#endif
617#if defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210) 617#if defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210)
618 unsigned char req71_91[] = {N7110_FRAME_HEADER, 0xee, 618 unsigned char req71_91[] = {N7110_FRAME_HEADER, 0xee,
619 0x1c};/* Setting */ 619 0x1c};/* Setting */
620#endif 620#endif
621 621
622 if (CheckDCT3Only()!=ERR_NONE) return; 622 if (CheckDCT3Only()!=ERR_NONE) return;
623 623
624 error=DCT3_EnableSecurity (&s, 0x01); 624 error=DCT3_EnableSecurity (&s, 0x01);
625 Print_Error(error); 625 Print_Error(error);
626 626
627 s.User.UserReplyFunctions=UserReplyFunctions3; 627 s.User.UserReplyFunctions=UserReplyFunctions3;
628 628
629#ifdef GSM_ENABLE_NOKIA6110 629#ifdef GSM_ENABLE_NOKIA6110
630 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) { 630 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) {
631 error=GSM_WaitFor (&s, req6110, 4, 0x40, 4, ID_User6); 631 error=GSM_WaitFor (&s, req6110, 4, 0x40, 4, ID_User6);
632 } 632 }
633#endif 633#endif
634#ifdef GSM_ENABLE_NOKIA7110 634#ifdef GSM_ENABLE_NOKIA7110
635 if (strstr(N7110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) { 635 if (strstr(N7110Phone.models, s.Phone.Data.ModelInfo->model) != NULL) {
636 error=GSM_WaitFor (&s, req71_91, 5, 0x7a, 4, ID_User6); 636 error=GSM_WaitFor (&s, req71_91, 5, 0x7a, 4, ID_User6);
637 } 637 }
638#endif 638#endif
639#ifdef GSM_ENABLE_NOKIA9210 639#ifdef GSM_ENABLE_NOKIA9210
640 if (strstr(N9210Phone.models, s.Phone.Data.ModelInfo->model) != NULL) { 640 if (strstr(N9210Phone.models, s.Phone.Data.ModelInfo->model) != NULL) {
641 error=GSM_WaitFor (&s, req71_91, 5, 0x7a, 4, ID_User6); 641 error=GSM_WaitFor (&s, req71_91, 5, 0x7a, 4, ID_User6);
642 } 642 }
643#endif 643#endif
644 Print_Error(error); 644 Print_Error(error);
645} 645}
646 646
647#ifdef GSM_ENABLE_NOKIA6110 647#ifdef GSM_ENABLE_NOKIA6110
648 648
649static GSM_Error DCT3_ReplyGetOperatorName(GSM_Protocol_Message msg, GSM_StateMachine *s) 649static GSM_Error DCT3_ReplyGetOperatorName(GSM_Protocol_Message msg, GSM_StateMachine *s)
650{ 650{
651 unsigned char buffer[10]; 651 unsigned char buffer[10];
652 652
653 NOKIA_DecodeNetworkCode(msg.Buffer+5, buffer); 653 NOKIA_DecodeNetworkCode(msg.Buffer+5, buffer);
654 buffer[6] = 0; 654 buffer[6] = 0;
655 printf("Network : %s (%s ",buffer,DecodeUnicodeString(GSM_GetNetworkName(buffer))); 655 printf("Network : %s (%s ",buffer,DecodeUnicodeString(GSM_GetNetworkName(buffer)));
656 printf(", %s)\n", DecodeUnicodeString(GSM_GetCountryName(buffer))); 656 printf(", %s)\n", DecodeUnicodeString(GSM_GetCountryName(buffer)));
657 printf("Name : \"%s\"\n",msg.Buffer+8); 657 printf("Name : \"%s\"\n",msg.Buffer+8);
658 658
659 return ERR_NONE; 659 return ERR_NONE;
660} 660}
661 661
662void DCT3GetOperatorName(int argc, char *argv[]) 662void DCT3GetOperatorName(int argc, char *argv[])
663{ 663{
664 unsigned char req[] = {0x00,0x01,0x8c,0x00}; 664 unsigned char req[] = {0x00,0x01,0x8c,0x00};
665 665
666 GSM_Init(true); 666 GSM_Init(true);
667 667
668 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) == NULL) Print_Error(ERR_NOTSUPPORTED); 668 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) == NULL) Print_Error(ERR_NOTSUPPORTED);
669 CheckDCT3(); 669 CheckDCT3();
670 670
671 error=DCT3_EnableSecurity (&s, 0x01); 671 error=DCT3_EnableSecurity (&s, 0x01);
672 Print_Error(error); 672 Print_Error(error);
673 673
674 s.User.UserReplyFunctions=UserReplyFunctions3; 674 s.User.UserReplyFunctions=UserReplyFunctions3;
675 675
676 error=GSM_WaitFor (&s, req, 4, 0x40, 4, ID_User5); 676 error=GSM_WaitFor (&s, req, 4, 0x40, 4, ID_User5);
677 Print_Error(error); 677 Print_Error(error);
678 678
679 GSM_Terminate(); 679 GSM_Terminate();
680} 680}
681 681
682static GSM_Error DCT3_ReplySetOperatorName(GSM_Protocol_Message msg, GSM_StateMachine *s) 682static GSM_Error DCT3_ReplySetOperatorName(GSM_Protocol_Message msg, GSM_StateMachine *s)
683{ 683{
684 printf("Operator name set OK\n"); 684 printf("Operator name set OK\n");
685 return ERR_NONE; 685 return ERR_NONE;
686} 686}
687 687
688void DCT3SetOperatorName(int argc, char *argv[]) 688void DCT3SetOperatorName(int argc, char *argv[])
689{ 689{
690 int i = 0; 690 int i = 0;
691 unsigned char req[256] = {0x00,0x01,0x8b,0x00, 691 unsigned char req[256] = {0x00,0x01,0x8b,0x00,
692 0x00,0x00, /* MCC */ 692 0x00,0x00, /* MCC */
693 0x00}; /* MNC */ 693 0x00}; /* MNC */
694 694
695 GSM_Init(true); 695 GSM_Init(true);
696 696
697 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) == NULL) Print_Error(ERR_NOTSUPPORTED); 697 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) == NULL) Print_Error(ERR_NOTSUPPORTED);
698 CheckDCT3(); 698 CheckDCT3();
699 699
700 error=DCT3_EnableSecurity (&s, 0x01); 700 error=DCT3_EnableSecurity (&s, 0x01);
701 Print_Error(error); 701 Print_Error(error);
702 702
703 s.User.UserReplyFunctions=UserReplyFunctions3; 703 s.User.UserReplyFunctions=UserReplyFunctions3;
704 704
705 switch (argc) { 705 switch (argc) {
706 case 2: 706 case 2:
707 case 3:NOKIA_EncodeNetworkCode(req+4,"000 00"); 707 case 3:NOKIA_EncodeNetworkCode(req+4,"000 00");
708 req[7] = 0x00; 708 req[7] = 0x00;
709 i = 1; 709 i = 1;
710 break; 710 break;
711 case 4: NOKIA_EncodeNetworkCode(req+4,argv[2]); 711 case 4: NOKIA_EncodeNetworkCode(req+4,argv[2]);
712 strncpy(req+7,argv[3],200); 712 strncpy(req+7,argv[3],200);
713 i = strlen(argv[3]); 713 i = strlen(argv[3]);
714 } 714 }
715 715
716 error=GSM_WaitFor (&s, req, 8+i, 0x40, 4, ID_User7); 716 error=GSM_WaitFor (&s, req, 8+i, 0x40, 4, ID_User7);
717 Print_Error(error); 717 Print_Error(error);
718 718
719 GSM_Terminate(); 719 GSM_Terminate();
720} 720}
721 721
722static GSM_Error DCT3_ReplyDisplayOutput(GSM_Protocol_Message msg, GSM_StateMachine *s) 722static GSM_Error DCT3_ReplyDisplayOutput(GSM_Protocol_Message msg, GSM_StateMachine *s)
723{ 723{
724 unsigned char buf[100]; 724 unsigned char buf[100];
725 725
726 switch (msg.Buffer[3]) { 726 switch (msg.Buffer[3]) {
727 case 0x50: 727 case 0x50:
728 dbgprintf("Display string received\n"); 728 dbgprintf("Display string received\n");
729 memcpy(buf,msg.Buffer+8,msg.Buffer[7]*2); 729 memcpy(buf,msg.Buffer+8,msg.Buffer[7]*2);
730 buf[msg.Buffer[7]*2] = 0; 730 buf[msg.Buffer[7]*2] = 0;
731 buf[msg.Buffer[7]*2+1] = 0; 731 buf[msg.Buffer[7]*2+1] = 0;
732 printf("X=%i, Y=%i, Text=\"%s\"\n",msg.Buffer[6],msg.Buffer[5],DecodeUnicodeString(buf)); 732 printf("X=%i, Y=%i, Text=\"%s\"\n",msg.Buffer[6],msg.Buffer[5],DecodeUnicodeString(buf));
733 return ERR_NONE; 733 return ERR_NONE;
734 case 0x54: 734 case 0x54:
735 dbgprintf("Display output set\n"); 735 dbgprintf("Display output set\n");
736 return ERR_NONE; 736 return ERR_NONE;
737 } 737 }
738 return ERR_UNKNOWNRESPONSE; 738 return ERR_UNKNOWNRESPONSE;
739} 739}
740 740
741void DCT3DisplayOutput(int argc, char *argv[]) 741void DCT3DisplayOutput(int argc, char *argv[])
742{ 742{
743 unsigned char req[] = {N6110_FRAME_HEADER, 0x53, 743 unsigned char req[] = {N6110_FRAME_HEADER, 0x53,
744 0x01}; //1 = enable, 2 = disable 744 0x01}; //1 = enable, 2 = disable
745 745
746 GSM_Init(true); 746 GSM_Init(true);
747 747
748 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) == NULL) Print_Error(ERR_NOTSUPPORTED); 748 if (strstr(N6110Phone.models, s.Phone.Data.ModelInfo->model) == NULL) Print_Error(ERR_NOTSUPPORTED);
749 CheckDCT3(); 749 CheckDCT3();
750 750
751 s.User.UserReplyFunctions=UserReplyFunctions3; 751 s.User.UserReplyFunctions=UserReplyFunctions3;
752 752
753 error=GSM_WaitFor (&s, req, 5, 0x0d, 4, ID_User7); 753 error=GSM_WaitFor (&s, req, 5, 0x0d, 4, ID_User7);
754 Print_Error(error); 754 Print_Error(error);
755 755
756 signal(SIGINT, interrupt); 756 signal(SIGINT, interrupt);
757 printf("Press Ctrl+C to break...\n"); 757 printf("Press Ctrl+C to break...\n");
758 printf("Entering monitor mode...\n\n"); 758 printf("Entering monitor mode...\n\n");
759 759
760 while (!gshutdown) { 760 while (!gshutdown) {
761 GSM_ReadDevice(&s,true); 761 GSM_ReadDevice(&s,true);
762 my_sleep(10); 762 my_sleep(10);
763 } 763 }
764 764
765 req[4] = 0x02; 765 req[4] = 0x02;
766 error=GSM_WaitFor (&s, req, 5, 0x0d, 4, ID_User7); 766 error=GSM_WaitFor (&s, req, 5, 0x0d, 4, ID_User7);
767 Print_Error(error); 767 Print_Error(error);
768 768
769 GSM_Terminate(); 769 GSM_Terminate();
770} 770}
771#endif 771#endif
772 772
773static GSM_Reply_Function UserReplyFunctions3[] = { 773static GSM_Reply_Function UserReplyFunctions3[] = {
774#ifdef GSM_ENABLE_NOKIA6110 774#ifdef GSM_ENABLE_NOKIA6110
775 {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x50,ID_IncomingFrame}, 775 {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x50,ID_IncomingFrame},
776 {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x54,ID_User7 }, 776 {DCT3_ReplyDisplayOutput, "\x0D",0x03,0x54,ID_User7 },
777#endif 777#endif
778 778
779 {DCT3_ReplyEnableSecurity2, "\x40",0x02,0x64,ID_EnableSecurity}, 779 {DCT3_ReplyEnableSecurity2, "\x40",0x02,0x64,ID_EnableSecurity},
780 {DCT3_ReplyResetTest36, "\x40",0x02,0x65,ID_User2 }, 780 {DCT3_ReplyResetTest36, "\x40",0x02,0x65,ID_User2 },
781 {DCT3_ReplyGetADC, "\x40",0x02,0x68,ID_User3 }, 781 {DCT3_ReplyGetADC, "\x40",0x02,0x68,ID_User3 },
782 {DCT3_ReplyGetPPS, "\x40",0x02,0x6A,ID_User4 }, 782 {DCT3_ReplyGetPPS, "\x40",0x02,0x6A,ID_User4 },
783 {DCT3_ReplySetPPS, "\x40",0x02,0x6B,ID_User4 }, 783 {DCT3_ReplySetPPS, "\x40",0x02,0x6B,ID_User4 },
784 {DCT3_Reply61GetSecurityCode, "\x40",0x02,0x6E,ID_User6 }, 784 {DCT3_Reply61GetSecurityCode, "\x40",0x02,0x6E,ID_User6 },
785 {DCT3_ReplySimlockInfo, "\x40",0x02,0x8A,ID_User3 }, 785 {DCT3_ReplySimlockInfo, "\x40",0x02,0x8A,ID_User3 },
786#ifdef GSM_ENABLE_NOKIA6110 786#ifdef GSM_ENABLE_NOKIA6110
787 {DCT3_ReplySetOperatorName, "\x40",0x02,0x8B,ID_User7 }, 787 {DCT3_ReplySetOperatorName, "\x40",0x02,0x8B,ID_User7 },
788 {DCT3_ReplyGetOperatorName, "\x40",0x02,0x8C,ID_User5 }, 788 {DCT3_ReplyGetOperatorName, "\x40",0x02,0x8C,ID_User5 },
789#endif 789#endif
790 {DCT3_ReplyGetADC, "\x40",0x02,0x91,ID_User3 }, 790 {DCT3_ReplyGetADC, "\x40",0x02,0x91,ID_User3 },
791 {NoneReply, "\x40",0x02,0xA3,ID_User3 }, 791 {NoneReply, "\x40",0x02,0xA3,ID_User3 },
792 {DCT3_ReplyGetT9, "\x40",0x02,0xAE,ID_User3 }, 792 {DCT3_ReplyGetT9, "\x40",0x02,0xAE,ID_User3 },
793 {DCT3_ReplyGetMSID, "\x40",0x02,0xb5,ID_User8 }, 793 {DCT3_ReplyGetMSID, "\x40",0x02,0xb5,ID_User8 },
794 {DCT3_ReplyGetDSPROM, "\x40",0x02,0xC8,ID_User10 }, 794 {DCT3_ReplyGetDSPROM, "\x40",0x02,0xC8,ID_User10 },
795 {DCT3_ReplyGetMCUchkSum, "\x40",0x02,0xC8,ID_User9 }, 795 {DCT3_ReplyGetMCUchkSum, "\x40",0x02,0xC8,ID_User9 },
796 {DCT3_ReplyPhoneTests, "\x40",0x02,0xCF,ID_User1 }, 796 {DCT3_ReplyPhoneTests, "\x40",0x02,0xCF,ID_User1 },
797 797
798 {DCT3_Reply7191GetSecurityCode, "\x7a",0x04,0x1C,ID_User6 }, 798 {DCT3_Reply7191GetSecurityCode, "\x7a",0x04,0x1C,ID_User6 },
799 799
800 {NULL, "\x00",0x00,0x00,ID_None } 800 {NULL, "\x00",0x00,0x00,ID_None }
801 }; 801 };
802 802
803#endif 803#endif
804 804
805/* How should editor hadle tabs in this file? Add editor commands here. 805/* How should editor hadle tabs in this file? Add editor commands here.
806 * vim: noexpandtab sw=8 ts=8 sts=8: 806 * vim: noexpandtab sw=8 ts=8 sts=8:
807 */ 807 */
diff --git a/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c b/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c
index 64eda37..e46d9dd 100644
--- a/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c
+++ b/gammu/emb/gammu/depend/nokia/dct3trac/wmx.c
@@ -1,480 +1,480 @@
1/** 1/**
2 * Nokia DCT3 Firmware Debug Trace Monitor 2 * Nokia DCT3 Firmware Debug Trace Monitor
3 * wumpus 2003 -- www.blacksphere.tk 3 * wumpus 2003 -- www.blacksphere.tk
4 * SIM stuff by The Monty 4 * SIM stuff by The Monty
5 * 5 *
6 * Command line arguments: 6 * Command line arguments:
7 * gammu --nokiadebug v00-0F,20,21 7 * gammu --nokiadebug v00-0F,20,21
8 * (v=verbose) 8 * (v=verbose)
9 */ 9 */
10 10
11#include "../../../../common/gsmstate.h" 11#include "../../../../common/gsmstate.h"
12 12
13#ifdef GSM_ENABLE_NOKIA_DCT3 13#ifdef GSM_ENABLE_NOKIA_DCT3
14 14
15#include <string.h> 15#include <string.h>
16#include <signal.h> 16#include <signal.h>
17 17
18#include "../../../../common/misc/coding/coding.h" 18#include "../../../../common/misc/coding/coding.h"
19#include "../../../../common/gsmcomon.h" 19#include "../../../../common/gsmcomon.h"
20#include "../../../../common/gsmstate.h" 20#include "../../../../common/gsmstate.h"
21#include "../../../../common/service/gsmpbk.h" 21#include "../../../../common/service/gsmpbk.h"
22#include "../../../../common/phone/nokia/dct3/dct3func.h" 22#include "../../../../common/phone/nokia/dct3/dct3func.h"
23#include "../../../gammu.h" 23#include "../../../gammu.h"
24#include "../dct3.h" 24#include "../dct3.h"
25#include "wmx.h" 25#include "wmx.h"
26#include "wmx-util.h" 26#include "wmx-util.h"
27#include "wmx-gsm.h" 27#include "wmx-gsm.h"
28#include "wmx-sim.h" 28#include "wmx-sim.h"
29#include "wmx-list.h" 29#include "wmx-list.h"
30 30
31extern GSM_Reply_Function UserReplyFunctionsX[]; 31static GSM_Reply_Function UserReplyFunctionsX[];
32 32
33/* Global variables suck */ 33/* Global variables suck */
34 GSMDecoder *gsmdec; 34 GSMDecoder *gsmdec;
35 struct wmx_tracestruct *traces; 35 struct wmx_tracestruct *traces;
36 36
37static GSM_Error DCT3_ReplySwitchDebug(GSM_Protocol_Message msg, GSM_StateMachine *s) 37static GSM_Error DCT3_ReplySwitchDebug(GSM_Protocol_Message msg, GSM_StateMachine *s)
38{ 38{
39 switch(msg.Buffer[2]) { 39 switch(msg.Buffer[2]) {
40 case 0x70: 40 case 0x70:
41 printf("Debug Trace Enabled\n"); 41 printf("Debug Trace Enabled\n");
42 break; 42 break;
43 case 0x71: 43 case 0x71:
44 printf("Debug Trace Disabled\n"); 44 printf("Debug Trace Disabled\n");
45 break; 45 break;
46 } 46 }
47 return ERR_NONE; 47 return ERR_NONE;
48} 48}
49 49
50/** 50/**
51 * RPC confirmation/reply 51 * RPC confirmation/reply
52 */ 52 */
53static GSM_Error DCT3_ReplyRPC(GSM_Protocol_Message msg, GSM_StateMachine *s) 53static GSM_Error DCT3_ReplyRPC(GSM_Protocol_Message msg, GSM_StateMachine *s)
54{ 54{
55 printf("RPC Reply "); 55 printf("RPC Reply ");
56 printf("call=%02x rettype=%02x data=", msg.Buffer[2], msg.Buffer[3]); 56 printf("call=%02x rettype=%02x data=", msg.Buffer[2], msg.Buffer[3]);
57 if(msg.Buffer[3] == 3) { 57 if(msg.Buffer[3] == 3) {
58 /* string */ 58 /* string */
59 printf("%s", &msg.Buffer[4]); 59 printf("%s", &msg.Buffer[4]);
60 } else { 60 } else {
61 dumpraw("RPC Reply data", &msg.Buffer[4], msg.Length-4); 61 dumpraw("RPC Reply data", &msg.Buffer[4], msg.Length-4);
62 } 62 }
63 printf("\n"); 63 printf("\n");
64 return ERR_NONE; 64 return ERR_NONE;
65} 65}
66 66
67/* disassemble mdisnd (0x18xx) packet */ 67/* disassemble mdisnd (0x18xx) packet */
68static void mdisnd_data(unsigned char type, unsigned char *buffer, size_t length) 68static void mdisnd_data(unsigned char type, unsigned char *buffer, size_t length)
69{ 69{
70 GSMDecoder_l1l2data dat; 70 GSMDecoder_l1l2data dat;
71 size_t x; 71 size_t x;
72 int ch; 72 int ch;
73 73
74 if(type==0x1B && length>2) { 74 if(type==0x1B && length>2) {
75 /* channel packet */ 75 /* channel packet */
76 ch = buffer[1]; 76 ch = buffer[1];
77 dat.tx = GSMDECODER_SEND; 77 dat.tx = GSMDECODER_SEND;
78 dat.ch = ch; 78 dat.ch = ch;
79 printf("%02X ch=%02X ",buffer[0],ch); 79 printf("%02X ch=%02X ",buffer[0],ch);
80 if (ch == 0x80 || ch == 0xB0) { 80 if (ch == 0x80 || ch == 0xB0) {
81 printf("\n"); 81 printf("\n");
82 GSMDecoder_L2packet(gsmdec, &dat, &buffer[2], length-2); 82 GSMDecoder_L2packet(gsmdec, &dat, &buffer[2], length-2);
83 } else if (ch == 0x70) { 83 } else if (ch == 0x70) {
84 dumpraw("MDI send ch70 prefix", &buffer[2], 2); 84 dumpraw("MDI send ch70 prefix", &buffer[2], 2);
85 printf("\n"); 85 printf("\n");
86 GSMDecoder_L2packet(gsmdec, &dat, &buffer[4], length-4); 86 GSMDecoder_L2packet(gsmdec, &dat, &buffer[4], length-4);
87 } else { 87 } else {
88 dumpraw("MDI recv 1B packet", &buffer[2], length-2); 88 dumpraw("MDI recv 1B packet", &buffer[2], length-2);
89 } 89 }
90 } else { 90 } else {
91 /* hex */ 91 /* hex */
92 for(x=0; x<length; x++) { 92 for(x=0; x<length; x++) {
93 printf("%02x ",buffer[x]&0xFF); 93 printf("%02x ",buffer[x]&0xFF);
94 } 94 }
95 } 95 }
96} 96}
97 97
98/* disassemble mdircv (0x19xx) packet */ 98/* disassemble mdircv (0x19xx) packet */
99static void mdircv_data(unsigned char type, unsigned char *buffer, size_t length) 99static void mdircv_data(unsigned char type, unsigned char *buffer, size_t length)
100{ 100{
101 size_t x; 101 size_t x;
102 int ch; 102 int ch;
103 GSMDecoder_l1l2data dat; 103 GSMDecoder_l1l2data dat;
104 104
105 if (type==0x80 && length>1) { 105 if (type==0x80 && length>1) {
106 // buffer[0] channel 106 // buffer[0] channel
107 // buffer[1] flag1 107 // buffer[1] flag1
108 // buffer[2] flag2 108 // buffer[2] flag2
109 // buffer[3..5] timestamp 109 // buffer[3..5] timestamp
110 // buffer[6..7] unknown_hw1 110 // buffer[6..7] unknown_hw1
111 // buffer[8..9] unknown_hw2 111 // buffer[8..9] unknown_hw2
112 ch = buffer[0]; 112 ch = buffer[0];
113 dat.tx = GSMDECODER_RECEIVE; 113 dat.tx = GSMDECODER_RECEIVE;
114 dat.ch = ch; 114 dat.ch = ch;
115 dat.bsic = buffer[1]; 115 dat.bsic = buffer[1];
116 dat.err = buffer[2]; 116 dat.err = buffer[2];
117 dat.seq = (buffer[3]<<16)|(buffer[4]<<8)|(buffer[5]); 117 dat.seq = (buffer[3]<<16)|(buffer[4]<<8)|(buffer[5]);
118 dat.arfcn = (buffer[6]<<8)|buffer[7]; 118 dat.arfcn = (buffer[6]<<8)|buffer[7];
119 dat.timeshift = (buffer[8]<<8)|buffer[9]; 119 dat.timeshift = (buffer[8]<<8)|buffer[9];
120 120
121 printf("ch=%02X bsic=%i err=%i t=%06X arfcn=%i shift=%i", 121 printf("ch=%02X bsic=%i err=%i t=%06X arfcn=%i shift=%i",
122 ch, buffer[1], buffer[2], 122 ch, buffer[1], buffer[2],
123 dat.seq, dat.arfcn, dat.timeshift 123 dat.seq, dat.arfcn, dat.timeshift
124 ); 124 );
125 125
126 //dumpraw("MDI recv 80 header", &buffer[6], 4); 126 //dumpraw("MDI recv 80 header", &buffer[6], 4);
127 printf(" "); 127 printf(" ");
128 if(buffer[2] == 0) { /* unencrypted */ 128 if(buffer[2] == 0) { /* unencrypted */
129 if(ch == 0x70) { 129 if(ch == 0x70) {
130 /* Normal header + 2b prefix */ 130 /* Normal header + 2b prefix */
131 dumpraw("MDI recv ch70 prefix", &buffer[10], 2); 131 dumpraw("MDI recv ch70 prefix", &buffer[10], 2);
132 printf("\n"); 132 printf("\n");
133 GSMDecoder_L2packet(gsmdec, &dat, &buffer[12], length-12); 133 GSMDecoder_L2packet(gsmdec, &dat, &buffer[12], length-12);
134 } else if (ch == 0x80 || ch == 0xB0) { 134 } else if (ch == 0x80 || ch == 0xB0) {
135 /* Normal header */ 135 /* Normal header */
136 printf("\n"); 136 printf("\n");
137 GSMDecoder_L2packet(gsmdec, &dat, &buffer[10], length-10); 137 GSMDecoder_L2packet(gsmdec, &dat, &buffer[10], length-10);
138 } else if (ch == 0x50 || ch == 0x60) { 138 } else if (ch == 0x50 || ch == 0x60) {
139 /* Short header */ 139 /* Short header */
140 140
141 printf("\n"); 141 printf("\n");
142 GSMDecoder_L2short_packet(gsmdec, &dat, &buffer[10], length-10); 142 GSMDecoder_L2short_packet(gsmdec, &dat, &buffer[10], length-10);
143 } else { 143 } else {
144 dumpraw("MDI send 80 packet", &buffer[10], length-10); 144 dumpraw("MDI send 80 packet", &buffer[10], length-10);
145 } 145 }
146 } else { 146 } else {
147 /* Encrypted (?) */ 147 /* Encrypted (?) */
148 dumpraw("MDI send err 80", &buffer[10], length-10); 148 dumpraw("MDI send err 80", &buffer[10], length-10);
149 } 149 }
150 } else { 150 } else {
151 /* hex */ 151 /* hex */
152 for(x=0; x<length; x++) { 152 for(x=0; x<length; x++) {
153 printf("%02x ",buffer[x]&0xFF); 153 printf("%02x ",buffer[x]&0xFF);
154 } 154 }
155 } 155 }
156} 156}
157 157
158static GSM_Error DCT3_ReplyDebugTrace(GSM_Protocol_Message msg, GSM_StateMachine *s) 158static GSM_Error DCT3_ReplyDebugTrace(GSM_Protocol_Message msg, GSM_StateMachine *s)
159{ 159{
160 int x; 160 int x;
161 int id,timestamp,number,length; 161 int id,timestamp,number,length;
162 struct wmx_tracetype *minor; 162 struct wmx_tracetype *minor;
163 char *desc; 163 char *desc;
164 164
165 //printf("Debug Trace Received\n"); 165 //printf("Debug Trace Received\n");
166 /* parse frame 166 /* parse frame
167 Debug trace packet: 167 Debug trace packet:
168 packet type 0x00 168 packet type 0x00
169 source subsystem 0x01 (LOCAL) 169 source subsystem 0x01 (LOCAL)
170 verder formaat zie notebook 170 verder formaat zie notebook
171 0x08 ID (payload=offset 0x02 here) 171 0x08 ID (payload=offset 0x02 here)
172 0x0A timestamp 172 0x0A timestamp
173 0x0C seq nr 173 0x0C seq nr
174 0x0D .. parameters 174 0x0D .. parameters
175 */ 175 */
176 id = ((msg.Buffer[2]&0xFF)<<8)|(msg.Buffer[3]&0xFF); 176 id = ((msg.Buffer[2]&0xFF)<<8)|(msg.Buffer[3]&0xFF);
177 timestamp = ((msg.Buffer[4]&0xFF)<<8)|(msg.Buffer[5]&0xFF); 177 timestamp = ((msg.Buffer[4]&0xFF)<<8)|(msg.Buffer[5]&0xFF);
178 number = msg.Buffer[6]&0xFF; 178 number = msg.Buffer[6]&0xFF;
179 length = msg.Buffer[7]&0xFF; 179 length = msg.Buffer[7]&0xFF;
180 180
181 /* filter */ 181 /* filter */
182 //if((id&0xFF00)==0x1900 && id != 0x1980) 182 //if((id&0xFF00)==0x1900 && id != 0x1980)
183 //return GE_NONE; 183 //return GE_NONE;
184 //printf("%02x\n",msg.Buffer[10]); 184 //printf("%02x\n",msg.Buffer[10]);
185 //if(msg.Buffer[10]!=0x40) 185 //if(msg.Buffer[10]!=0x40)
186 //return GE_NONE; 186 //return GE_NONE;
187 /* Query trace type name */ 187 /* Query trace type name */
188 desc = "Unknown"; 188 desc = "Unknown";
189 if(traces != NULL) { 189 if(traces != NULL) {
190 minor = wmx_tracestruct_queryminor(traces, id); 190 minor = wmx_tracestruct_queryminor(traces, id);
191 if(minor != NULL) desc = minor->desc; 191 if(minor != NULL) desc = minor->desc;
192 } 192 }
193 printf("<%04X> %s\n", id, desc); 193 printf("<%04X> %s\n", id, desc);
194 printf("t=%04x nr=%02x: ", timestamp, number); 194 printf("t=%04x nr=%02x: ", timestamp, number);
195 195
196 /* TODO -- decode debug types on phone type */ 196 /* TODO -- decode debug types on phone type */
197 switch(id>>8) { 197 switch(id>>8) {
198 case 0x33: 198 case 0x33:
199 case 0x34: 199 case 0x34:
200 case 0x35: 200 case 0x35:
201 case 0x37: 201 case 0x37:
202 case 0x38: 202 case 0x38:
203 case 0x39: 203 case 0x39:
204 case 0x3A: 204 case 0x3A:
205 case 0x3B: 205 case 0x3B:
206 case 0x3C: 206 case 0x3C:
207 case 0x5F: 207 case 0x5F:
208 /* text */ 208 /* text */
209 /* skip length byte */ 209 /* skip length byte */
210 printf("\""); 210 printf("\"");
211 for(x=8; x<msg.Length; x++) { 211 for(x=8; x<msg.Length; x++) {
212 printf("%c",msg.Buffer[x]&0xFF); 212 printf("%c",msg.Buffer[x]&0xFF);
213 } 213 }
214 printf("\""); 214 printf("\"");
215 break; 215 break;
216 /* 216 /*
217 case 0x6801: 217 case 0x6801:
218 for(x=8; x<msg.Length; x++) { 218 for(x=8; x<msg.Length; x++) {
219 printf("%02x%c ",msg.Buffer[x]&0xFF,msg.Buffer[x]&0xFF); 219 printf("%02x%c ",msg.Buffer[x]&0xFF,msg.Buffer[x]&0xFF);
220 } 220 }
221 break; 221 break;
222 */ 222 */
223 case 0x18: /* MDISND */ 223 case 0x18: /* MDISND */
224 224
225 /* skip these: 225 /* skip these:
226 +00 length 226 +00 length
227 +01 type (also xx in 0x18xx) 227 +01 type (also xx in 0x18xx)
228 */ 228 */
229 if(msg.Length<10 || msg.Buffer[9]!=(id&0xFF)) { 229 if(msg.Length<10 || msg.Buffer[9]!=(id&0xFF)) {
230 printf("C %02X: param:%02x", id&0xFF, msg.Buffer[8]); 230 printf("C %02X: param:%02x", id&0xFF, msg.Buffer[8]);
231 } else { 231 } else {
232 //printf("D %02X: ", id&0xFF); 232 //printf("D %02X: ", id&0xFF);
233 printf("D %02X: ", id&0xFF); 233 printf("D %02X: ", id&0xFF);
234 mdisnd_data((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[10], msg.Length-10); 234 mdisnd_data((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[10], msg.Length-10);
235 } 235 }
236 break; 236 break;
237 case 0x19: /* MDIRCV */ 237 case 0x19: /* MDIRCV */
238 if(msg.Length<10 || msg.Buffer[9]!=(id&0xFF)) { 238 if(msg.Length<10 || msg.Buffer[9]!=(id&0xFF)) {
239 printf("C %02X: param:%02x", id&0xFF, msg.Buffer[8]); 239 printf("C %02X: param:%02x", id&0xFF, msg.Buffer[8]);
240 } else { 240 } else {
241 printf("D %02X: ", id&0xFF); 241 printf("D %02X: ", id&0xFF);
242 mdircv_data((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[10], msg.Length-10); 242 mdircv_data((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[10], msg.Length-10);
243 //dumpraw((unsigned char*)&msg.Buffer[10], msg.Length-10); 243 //dumpraw((unsigned char*)&msg.Buffer[10], msg.Length-10);
244 } 244 }
245 break; 245 break;
246 case 0x20: /* 0x25 SIM commands */ 246 case 0x20: /* 0x25 SIM commands */
247 /* 247 /*
248 for(x=8;x<msg.Length;x++) 248 for(x=8;x<msg.Length;x++)
249 printf("%02x ", msg.Buffer[x]&0xFF); 249 printf("%02x ", msg.Buffer[x]&0xFF);
250 */ 250 */
251 printf("SIM command "); 251 printf("SIM command ");
252 if(msg.Buffer[8]==0xa0) { // check if valid (class=a0) 252 if(msg.Buffer[8]==0xa0) { // check if valid (class=a0)
253 simCommand_data(msg.Buffer[9], (unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[10], msg.Length-10); 253 simCommand_data(msg.Buffer[9], (unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[10], msg.Length-10);
254 // TODO: pass the msg.Buffer[9] and skip 1rst arg 254 // TODO: pass the msg.Buffer[9] and skip 1rst arg
255 } else { 255 } else {
256 printf("Unknown 0x25 packet (NOT SIM cmd): "); 256 printf("Unknown 0x25 packet (NOT SIM cmd): ");
257 for(x=8;x<msg.Length;x++) printf("%02x ", msg.Buffer[x]&0xFF); 257 for(x=8;x<msg.Length;x++) printf("%02x ", msg.Buffer[x]&0xFF);
258 printf("\n"); 258 printf("\n");
259 } 259 }
260 break; 260 break;
261 case 0x22: /* 0x27 SIM answer to command (error/ok/etc..) */ 261 case 0x22: /* 0x27 SIM answer to command (error/ok/etc..) */
262 if(msg.Length<10) { 262 if(msg.Length<10) {
263 // Unknown response 263 // Unknown response
264 for(x=0;x<msg.Length-10;x++) printf("%02x ", msg.Buffer[x]&0xFF); 264 for(x=0;x<msg.Length-10;x++) printf("%02x ", msg.Buffer[x]&0xFF);
265 printf(" (Unknown 0x27 packet ? ? )\n"); 265 printf(" (Unknown 0x27 packet ? ? )\n");
266 } else { 266 } else {
267 simAnswer_Process((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[8], length); 267 simAnswer_Process((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[8], length);
268 } 268 }
269 break; 269 break;
270 case 0x23: /* 0x28 SIM response data to commands */ 270 case 0x23: /* 0x28 SIM response data to commands */
271 if(msg.Length<10) { 271 if(msg.Length<10) {
272 // Unknown response 272 // Unknown response
273 for(x=0;x<msg.Length-10;x++) printf("%02x ", msg.Buffer[x]&0xFF); 273 for(x=0;x<msg.Length-10;x++) printf("%02x ", msg.Buffer[x]&0xFF);
274 printf(" (Unknown 0x28 packet)\n"); 274 printf(" (Unknown 0x28 packet)\n");
275 } else { 275 } else {
276 simResponse_Process((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[8], length); 276 simResponse_Process((unsigned char)(id&0xFF), (unsigned char*)&msg.Buffer[8], length);
277 } 277 }
278 break; 278 break;
279 default: 279 default:
280 /* hex */ 280 /* hex */
281 for(x=8; x<msg.Length; x++) { 281 for(x=8; x<msg.Length; x++) {
282 printf("%02x ",msg.Buffer[x]&0xFF); 282 printf("%02x ",msg.Buffer[x]&0xFF);
283 } 283 }
284 break; 284 break;
285 } 285 }
286 printf("\n"); 286 printf("\n");
287 return ERR_NONE; 287 return ERR_NONE;
288} 288}
289 289
290 290
291static GSM_Error DCT3_ReplyMyPacket(GSM_Protocol_Message msg, GSM_StateMachine *s) 291static GSM_Error DCT3_ReplyMyPacket(GSM_Protocol_Message msg, GSM_StateMachine *s)
292{ 292{
293 int x; 293 int x;
294 294
295 printf("MyPacket "); 295 printf("MyPacket ");
296 for(x=0; x<msg.Length; x++) { 296 for(x=0; x<msg.Length; x++) {
297 printf("%02x ",msg.Buffer[x]&0xFF); 297 printf("%02x ",msg.Buffer[x]&0xFF);
298 } 298 }
299 printf("\n"); 299 printf("\n");
300 return ERR_NONE; 300 return ERR_NONE;
301} 301}
302 302
303#define ID_DebugTrace 0x666 303#define ID_DebugTrace 0x666
304#define ID_DebugSwitch 0x667 304#define ID_DebugSwitch 0x667
305 #define ID_RPC 0x668 305 #define ID_RPC 0x668
306 306
307void DCT3SetDebug(int argc, char *argv[]) 307void DCT3SetDebug(int argc, char *argv[])
308 { 308 {
309 int x,count; 309 int x,count;
310 unsigned int y; 310 unsigned int y;
311 unsigned char reqDisable[] = {0x01, 0x01, 0x71}; 311 unsigned char reqDisable[] = {0x01, 0x01, 0x71};
312 // unsigned char reqTest[] = {0x01, 0x01, 0x96, 0xFF, 0xFF}; 312 // unsigned char reqTest[] = {0x01, 0x01, 0x96, 0xFF, 0xFF};
313 313
314 /* RPC testing packets: */ 314 /* RPC testing packets: */
315 315
316 /* RPC: Get version */ 316 /* RPC: Get version */
317 //unsigned char reqTest2[] = {0x01, 0x01, 0x00, 0x03, 0x00}; 317 //unsigned char reqTest2[] = {0x01, 0x01, 0x00, 0x03, 0x00};
318 /* RPC: read I/O 0x6D mask 0xFF */ 318 /* RPC: read I/O 0x6D mask 0xFF */
319 //unsigned char reqTest2[] = {0x01, 0x01, 0x02, 0x01, 0x02, 0x6D, 0xFF}; /* */ 319 //unsigned char reqTest2[] = {0x01, 0x01, 0x02, 0x01, 0x02, 0x6D, 0xFF}; /* */
320 /* RPC: write I/O 0x03 mask 0xFF value 0x31 */ 320 /* RPC: write I/O 0x03 mask 0xFF value 0x31 */
321 //unsigned char reqTest2[] = {0x01, 0x01, 0x01, 0x01, 0x07, 0x03, 0xFF, 0x31}; /* write I/O */ 321 //unsigned char reqTest2[] = {0x01, 0x01, 0x01, 0x01, 0x07, 0x03, 0xFF, 0x31}; /* write I/O */
322 322
323 /* RPC: write forged FBUS packet to MDISND */ 323 /* RPC: write forged FBUS packet to MDISND */
324 // unsigned char reqTest2[] = {0x01, 0x01, 0x16, 0x01, 0x06, 324 // unsigned char reqTest2[] = {0x01, 0x01, 0x16, 0x01, 0x06,
325 //0x14, // R0 -- length 325 //0x14, // R0 -- length
326 //0x05, // R1 -- MDI type identifier 0x05(FBUS) 326 //0x05, // R1 -- MDI type identifier 0x05(FBUS)
327 //0x1e, 0x0c, 0x00, 0x66, 327 //0x1e, 0x0c, 0x00, 0x66,
328 //0x00, 0x0e, 0x01, 0x01, 328 //0x00, 0x0e, 0x01, 0x01,
329 //0x66, 0x55, 0x44, 0x33, 329 //0x66, 0x55, 0x44, 0x33,
330 //0x0d, 0x01, 0x01, 0x01, 330 //0x0d, 0x01, 0x01, 0x01,
331 //0x1b, 0x58, 0x01, 0x44}; 331 //0x1b, 0x58, 0x01, 0x44};
332 //1805 t=cb37 nr=e2 :D 05: 332 //1805 t=cb37 nr=e2 :D 05:
333 333
334 /* debug enable packet */ 334 /* debug enable packet */
335 unsigned char reqEnable[] = { 335 unsigned char reqEnable[] = {
336 0x00, 0x01, 0x70, 336 0x00, 0x01, 0x70,
337 /* Debug bits 337 /* Debug bits
338 byte[bit>>3]&(1<<(7-(bit&7))) 338 byte[bit>>3]&(1<<(7-(bit&7)))
339 */ 339 */
340 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00 */ 340 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00 */
341 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40 */ 341 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x40 */
342 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80 */ 342 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80 */
343 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0 */ 343 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xC0 */
344 /* Debug verbose bits 344 /* Debug verbose bits
345 byte[bit>>3]&(1<<(7-(bit&7))) 345 byte[bit>>3]&(1<<(7-(bit&7)))
346 */ 346 */
347 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 347 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
348 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 348 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
349 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 349 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
350 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 350 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
351 }; 351 };
352 352
353 #define ENABLE_BIT(bit,verbose) reqEnable[3 + (bit>>3)] |= 1<<(7-(bit&7)); if(verbose){reqEnable[3 + 32 + (bit>>3)] |= 1<<(7-(bit&7));} 353 #define ENABLE_BIT(bit,verbose) reqEnable[3 + (bit>>3)] |= 1<<(7-(bit&7)); if(verbose){reqEnable[3 + 32 + (bit>>3)] |= 1<<(7-(bit&7));}
354 354
355 /* Enable some bit 355 /* Enable some bit
356 TODO command line or GUI interface 356 TODO command line or GUI interface
357 */ 357 */
358 //ENABLE_BIT(0x18, 1);/* Enable MDISND debugging */ 358 //ENABLE_BIT(0x18, 1);/* Enable MDISND debugging */
359 //ENABLE_BIT(0x19, 1);/* Enable MDIRCV debugging */ 359 //ENABLE_BIT(0x19, 1);/* Enable MDIRCV debugging */
360 //ENABLE_BIT(0x31, 1); 360 //ENABLE_BIT(0x31, 1);
361 361
362 gsmdec = GSMDecoder_new(); 362 gsmdec = GSMDecoder_new();
363 /* Open XML file .. needs to be argument */ 363 /* Open XML file .. needs to be argument */
364 { 364 {
365 FILE *xout = fopen("out.xml", "w"); 365 FILE *xout = fopen("out.xml", "w");
366 GSMDecoder_xmlout(gsmdec, xout); 366 GSMDecoder_xmlout(gsmdec, xout);
367 } 367 }
368 printf("Debug Trace Mode -- wumpus 2003\n"); 368 printf("Debug Trace Mode -- wumpus 2003\n");
369 traces = wmx_tracestruct_load(argv[2]); 369 traces = wmx_tracestruct_load(argv[2]);
370 if(traces == NULL) 370 if(traces == NULL)
371 printf("Warning: could not load trace description file %s\n", argv[2]); 371 printf("Warning: could not load trace description file %s\n", argv[2]);
372 printf("Activating ranges:\n"); 372 printf("Activating ranges:\n");
373 count = 0; 373 count = 0;
374 for(x=3; x<argc; x++) { 374 for(x=3; x<argc; x++) {
375 char *ptr = argv[x]; 375 char *ptr = argv[x];
376 unsigned from,to,verbose; 376 unsigned from,to,verbose;
377 377
378 while(*ptr) { 378 while(*ptr) {
379 verbose = 0; 379 verbose = 0;
380 if(*ptr == 'v') { 380 if(*ptr == 'v') {
381 verbose = 1; 381 verbose = 1;
382 ptr++; 382 ptr++;
383 } 383 }
384 to = from = strtol(ptr, &ptr, 16); 384 to = from = strtol(ptr, &ptr, 16);
385 if(*ptr == '-') { 385 if(*ptr == '-') {
386 ptr ++; 386 ptr ++;
387 to = strtol(ptr, &ptr, 16); 387 to = strtol(ptr, &ptr, 16);
388 } 388 }
389 if(*ptr != ',' && *ptr != 0) { 389 if(*ptr != ',' && *ptr != 0) {
390 printf("Invalid parameter '%s'\n", argv[x]); 390 printf("Invalid parameter '%s'\n", argv[x]);
391 return; 391 return;
392 } 392 }
393 if(*ptr == ',') 393 if(*ptr == ',')
394 ptr++; 394 ptr++;
395 if(from > 0xFF) from=0xFF; 395 if(from > 0xFF) from=0xFF;
396 if(to > 0xFF) to=0xFF; 396 if(to > 0xFF) to=0xFF;
397 printf(" %02x-%02x verbose=%i\n",from,to,verbose); 397 printf(" %02x-%02x verbose=%i\n",from,to,verbose);
398 for(y=from; y<=to; y++) { 398 for(y=from; y<=to; y++) {
399 ENABLE_BIT(y, verbose); 399 ENABLE_BIT(y, verbose);
400 count++; 400 count++;
401 } 401 }
402 } 402 }
403 } 403 }
404 if(count == 0) { 404 if(count == 0) {
405 printf("Nothing activated -- bailing out\n"); 405 printf("Nothing activated -- bailing out\n");
406 return; 406 return;
407 } 407 }
408 //ENABLE_BIT(0x20, 1); /* SIM commands (literal) */ 408 //ENABLE_BIT(0x20, 1); /* SIM commands (literal) */
409 //ENABLE_BIT(0x21, 1); /* SIML2 commands (literal) */ 409 //ENABLE_BIT(0x21, 1); /* SIML2 commands (literal) */
410 //ENABLE_BIT(0x22, 1); /* SIM commands (literal) */ 410 //ENABLE_BIT(0x22, 1); /* SIM commands (literal) */
411 //ENABLE_BIT(0x3B, 1);/* PHCTRL state */ 411 //ENABLE_BIT(0x3B, 1);/* PHCTRL state */
412 412
413 GSM_Init(true); 413 GSM_Init(true);
414 414
415 /* We Need DCT3 */ 415 /* We Need DCT3 */
416 if (CheckDCT3Only()!=ERR_NONE) return; 416 if (CheckDCT3Only()!=ERR_NONE) return;
417 417
418 error=DCT3_EnableSecurity (&s, 0x01); 418 error=DCT3_EnableSecurity (&s, 0x01);
419 Print_Error(error); 419 Print_Error(error);
420 420
421 s.User.UserReplyFunctions=UserReplyFunctionsX; 421 s.User.UserReplyFunctions=UserReplyFunctionsX;
422 422
423 //error=GSM_WaitFor (&s, reqTest, sizeof(reqTest), 0x40, 1, ID_DebugSwitch); 423 //error=GSM_WaitFor (&s, reqTest, sizeof(reqTest), 0x40, 1, ID_DebugSwitch);
424 424
425 //error=GSM_WaitFor (&s, reqTest2, sizeof(reqTest2), 0xD1, 4, ID_RPC); 425 //error=GSM_WaitFor (&s, reqTest2, sizeof(reqTest2), 0xD1, 4, ID_RPC);
426 426
427 /* Enable Debug Mode */ 427 /* Enable Debug Mode */
428 error=GSM_WaitFor (&s, reqEnable, sizeof(reqEnable), 0x40, 4, ID_DebugSwitch); 428 error=GSM_WaitFor (&s, reqEnable, sizeof(reqEnable), 0x40, 4, ID_DebugSwitch);
429 429
430 Print_Error(error); 430 Print_Error(error);
431 signal(SIGINT, interrupt); 431 signal(SIGINT, interrupt);
432 printf("Press Ctrl+C to interrupt...\n"); 432 printf("Press Ctrl+C to interrupt...\n");
433 x=0; 433 x=0;
434 434
435 /* 435 /*
436 while(x<100) { 436 while(x<100) {
437 //printf(": %02x\n",x); 437 //printf(": %02x\n",x);
438 s.Phone.Data.RequestID= ID_DebugTrace; 438 s.Phone.Data.RequestID= ID_DebugTrace;
439 res = s.Device.Functions->ReadDevice(&s, buff, 255); 439 res = s.Device.Functions->ReadDevice(&s, buff, 255);
440 if(res) { 440 if(res) {
441 printf("%02x\n",x); 441 printf("%02x\n",x);
442 for(y=0;y<res;y++) { 442 for(y=0;y<res;y++) {
443 //printf("%02x\n",x,buff[y]&0xFF); 443 //printf("%02x\n",x,buff[y]&0xFF);
444 s.Protocol.Functions->StateMachine(&s,buff[y]); 444 s.Protocol.Functions->StateMachine(&s,buff[y]);
445 x++; 445 x++;
446 } 446 }
447 } 447 }
448 } 448 }
449 */ 449 */
450 ; 450 ;
451 451
452 /* todo: wait and dump for some time */ 452 /* todo: wait and dump for some time */
453 while (!gshutdown) { 453 while (!gshutdown) {
454 GSM_ReadDevice(&s,true); 454 GSM_ReadDevice(&s,true);
455 my_sleep(10); 455 my_sleep(10);
456 } 456 }
457 signal(SIGINT, SIG_DFL); 457 signal(SIGINT, SIG_DFL);
458 printf("Disabling\n"); 458 printf("Disabling\n");
459 error=GSM_WaitFor (&s, reqDisable, sizeof(reqDisable), 0x40, 10, ID_DebugSwitch); 459 error=GSM_WaitFor (&s, reqDisable, sizeof(reqDisable), 0x40, 10, ID_DebugSwitch);
460 Print_Error(error); 460 Print_Error(error);
461 461
462 GSMDecoder_free(gsmdec); 462 GSMDecoder_free(gsmdec);
463} 463}
464 464
465static GSM_Reply_Function UserReplyFunctionsX[] = { 465static GSM_Reply_Function UserReplyFunctionsX[] = {
466 {DCT3_ReplySwitchDebug, "\x40",0x02,0x70,ID_DebugSwitch }, 466 {DCT3_ReplySwitchDebug, "\x40",0x02,0x70,ID_DebugSwitch },
467 {DCT3_ReplySwitchDebug, "\x40",0x02,0x71,ID_DebugSwitch }, 467 {DCT3_ReplySwitchDebug, "\x40",0x02,0x71,ID_DebugSwitch },
468 {DCT3_ReplyDebugTrace, "\x00",0x00,0x00,ID_IncomingFrame}, 468 {DCT3_ReplyDebugTrace, "\x00",0x00,0x00,ID_IncomingFrame},
469 {DCT3_ReplyMyPacket, "\x40",0x00,0x00,ID_IncomingFrame}, 469 {DCT3_ReplyMyPacket, "\x40",0x00,0x00,ID_IncomingFrame},
470 470
471 {DCT3_ReplyRPC, "\xD2",0x00,0x00,ID_RPC }, 471 {DCT3_ReplyRPC, "\xD2",0x00,0x00,ID_RPC },
472 472
473 {NULL, "\x00",0x00,0x00,ID_None } 473 {NULL, "\x00",0x00,0x00,ID_None }
474 }; 474 };
475 475
476#endif 476#endif
477 477
478/* How should editor hadle tabs in this file? Add editor commands here. 478/* How should editor hadle tabs in this file? Add editor commands here.
479 * vim: noexpandtab sw=8 ts=8 sts=8: 479 * vim: noexpandtab sw=8 ts=8 sts=8:
480 */ 480 */
diff --git a/gammu/emb/gammu/depend/nokia/dct4.c b/gammu/emb/gammu/depend/nokia/dct4.c
index 4bf958d..43d8f09 100644
--- a/gammu/emb/gammu/depend/nokia/dct4.c
+++ b/gammu/emb/gammu/depend/nokia/dct4.c
@@ -1,1350 +1,1350 @@
1/* (c) 2002-2004 by Marcin Wiacek */ 1/* (c) 2002-2004 by Marcin Wiacek */
2 2
3#include "../../../common/gsmstate.h" 3#include "../../../common/gsmstate.h"
4 4
5#ifdef GSM_ENABLE_NOKIA_DCT4 5#ifdef GSM_ENABLE_NOKIA_DCT4
6 6
7#include <string.h> 7#include <string.h>
8 8
9#include "dct4.h" 9#include "dct4.h"
10#include "../../gammu.h" 10#include "../../gammu.h"
11#include "../../../common/phone/pfunc.h" 11#include "../../../common/phone/pfunc.h"
12#include "../../../common/phone/nokia/nfunc.h" 12#include "../../../common/phone/nokia/nfunc.h"
13#include "../../../common/phone/nokia/dct4/dct4func.h" 13#include "../../../common/phone/nokia/dct4/dct4func.h"
14#include "../../../common/misc/coding/coding.h" 14#include "../../../common/misc/coding/coding.h"
15 15
16extern GSM_Reply_Function UserReplyFunctions4[]; 16static GSM_Reply_Function UserReplyFunctions4[];
17 17
18/* ------- some usefull functions ----------------------------------------- */ 18/* ------- some usefull functions ----------------------------------------- */
19 19
20GSM_Error CheckDCT4Only() 20GSM_Error CheckDCT4Only()
21{ 21{
22 bool found = false; 22 bool found = false;
23 23
24 /* Checking if phone is DCT4 */ 24 /* Checking if phone is DCT4 */
25#ifdef GSM_ENABLE_NOKIA3650 25#ifdef GSM_ENABLE_NOKIA3650
26 if (strstr(N3650Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true; 26 if (strstr(N3650Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
27#endif 27#endif
28#ifdef GSM_ENABLE_NOKIA6510 28#ifdef GSM_ENABLE_NOKIA6510
29 if (strstr(N6510Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true; 29 if (strstr(N6510Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
30#endif 30#endif
31#ifdef GSM_ENABLE_NOKIA3320 31#ifdef GSM_ENABLE_NOKIA3320
32 if (strstr(N3320Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true; 32 if (strstr(N3320Phone.models, s.Phone.Data.ModelInfo->model) != NULL) found = true;
33#endif 33#endif
34 if (!found) return ERR_NOTSUPPORTED; 34 if (!found) return ERR_NOTSUPPORTED;
35 35
36 if (s.ConnectionType!=GCT_MBUS2 && s.ConnectionType!=GCT_FBUS2 && 36 if (s.ConnectionType!=GCT_MBUS2 && s.ConnectionType!=GCT_FBUS2 &&
37 s.ConnectionType!=GCT_FBUS2DLR3 && s.ConnectionType!=GCT_PHONETBLUE && 37 s.ConnectionType!=GCT_FBUS2DLR3 && s.ConnectionType!=GCT_PHONETBLUE &&
38 s.ConnectionType!=GCT_IRDAPHONET && s.ConnectionType!=GCT_BLUEPHONET && 38 s.ConnectionType!=GCT_IRDAPHONET && s.ConnectionType!=GCT_BLUEPHONET &&
39 s.ConnectionType!=GCT_FBUS2DKU5) { 39 s.ConnectionType!=GCT_FBUS2DKU5) {
40 return ERR_OTHERCONNECTIONREQUIRED; 40 return ERR_OTHERCONNECTIONREQUIRED;
41 } 41 }
42 return ERR_NONE; 42 return ERR_NONE;
43} 43}
44 44
45static void CheckDCT4() 45static void CheckDCT4()
46{ 46{
47 GSM_Error error; 47 GSM_Error error;
48 48
49 error = CheckDCT4Only(); 49 error = CheckDCT4Only();
50 switch (error) { 50 switch (error) {
51 case ERR_NOTSUPPORTED: 51 case ERR_NOTSUPPORTED:
52 Print_Error(ERR_NOTSUPPORTED); 52 Print_Error(ERR_NOTSUPPORTED);
53 break; 53 break;
54 case ERR_OTHERCONNECTIONREQUIRED: 54 case ERR_OTHERCONNECTIONREQUIRED:
55 printf("Can't do it with current phone protocol\n"); 55 printf("Can't do it with current phone protocol\n");
56 GSM_TerminateConnection(&s); 56 GSM_TerminateConnection(&s);
57 exit(-1); 57 exit(-1);
58 default: 58 default:
59 break; 59 break;
60 } 60 }
61} 61}
62 62
63static bool answer_yes2(char *text) 63static bool answer_yes2(char *text)
64{ 64{
65 int len; 65 int len;
66 char ans[99]; 66 char ans[99];
67 67
68 while (1) { 68 while (1) {
69 printf("%s (yes/no) ? ",text); 69 printf("%s (yes/no) ? ",text);
70 len=GetLine(stdin, ans, 99); 70 len=GetLine(stdin, ans, 99);
71 if (len==-1) exit(-1); 71 if (len==-1) exit(-1);
72 if (mystrncasecmp(ans, "yes",0)) return true; 72 if (mystrncasecmp(ans, "yes",0)) return true;
73 if (mystrncasecmp(ans, "no" ,0)) return false; 73 if (mystrncasecmp(ans, "no" ,0)) return false;
74 } 74 }
75} 75}
76 76
77/* ------------------- functions ------------------------------------------- */ 77/* ------------------- functions ------------------------------------------- */
78 78
79static DCT4_Feature DCT4Features[] = { 79static DCT4_Feature DCT4Features[] = {
80 {DCT4_ALWAYS_ONLINE, "GPRS Always Online", {{0,"on (Context)"},{1,"off (Attach)"},{0,""}}},///?? 80 {DCT4_ALWAYS_ONLINE, "GPRS Always Online", {{0,"on (Context)"},{1,"off (Attach)"},{0,""}}},///??
81 {DCT4_GPRS_PCCH, "PCCH support for GPRS", {{1,"on"},{0,"off"},{0,""}}}, 81 {DCT4_GPRS_PCCH, "PCCH support for GPRS", {{1,"on"},{0,"off"},{0,""}}},
82 {DCT4_GEA1, "GEA1 support indication", {{1,"on"},{0,"off"},{0,""}}}, 82 {DCT4_GEA1, "GEA1 support indication", {{1,"on"},{0,"off"},{0,""}}},
83 {DCT4_EOTD, "EOTD support", {{1,"on"},{0,"off"},{0,""}}}, 83 {DCT4_EOTD, "EOTD support", {{1,"on"},{0,"off"},{0,""}}},
84 {DCT4_WAP_PUSH, "WAP push", {{1,"on"},{0,"off"},{0,""}}}, 84 {DCT4_WAP_PUSH, "WAP push", {{1,"on"},{0,"off"},{0,""}}},
85 {DCT4_USE_PREF_SIM_NET, "Use SIM preffered network list",{{1,"on"},{0,"off"},{0,""}}}, 85 {DCT4_USE_PREF_SIM_NET, "Use SIM preffered network list",{{1,"on"},{0,"off"},{0,""}}},
86 {DCT4_JAVA_TCK, "Java TCK support", {{1,"on"},{0,"off"},{0,""}}}, 86 {DCT4_JAVA_TCK, "Java TCK support", {{1,"on"},{0,"off"},{0,""}}},
87 87
88 {DCT4_ALS, "Alternate Line Service (ALS)", {{1,"on"},{0,"off"},{0,""}}}, 88 {DCT4_ALS, "Alternate Line Service (ALS)", {{1,"on"},{0,"off"},{0,""}}},
89 {DCT4_A52, "Ciphering alghoritm A52", {{1,"on"},{0,"off"},{0,""}}}, 89 {DCT4_A52, "Ciphering alghoritm A52", {{1,"on"},{0,"off"},{0,""}}},
90 {DCT4_CSP, "Customer Service Profile", {{0,"off"},{1,"on"},{0,""}}}, 90 {DCT4_CSP, "Customer Service Profile", {{0,"off"},{1,"on"},{0,""}}},
91 {DCT4_EONS, "EONS support", {{1,"on"},{0,"off"},{0,""}}}, 91 {DCT4_EONS, "EONS support", {{1,"on"},{0,"off"},{0,""}}},
92 {DCT4_3GINDICATOR, "3G indicator", {{1,"on"},{0,"off"},{0,""}}}, 92 {DCT4_3GINDICATOR, "3G indicator", {{1,"on"},{0,"off"},{0,""}}},
93 {DCT4_DISPLAY_PHONE_NAME, "Display both number and name for incoming calls",{{1,"on"},{0,"off"},{0,""}}}, 93 {DCT4_DISPLAY_PHONE_NAME, "Display both number and name for incoming calls",{{1,"on"},{0,"off"},{0,""}}},
94 {DCT4_DISPLAY_WAP_PROFILE, "Display selected WAP profile name instead of Home option menu in Services",{{1,"on"},{0,"off"},{0,""}}}, 94 {DCT4_DISPLAY_WAP_PROFILE, "Display selected WAP profile name instead of Home option menu in Services",{{1,"on"},{0,"off"},{0,""}}},
95 95
96 {DCT4_GAMES_WAP_DOWNLOAD, "Games WAP download", {{1,"on"},{0,"off"},{0,""}}}, 96 {DCT4_GAMES_WAP_DOWNLOAD, "Games WAP download", {{1,"on"},{0,"off"},{0,""}}},
97 {DCT4_GAMES_SCORE_SEND, "Games WAP score send", {{1,"on"},{0,"off"},{0,""}}}, 97 {DCT4_GAMES_SCORE_SEND, "Games WAP score send", {{1,"on"},{0,"off"},{0,""}}},
98 {DCT4_GAMES_URL_CHECK, "Games URL check", {{1,"on"},{0,"off"},{0,""}}}, 98 {DCT4_GAMES_URL_CHECK, "Games URL check", {{1,"on"},{0,"off"},{0,""}}},
99 99
100 {DCT4_BLUETOOTH_MENU, "Bluetooth menu", {{1,"on"},{0,"off"},{0,""}}}, 100 {DCT4_BLUETOOTH_MENU, "Bluetooth menu", {{1,"on"},{0,"off"},{0,""}}},
101 {DCT4_WAP_BOOKMARKS_MENU, "Bookmarks menu in Services", {{1,"on"},{0,"off"},{0,""}}}, 101 {DCT4_WAP_BOOKMARKS_MENU, "Bookmarks menu in Services", {{1,"on"},{0,"off"},{0,""}}},
102 {DCT4_WAP_BOOKMARKS_MENU2, "Bookmarks menu in Services", {{3,"bookmarks & download"},{0,"off"},{0,""}}}, 102 {DCT4_WAP_BOOKMARKS_MENU2, "Bookmarks menu in Services", {{3,"bookmarks & download"},{0,"off"},{0,""}}},
103 {DCT4_WAP_GOTO_MENU, "GoTo menu in Services", {{0,"on"},{1,"off"},{0,""}}}, 103 {DCT4_WAP_GOTO_MENU, "GoTo menu in Services", {{0,"on"},{1,"off"},{0,""}}},
104 {DCT4_WAP_SETTINGS_MENU, "Profiles menu in Services", {{0,"on"},{1,"off"},{0,""}}}, 104 {DCT4_WAP_SETTINGS_MENU, "Profiles menu in Services", {{0,"on"},{1,"off"},{0,""}}},
105 {DCT4_SERVICES_GAMES_APP_GALLERY,"Services menu in Games/Apps/Gallery",{{1,"on"},{0,"off"},{0,""}}}, 105 {DCT4_SERVICES_GAMES_APP_GALLERY,"Services menu in Games/Apps/Gallery",{{1,"on"},{0,"off"},{0,""}}},
106 {DCT4_JAVA_GAMES_MENU, "Java games menu in Games", {{1,"on"},{0,"off"},{0,""}}}, 106 {DCT4_JAVA_GAMES_MENU, "Java games menu in Games", {{1,"on"},{0,"off"},{0,""}}},
107 {DCT4_SAT_CONFIRM_MENU, "Can use confirming SIM service actions", {{1,"on"},{0,"off"},{0,""}}}, 107 {DCT4_SAT_CONFIRM_MENU, "Can use confirming SIM service actions", {{1,"on"},{0,"off"},{0,""}}},
108 {DCT4_INSTANT_MESS_MENU, "Instant Messaging in Messages",{{1,"on"},{0,"off"},{0,""}}}, 108 {DCT4_INSTANT_MESS_MENU, "Instant Messaging in Messages",{{1,"on"},{0,"off"},{0,""}}},
109 {DCT4_CONFIRM_ALS, "Confirm using ALS", {{1,"on"},{0,"off"},{0,""}}}, 109 {DCT4_CONFIRM_ALS, "Confirm using ALS", {{1,"on"},{0,"off"},{0,""}}},
110 {DCT4_BOOKMARK_GOTO_MENU, "Bookmarks in GoTo menu", {{1,"on"},{0,"off"},{0,""}}}, 110 {DCT4_BOOKMARK_GOTO_MENU, "Bookmarks in GoTo menu", {{1,"on"},{0,"off"},{0,""}}},
111 111
112 {DCT4_5100_IDENTIFY, "Phone identification", {{1,"NPM-6U"},{0,"NPM-6"},{0,""}}}, 112 {DCT4_5100_IDENTIFY, "Phone identification", {{1,"NPM-6U"},{0,"NPM-6"},{0,""}}},
113 113
114#ifdef DEBUG 114#ifdef DEBUG
115 {DCT4_TEST,"",{{1,"1"},{0,"0"}}}, 115 {DCT4_TEST,"",{{1,"1"},{0,"0"}}},
116#endif 116#endif
117 117
118 {0, "", {{0,""}}} 118 {0, "", {{0,""}}}
119}; 119};
120 120
121static DCT4_Phone_Features DCT4PhoneFeatures[] = { 121static DCT4_Phone_Features DCT4PhoneFeatures[] = {
122 /*3100*/ {"RH-19",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,4},{DCT4_GPRS_PCCH,8}, 122 /*3100*/ {"RH-19",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,4},{DCT4_GPRS_PCCH,8},
123 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 123 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
124 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 124 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
125 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 125 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
126 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 126 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
127 {DCT4_EONS,28},{DCT4_3GINDICATOR,30},{DCT4_INSTANT_MESS_MENU,33}, 127 {DCT4_EONS,28},{DCT4_3GINDICATOR,30},{DCT4_INSTANT_MESS_MENU,33},
128 {DCT4_CONFIRM_ALS,35}, 128 {DCT4_CONFIRM_ALS,35},
129 {0,0}}}, 129 {0,0}}},
130 /*3200*/ {"RH-30",{{DCT4_ALS,2},{DCT4_A52,4},{DCT4_CSP,5},{DCT4_GPRS_PCCH,14}, 130 /*3200*/ {"RH-30",{{DCT4_ALS,2},{DCT4_A52,4},{DCT4_CSP,5},{DCT4_GPRS_PCCH,14},
131 {DCT4_GEA1,15},{DCT4_EOTD,18},{DCT4_WAP_SETTINGS_MENU,20}, 131 {DCT4_GEA1,15},{DCT4_EOTD,18},{DCT4_WAP_SETTINGS_MENU,20},
132 {DCT4_DISPLAY_PHONE_NAME,21},{DCT4_WAP_GOTO_MENU,23}, 132 {DCT4_DISPLAY_PHONE_NAME,21},{DCT4_WAP_GOTO_MENU,23},
133 {DCT4_SERVICES_GAMES_APP_GALLERY,26},{DCT4_3GINDICATOR,28}, 133 {DCT4_SERVICES_GAMES_APP_GALLERY,26},{DCT4_3GINDICATOR,28},
134 {DCT4_DISPLAY_WAP_PROFILE,31},{DCT4_SAT_CONFIRM_MENU,33}, 134 {DCT4_DISPLAY_WAP_PROFILE,31},{DCT4_SAT_CONFIRM_MENU,33},
135 {DCT4_CONFIRM_ALS,34},{DCT4_EONS,40},{DCT4_ALWAYS_ONLINE,45}, 135 {DCT4_CONFIRM_ALS,34},{DCT4_EONS,40},{DCT4_ALWAYS_ONLINE,45},
136 {0,0}}}, 136 {0,0}}},
137 /*3200*/ {"RH-31",{{DCT4_ALS,2},{DCT4_A52,4},{DCT4_CSP,5},{DCT4_GPRS_PCCH,14}, 137 /*3200*/ {"RH-31",{{DCT4_ALS,2},{DCT4_A52,4},{DCT4_CSP,5},{DCT4_GPRS_PCCH,14},
138 {DCT4_GEA1,15},{DCT4_EOTD,18},{DCT4_WAP_SETTINGS_MENU,20}, 138 {DCT4_GEA1,15},{DCT4_EOTD,18},{DCT4_WAP_SETTINGS_MENU,20},
139 {DCT4_DISPLAY_PHONE_NAME,21},{DCT4_WAP_GOTO_MENU,23}, 139 {DCT4_DISPLAY_PHONE_NAME,21},{DCT4_WAP_GOTO_MENU,23},
140 {DCT4_SERVICES_GAMES_APP_GALLERY,26},{DCT4_3GINDICATOR,28}, 140 {DCT4_SERVICES_GAMES_APP_GALLERY,26},{DCT4_3GINDICATOR,28},
141 {DCT4_DISPLAY_WAP_PROFILE,31},{DCT4_SAT_CONFIRM_MENU,33}, 141 {DCT4_DISPLAY_WAP_PROFILE,31},{DCT4_SAT_CONFIRM_MENU,33},
142 {DCT4_CONFIRM_ALS,34},{DCT4_EONS,40},{DCT4_ALWAYS_ONLINE,45}, 142 {DCT4_CONFIRM_ALS,34},{DCT4_EONS,40},{DCT4_ALWAYS_ONLINE,45},
143 {0,0}}}, 143 {0,0}}},
144 /*3300*/ {"NEM-1",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 144 /*3300*/ {"NEM-1",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
145 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 145 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
146 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 146 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
147 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 147 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
148 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 148 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
149 /*MORE*/ {0,0}}}, 149 /*MORE*/ {0,0}}},
150 /*3510*/ {"NHM-8",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6}, 150 /*3510*/ {"NHM-8",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6},
151 {DCT4_GAMES_WAP_DOWNLOAD,7},{DCT4_GAMES_SCORE_SEND,8}, 151 {DCT4_GAMES_WAP_DOWNLOAD,7},{DCT4_GAMES_SCORE_SEND,8},
152 {DCT4_GAMES_URL_CHECK,9},{DCT4_GPRS_PCCH,13}, 152 {DCT4_GAMES_URL_CHECK,9},{DCT4_GPRS_PCCH,13},
153 {DCT4_GEA1,15},{DCT4_ALWAYS_ONLINE,18},{0,0}}}, 153 {DCT4_GEA1,15},{DCT4_ALWAYS_ONLINE,18},{0,0}}},
154 /*3510i*/{"RH-9",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,4},{DCT4_GPRS_PCCH,9}, 154 /*3510i*/{"RH-9",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,4},{DCT4_GPRS_PCCH,9},
155 {DCT4_DISPLAY_PHONE_NAME,14},{DCT4_WAP_GOTO_MENU,15}, 155 {DCT4_DISPLAY_PHONE_NAME,14},{DCT4_WAP_GOTO_MENU,15},
156 {DCT4_WAP_SETTINGS_MENU,16},{DCT4_SERVICES_GAMES_APP_GALLERY,19}, 156 {DCT4_WAP_SETTINGS_MENU,16},{DCT4_SERVICES_GAMES_APP_GALLERY,19},
157 {DCT4_DISPLAY_WAP_PROFILE,25},{0,0}}}, 157 {DCT4_DISPLAY_WAP_PROFILE,25},{0,0}}},
158 /*3650*/ {"NHL-8",{{DCT4_ALS,1},{0,0}}}, 158 /*3650*/ {"NHL-8",{{DCT4_ALS,1},{0,0}}},
159 /*5100*/ {"NPM-6",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 159 /*5100*/ {"NPM-6",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
160 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 160 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
161 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 161 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
162 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 162 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
163 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 163 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
164 {DCT4_EONS,28}, 164 {DCT4_EONS,28},
165 // {DCT4_5100_IDENTIFY,10}, 165 // {DCT4_5100_IDENTIFY,10},
166 {0,0}}}, 166 {0,0}}},
167 /*5100*/ {"NPM-6U",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 167 /*5100*/ {"NPM-6U",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
168 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 168 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
169 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 169 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
170 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 170 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
171 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 171 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
172 {DCT4_EONS,28}, 172 {DCT4_EONS,28},
173 // {DCT4_5100_IDENTIFY,10}, 173 // {DCT4_5100_IDENTIFY,10},
174 {0,0}}}, 174 {0,0}}},
175 /*6100*/ {"NPL-2",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 175 /*6100*/ {"NPL-2",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
176 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 176 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
177 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 177 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
178 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 178 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
179 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 179 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
180 {0,0}}}, 180 {0,0}}},
181 /*6220*/ {"RH-20",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,4}, 181 /*6220*/ {"RH-20",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,4},
182 {DCT4_GEA1,14},{DCT4_EOTD,17},{DCT4_WAP_SETTINGS_MENU,19}, 182 {DCT4_GEA1,14},{DCT4_EOTD,17},{DCT4_WAP_SETTINGS_MENU,19},
183 {DCT4_DISPLAY_PHONE_NAME,20},{DCT4_WAP_GOTO_MENU,22}, 183 {DCT4_DISPLAY_PHONE_NAME,20},{DCT4_WAP_GOTO_MENU,22},
184 {DCT4_WAP_BOOKMARKS_MENU2,24},{DCT4_SERVICES_GAMES_APP_GALLERY,25}, 184 {DCT4_WAP_BOOKMARKS_MENU2,24},{DCT4_SERVICES_GAMES_APP_GALLERY,25},
185 {DCT4_3GINDICATOR,27},{DCT4_DISPLAY_WAP_PROFILE,30},{DCT4_SAT_CONFIRM_MENU,32}, 185 {DCT4_3GINDICATOR,27},{DCT4_DISPLAY_WAP_PROFILE,30},{DCT4_SAT_CONFIRM_MENU,32},
186 {DCT4_CONFIRM_ALS,33},{DCT4_JAVA_TCK,36},{DCT4_BOOKMARK_GOTO_MENU,37}, 186 {DCT4_CONFIRM_ALS,33},{DCT4_JAVA_TCK,36},{DCT4_BOOKMARK_GOTO_MENU,37},
187 {0,0}}}, 187 {0,0}}},
188 /*6310*/ {"NPE-4",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7}, 188 /*6310*/ {"NPE-4",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7},
189 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9},{DCT4_BLUETOOTH_MENU,10}, 189 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9},{DCT4_BLUETOOTH_MENU,10},
190 {DCT4_GPRS_PCCH,13},{DCT4_GEA1,15},{DCT4_ALWAYS_ONLINE,18},{0,0}}}, 190 {DCT4_GPRS_PCCH,13},{DCT4_GEA1,15},{DCT4_ALWAYS_ONLINE,18},{0,0}}},
191 /*6310i*/{"NPL-1",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7}, 191 /*6310i*/{"NPL-1",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7},
192 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9}, 192 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9},
193 {DCT4_BLUETOOTH_MENU,10},{DCT4_USE_PREF_SIM_NET,11}, 193 {DCT4_BLUETOOTH_MENU,10},{DCT4_USE_PREF_SIM_NET,11},
194 {DCT4_GPRS_PCCH,13},{DCT4_GEA1,15},{DCT4_EOTD,16}, 194 {DCT4_GPRS_PCCH,13},{DCT4_GEA1,15},{DCT4_EOTD,16},
195 {DCT4_ALWAYS_ONLINE,17},{DCT4_JAVA_GAMES_MENU,18}, 195 {DCT4_ALWAYS_ONLINE,17},{DCT4_JAVA_GAMES_MENU,18},
196 {DCT4_WAP_BOOKMARKS_MENU,20},{DCT4_WAP_SETTINGS_MENU,21}, 196 {DCT4_WAP_BOOKMARKS_MENU,20},{DCT4_WAP_SETTINGS_MENU,21},
197 {DCT4_WAP_PUSH,28},{DCT4_WAP_GOTO_MENU,29},{0,0}}}, 197 {DCT4_WAP_PUSH,28},{DCT4_WAP_GOTO_MENU,29},{0,0}}},
198 /*6510*/ {"NPM-9",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7}, 198 /*6510*/ {"NPM-9",{{DCT4_ALS,1},{DCT4_A52,3},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7},
199 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9}, 199 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9},
200 {DCT4_GPRS_PCCH,13},{DCT4_GEA1,15},{DCT4_ALWAYS_ONLINE,18},{0,0}}}, 200 {DCT4_GPRS_PCCH,13},{DCT4_GEA1,15},{DCT4_ALWAYS_ONLINE,18},{0,0}}},
201 /*6610*/ {"NHL-4U",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 201 /*6610*/ {"NHL-4U",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
202 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 202 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
203 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 203 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
204 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 204 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
205 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 205 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
206 {0,0}}}, 206 {0,0}}},
207 /*6800*/ {"NHL-6",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 207 /*6800*/ {"NHL-6",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
208 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 208 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
209 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 209 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
210 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 210 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
211 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 211 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
212 /*MORE*/ {0,0}}}, 212 /*MORE*/ {0,0}}},
213 /*7210*/ {"NHL-4",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 213 /*7210*/ {"NHL-4",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
214 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 214 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
215 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 215 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
216 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 216 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
217 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 217 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
218 {0,0}}}, 218 {0,0}}},
219 /*7250*/ {"NHL-4J",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 219 /*7250*/ {"NHL-4J",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
220 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 220 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
221 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 221 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
222 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 222 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
223 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 223 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
224 {0,0}}}, 224 {0,0}}},
225 /*7250i*/{"NHL-4JX",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8}, 225 /*7250i*/{"NHL-4JX",{{DCT4_ALS,1},{DCT4_CSP,4},{DCT4_GAMES_URL_CHECK,5},{DCT4_GPRS_PCCH,8},
226 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12}, 226 {DCT4_GEA1,9},{DCT4_ALWAYS_ONLINE,11},{DCT4_EOTD,12},
227 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18}, 227 {DCT4_DISPLAY_PHONE_NAME,17},{DCT4_WAP_GOTO_MENU,18},
228 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22}, 228 {DCT4_WAP_SETTINGS_MENU,19},{DCT4_SERVICES_GAMES_APP_GALLERY,22},
229 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27}, 229 {DCT4_DISPLAY_WAP_PROFILE,26},{DCT4_SAT_CONFIRM_MENU,27},
230 /*MORE*/ {0,0}}}, 230 /*MORE*/ {0,0}}},
231 /*8310*/{"NHM-7",{{DCT4_ALS,1},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7}, 231 /*8310*/{"NHM-7",{{DCT4_ALS,1},{DCT4_CSP,6},{DCT4_GAMES_WAP_DOWNLOAD,7},
232 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9},{DCT4_GPRS_PCCH,13}, 232 {DCT4_GAMES_SCORE_SEND,8},{DCT4_GAMES_URL_CHECK,9},{DCT4_GPRS_PCCH,13},
233 {DCT4_ALWAYS_ONLINE,18},{0,0}}}, 233 {DCT4_ALWAYS_ONLINE,18},{0,0}}},
234 {"", {{0,0}}} 234 {"", {{0,0}}}
235}; 235};
236 236
237static GSM_Error DCT4_ReplySetPPS(GSM_Protocol_Message msg, GSM_StateMachine *s) 237static GSM_Error DCT4_ReplySetPPS(GSM_Protocol_Message msg, GSM_StateMachine *s)
238{ 238{
239 printf("Setting done OK\n"); 239 printf("Setting done OK\n");
240 return ERR_NONE; 240 return ERR_NONE;
241} 241}
242 242
243void DCT4SetPhoneMenus(int argc, char *argv[]) 243void DCT4SetPhoneMenus(int argc, char *argv[])
244{ 244{
245 int current = 10,i=0,j,z; 245 int current = 10,i=0,j,z;
246 unsigned char reqSet[200] = { 246 unsigned char reqSet[200] = {
247 N7110_FRAME_HEADER,0x04,0x00,0x01,0x47,0x48,0x02, 247 N7110_FRAME_HEADER,0x04,0x00,0x01,0x47,0x48,0x02,
248 0x00}; /* Number of changed features */ 248 0x00}; /* Number of changed features */
249 249
250 if (CheckDCT4Only()!=ERR_NONE) return; 250 if (CheckDCT4Only()!=ERR_NONE) return;
251 251
252 s.User.UserReplyFunctions=UserReplyFunctions4; 252 s.User.UserReplyFunctions=UserReplyFunctions4;
253 253
254 while (DCT4PhoneFeatures[i].Model[0] != 0x00) { 254 while (DCT4PhoneFeatures[i].Model[0] != 0x00) {
255 if (!strcmp(DCT4PhoneFeatures[i].Model,s.Phone.Data.Model)) { 255 if (!strcmp(DCT4PhoneFeatures[i].Model,s.Phone.Data.Model)) {
256 j = 0; 256 j = 0;
257 while (DCT4PhoneFeatures[i].Features[j].Name != 0x00) { 257 while (DCT4PhoneFeatures[i].Features[j].Name != 0x00) {
258 z = 0; 258 z = 0;
259 while (DCT4Features[z].Name != 0x00) { 259 while (DCT4Features[z].Name != 0x00) {
260 if (DCT4Features[z].Name == DCT4PhoneFeatures[i].Features[j].Name) { 260 if (DCT4Features[z].Name == DCT4PhoneFeatures[i].Features[j].Name) {
261 printf("%s : %s\n",DCT4Features[z].Text,DCT4Features[z].Values[0].Text); 261 printf("%s : %s\n",DCT4Features[z].Text,DCT4Features[z].Values[0].Text);
262 reqSet[9]++; /* Number of features */ 262 reqSet[9]++; /* Number of features */
263 reqSet[current++] = DCT4PhoneFeatures[i].Features[j].Number; /* Feature number */ 263 reqSet[current++] = DCT4PhoneFeatures[i].Features[j].Number; /* Feature number */
264 reqSet[current++] = DCT4Features[z].Values[0].Value; /* Value */ 264 reqSet[current++] = DCT4Features[z].Values[0].Value; /* Value */
265 break; 265 break;
266 } 266 }
267 z++; 267 z++;
268 } 268 }
269 j++; 269 j++;
270 } 270 }
271 } 271 }
272 i++; 272 i++;
273 } 273 }
274 274
275 if (current == 10) { 275 if (current == 10) {
276 printf("Sorry, but configuration matrix for this model is not added yet. Please report\n"); 276 printf("Sorry, but configuration matrix for this model is not added yet. Please report\n");
277 return; 277 return;
278 } 278 }
279 279
280 reqSet[current++] = 0x00; 280 reqSet[current++] = 0x00;
281 reqSet[current++] = 0x00; 281 reqSet[current++] = 0x00;
282 282
283 error=GSM_WaitFor (&s, reqSet, current, 0x1b, 4, ID_User1); 283 error=GSM_WaitFor (&s, reqSet, current, 0x1b, 4, ID_User1);
284 Print_Error(error); 284 Print_Error(error);
285} 285}
286 286
287DCT4_Phone_Tests DCT4Tests; 287DCT4_Phone_Tests DCT4Tests;
288 288
289static GSM_Error DCT4_ReplyTestsNames(GSM_Protocol_Message msg, GSM_StateMachine *s) 289static GSM_Error DCT4_ReplyTestsNames(GSM_Protocol_Message msg, GSM_StateMachine *s)
290{ 290{
291 int i,pos; 291 int i,pos;
292 292
293 DCT4Tests.Num = msg.Buffer[5]; 293 DCT4Tests.Num = msg.Buffer[5];
294 pos = 6; 294 pos = 6;
295 295
296 smprintf(s,"%i names for phone tests received\n",msg.Buffer[5]); 296 smprintf(s,"%i names for phone tests received\n",msg.Buffer[5]);
297 for (i=0;i<msg.Buffer[5];i++) { 297 for (i=0;i<msg.Buffer[5];i++) {
298 strcpy(DCT4Tests.Tests[i].Name,msg.Buffer+pos+4); 298 strcpy(DCT4Tests.Tests[i].Name,msg.Buffer+pos+4);
299 DCT4Tests.Tests[i].ID = msg.Buffer[pos+2]; 299 DCT4Tests.Tests[i].ID = msg.Buffer[pos+2];
300 smprintf(s,"%x.\"%s\"\n",DCT4Tests.Tests[i].ID,DCT4Tests.Tests[i].Name); 300 smprintf(s,"%x.\"%s\"\n",DCT4Tests.Tests[i].ID,DCT4Tests.Tests[i].Name);
301 pos+=msg.Buffer[pos+1]; 301 pos+=msg.Buffer[pos+1];
302 } 302 }
303 303
304 return ERR_NONE; 304 return ERR_NONE;
305} 305}
306 306
307static GSM_Error DCT4_ReplyTestsStartup(GSM_Protocol_Message msg, GSM_StateMachine *s) 307static GSM_Error DCT4_ReplyTestsStartup(GSM_Protocol_Message msg, GSM_StateMachine *s)
308{ 308{
309 int i,pos,j; 309 int i,pos,j;
310 bool found; 310 bool found;
311 311
312 pos = 10; 312 pos = 10;
313 313
314 for (i=0;i<msg.Buffer[8];i++) { 314 for (i=0;i<msg.Buffer[8];i++) {
315 found = false; 315 found = false;
316 for (j=0;j<DCT4Tests.Num;j++) { 316 for (j=0;j<DCT4Tests.Num;j++) {
317 if (DCT4Tests.Tests[j].ID == msg.Buffer[pos]) { 317 if (DCT4Tests.Tests[j].ID == msg.Buffer[pos]) {
318 DCT4Tests.Tests[j].Startup = true; 318 DCT4Tests.Tests[j].Startup = true;
319 found = true; 319 found = true;
320 break; 320 break;
321 } 321 }
322 } 322 }
323 if (!found) printf("%x ",msg.Buffer[pos]); 323 if (!found) printf("%x ",msg.Buffer[pos]);
324 pos++; 324 pos++;
325 } 325 }
326 326
327 return ERR_NONE; 327 return ERR_NONE;
328} 328}
329 329
330static GSM_Error DCT4_ReplyTestsStatus(GSM_Protocol_Message msg, GSM_StateMachine *s) 330static GSM_Error DCT4_ReplyTestsStatus(GSM_Protocol_Message msg, GSM_StateMachine *s)
331{ 331{
332 int i,pos,j; 332 int i,pos,j;
333 333
334 pos = 6; 334 pos = 6;
335 335
336 smprintf(s,"%i status entries for phone tests received\n",msg.Buffer[5]); 336 smprintf(s,"%i status entries for phone tests received\n",msg.Buffer[5]);
337 for (i=0;i<msg.Buffer[5];i++) { 337 for (i=0;i<msg.Buffer[5];i++) {
338 for (j=0;j<DCT4Tests.Num;j++) { 338 for (j=0;j<DCT4Tests.Num;j++) {
339 if (DCT4Tests.Tests[j].ID == msg.Buffer[pos+2]) { 339 if (DCT4Tests.Tests[j].ID == msg.Buffer[pos+2]) {
340 printf("\"%40s\" : ",DCT4Tests.Tests[j].Name); 340 printf("\"%40s\" : ",DCT4Tests.Tests[j].Name);
341 switch(msg.Buffer[pos+3]) { 341 switch(msg.Buffer[pos+3]) {
342 case 0x00: printf("Passed"); break; 342 case 0x00: printf("Passed"); break;
343 case 0x01: printf("Fail"); break; 343 case 0x01: printf("Fail"); break;
344 case 0x03: printf("Not executed"); break; 344 case 0x03: printf("Not executed"); break;
345 case 0x06: printf("No signal"); break; 345 case 0x06: printf("No signal"); break;
346 case 0x0D: printf("Timeout"); break; 346 case 0x0D: printf("Timeout"); break;
347 default : printf("Unknown (%x)",msg.Buffer[pos+3]); 347 default : printf("Unknown (%x)",msg.Buffer[pos+3]);
348 } 348 }
349 if (DCT4Tests.Tests[j].Startup) printf(" (startup)"); 349 if (DCT4Tests.Tests[j].Startup) printf(" (startup)");
350 printf("\n"); 350 printf("\n");
351 break; 351 break;
352 } 352 }
353 } 353 }
354 pos+=msg.Buffer[pos+1]; 354 pos+=msg.Buffer[pos+1];
355 } 355 }
356 356
357 return ERR_NONE; 357 return ERR_NONE;
358} 358}
359 359
360void DCT4SelfTests(int argc, char *argv[]) 360void DCT4SelfTests(int argc, char *argv[])
361{ 361{
362 int j; 362 int j;
363 unsigned char GetDoneST[6] = {0x00, 0x08, 0x01, 0x04, 0x01, 0x00}; 363 unsigned char GetDoneST[6] = {0x00, 0x08, 0x01, 0x04, 0x01, 0x00};
364 unsigned char GetDoneST2[6] = {0x00, 0x08, 0x02, 0x04, 0x02, 0x00}; 364 unsigned char GetDoneST2[6] = {0x00, 0x08, 0x02, 0x04, 0x02, 0x00};
365 unsigned char GetNames[6] = {0x00, 0x08, 0x03, 0x06, 0x03, 0x00}; 365 unsigned char GetNames[6] = {0x00, 0x08, 0x03, 0x06, 0x03, 0x00};
366 unsigned char GetStatus[6] = {0x00, 0x08, 0x04, 0x02, 0x03, 0x00}; 366 unsigned char GetStatus[6] = {0x00, 0x08, 0x04, 0x02, 0x03, 0x00};
367 367
368 unsigned char RunALL[6] = {0x00, 0x06, 0x04, 0x00, 0x03, 0x00}; 368 unsigned char RunALL[6] = {0x00, 0x06, 0x04, 0x00, 0x03, 0x00};
369 369
370 //unsigned char GetID[6] = {0x00, 0x08, 0x00, 0x04, 0x03, 0x00};//tests ID 370 //unsigned char GetID[6] = {0x00, 0x08, 0x00, 0x04, 0x03, 0x00};//tests ID
371 371
372 if (CheckDCT4Only()!=ERR_NONE) return; 372 if (CheckDCT4Only()!=ERR_NONE) return;
373 373
374 s.User.UserReplyFunctions=UserReplyFunctions4; 374 s.User.UserReplyFunctions=UserReplyFunctions4;
375 375
376 if (answer_yes2("Run all tests now ?")) { 376 if (answer_yes2("Run all tests now ?")) {
377 error=GSM_WaitFor (&s, RunALL, 6, 0x35, 4, ID_User1); 377 error=GSM_WaitFor (&s, RunALL, 6, 0x35, 4, ID_User1);
378 Print_Error(error); 378 Print_Error(error);
379 } 379 }
380 380
381 error=GSM_WaitFor (&s, GetNames, 6, 0x35, 4, ID_User1); 381 error=GSM_WaitFor (&s, GetNames, 6, 0x35, 4, ID_User1);
382 Print_Error(error); 382 Print_Error(error);
383 383
384 for (j=0;j<DCT4Tests.Num;j++) DCT4Tests.Tests[j].Startup = false; 384 for (j=0;j<DCT4Tests.Num;j++) DCT4Tests.Tests[j].Startup = false;
385 385
386 error=GSM_WaitFor (&s, GetDoneST, 6, 0x35, 4, ID_User3); 386 error=GSM_WaitFor (&s, GetDoneST, 6, 0x35, 4, ID_User3);
387 Print_Error(error); 387 Print_Error(error);
388 388
389 error=GSM_WaitFor (&s, GetDoneST2, 6, 0x35, 4, ID_User3); 389 error=GSM_WaitFor (&s, GetDoneST2, 6, 0x35, 4, ID_User3);
390 Print_Error(error); 390 Print_Error(error);
391 391
392 error=GSM_WaitFor (&s, GetStatus, 6, 0x35, 4, ID_User2); 392 error=GSM_WaitFor (&s, GetStatus, 6, 0x35, 4, ID_User2);
393 Print_Error(error); 393 Print_Error(error);
394} 394}
395 395
396static GSM_Error DCT4_ReplyVibra(GSM_Protocol_Message msg, GSM_StateMachine *s) 396static GSM_Error DCT4_ReplyVibra(GSM_Protocol_Message msg, GSM_StateMachine *s)
397{ 397{
398#ifdef DEBUG 398#ifdef DEBUG
399 switch (msg.Buffer[3]) { 399 switch (msg.Buffer[3]) {
400 case 0x0D : dbgprintf("Vibra state set OK\n"); break; 400 case 0x0D : dbgprintf("Vibra state set OK\n"); break;
401 case 0x0F : dbgprintf("Vibra power set OK\n"); break; 401 case 0x0F : dbgprintf("Vibra power set OK\n"); break;
402 } 402 }
403#endif 403#endif
404 return ERR_NONE; 404 return ERR_NONE;
405} 405}
406 406
407static GSM_Error DCT4EnableVibra(GSM_StateMachine *s, bool enable) 407static GSM_Error DCT4EnableVibra(GSM_StateMachine *s, bool enable)
408{ 408{
409 /* Enables or disables vibra */ 409 /* Enables or disables vibra */
410 unsigned char Control[6] = {N7110_FRAME_HEADER,0x0C, 410 unsigned char Control[6] = {N7110_FRAME_HEADER,0x0C,
411 0x01, /* 0x01 = On, 0x00 = Off */ 411 0x01, /* 0x01 = On, 0x00 = Off */
412 0x00}; 412 0x00};
413 413
414 if (!enable) Control[4] = 0x00; 414 if (!enable) Control[4] = 0x00;
415 return GSM_WaitFor (s, Control, 6, 0x1C, 4, ID_User3); 415 return GSM_WaitFor (s, Control, 6, 0x1C, 4, ID_User3);
416} 416}
417 417
418void DCT4SetVibraLevel(int argc, char *argv[]) 418void DCT4SetVibraLevel(int argc, char *argv[])
419{ 419{
420 GSM_DateTimeDate; 420 GSM_DateTimeDate;
421 unsigned inti,j; 421 unsigned inti,j;
422 422
423 /* Set vibra level */ 423 /* Set vibra level */
424 unsigned char SetLevel[6] = {N7110_FRAME_HEADER,0x0E, 424 unsigned char SetLevel[6] = {N7110_FRAME_HEADER,0x0E,
425 0x64,/* Vibra power (in percent) */ 425 0x64,/* Vibra power (in percent) */
426 0x00}; 426 0x00};
427 427
428 GSM_Init(true); 428 GSM_Init(true);
429 429
430 CheckDCT4(); 430 CheckDCT4();
431 431
432 s.User.UserReplyFunctions=UserReplyFunctions4; 432 s.User.UserReplyFunctions=UserReplyFunctions4;
433 433
434 SetLevel[4] = atoi(argv[2]); 434 SetLevel[4] = atoi(argv[2]);
435 error=GSM_WaitFor (&s, SetLevel, 6, 0x1C, 4, ID_User3); 435 error=GSM_WaitFor (&s, SetLevel, 6, 0x1C, 4, ID_User3);
436 Print_Error(error); 436 Print_Error(error);
437 437
438 error=DCT4EnableVibra(&s, true); 438 error=DCT4EnableVibra(&s, true);
439 Print_Error(error); 439 Print_Error(error);
440 440
441 for (i=0;i<3;i++) { 441 for (i=0;i<3;i++) {
442 GSM_GetCurrentDateTime (&Date); 442 GSM_GetCurrentDateTime (&Date);
443 j=Date.Second; 443 j=Date.Second;
444 while (j==Date.Second) { 444 while (j==Date.Second) {
445 my_sleep(10); 445 my_sleep(10);
446 GSM_GetCurrentDateTime(&Date); 446 GSM_GetCurrentDateTime(&Date);
447 } 447 }
448 } 448 }
449 449
450 error=DCT4EnableVibra(&s, false); 450 error=DCT4EnableVibra(&s, false);
451 Print_Error(error); 451 Print_Error(error);
452 452
453 GSM_Terminate(); 453 GSM_Terminate();
454} 454}
455 455
456void DCT4VibraTest(int argc, char *argv[]) 456void DCT4VibraTest(int argc, char *argv[])
457{ 457{
458 unsigned char ans[200]; 458 unsigned char ans[200];
459 459
460 if (CheckDCT4Only()!=ERR_NONE) return; 460 if (CheckDCT4Only()!=ERR_NONE) return;
461 461
462 s.User.UserReplyFunctions=UserReplyFunctions4; 462 s.User.UserReplyFunctions=UserReplyFunctions4;
463 463
464 error=DCT4EnableVibra(&s, true); 464 error=DCT4EnableVibra(&s, true);
465 Print_Error(error); 465 Print_Error(error);
466 466
467 printf("Press any key to continue...\n"); 467 printf("Press any key to continue...\n");
468 GetLine(stdin, ans, 99); 468 GetLine(stdin, ans, 99);
469 469
470 error=DCT4EnableVibra(&s, false); 470 error=DCT4EnableVibra(&s, false);
471 Print_Error(error); 471 Print_Error(error);
472} 472}
473 473
474#ifdef DEBUG 474#ifdef DEBUG
475static GSM_Error DCT4_ReplyResetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s) 475static GSM_Error DCT4_ReplyResetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
476{ 476{
477 switch (msg.Buffer[3]) { 477 switch (msg.Buffer[3]) {
478 case 0x05: 478 case 0x05:
479 printf("Security code set to \"12345\"\n"); 479 printf("Security code set to \"12345\"\n");
480 return ERR_NONE; 480 return ERR_NONE;
481 case 0x06: 481 case 0x06:
482 printf("Unknown reason. Can't reset your security code\n"); 482 printf("Unknown reason. Can't reset your security code\n");
483 return ERR_UNKNOWN; 483 return ERR_UNKNOWN;
484 } 484 }
485 return ERR_UNKNOWNRESPONSE; 485 return ERR_UNKNOWNRESPONSE;
486} 486}
487 487
488void DCT4ResetSecurityCode(int argc, char *argv[]) 488void DCT4ResetSecurityCode(int argc, char *argv[])
489{ 489{
490 unsigned inti; 490 unsigned inti;
491 unsigned char ResetCode[30] = {0x00,0x06,0x03,0x04,0x01, 491 unsigned char ResetCode[30] = {0x00,0x06,0x03,0x04,0x01,
492 '1','2','3','4','5','6','7','8','9','0',/* Old code */ 492 '1','2','3','4','5','6','7','8','9','0',/* Old code */
493 0x00, 493 0x00,
494 '1','2','3','4','5',0x00,0x00,0x00,0x00,0x00, /* New code */ 494 '1','2','3','4','5',0x00,0x00,0x00,0x00,0x00, /* New code */
495 0x00}; 495 0x00};
496 496
497 if (CheckDCT4Only()!=ERR_NONE) return; 497 if (CheckDCT4Only()!=ERR_NONE) return;
498 498
499 s.User.UserReplyFunctions=UserReplyFunctions4; 499 s.User.UserReplyFunctions=UserReplyFunctions4;
500 500
501 error=GSM_WaitFor (&s, ResetCode, 27, 0x08, 4, ID_User2); 501 error=GSM_WaitFor (&s, ResetCode, 27, 0x08, 4, ID_User2);
502 if (error == ERR_UNKNOWN) { 502 if (error == ERR_UNKNOWN) {
503 if (answer_yes2("Try brutal force ?")) { 503 if (answer_yes2("Try brutal force ?")) {
504 for (i=10000;i<9999999;i++) { 504 for (i=10000;i<9999999;i++) {
505 printf("Trying %i\n",i); 505 printf("Trying %i\n",i);
506 memset(ResetCode+6,0,22); 506 memset(ResetCode+6,0,22);
507 sprintf(ResetCode+5,"%i",i); 507 sprintf(ResetCode+5,"%i",i);
508 sprintf(ResetCode+16,"12345"); 508 sprintf(ResetCode+16,"12345");
509 error=GSM_WaitFor (&s, ResetCode, 27, 0x08, 4, ID_User2); 509 error=GSM_WaitFor (&s, ResetCode, 27, 0x08, 4, ID_User2);
510 if (error == ERR_NONE) break; 510 if (error == ERR_NONE) break;
511 } 511 }
512 } 512 }
513 } else Print_Error(error); 513 } else Print_Error(error);
514} 514}
515#endif 515#endif
516 516
517char SecLength; 517char SecLength;
518 518
519static GSM_Error DCT4_ReplyGetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s) 519static GSM_Error DCT4_ReplyGetSecurityCode(GSM_Protocol_Message msg, GSM_StateMachine *s)
520{ 520{
521 if (msg.Length > 12) { 521 if (msg.Length > 12) {
522 SecLength = msg.Buffer[13]; 522 SecLength = msg.Buffer[13];
523 if ((msg.Buffer[17]+18) == msg.Length) { 523 if ((msg.Buffer[17]+18) == msg.Length) {
524 printf("Security code is %s\n",msg.Buffer+18); 524 printf("Security code is %s\n",msg.Buffer+18);
525 // DumpMessage(stdout, msg.Buffer, msg.Length); 525 // DumpMessage(stdout, msg.Buffer, msg.Length);
526 } 526 }
527 } 527 }
528 return ERR_NONE; 528 return ERR_NONE;
529} 529}
530 530
531void DCT4GetSecurityCode(int argc, char *argv[]) 531void DCT4GetSecurityCode(int argc, char *argv[])
532{ 532{
533 GSM_Error error; 533 GSM_Error error;
534 unsigned char getlen[]={0x00, 0x08, 0x01, 0x0C, 534 unsigned char getlen[]={0x00, 0x08, 0x01, 0x0C,
535 0x00, 0x23, //ID 535 0x00, 0x23, //ID
536 0x00, 0x00, //Index 536 0x00, 0x00, //Index
537 0x00, 0x00}; 537 0x00, 0x00};
538 unsigned char read[]={0x00, 0x08, 0x02, 0x04, 538 unsigned char read[]={0x00, 0x08, 0x02, 0x04,
539 0x00, 0x23, //ID 539 0x00, 0x23, //ID
540 0x00, 0x00, //Index 540 0x00, 0x00, //Index
541 0x00, 0x00, 0x00, 0x00, 0x00, 541 0x00, 0x00, 0x00, 0x00, 0x00,
542 0x00, 0x00, 0x00, 0x00, 542 0x00, 0x00, 0x00, 0x00,
543 0x00}; //Length 543 0x00}; //Length
544 544
545 if (CheckDCT4Only()!=ERR_NONE) return; 545 if (CheckDCT4Only()!=ERR_NONE) return;
546 546
547 s.User.UserReplyFunctions=UserReplyFunctions4; 547 s.User.UserReplyFunctions=UserReplyFunctions4;
548 548
549 SecLength = 0; 549 SecLength = 0;
550 error=GSM_WaitFor (&s, getlen, sizeof(getlen), 0x23, 1, ID_User1); 550 error=GSM_WaitFor (&s, getlen, sizeof(getlen), 0x23, 1, ID_User1);
551 Print_Error(error); 551 Print_Error(error);
552 if (SecLength != 0) { 552 if (SecLength != 0) {
553 read[17] = SecLength; 553 read[17] = SecLength;
554 error=GSM_WaitFor (&s, read, sizeof(read), 0x23, 5, ID_User1); 554 error=GSM_WaitFor (&s, read, sizeof(read), 0x23, 5, ID_User1);
555 Print_Error(error); 555 Print_Error(error);
556 } 556 }
557} 557}
558 558
559static GSM_Error DCT4_ReplyGetVoiceRecord(GSM_Protocol_Message msg, GSM_StateMachine *s) 559static GSM_Error DCT4_ReplyGetVoiceRecord(GSM_Protocol_Message msg, GSM_StateMachine *s)
560{ 560{
561 int i=18,j; 561 int i=18,j;
562 unsigned charBuffer[100]; 562 unsigned charBuffer[100];
563 563
564 switch (msg.Buffer[3]) { 564 switch (msg.Buffer[3]) {
565 case 0x05: 565 case 0x05:
566 dbgprintf("Part of voice record received\n"); 566 dbgprintf("Part of voice record received\n");
567 if (msg.Length == 6) { 567 if (msg.Length == 6) {
568 dbgprintf("Empty\n"); 568 dbgprintf("Empty\n");
569 return ERR_EMPTY; 569 return ERR_EMPTY;
570 } 570 }
571 *s->Phone.Data.VoiceRecord = 0; 571 *s->Phone.Data.VoiceRecord = 0;
572 while (i<msg.Length) { 572 while (i<msg.Length) {
573 s->Phone.Data.PhoneString[(*s->Phone.Data.VoiceRecord)++] = msg.Buffer[i+1]; 573 s->Phone.Data.PhoneString[(*s->Phone.Data.VoiceRecord)++] = msg.Buffer[i+1];
574 s->Phone.Data.PhoneString[(*s->Phone.Data.VoiceRecord)++] = msg.Buffer[i]; 574 s->Phone.Data.PhoneString[(*s->Phone.Data.VoiceRecord)++] = msg.Buffer[i];
575 i += 2; 575 i += 2;
576 } 576 }
577 return ERR_NONE; 577 return ERR_NONE;
578 case 0x0D: 578 case 0x0D:
579 dbgprintf("Last part of voice record is %02x %02x\n",msg.Buffer[11],msg.Buffer[12]); 579 dbgprintf("Last part of voice record is %02x %02x\n",msg.Buffer[11],msg.Buffer[12]);
580 dbgprintf("Token is %02x\n",msg.Buffer[13]); 580 dbgprintf("Token is %02x\n",msg.Buffer[13]);
581 s->Phone.Data.PhoneString[0] = msg.Buffer[11]; 581 s->Phone.Data.PhoneString[0] = msg.Buffer[11];
582 s->Phone.Data.PhoneString[1] = msg.Buffer[12]; 582 s->Phone.Data.PhoneString[1] = msg.Buffer[12];
583 s->Phone.Data.PhoneString[2] = msg.Buffer[13]; 583 s->Phone.Data.PhoneString[2] = msg.Buffer[13];
584 return ERR_NONE; 584 return ERR_NONE;
585 break; 585 break;
586 case 0x31: 586 case 0x31:
587 dbgprintf("Names of voice records received\n"); 587 dbgprintf("Names of voice records received\n");
588 j = 33; 588 j = 33;
589 for (i=0;i<msg.Buffer[9];i++) { 589 for (i=0;i<msg.Buffer[9];i++) {
590 memcpy(Buffer,msg.Buffer+(j+1),msg.Buffer[j]); 590 memcpy(Buffer,msg.Buffer+(j+1),msg.Buffer[j]);
591 Buffer[msg.Buffer[j]] = 0; 591 Buffer[msg.Buffer[j]] = 0;
592 Buffer[msg.Buffer[j]+1] = 0; 592 Buffer[msg.Buffer[j]+1] = 0;
593 dbgprintf("%i. \"%s\"\n",i+1,DecodeUnicodeString(Buffer)); 593 dbgprintf("%i. \"%s\"\n",i+1,DecodeUnicodeString(Buffer));
594 if (i==*s->Phone.Data.VoiceRecord) { 594 if (i==*s->Phone.Data.VoiceRecord) {
595 sprintf(s->Phone.Data.PhoneString,"%s.wav",DecodeUnicodeString(Buffer)); 595 sprintf(s->Phone.Data.PhoneString,"%s.wav",DecodeUnicodeString(Buffer));
596 return ERR_NONE; 596 return ERR_NONE;
597 } 597 }
598 if (i != msg.Buffer[9] - 1) { 598 if (i != msg.Buffer[9] - 1) {
599 j+=msg.Buffer[j] + 1; 599 j+=msg.Buffer[j] + 1;
600 if (msg.Buffer[j] == 0x00 && msg.Buffer[j+1]==0x00) j+=2; 600 if (msg.Buffer[j] == 0x00 && msg.Buffer[j+1]==0x00) j+=2;
601 j+=23; 601 j+=23;
602 } 602 }
603 } 603 }
604 return ERR_EMPTY; 604 return ERR_EMPTY;
605 } 605 }
606 return ERR_UNKNOWNRESPONSE; 606 return ERR_UNKNOWNRESPONSE;
607} 607}
608 608
609void DCT4GetVoiceRecord(int argc, char *argv[]) 609void DCT4GetVoiceRecord(int argc, char *argv[])
610{ 610{
611 /* Voice records names */ 611 /* Voice records names */
612 unsigned char ReqNames[200] = { 612 unsigned char ReqNames[200] = {
613 N7110_FRAME_HEADER, 613 N7110_FRAME_HEADER,
614 0x30,0x01,0x55,0x00,0x00,0xFF,0xFF,0x01,0x01,0x55,0x55}; 614 0x30,0x01,0x55,0x00,0x00,0xFF,0xFF,0x01,0x01,0x55,0x55};
615 /* Voice record token */ 615 /* Voice record token */
616 unsigned char ReqToken[200] = { 616 unsigned char ReqToken[200] = {
617 N7110_FRAME_HEADER,0x0C,0x00,0x44,0x00, 617 N7110_FRAME_HEADER,0x0C,0x00,0x44,0x00,
618 0x00, /* Location: 0, 1, ... */ 618 0x00, /* Location: 0, 1, ... */
619 0x55,0x55}; 619 0x55,0x55};
620 /* Voice record part */ 620 /* Voice record part */
621 unsigned char ReqGet[200] = { 621 unsigned char ReqGet[200] = {
622 N7110_FRAME_HEADER,0x04,0x00,0x44, 622 N7110_FRAME_HEADER,0x04,0x00,0x44,
623 0x00,0x00,/* Location: 0, 1, ... */ 623 0x00,0x00,/* Location: 0, 1, ... */
624 0x55,0x55,0x00, 624 0x55,0x55,0x00,
625 625
626 0x00,0x00, /* Part Location*/ 626 0x00,0x00, /* Part Location*/
627 0x00,0x00,0x00, 627 0x00,0x00,0x00,
628 628
629 0x04, /* ??? */ 629 0x04, /* ??? */
630 630
631 0x00}; /* Token */ 631 0x00}; /* Token */
632 632
633 /* WAV file headers */ 633 /* WAV file headers */
634 unsigned char WAV_Header[] = { 634 unsigned char WAV_Header[] = {
635 'R','I','F','F', 635 'R','I','F','F',
636 0x00,0x00,0x00,0x00,/* Length */ 636 0x00,0x00,0x00,0x00,/* Length */
637 'W','A','V','E'}; 637 'W','A','V','E'};
638 unsigned char FMT_Header[] = {'f','m','t',' ', 638 unsigned char FMT_Header[] = {'f','m','t',' ',
639 0x14,0x00,0x00,0x00,0x31,0x00,0x01,0x00,0x40,0x1f, 639 0x14,0x00,0x00,0x00,0x31,0x00,0x01,0x00,0x40,0x1f,
640 0x00,0x00,0x59,0x06,0x00,0x00,0x41,0x00,0x00,0x00, 640 0x00,0x00,0x59,0x06,0x00,0x00,0x41,0x00,0x00,0x00,
641 0x02,0x00,0x40,0x01,'f', 'a', 'c', 't', 0x04,0x00, 641 0x02,0x00,0x40,0x01,'f', 'a', 'c', 't', 0x04,0x00,
642 0x00,0x00, 642 0x00,0x00,
643 0x00,0x73,0x00,0x00};/* Seems to be some length */ 643 0x00,0x73,0x00,0x00};/* Seems to be some length */
644 unsigned char DATA_Header[] = { 644 unsigned char DATA_Header[] = {
645 'd','a','t','a', 645 'd','a','t','a',
646 0x00,0x00,0x00,0x00};/* Length */ 646 0x00,0x00,0x00,0x00};/* Length */
647 647
648 long wavfilesize=0; 648 long wavfilesize=0;
649 unsigned charFileName[100], Buffer[10000], Token; 649 unsigned charFileName[100], Buffer[10000], Token;
650 unsigned int Location, size=0, CurrentLocation = 0, TokenLocation; 650 unsigned int Location, size=0, CurrentLocation = 0, TokenLocation;
651 int i; 651 int i;
652 FILE *WAVFile; 652 FILE *WAVFile;
653 653
654 Location = atoi(argv[2]); 654 Location = atoi(argv[2]);
655 if (Location == 0x00) { 655 if (Location == 0x00) {
656 printf("Please numerate locations from 1\n"); 656 printf("Please numerate locations from 1\n");
657 return; 657 return;
658 } 658 }
659 Location--; 659 Location--;
660 660
661 GSM_Init(true); 661 GSM_Init(true);
662 662
663 CheckDCT4(); 663 CheckDCT4();
664 664
665 s.User.UserReplyFunctions=UserReplyFunctions4; 665 s.User.UserReplyFunctions=UserReplyFunctions4;
666 666
667 s.Phone.Data.VoiceRecord = &Location; 667 s.Phone.Data.VoiceRecord = &Location;
668 s.Phone.Data.PhoneString = FileName; 668 s.Phone.Data.PhoneString = FileName;
669 dbgprintf("Getting voice record name\n"); 669 dbgprintf("Getting voice record name\n");
670 error=GSM_WaitFor (&s, ReqNames, 14, 0x4A, 4, ID_User4); 670 error=GSM_WaitFor (&s, ReqNames, 14, 0x4A, 4, ID_User4);
671 Print_Error(error); 671 Print_Error(error);
672 672
673 s.Phone.Data.PhoneString = Buffer; 673 s.Phone.Data.PhoneString = Buffer;
674 ReqToken[7] = Location; 674 ReqToken[7] = Location;
675 dbgprintf("Getting voice record token\n"); 675 dbgprintf("Getting voice record token\n");
676 error=GSM_WaitFor (&s, ReqToken, 10, 0x23, 4, ID_User4); 676 error=GSM_WaitFor (&s, ReqToken, 10, 0x23, 4, ID_User4);
677 Print_Error(error); 677 Print_Error(error);
678 TokenLocation = Buffer[0] * 256 + Buffer[1]; 678 TokenLocation = Buffer[0] * 256 + Buffer[1];
679 Token = Buffer[2]; 679 Token = Buffer[2];
680 680
681 WAVFile = fopen(FileName, "wb"); 681 WAVFile = fopen(FileName, "wb");
682 682
683 fwrite(&WAV_Header, 1, sizeof(WAV_Header),WAVFile); 683 fwrite(&WAV_Header, 1, sizeof(WAV_Header),WAVFile);
684 fwrite(&FMT_Header, 1, sizeof(FMT_Header),WAVFile); 684 fwrite(&FMT_Header, 1, sizeof(FMT_Header),WAVFile);
685 fwrite(&DATA_Header, 1, sizeof(DATA_Header),WAVFile); 685 fwrite(&DATA_Header, 1, sizeof(DATA_Header),WAVFile);
686 686
687 s.Phone.Data.VoiceRecord = &size; 687 s.Phone.Data.VoiceRecord = &size;
688 s.Phone.Data.PhoneString = Buffer; 688 s.Phone.Data.PhoneString = Buffer;
689 ReqGet[7] = Location; 689 ReqGet[7] = Location;
690 fprintf(stderr,"Getting voice record and saving to \"%s\": ",FileName); 690 fprintf(stderr,"Getting voice record and saving to \"%s\": ",FileName);
691 while (1) { 691 while (1) {
692 dbgprintf("Getting next part of voice record\n"); 692 dbgprintf("Getting next part of voice record\n");
693 fprintf(stderr,"."); 693 fprintf(stderr,".");
694 error=GSM_WaitFor (&s, ReqGet, 18, 0x23, 4, ID_User4); 694 error=GSM_WaitFor (&s, ReqGet, 18, 0x23, 4, ID_User4);
695 if (error == ERR_NONE) { 695 if (error == ERR_NONE) {
696 wavfilesize += size; 696 wavfilesize += size;
697 fwrite(Buffer,1,size,WAVFile); 697 fwrite(Buffer,1,size,WAVFile);
698 } 698 }
699 if (error == ERR_EMPTY) break; 699 if (error == ERR_EMPTY) break;
700 Print_Error(error); 700 Print_Error(error);
701 CurrentLocation += 4; 701 CurrentLocation += 4;
702 ReqGet[11] = CurrentLocation / 256; 702 ReqGet[11] = CurrentLocation / 256;
703 ReqGet[12] = CurrentLocation % 256; 703 ReqGet[12] = CurrentLocation % 256;
704 if (CurrentLocation+4 > TokenLocation) break; 704 if (CurrentLocation+4 > TokenLocation) break;
705 } 705 }
706 dbgprintf("Getting first part in last sequence of voice record\n"); 706 dbgprintf("Getting first part in last sequence of voice record\n");
707 for (i=255;i>=0;i--) { 707 for (i=255;i>=0;i--) {
708 ReqGet[16] = i; 708 ReqGet[16] = i;
709 ReqGet[17] = Token; 709 ReqGet[17] = Token;
710 fprintf(stderr,"."); 710 fprintf(stderr,".");
711 error=GSM_WaitFor (&s, ReqGet, 18, 0x23, 4, ID_User4); 711 error=GSM_WaitFor (&s, ReqGet, 18, 0x23, 4, ID_User4);
712 if (error == ERR_NONE) { 712 if (error == ERR_NONE) {
713 wavfilesize += size; 713 wavfilesize += size;
714 fwrite(Buffer,1,size,WAVFile); 714 fwrite(Buffer,1,size,WAVFile);
715 break; 715 break;
716 } 716 }
717 if (error != ERR_EMPTY) Print_Error(error); 717 if (error != ERR_EMPTY) Print_Error(error);
718 } 718 }
719 while (1) { 719 while (1) {
720 dbgprintf("Getting next part of last sequence in voice record\n"); 720 dbgprintf("Getting next part of last sequence in voice record\n");
721 CurrentLocation += 4; 721 CurrentLocation += 4;
722 ReqGet[11] = CurrentLocation / 256; 722 ReqGet[11] = CurrentLocation / 256;
723 ReqGet[12] = CurrentLocation % 256; 723 ReqGet[12] = CurrentLocation % 256;
724 fprintf(stderr,"."); 724 fprintf(stderr,".");
725 error=GSM_WaitFor (&s, ReqGet, 18, 0x23, 4, ID_User4); 725 error=GSM_WaitFor (&s, ReqGet, 18, 0x23, 4, ID_User4);
726 if (error == ERR_NONE) { 726 if (error == ERR_NONE) {
727 wavfilesize += size; 727 wavfilesize += size;
728 fwrite(Buffer,1,size,WAVFile); 728 fwrite(Buffer,1,size,WAVFile);
729 } 729 }
730 if (error == ERR_EMPTY) break; 730 if (error == ERR_EMPTY) break;
731 Print_Error(error); 731 Print_Error(error);
732 } 732 }
733 fprintf(stderr,"\n"); 733 fprintf(stderr,"\n");
734 734
735 wavfilesize += sizeof(WAV_Header) + sizeof(FMT_Header) + sizeof(DATA_Header); 735 wavfilesize += sizeof(WAV_Header) + sizeof(FMT_Header) + sizeof(DATA_Header);
736 WAV_Header[4] = (unsigned char)(wavfilesize % 256); 736 WAV_Header[4] = (unsigned char)(wavfilesize % 256);
737 WAV_Header[5] = (unsigned char)(wavfilesize / 256); 737 WAV_Header[5] = (unsigned char)(wavfilesize / 256);
738 WAV_Header[6] = (unsigned char)(wavfilesize / (256*256)); 738 WAV_Header[6] = (unsigned char)(wavfilesize / (256*256));
739 WAV_Header[7] = (unsigned char)(wavfilesize / (256*256*256)); 739 WAV_Header[7] = (unsigned char)(wavfilesize / (256*256*256));
740 740
741 /* FIXME */ 741 /* FIXME */
742 FMT_Header[36]= (unsigned char)(((wavfilesize - 238) * 5 ) % 256); 742 FMT_Header[36]= (unsigned char)(((wavfilesize - 238) * 5 ) % 256);
743 FMT_Header[37]= (unsigned char)(((wavfilesize - 238) * 5 ) / 256); 743 FMT_Header[37]= (unsigned char)(((wavfilesize - 238) * 5 ) / 256);
744 FMT_Header[38]= (unsigned char)(((wavfilesize - 238) * 5 ) / (256*256)); 744 FMT_Header[38]= (unsigned char)(((wavfilesize - 238) * 5 ) / (256*256));
745 FMT_Header[39]= (unsigned char)(((wavfilesize - 238) * 5 ) / (256*256*256)); 745 FMT_Header[39]= (unsigned char)(((wavfilesize - 238) * 5 ) / (256*256*256));
746 746
747 wavfilesize = wavfilesize - 54 - 6; 747 wavfilesize = wavfilesize - 54 - 6;
748 DATA_Header[4] = (unsigned char)(wavfilesize % 256); 748 DATA_Header[4] = (unsigned char)(wavfilesize % 256);
749 DATA_Header[5] = (unsigned char)(wavfilesize / 256); 749 DATA_Header[5] = (unsigned char)(wavfilesize / 256);
750 DATA_Header[6] = (unsigned char)(wavfilesize / (256*256)); 750 DATA_Header[6] = (unsigned char)(wavfilesize / (256*256));
751 DATA_Header[7] = (unsigned char)(wavfilesize / (256*256*256)); 751 DATA_Header[7] = (unsigned char)(wavfilesize / (256*256*256));
752 752
753 fseek( WAVFile, 0, SEEK_SET); 753 fseek( WAVFile, 0, SEEK_SET);
754 fwrite(&WAV_Header, 1, sizeof(WAV_Header),WAVFile); 754 fwrite(&WAV_Header, 1, sizeof(WAV_Header),WAVFile);
755 fwrite(&FMT_Header, 1, sizeof(FMT_Header),WAVFile); 755 fwrite(&FMT_Header, 1, sizeof(FMT_Header),WAVFile);
756 fwrite(&DATA_Header, 1, sizeof(DATA_Header),WAVFile); 756 fwrite(&DATA_Header, 1, sizeof(DATA_Header),WAVFile);
757 757
758 fclose(WAVFile); 758 fclose(WAVFile);
759 759
760 GSM_Terminate(); 760 GSM_Terminate();
761} 761}
762 762
763static GSM_Error DCT4_ReplyGetBTInfo(GSM_Protocol_Message msg, GSM_StateMachine *s) 763static GSM_Error DCT4_ReplyGetBTInfo(GSM_Protocol_Message msg, GSM_StateMachine *s)
764{ 764{
765 printf("device address %02x%02x%02x%02x%02x%02x\n", 765 printf("device address %02x%02x%02x%02x%02x%02x\n",
766 msg.Buffer[9],msg.Buffer[10],msg.Buffer[11], 766 msg.Buffer[9],msg.Buffer[10],msg.Buffer[11],
767 msg.Buffer[12],msg.Buffer[13],msg.Buffer[14]); 767 msg.Buffer[12],msg.Buffer[13],msg.Buffer[14]);
768 return ERR_NONE; 768 return ERR_NONE;
769} 769}
770 770
771static GSM_Error DCT4_ReplyGetSimlock(GSM_Protocol_Message msg, GSM_StateMachine *s) 771static GSM_Error DCT4_ReplyGetSimlock(GSM_Protocol_Message msg, GSM_StateMachine *s)
772{ 772{
773 int i; 773 int i;
774 774
775 switch (msg.Buffer[3]) { 775 switch (msg.Buffer[3]) {
776 case 0x0D: 776 case 0x0D:
777 dbgprintf("Simlock info received\n"); 777 dbgprintf("Simlock info received\n");
778 dbgprintf("Config_Data: "); 778 dbgprintf("Config_Data: ");
779 for (i=14;i<22;i++) { 779 for (i=14;i<22;i++) {
780 dbgprintf("%02x",msg.Buffer[i]); 780 dbgprintf("%02x",msg.Buffer[i]);
781 } 781 }
782 dbgprintf("\n"); 782 dbgprintf("\n");
783 dbgprintf("Profile_Bits: "); 783 dbgprintf("Profile_Bits: ");
784 for (i=22;i<30;i++) { 784 for (i=22;i<30;i++) {
785 dbgprintf("%02x",msg.Buffer[i]); 785 dbgprintf("%02x",msg.Buffer[i]);
786 } 786 }
787 dbgprintf("\n"); 787 dbgprintf("\n");
788 return ERR_NONE; 788 return ERR_NONE;
789 case 0x13: 789 case 0x13:
790 dbgprintf("Simlock info received\n"); 790 dbgprintf("Simlock info received\n");
791 if (msg.Buffer[58] == 0x05 && msg.Buffer[59] == 0x02) { 791 if (msg.Buffer[58] == 0x05 && msg.Buffer[59] == 0x02) {
792 dbgprintf("SIM_PATH: "); 792 dbgprintf("SIM_PATH: ");
793 for (i=44;i<52;i++) { 793 for (i=44;i<52;i++) {
794 dbgprintf("%02x",msg.Buffer[i]); 794 dbgprintf("%02x",msg.Buffer[i]);
795 } 795 }
796 dbgprintf("\n"); 796 dbgprintf("\n");
797 printf("Simlock data : "); 797 printf("Simlock data : ");
798 for (i=60;i<63;i++) { 798 for (i=60;i<63;i++) {
799 printf("%02x",msg.Buffer[i]); 799 printf("%02x",msg.Buffer[i]);
800 } 800 }
801 printf("\n"); 801 printf("\n");
802 } 802 }
803 return ERR_NONE; 803 return ERR_NONE;
804 } 804 }
805 return ERR_UNKNOWNRESPONSE; 805 return ERR_UNKNOWNRESPONSE;
806} 806}
807 807
808void DCT4Info(int argc, char *argv[]) 808void DCT4Info(int argc, char *argv[])
809{ 809{
810 unsigned char GetBTAddress[8] = {N6110_FRAME_HEADER, 0x09, 0x19, 0x01, 0x03, 0x06}; 810 unsigned char GetBTAddress[8] = {N6110_FRAME_HEADER, 0x09, 0x19, 0x01, 0x03, 0x06};
811 unsigned char GetSimlock[5] = {N6110_FRAME_HEADER, 0x12, 0x0D}; 811 unsigned char GetSimlock[5] = {N6110_FRAME_HEADER, 0x12, 0x0D};
812 unsigned char value[10]; 812 unsigned char value[10];
813 813
814 if (CheckDCT4Only()!=ERR_NONE) return; 814 if (CheckDCT4Only()!=ERR_NONE) return;
815 815
816 s.User.UserReplyFunctions=UserReplyFunctions4; 816 s.User.UserReplyFunctions=UserReplyFunctions4;
817 817
818 if (IsPhoneFeatureAvailable(s.Phone.Data.ModelInfo, F_BLUETOOTH)) { 818 if (IsPhoneFeatureAvailable(s.Phone.Data.ModelInfo, F_BLUETOOTH)) {
819 printf("Bluetooth : "); 819 printf("Bluetooth : ");
820 820
821 error=GSM_WaitFor (&s, GetBTAddress, 8, 0xD7, 4, ID_User6); 821 error=GSM_WaitFor (&s, GetBTAddress, 8, 0xD7, 4, ID_User6);
822 Print_Error(error); 822 Print_Error(error);
823 } 823 }
824 824
825 error=GSM_WaitFor (&s, GetSimlock, 5, 0x53, 4, ID_User6); 825 error=GSM_WaitFor (&s, GetSimlock, 5, 0x53, 4, ID_User6);
826 Print_Error(error); 826 Print_Error(error);
827 GetSimlock[4] = 0x0E; 827 GetSimlock[4] = 0x0E;
828 error=GSM_WaitFor (&s, GetSimlock, 5, 0x53, 4, ID_User6); 828 error=GSM_WaitFor (&s, GetSimlock, 5, 0x53, 4, ID_User6);
829 Print_Error(error); 829 Print_Error(error);
830 GetSimlock[3] = 0x0C; 830 GetSimlock[3] = 0x0C;
831 error=GSM_WaitFor (&s, GetSimlock, 4, 0x53, 4, ID_User6); 831 error=GSM_WaitFor (&s, GetSimlock, 4, 0x53, 4, ID_User6);
832 Print_Error(error); 832 Print_Error(error);
833 error=NOKIA_GetPhoneString(&s,"\x00\x03\x02\x07\x00\x08",6,0x1b,value,ID_User6,10); 833 error=NOKIA_GetPhoneString(&s,"\x00\x03\x02\x07\x00\x08",6,0x1b,value,ID_User6,10);
834 Print_Error(error); 834 Print_Error(error);
835 printf("UEM : %s\n",value); 835 printf("UEM : %s\n",value);
836} 836}
837 837
838 static FILE *T9File; 838 static FILE *T9File;
839 int T9Size; 839 int T9Size;
840 int T9FullSize; 840 int T9FullSize;
841 841
842static GSM_Error DCT4_ReplyGetT9(GSM_Protocol_Message msg, GSM_StateMachine *s) 842static GSM_Error DCT4_ReplyGetT9(GSM_Protocol_Message msg, GSM_StateMachine *s)
843{ 843{
844 T9FullSize = msg.Buffer[18] * 256 + msg.Buffer[19]; 844 T9FullSize = msg.Buffer[18] * 256 + msg.Buffer[19];
845 T9Size = msg.Length - 18; 845 T9Size = msg.Length - 18;
846 fwrite(msg.Buffer+18,1,T9Size,T9File); 846 fwrite(msg.Buffer+18,1,T9Size,T9File);
847 return ERR_NONE; 847 return ERR_NONE;
848} 848}
849 849
850void DCT4GetT9(int argc, char *argv[]) 850void DCT4GetT9(int argc, char *argv[])
851{ 851{
852 int i,T9Dictionary=0; 852 int i,T9Dictionary=0;
853 unsigned char req[] = {N7110_FRAME_HEADER, 0x04, 0x00, 0x5B, 853 unsigned char req[] = {N7110_FRAME_HEADER, 0x04, 0x00, 0x5B,
854 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 854 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
855 0x00, 0x00,/* Start position */ 855 0x00, 0x00,/* Start position */
856 0x00, 0x00, 856 0x00, 0x00,
857 0x02, 0xBC};/* How many bytes to read */ 857 0x02, 0xBC};/* How many bytes to read */
858 858
859 if (CheckDCT4Only()!=ERR_NONE) return; 859 if (CheckDCT4Only()!=ERR_NONE) return;
860 860
861 T9File = fopen("T9", "w"); 861 T9File = fopen("T9", "w");
862 if (T9File == NULL) return; 862 if (T9File == NULL) return;
863 863
864 s.User.UserReplyFunctions=UserReplyFunctions4; 864 s.User.UserReplyFunctions=UserReplyFunctions4;
865 865
866 i = 0; 866 i = 0;
867 while (1) { 867 while (1) {
868 req[12] = i / 256; 868 req[12] = i / 256;
869 req[13] = i % 256; 869 req[13] = i % 256;
870 if (i != 0) { 870 if (i != 0) {
871 if (T9Dictionary - i < req[16]*256+req[17]) { 871 if (T9Dictionary - i < req[16]*256+req[17]) {
872 req[16] = (T9Dictionary - i) / 256; 872 req[16] = (T9Dictionary - i) / 256;
873 req[17] = (T9Dictionary - i) % 256; 873 req[17] = (T9Dictionary - i) % 256;
874 } 874 }
875 if (T9Dictionary - i == 0) break; 875 if (T9Dictionary - i == 0) break;
876 } 876 }
877 error=GSM_WaitFor (&s, req, 18, 0x23, 4, ID_User3); 877 error=GSM_WaitFor (&s, req, 18, 0x23, 4, ID_User3);
878 Print_Error(error); 878 Print_Error(error);
879 if (i==0) { 879 if (i==0) {
880 T9Dictionary = T9FullSize; 880 T9Dictionary = T9FullSize;
881 dbgprintf("T9 dictionary size is %i\n",T9Dictionary); 881 dbgprintf("T9 dictionary size is %i\n",T9Dictionary);
882 } 882 }
883 i+=T9Size; 883 i+=T9Size;
884 } 884 }
885 885
886 fclose(T9File); 886 fclose(T9File);
887} 887}
888 888
889#ifdef GSM_ENABLE_NOKIA6510 889#ifdef GSM_ENABLE_NOKIA6510
890 890
891extern GSM_Error N6510_SetLight(GSM_StateMachine *s, N6510_PHONE_LIGHTS light, bool enable); 891extern GSM_Error N6510_SetLight(GSM_StateMachine *s, N6510_PHONE_LIGHTS light, bool enable);
892 892
893void DCT4SetLight(int argc, char *argv[]) 893void DCT4SetLight(int argc, char *argv[])
894{ 894{
895 int i; 895 int i;
896 N6510_PHONE_LIGHTS type; 896 N6510_PHONE_LIGHTS type;
897 bool enable; 897 bool enable;
898 898
899 if (mystrncasecmp(argv[2],"display",0)) { type = N6510_LIGHT_DISPLAY; 899 if (mystrncasecmp(argv[2],"display",0)) { type = N6510_LIGHT_DISPLAY;
900 } else if (mystrncasecmp(argv[2],"keypad",0)) {type = N6510_LIGHT_KEYPAD; 900 } else if (mystrncasecmp(argv[2],"keypad",0)) {type = N6510_LIGHT_KEYPAD;
901 } else if (mystrncasecmp(argv[2],"torch",0)) {type = N6510_LIGHT_TORCH; 901 } else if (mystrncasecmp(argv[2],"torch",0)) {type = N6510_LIGHT_TORCH;
902 } else { 902 } else {
903 printf("What lights should I enable (\"%s\") ?\n",argv[2]); 903 printf("What lights should I enable (\"%s\") ?\n",argv[2]);
904 exit(-1); 904 exit(-1);
905 } 905 }
906 906
907 if (mystrncasecmp(argv[3],"on",0)) { enable = true; 907 if (mystrncasecmp(argv[3],"on",0)) { enable = true;
908 } else if (mystrncasecmp(argv[3],"off",0)) {enable = false; 908 } else if (mystrncasecmp(argv[3],"off",0)) {enable = false;
909 } else { 909 } else {
910 printf("What should I do (\"%s\") ?\n",argv[3]); 910 printf("What should I do (\"%s\") ?\n",argv[3]);
911 exit(-1); 911 exit(-1);
912 } 912 }
913 913
914 for (i=0;i<s.ConfigNum;i++) { 914 for (i=0;i<s.ConfigNum;i++) {
915 s.Config[i].StartInfo = "false"; 915 s.Config[i].StartInfo = "false";
916 } 916 }
917 917
918 GSM_Init(true); 918 GSM_Init(true);
919 919
920 CheckDCT4(); 920 CheckDCT4();
921 921
922 error=N6510_SetLight(&s, type, enable); 922 error=N6510_SetLight(&s, type, enable);
923 Print_Error(error); 923 Print_Error(error);
924 924
925 GSM_Terminate(); 925 GSM_Terminate();
926} 926}
927#endif 927#endif
928 928
929void DCT4DisplayTest(int argc, char *argv[]) 929void DCT4DisplayTest(int argc, char *argv[])
930{ 930{
931 unsigned char ans[200]; 931 unsigned char ans[200];
932 unsigned char req0[] = {0x00, 0x08, 0x0D, 0x00, 0x0F, 0x00}; 932 unsigned char req0[] = {0x00, 0x08, 0x0D, 0x00, 0x0F, 0x00};
933 unsigned char req[] = {0x00, 0x08, 0x0E, 0x00, 0x12, 0x01, 0x00, 0x04, 933 unsigned char req[] = {0x00, 0x08, 0x0E, 0x00, 0x12, 0x01, 0x00, 0x04,
934 0x09, /* test number */ 934 0x09, /* test number */
935 0x00}; 935 0x00};
936 936
937 if (CheckDCT4Only()!=ERR_NONE) return; 937 if (CheckDCT4Only()!=ERR_NONE) return;
938 938
939 s.User.UserReplyFunctions=UserReplyFunctions4; 939 s.User.UserReplyFunctions=UserReplyFunctions4;
940 940
941 DCT4_SetPhoneMode(&s, DCT4_MODE_TEST); 941 DCT4_SetPhoneMode(&s, DCT4_MODE_TEST);
942 942
943 s.Protocol.Functions->WriteMessage(&s, req0, 6, 0x40); 943 s.Protocol.Functions->WriteMessage(&s, req0, 6, 0x40);
944 944
945 req[8] = atoi(argv[2]); 945 req[8] = atoi(argv[2]);
946 s.Protocol.Functions->WriteMessage(&s, req, 10, 0x40); 946 s.Protocol.Functions->WriteMessage(&s, req, 10, 0x40);
947 947
948 printf("Press any key to continue...\n"); 948 printf("Press any key to continue...\n");
949 GetLine(stdin, ans, 99); 949 GetLine(stdin, ans, 99);
950 950
951 DCT4_SetPhoneMode(&s, DCT4_MODE_NORMAL); 951 DCT4_SetPhoneMode(&s, DCT4_MODE_NORMAL);
952} 952}
953 953
954int ADC; 954int ADC;
955 955
956static GSM_Error DCT4_ReplyGetADC(GSM_Protocol_Message msg, GSM_StateMachine *s) 956static GSM_Error DCT4_ReplyGetADC(GSM_Protocol_Message msg, GSM_StateMachine *s)
957{ 957{
958 if (msg.Buffer[6] == 0xff && msg.Buffer[7] == 0xff) return ERR_NONE; 958 if (msg.Buffer[6] == 0xff && msg.Buffer[7] == 0xff) return ERR_NONE;
959 switch (msg.Buffer[3]) { 959 switch (msg.Buffer[3]) {
960 case 0x10: 960 case 0x10:
961 printf("raw "); 961 printf("raw ");
962 printf("%10i ",msg.Buffer[8]*256+msg.Buffer[9]); 962 printf("%10i ",msg.Buffer[8]*256+msg.Buffer[9]);
963 break; 963 break;
964 case 0x12: 964 case 0x12:
965 printf("unit result "); 965 printf("unit result ");
966 printf("%10i ",(msg.Buffer[8]*256+msg.Buffer[9])*ADC); 966 printf("%10i ",(msg.Buffer[8]*256+msg.Buffer[9])*ADC);
967 break; 967 break;
968 } 968 }
969 return ERR_NONE; 969 return ERR_NONE;
970} 970}
971 971
972struct DCT4ADCInfo { 972struct DCT4ADCInfo {
973 char *name; 973 char *name;
974 char *unit; 974 char *unit;
975 int x; 975 int x;
976}; 976};
977 977
978static struct DCT4ADCInfo DCT4ADC[] = { 978static struct DCT4ADCInfo DCT4ADC[] = {
979 {"Battery voltage, divided:", "mV", 1}, 979 {"Battery voltage, divided:", "mV", 1},
980 {"Battery voltage, scaled:", "mV", 1}, 980 {"Battery voltage, scaled:", "mV", 1},
981 {"Charger voltage:", "mV", 1}, 981 {"Charger voltage:", "mV", 1},
982 {"Charger current:", "mA", 1}, 982 {"Charger current:", "mA", 1},
983 {"Battery size indicator:", "Ohms",100}, 983 {"Battery size indicator:", "Ohms",100},
984 {"Battery temperature:", "K", 1}, 984 {"Battery temperature:", "K", 1},
985 {"Headset interconnection:", "mV", 1}, 985 {"Headset interconnection:", "mV", 1},
986 {"Hook interconnection:", "mV", 1}, 986 {"Hook interconnection:", "mV", 1},
987 {"Light sensor:", "mV", 1}, 987 {"Light sensor:", "mV", 1},
988 {"Power amplifier temperature:","K", 1}, 988 {"Power amplifier temperature:","K", 1},
989 {"VCXO temperature:", "K", 1}, 989 {"VCXO temperature:", "K", 1},
990 {"Resistive keyboard 1/headint2:","mV", 1}, 990 {"Resistive keyboard 1/headint2:","mV", 1},
991 {"Resistive keyboard 1/auxdet:","mV", 1}, 991 {"Resistive keyboard 1/auxdet:","mV", 1},
992 {"Initial battery voltage:", "mV", 1}, 992 {"Initial battery voltage:", "mV", 1},
993 {"Battery Current:", "mA", 1}, 993 {"Battery Current:", "mA", 1},
994 {"Battery Current Fast:", "mA", 1}, 994 {"Battery Current Fast:", "mA", 1},
995 995
996 {"", "", 1} 996 {"", "", 1}
997}; 997};
998 998
999void DCT4GetADC(int argc, char *argv[]) 999void DCT4GetADC(int argc, char *argv[])
1000{ 1000{
1001 int i = 0; 1001 int i = 0;
1002 unsigned char GetRaw[] = {N6110_FRAME_HEADER, 0x0F, 1002 unsigned char GetRaw[] = {N6110_FRAME_HEADER, 0x0F,
1003 0x00, /* Test number */ 1003 0x00, /* Test number */
1004 0x01}; 1004 0x01};
1005 unsigned char GetUnit[] = {N6110_FRAME_HEADER, 0x11, 1005 unsigned char GetUnit[] = {N6110_FRAME_HEADER, 0x11,
1006 0x00, /* Test number */ 1006 0x00, /* Test number */
1007 0x01}; 1007 0x01};
1008 1008
1009 if (CheckDCT4Only()!=ERR_NONE) return; 1009 if (CheckDCT4Only()!=ERR_NONE) return;
1010 1010
1011 s.User.UserReplyFunctions=UserReplyFunctions4; 1011 s.User.UserReplyFunctions=UserReplyFunctions4;
1012 1012
1013 while (1) { 1013 while (1) {
1014 printf(" %30s ",DCT4ADC[i].name); 1014 printf(" %30s ",DCT4ADC[i].name);
1015 GetRaw[4] = i; 1015 GetRaw[4] = i;
1016 error=GSM_WaitFor (&s, GetRaw, 6, 0x17, 4, ID_User3); 1016 error=GSM_WaitFor (&s, GetRaw, 6, 0x17, 4, ID_User3);
1017 Print_Error(error); 1017 Print_Error(error);
1018 GetUnit[4] = i; 1018 GetUnit[4] = i;
1019 ADC = DCT4ADC[i].x; 1019 ADC = DCT4ADC[i].x;
1020 error=GSM_WaitFor (&s, GetUnit, 6, 0x17, 4, ID_User3); 1020 error=GSM_WaitFor (&s, GetUnit, 6, 0x17, 4, ID_User3);
1021 Print_Error(error); 1021 Print_Error(error);
1022 printf("%s\n",DCT4ADC[i].unit); 1022 printf("%s\n",DCT4ADC[i].unit);
1023 i++; 1023 i++;
1024 if (DCT4ADC[i].name[0] == 0x00) break; 1024 if (DCT4ADC[i].name[0] == 0x00) break;
1025 } 1025 }
1026} 1026}
1027 1027
1028#ifdef GSM_ENABLE_NOKIA6510 1028#ifdef GSM_ENABLE_NOKIA6510
1029 1029
1030 static double RadioFreq; 1030 static double RadioFreq;
1031 static unsigned char RadioName[100]; 1031 static unsigned char RadioName[100];
1032 1032
1033static GSM_Error DCT4_ReplyTuneRadio(GSM_Protocol_Message msg, GSM_StateMachine *s) 1033static GSM_Error DCT4_ReplyTuneRadio(GSM_Protocol_Message msg, GSM_StateMachine *s)
1034{ 1034{
1035 int length; 1035 int length;
1036 unsigned char name[100]; 1036 unsigned char name[100];
1037 1037
1038 switch (msg.Buffer[3]) { 1038 switch (msg.Buffer[3]) {
1039 case 0x09: 1039 case 0x09:
1040 N6510_DecodeFMFrequency(&RadioFreq, msg.Buffer+16); 1040 N6510_DecodeFMFrequency(&RadioFreq, msg.Buffer+16);
1041 1041
1042 length = msg.Buffer[8]; 1042 length = msg.Buffer[8];
1043 memcpy(name,msg.Buffer+18,length*2); 1043 memcpy(name,msg.Buffer+18,length*2);
1044 name[length*2] = 0x00; 1044 name[length*2] = 0x00;
1045 name[length*2+1] = 0x00; 1045 name[length*2+1] = 0x00;
1046 CopyUnicodeString(RadioName,name); 1046 CopyUnicodeString(RadioName,name);
1047 smprintf(s,"Station name: \"%s\"\n",DecodeUnicodeString(RadioName)); 1047 smprintf(s,"Station name: \"%s\"\n",DecodeUnicodeString(RadioName));
1048 return ERR_NONE; 1048 return ERR_NONE;
1049 case 0x15: 1049 case 0x15:
1050 case 0x16: 1050 case 0x16:
1051 smprintf(s,"Response for enabling radio/headset status received\n"); 1051 smprintf(s,"Response for enabling radio/headset status received\n");
1052 if (msg.Buffer[5] == 0) { 1052 if (msg.Buffer[5] == 0) {
1053 smprintf(s,"Connected\n"); 1053 smprintf(s,"Connected\n");
1054 return ERR_NONE; 1054 return ERR_NONE;
1055 } 1055 }
1056 smprintf(s,"Probably not connected\n"); 1056 smprintf(s,"Probably not connected\n");
1057 return ERR_PERMISSION; 1057 return ERR_PERMISSION;
1058 } 1058 }
1059 return ERR_UNKNOWNRESPONSE; 1059 return ERR_UNKNOWNRESPONSE;
1060} 1060}
1061 1061
1062void DCT4TuneRadio(int argc, char *argv[]) 1062void DCT4TuneRadio(int argc, char *argv[])
1063{ 1063{
1064 double Freq, diff; 1064 double Freq, diff;
1065 GSM_FMStation FMStation[50],FMStat; 1065 GSM_FMStation FMStation[50],FMStat;
1066 int i, j, num; 1066 int i, j, num;
1067 bool found; 1067 bool found;
1068 1068
1069 unsigned char Enable[] = {N6110_FRAME_HEADER, 0x00, 0x00, 0x00}; 1069 unsigned char Enable[] = {N6110_FRAME_HEADER, 0x00, 0x00, 0x00};
1070 unsigned char Disable[] = {N6110_FRAME_HEADER, 0x01, 0x0E, 0x00}; 1070 unsigned char Disable[] = {N6110_FRAME_HEADER, 0x01, 0x0E, 0x00};
1071 //unsigned char SetVolume[] = {N6110_FRAME_HEADER, 0x14, 1071 //unsigned char SetVolume[] = {N6110_FRAME_HEADER, 0x14,
1072 // 0x00,/* Volume level */ 1072 // 0x00,/* Volume level */
1073 // 0x00}; 1073 // 0x00};
1074 //unsigned char MuteUnMute[] = {N6110_FRAME_HEADER, 0x0F, 1074 //unsigned char MuteUnMute[] = {N6110_FRAME_HEADER, 0x0F,
1075 // 0x0C,/* 0x0B = mute, 0x0C = unmute */ 1075 // 0x0C,/* 0x0B = mute, 0x0C = unmute */
1076 // 0x00}; 1076 // 0x00};
1077 unsigned char SetFreq[] = {N6110_FRAME_HEADER, 0x08, 1077 unsigned char SetFreq[] = {N6110_FRAME_HEADER, 0x08,
1078 0x08, 0x14, 0x00, 0x01, 1078 0x08, 0x14, 0x00, 0x01,
1079 0x9A, 0x28}; /* Frequency */ 1079 0x9A, 0x28}; /* Frequency */
1080 // unsigned char Find1[] = {N6110_FRAME_HEADER, 0x08, 1080 // unsigned char Find1[] = {N6110_FRAME_HEADER, 0x08,
1081 // 0x04, 0x14, 0x00, 0x00, 0x00, 0x00}; 1081 // 0x04, 0x14, 0x00, 0x00, 0x00, 0x00};
1082 unsigned char Find2[] = {N6110_FRAME_HEADER, 0x08, 1082 unsigned char Find2[] = {N6110_FRAME_HEADER, 0x08,
1083 0x05, 0x14, 0x00, 0x00, 0x00, 0x00}; 1083 0x05, 0x14, 0x00, 0x00, 0x00, 0x00};
1084 //unsigned char SetStereo[] = {N6110_FRAME_HEADER, 0x19, 1084 //unsigned char SetStereo[] = {N6110_FRAME_HEADER, 0x19,
1085 // 0x0A, 0x00, 0x15}; 1085 // 0x0A, 0x00, 0x15};
1086 //unsigned char SetMono[] = {N6110_FRAME_HEADER, 0x19, 1086 //unsigned char SetMono[] = {N6110_FRAME_HEADER, 0x19,
1087 // 0x09, 0x00, 0x96}; 1087 // 0x09, 0x00, 0x96};
1088 1088
1089 GSM_Init(true); 1089 GSM_Init(true);
1090 1090
1091 CheckDCT4(); 1091 CheckDCT4();
1092 1092
1093 s.User.UserReplyFunctions=UserReplyFunctions4; 1093 s.User.UserReplyFunctions=UserReplyFunctions4;
1094 1094
1095 FMStat.Location = 1; 1095 FMStat.Location = 1;
1096 error = Phone->GetFMStation(&s,&FMStat); 1096 error = Phone->GetFMStation(&s,&FMStat);
1097 if (error != ERR_NONE && error != ERR_EMPTY) { 1097 if (error != ERR_NONE && error != ERR_EMPTY) {
1098 printf("Phone seems not to support radio\n"); 1098 printf("Phone seems not to support radio\n");
1099 GSM_Terminate(); 1099 GSM_Terminate();
1100 exit(-1); 1100 exit(-1);
1101 } 1101 }
1102 1102
1103 error=GSM_WaitFor (&s, Enable, 6, 0x3E, 4, ID_User3); 1103 error=GSM_WaitFor (&s, Enable, 6, 0x3E, 4, ID_User3);
1104 if (error == ERR_PERMISSION) { 1104 if (error == ERR_PERMISSION) {
1105 printf("Please connect headset. Required as antenna\n"); 1105 printf("Please connect headset. Required as antenna\n");
1106 GSM_Terminate(); 1106 GSM_Terminate();
1107 exit(-1); 1107 exit(-1);
1108 } 1108 }
1109 Print_Error(error); 1109 Print_Error(error);
1110 1110
1111 num=0; 1111 num=0;
1112 for (i=88;i<108;i++) { 1112 for (i=88;i<108;i++) {
1113 fprintf(stderr,"%cSearching: %i percent",13,(i-88)*100/(108-88)); 1113 fprintf(stderr,"%cSearching: %i percent",13,(i-88)*100/(108-88));
1114 Freq = i; 1114 Freq = i;
1115 N6510_EncodeFMFrequency(Freq, SetFreq+8); 1115 N6510_EncodeFMFrequency(Freq, SetFreq+8);
1116 error=GSM_WaitFor (&s, SetFreq, 10, 0x3E, 4, ID_User3); 1116 error=GSM_WaitFor (&s, SetFreq, 10, 0x3E, 4, ID_User3);
1117 Print_Error(error); 1117 Print_Error(error);
1118 1118
1119 error=GSM_WaitFor (&s, Find2, 10, 0x3E, 4, ID_User3); 1119 error=GSM_WaitFor (&s, Find2, 10, 0x3E, 4, ID_User3);
1120 Print_Error(error); 1120 Print_Error(error);
1121 found = false; 1121 found = false;
1122 for (j=0;j<num;j++) { 1122 for (j=0;j<num;j++) {
1123 if (FMStation[j].Frequency > RadioFreq) { 1123 if (FMStation[j].Frequency > RadioFreq) {
1124 diff = FMStation[j].Frequency - RadioFreq; 1124 diff = FMStation[j].Frequency - RadioFreq;
1125 } else { 1125 } else {
1126 diff = RadioFreq - FMStation[j].Frequency; 1126 diff = RadioFreq - FMStation[j].Frequency;
1127 } 1127 }
1128 if (diff <= 0.2) { 1128 if (diff <= 0.2) {
1129 dbgprintf("diff is %f\n",diff); 1129 dbgprintf("diff is %f\n",diff);
1130 found = true; 1130 found = true;
1131 break; 1131 break;
1132 } 1132 }
1133 } 1133 }
1134 if (!found) { 1134 if (!found) {
1135 dbgprintf("Adding %f, num %i\n",RadioFreq,num); 1135 dbgprintf("Adding %f, num %i\n",RadioFreq,num);
1136 FMStation[num].Frequency = RadioFreq; 1136 FMStation[num].Frequency = RadioFreq;
1137 CopyUnicodeString(FMStation[num].StationName,RadioName); 1137 CopyUnicodeString(FMStation[num].StationName,RadioName);
1138 num++; 1138 num++;
1139 } 1139 }
1140 } 1140 }
1141 fprintf(stderr,"%cSearching: %i percent",13,100); 1141 fprintf(stderr,"%cSearching: %i percent",13,100);
1142 fprintf(stderr,"\n\n"); 1142 fprintf(stderr,"\n\n");
1143 1143
1144 i=0; 1144 i=0;
1145 while(1) { 1145 while(1) {
1146 if (i==num || i==num-1) break; 1146 if (i==num || i==num-1) break;
1147 if (FMStation[i].Frequency > FMStation[i+1].Frequency) { 1147 if (FMStation[i].Frequency > FMStation[i+1].Frequency) {
1148 memcpy(&FMStat,&FMStation[i],sizeof(GSM_FMStation)); 1148 memcpy(&FMStat,&FMStation[i],sizeof(GSM_FMStation));
1149 memcpy(&FMStation[i],&FMStation[i+1],sizeof(GSM_FMStation)); 1149 memcpy(&FMStation[i],&FMStation[i+1],sizeof(GSM_FMStation));
1150 memcpy(&FMStation[i+1],&FMStat,sizeof(GSM_FMStation)); 1150 memcpy(&FMStation[i+1],&FMStat,sizeof(GSM_FMStation));
1151 i = 0; 1151 i = 0;
1152 continue; 1152 continue;
1153 } 1153 }
1154 i++; 1154 i++;
1155 } 1155 }
1156 for (i=0;i<num;i++) { 1156 for (i=0;i<num;i++) {
1157 fprintf(stderr,"%02i.",i+1); 1157 fprintf(stderr,"%02i.",i+1);
1158 if (FMStation[i].Frequency < 100) fprintf(stderr," "); 1158 if (FMStation[i].Frequency < 100) fprintf(stderr," ");
1159 fprintf(stderr,"%.1f MHz - \"%s\" \n", 1159 fprintf(stderr,"%.1f MHz - \"%s\" \n",
1160 FMStation[i].Frequency, 1160 FMStation[i].Frequency,
1161 DecodeUnicodeString(FMStation[i].StationName)); 1161 DecodeUnicodeString(FMStation[i].StationName));
1162 } 1162 }
1163 1163
1164 if (answer_yes2("Do you want to save found stations")) { 1164 if (answer_yes2("Do you want to save found stations")) {
1165 fprintf(stderr,"Deleting old FM stations: "); 1165 fprintf(stderr,"Deleting old FM stations: ");
1166 error=Phone->ClearFMStations(&s); 1166 error=Phone->ClearFMStations(&s);
1167 Print_Error(error); 1167 Print_Error(error);
1168 fprintf(stderr,"Done\n"); 1168 fprintf(stderr,"Done\n");
1169 for (i=0;i<num;i++) { 1169 for (i=0;i<num;i++) {
1170 FMStation[i].Location = i+1; 1170 FMStation[i].Location = i+1;
1171 error=Phone->SetFMStation(&s,&FMStation[i]); 1171 error=Phone->SetFMStation(&s,&FMStation[i]);
1172 Print_Error(error); 1172 Print_Error(error);
1173 fprintf(stderr,"%cWriting: %i percent",13,(i+1)*100/num); 1173 fprintf(stderr,"%cWriting: %i percent",13,(i+1)*100/num);
1174 } 1174 }
1175 fprintf(stderr,"\n"); 1175 fprintf(stderr,"\n");
1176 } 1176 }
1177 1177
1178 error=GSM_WaitFor (&s, Disable, 6, 0x3E, 4, ID_User3); 1178 error=GSM_WaitFor (&s, Disable, 6, 0x3E, 4, ID_User3);
1179 Print_Error(error); 1179 Print_Error(error);
1180 1180
1181 GSM_Terminate(); 1181 GSM_Terminate();
1182} 1182}
1183#endif 1183#endif
1184 1184
1185void DCT4PlaySavedRingtone(int argc, char *argv[]) 1185void DCT4PlaySavedRingtone(int argc, char *argv[])
1186{ 1186{
1187 unsigned char req[] = {N6110_FRAME_HEADER, 1187 unsigned char req[] = {N6110_FRAME_HEADER,
1188 0x01, 1188 0x01,
1189 0x00,0x64,//id 1189 0x00,0x64,//id
1190 0x01, //group 1190 0x01, //group
1191 0x01,0x00,0x00, 1191 0x01,0x00,0x00,
1192 0x0A, //volume 1192 0x0A, //volume
1193 0x00,0x00,0x00,0x00,0x00,0x00,0x00}; 1193 0x00,0x00,0x00,0x00,0x00,0x00,0x00};
1194 GSM_AllRingtonesInfo Info; 1194 GSM_AllRingtonesInfo Info;
1195 1195
1196 GSM_Init(true); 1196 GSM_Init(true);
1197 1197
1198 CheckDCT4(); 1198 CheckDCT4();
1199 1199
1200 s.User.UserReplyFunctions=UserReplyFunctions4; 1200 s.User.UserReplyFunctions=UserReplyFunctions4;
1201 1201
1202 error=Phone->GetRingtonesInfo(&s,&Info); 1202 error=Phone->GetRingtonesInfo(&s,&Info);
1203 Print_Error(error); 1203 Print_Error(error);
1204 1204
1205 if (atoi(argv[2]) > Info.Number-1) { 1205 if (atoi(argv[2]) > Info.Number-1) {
1206 GSM_Terminate(); 1206 GSM_Terminate();
1207 return; 1207 return;
1208 } 1208 }
1209 req[4] = Info.Ringtone[atoi(argv[2])].ID / 256; 1209 req[4] = Info.Ringtone[atoi(argv[2])].ID / 256;
1210 req[5] = Info.Ringtone[atoi(argv[2])].ID % 256; 1210 req[5] = Info.Ringtone[atoi(argv[2])].ID % 256;
1211 req[6] = Info.Ringtone[atoi(argv[2])].Group; 1211 req[6] = Info.Ringtone[atoi(argv[2])].Group;
1212 1212
1213 error=GSM_WaitFor (&s, req, 18, 0x1F, 4, ID_User3); 1213 error=GSM_WaitFor (&s, req, 18, 0x1F, 4, ID_User3);
1214 Print_Error(error); 1214 Print_Error(error);
1215 1215
1216 //for (i=0;i<Info.Number;i++) printmsg("%i. \"%s\"\n",i,DecodeUnicodeConsole(Info.Ringtone[i].Name)); 1216 //for (i=0;i<Info.Number;i++) printmsg("%i. \"%s\"\n",i,DecodeUnicodeConsole(Info.Ringtone[i].Name));
1217 1217
1218 GSM_Terminate(); 1218 GSM_Terminate();
1219} 1219}
1220 1220
1221static GSM_Error DCT4_ReplyMakeCameraShoot(GSM_Protocol_Message msg, GSM_StateMachine *s) 1221static GSM_Error DCT4_ReplyMakeCameraShoot(GSM_Protocol_Message msg, GSM_StateMachine *s)
1222{ 1222{
1223 return ERR_NONE; 1223 return ERR_NONE;
1224} 1224}
1225 1225
1226void DCT4MakeCameraShoot(int argc, char *argv[]) 1226void DCT4MakeCameraShoot(int argc, char *argv[])
1227{ 1227{
1228 unsigned char SetCamera[] = {N6110_FRAME_HEADER, 0x09, 0x01, 0x02}; 1228 unsigned char SetCamera[] = {N6110_FRAME_HEADER, 0x09, 0x01, 0x02};
1229 unsigned char CameraON[] = {N6110_FRAME_HEADER, 0x02, 0x01, 0x00, 0x00, 0x00 , 0x00, 0x00}; 1229 unsigned char CameraON[] = {N6110_FRAME_HEADER, 0x02, 0x01, 0x00, 0x00, 0x00 , 0x00, 0x00};
1230 unsigned char CameraON2[] = {N6110_FRAME_HEADER, 0xF0, 0x02, 0x00}; 1230 unsigned char CameraON2[] = {N6110_FRAME_HEADER, 0xF0, 0x02, 0x00};
1231 unsigned char MakeShot[200] = {N6110_FRAME_HEADER, 0x06, 0x01, 0x06, 1231 unsigned char MakeShot[200] = {N6110_FRAME_HEADER, 0x06, 0x01, 0x06,
1232 0x01, 0x00, 0x00, 0x02, 0x00, 0x04, 0x32, 0x00, 0x01, 1232 0x01, 0x00, 0x00, 0x02, 0x00, 0x04, 0x32, 0x00, 0x01,
1233 0x1D, //length of rest 1233 0x1D, //length of rest
1234 0x00, 0x00, 0x00, 0x01, 1234 0x00, 0x00, 0x00, 0x01,
1235 0x00, 0x02,//master folder id 1235 0x00, 0x02,//master folder id
1236 0x00, 0x14}; //length 1236 0x00, 0x14}; //length
1237 unsigned char CameraOFF[] = {N6110_FRAME_HEADER, 0x04, 0x01, 0x00}; 1237 unsigned char CameraOFF[] = {N6110_FRAME_HEADER, 0x04, 0x01, 0x00};
1238 1238
1239 GSM_Init(true); 1239 GSM_Init(true);
1240 1240
1241 CheckDCT4(); 1241 CheckDCT4();
1242 1242
1243 s.User.UserReplyFunctions=UserReplyFunctions4; 1243 s.User.UserReplyFunctions=UserReplyFunctions4;
1244 1244
1245 error=GSM_WaitFor (&s, SetCamera, 6, 0x61, 4, ID_User3); 1245 error=GSM_WaitFor (&s, SetCamera, 6, 0x61, 4, ID_User3);
1246 Print_Error(error); 1246 Print_Error(error);
1247 error=GSM_WaitFor (&s, CameraON, 10, 0x61, 4, ID_User3); 1247 error=GSM_WaitFor (&s, CameraON, 10, 0x61, 4, ID_User3);
1248 Print_Error(error); 1248 Print_Error(error);
1249 error=GSM_WaitFor (&s, CameraON2, 6, 0x61, 4, ID_User3); 1249 error=GSM_WaitFor (&s, CameraON2, 6, 0x61, 4, ID_User3);
1250 Print_Error(error); 1250 Print_Error(error);
1251 EncodeUnicode(MakeShot+24,"GammuShot",9); 1251 EncodeUnicode(MakeShot+24,"GammuShot",9);
1252 MakeShot[15] = 9+9*2; 1252 MakeShot[15] = 9+9*2;
1253 MakeShot[23] = 9*2; 1253 MakeShot[23] = 9*2;
1254 error=GSM_WaitFor (&s, MakeShot, 24+MakeShot[23], 0x61, 4, ID_User3); 1254 error=GSM_WaitFor (&s, MakeShot, 24+MakeShot[23], 0x61, 4, ID_User3);
1255 Print_Error(error); 1255 Print_Error(error);
1256 error=GSM_WaitFor (&s, SetCamera, 6, 0x61, 4, ID_User3); 1256 error=GSM_WaitFor (&s, SetCamera, 6, 0x61, 4, ID_User3);
1257 Print_Error(error); 1257 Print_Error(error);
1258 error=GSM_WaitFor (&s, CameraOFF, 6, 0x61, 4, ID_User3); 1258 error=GSM_WaitFor (&s, CameraOFF, 6, 0x61, 4, ID_User3);
1259 Print_Error(error); 1259 Print_Error(error);
1260 1260
1261 GSM_Terminate(); 1261 GSM_Terminate();
1262} 1262}
1263 1263
1264int len; 1264int len;
1265 1265
1266static GSM_Error DCT4_ReplyGetScreenDump(GSM_Protocol_Message msg, GSM_StateMachine *s) 1266static GSM_Error DCT4_ReplyGetScreenDump(GSM_Protocol_Message msg, GSM_StateMachine *s)
1267{ 1267{
1268 if (msg.Buffer[7] == 0x0C) len = 1; 1268 if (msg.Buffer[7] == 0x0C) len = 1;
1269 return ERR_NONE; 1269 return ERR_NONE;
1270} 1270}
1271 1271
1272void DCT4GetScreenDump(int argc, char *argv[]) 1272void DCT4GetScreenDump(int argc, char *argv[])
1273{ 1273{
1274 unsigned char req[] = {N6110_FRAME_HEADER, 0x07, 0x01, 0x00}; 1274 unsigned char req[] = {N6110_FRAME_HEADER, 0x07, 0x01, 0x00};
1275 //n6110_frameheader 06//screen info 1275 //n6110_frameheader 06//screen info
1276 1276
1277 GSM_Init(true); 1277 GSM_Init(true);
1278 1278
1279 CheckDCT4(); 1279 CheckDCT4();
1280 1280
1281 s.User.UserReplyFunctions=UserReplyFunctions4; 1281 s.User.UserReplyFunctions=UserReplyFunctions4;
1282 1282
1283 error=GSM_WaitFor (&s, req, 6, 0x0E, 4, ID_User3); 1283 error=GSM_WaitFor (&s, req, 6, 0x0E, 4, ID_User3);
1284 Print_Error(error); 1284 Print_Error(error);
1285 len = 2000; 1285 len = 2000;
1286 while (len >= 200) GSM_ReadDevice(&s,true); 1286 while (len >= 200) GSM_ReadDevice(&s,true);
1287 1287
1288 GSM_Terminate(); 1288 GSM_Terminate();
1289} 1289}
1290 1290
1291static GSM_Reply_Function UserReplyFunctions4[] = { 1291static GSM_Reply_Function UserReplyFunctions4[] = {
1292 1292
1293#ifdef DEBUG 1293#ifdef DEBUG
1294 {DCT4_ReplyResetSecurityCode, "\x08",0x03,0x05,ID_User2}, 1294 {DCT4_ReplyResetSecurityCode, "\x08",0x03,0x05,ID_User2},
1295 {DCT4_ReplyResetSecurityCode, "\x08",0x03,0x06,ID_User2}, 1295 {DCT4_ReplyResetSecurityCode, "\x08",0x03,0x06,ID_User2},
1296#endif 1296#endif
1297 1297
1298 {DCT4_ReplyGetScreenDump, "\x0E",0x00,0x00,ID_User3}, 1298 {DCT4_ReplyGetScreenDump, "\x0E",0x00,0x00,ID_User3},
1299 {DCT4_ReplyGetScreenDump,"\x0E",0x00,0x00,ID_IncomingFrame}, 1299 {DCT4_ReplyGetScreenDump,"\x0E",0x00,0x00,ID_IncomingFrame},
1300 1300
1301 {DCT4_ReplyGetADC, "\x17",0x03,0x10,ID_User3}, 1301 {DCT4_ReplyGetADC, "\x17",0x03,0x10,ID_User3},
1302 {DCT4_ReplyGetADC, "\x17",0x03,0x12,ID_User3}, 1302 {DCT4_ReplyGetADC, "\x17",0x03,0x12,ID_User3},
1303 1303
1304 {DCT4_ReplySetPPS, "\x1b",0x03,0x05,ID_User1}, 1304 {DCT4_ReplySetPPS, "\x1b",0x03,0x05,ID_User1},
1305 {NOKIA_ReplyGetPhoneString, "\x1B",0x03,0x08,ID_User6}, 1305 {NOKIA_ReplyGetPhoneString, "\x1B",0x03,0x08,ID_User6},
1306 1306
1307 {DCT4_ReplyVibra, "\x1C",0x03,0x0D,ID_User3}, 1307 {DCT4_ReplyVibra, "\x1C",0x03,0x0D,ID_User3},
1308 {DCT4_ReplyVibra, "\x1C",0x03,0x0F,ID_User3}, 1308 {DCT4_ReplyVibra, "\x1C",0x03,0x0F,ID_User3},
1309 1309
1310 {NoneReply, "\x1F",0x03,0x02,ID_User3}, 1310 {NoneReply, "\x1F",0x03,0x02,ID_User3},
1311 1311
1312 {DCT4_ReplyGetSecurityCode, "\x23",0x03,0x05,ID_User1}, 1312 {DCT4_ReplyGetSecurityCode, "\x23",0x03,0x05,ID_User1},
1313 {DCT4_ReplyGetT9, "\x23",0x03,0x05,ID_User3}, 1313 {DCT4_ReplyGetT9, "\x23",0x03,0x05,ID_User3},
1314 {DCT4_ReplyGetVoiceRecord, "\x23",0x03,0x05,ID_User4}, 1314 {DCT4_ReplyGetVoiceRecord, "\x23",0x03,0x05,ID_User4},
1315 {DCT4_ReplyGetVoiceRecord, "\x23",0x03,0x0D,ID_User4}, 1315 {DCT4_ReplyGetVoiceRecord, "\x23",0x03,0x0D,ID_User4},
1316 {DCT4_ReplyGetSecurityCode, "\x23",0x03,0x0D,ID_User1}, 1316 {DCT4_ReplyGetSecurityCode, "\x23",0x03,0x0D,ID_User1},
1317 1317
1318 {DCT4_ReplyTestsStartup, "\x35",0x02,0x01,ID_User3}, 1318 {DCT4_ReplyTestsStartup, "\x35",0x02,0x01,ID_User3},
1319 {DCT4_ReplyTestsStartup, "\x35",0x02,0x02,ID_User3}, 1319 {DCT4_ReplyTestsStartup, "\x35",0x02,0x02,ID_User3},
1320 {DCT4_ReplyTestsNames, "\x35",0x02,0x03,ID_User1}, 1320 {DCT4_ReplyTestsNames, "\x35",0x02,0x03,ID_User1},
1321 {DCT4_ReplyTestsStatus, "\x35",0x02,0x04,ID_User2}, 1321 {DCT4_ReplyTestsStatus, "\x35",0x02,0x04,ID_User2},
1322 1322
1323#ifdef GSM_ENABLE_NOKIA6510 1323#ifdef GSM_ENABLE_NOKIA6510
1324 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x09,ID_User3}, 1324 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x09,ID_User3},
1325 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x15,ID_User3}, 1325 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x15,ID_User3},
1326 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x15,ID_SetFMStation}, 1326 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x15,ID_SetFMStation},
1327 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x16,ID_User3}, 1327 {DCT4_ReplyTuneRadio, "\x3E",0x03,0x16,ID_User3},
1328#endif 1328#endif
1329 1329
1330 {DCT4_ReplyGetVoiceRecord, "\x4A",0x03,0x31,ID_User4}, 1330 {DCT4_ReplyGetVoiceRecord, "\x4A",0x03,0x31,ID_User4},
1331 1331
1332 {DCT4_ReplyGetSimlock, "\x53",0x03,0x0D,ID_User6}, 1332 {DCT4_ReplyGetSimlock, "\x53",0x03,0x0D,ID_User6},
1333 {DCT4_ReplyGetSimlock, "\x53",0x03,0x13,ID_User6}, 1333 {DCT4_ReplyGetSimlock, "\x53",0x03,0x13,ID_User6},
1334 1334
1335 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x03,ID_User3}, 1335 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x03,ID_User3},
1336 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x07,ID_User3}, 1336 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x07,ID_User3},
1337 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x08,ID_User3}, 1337 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x08,ID_User3},
1338 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x0A,ID_User3}, 1338 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0x0A,ID_User3},
1339 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0xF0,ID_User3}, 1339 {DCT4_ReplyMakeCameraShoot, "\x61",0x03,0xF0,ID_User3},
1340 1340
1341 {DCT4_ReplyGetBTInfo, "\xD7",0x03,0x0A,ID_User6}, 1341 {DCT4_ReplyGetBTInfo, "\xD7",0x03,0x0A,ID_User6},
1342 1342
1343 {NULL, "\x00",0x00,0x00,ID_None} 1343 {NULL, "\x00",0x00,0x00,ID_None}
1344}; 1344};
1345 1345
1346#endif 1346#endif
1347 1347
1348/* How should editor hadle tabs in this file? Add editor commands here. 1348/* How should editor hadle tabs in this file? Add editor commands here.
1349 * vim: noexpandtab sw=8 ts=8 sts=8: 1349 * vim: noexpandtab sw=8 ts=8 sts=8:
1350 */ 1350 */
diff --git a/gammu/emb/gammu/depend/siemens/dsiemens.c b/gammu/emb/gammu/depend/siemens/dsiemens.c
index dc54102..a34bc3b 100644
--- a/gammu/emb/gammu/depend/siemens/dsiemens.c
+++ b/gammu/emb/gammu/depend/siemens/dsiemens.c
@@ -1,363 +1,363 @@
1/* (c) by Walek */ 1/* (c) by Walek */
2 2
3#include "../../../common/gsmstate.h" 3#include "../../../common/gsmstate.h"
4 4
5#ifdef GSM_ENABLE_ATGEN 5#ifdef GSM_ENABLE_ATGEN
6 6
7#include <string.h> 7#include <string.h>
8 8
9#include "../../../common/misc/coding/coding.h" 9#include "../../../common/misc/coding/coding.h"
10#include "../../../common/gsmcomon.h" 10#include "../../../common/gsmcomon.h"
11#include "../../../common/service/gsmnet.h" 11#include "../../../common/service/gsmnet.h"
12#include "../../../common/phone/at/atgen.h" 12#include "../../../common/phone/at/atgen.h"
13#include "../../gammu.h" 13#include "../../gammu.h"
14#include "dsiemens.h" 14#include "dsiemens.h"
15#include "chiffre.h" 15#include "chiffre.h"
16 16
17extern GSM_Error ATGEN_GetSIMIMSI (GSM_StateMachine *s, char *IMSI); 17extern GSM_Error ATGEN_GetSIMIMSI (GSM_StateMachine *s, char *IMSI);
18extern GSM_Error ATGEN_GetMemoryStatus (GSM_StateMachine *s, GSM_MemoryStatus *status); 18extern GSM_Error ATGEN_GetMemoryStatus (GSM_StateMachine *s, GSM_MemoryStatus *status);
19extern GSM_Error ATGEN_SetMemory (GSM_StateMachine *s, GSM_MemoryEntry *pbk); 19extern GSM_Error ATGEN_SetMemory (GSM_StateMachine *s, GSM_MemoryEntry *pbk);
20extern GSM_Reply_Function UserReplyFunctionsAtS[]; 20static GSM_Reply_Function UserReplyFunctionsAtS[];
21 21
22 bool new_variable; 22 bool new_variable;
23GSM_Error CheckSiemens() 23GSM_Error CheckSiemens()
24{ 24{
25 if (s.Phone.Data.Priv.ATGEN.Manufacturer != AT_Siemens) return ERR_NOTSUPPORTED; 25 if (s.Phone.Data.Priv.ATGEN.Manufacturer != AT_Siemens) return ERR_NOTSUPPORTED;
26 return ERR_NONE; 26 return ERR_NONE;
27} 27}
28 28
29GSM_Error ATSIEMENS_Reply_GetSAT(GSM_Protocol_Message msg, GSM_StateMachine *s) 29GSM_Error ATSIEMENS_Reply_GetSAT(GSM_Protocol_Message msg, GSM_StateMachine *s)
30{ 30{
31 GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN; 31 GSM_Phone_ATGENData *Priv = &s->Phone.Data.Priv.ATGEN;
32 GSM_SAT_Measure_results MeasureResult; 32 GSM_SAT_Measure_results MeasureResult;
33 unsigned char buf[256]; 33 unsigned char buf[256];
34 int length,i,rep,ChNo=1,j=0,result=0,origARFCN=0; 34 int length,i,rep,ChNo=1,j=0,result=0,origARFCN=0;
35 int freq_tmp,frequency[24]; 35 int freq_tmp,frequency[24];
36 GSM_NetworkInfo Network; 36 GSM_NetworkInfo Network;
37 37
38 if (Priv->ReplyState!=AT_Reply_OK) return ERR_UNKNOWN; 38 if (Priv->ReplyState!=AT_Reply_OK) return ERR_UNKNOWN;
39 if (s->Protocol.Data.AT.EditMode) s->Protocol.Data.AT.EditMode = false; 39 if (s->Protocol.Data.AT.EditMode) s->Protocol.Data.AT.EditMode = false;
40 if (strstr(GetLineString(msg.Buffer,Priv->Lines,2),"SSTK")) { 40 if (strstr(GetLineString(msg.Buffer,Priv->Lines,2),"SSTK")) {
41 length = strlen(GetLineString(msg.Buffer,Priv->Lines,2))-7; 41 length = strlen(GetLineString(msg.Buffer,Priv->Lines,2))-7;
42 DecodeHexBin(buf, GetLineString(msg.Buffer,Priv->Lines,2)+7,length); 42 DecodeHexBin(buf, GetLineString(msg.Buffer,Priv->Lines,2)+7,length);
43 if (buf[0]==0x7f) { 43 if (buf[0]==0x7f) {
44 new_variable=true; 44 new_variable=true;
45 return ERR_NONE; 45 return ERR_NONE;
46 } 46 }
47 else return ERR_UNKNOWN; 47 else return ERR_UNKNOWN;
48 } 48 }
49 if (!strstr(GetLineString(msg.Buffer,Priv->Lines,3),"SSTK")) return ERR_UNKNOWN; 49 if (!strstr(GetLineString(msg.Buffer,Priv->Lines,3),"SSTK")) return ERR_UNKNOWN;
50 50
51 length = strlen(GetLineString(msg.Buffer,Priv->Lines,3))-7; 51 length = strlen(GetLineString(msg.Buffer,Priv->Lines,3))-7;
52 DecodeHexBin(buf, GetLineString(msg.Buffer,Priv->Lines,3)+7,length); 52 DecodeHexBin(buf, GetLineString(msg.Buffer,Priv->Lines,3)+7,length);
53 53
54 if (buf[3]!=0x26) return ERR_UNKNOWN; 54 if (buf[3]!=0x26) return ERR_UNKNOWN;
55 55
56#ifdef DEBUG 56#ifdef DEBUG
57 dbgprintf ("SAT command: Provide Local Information\nFunction: "); 57 dbgprintf ("SAT command: Provide Local Information\nFunction: ");
58 switch (buf[4]) { 58 switch (buf[4]) {
59 case 00: dbgprintf ("Loc Info\n"); break; 59 case 00: dbgprintf ("Loc Info\n"); break;
60 case 01: dbgprintf ("IMEI\n"); break; 60 case 01: dbgprintf ("IMEI\n"); break;
61 case 02: dbgprintf ("Network Measure\n"); break; 61 case 02: dbgprintf ("Network Measure\n"); break;
62 case 03: dbgprintf ("Date time and timezone\n");break; 62 case 03: dbgprintf ("Date time and timezone\n");break;
63 case 04: dbgprintf ("Language setting\n"); break; 63 case 04: dbgprintf ("Language setting\n"); break;
64 case 05: dbgprintf ("Timing advance\n"); break; 64 case 05: dbgprintf ("Timing advance\n"); break;
65 } 65 }
66#endif 66#endif
67 /* Loc Info (MCC, MNC, LAC, Cell ID) */ 67 /* Loc Info (MCC, MNC, LAC, Cell ID) */
68 if (buf[4]==00) { 68 if (buf[4]==00) {
69 DecodeBCD (Network.NetworkCode,buf+14,2); 69 DecodeBCD (Network.NetworkCode,buf+14,2);
70 Network.NetworkCode[3] = ' '; 70 Network.NetworkCode[3] = ' ';
71 DecodeBCD (Network.NetworkCode+4,buf+16,1); 71 DecodeBCD (Network.NetworkCode+4,buf+16,1);
72 EncodeHexBin (Network.LAC,buf+17,2); 72 EncodeHexBin (Network.LAC,buf+17,2);
73 EncodeHexBin (Network.CID,buf+19,2); 73 EncodeHexBin (Network.CID,buf+19,2);
74 74
75 printf(" Network code : %s\n",Network.NetworkCode); 75 printf(" Network code : %s\n",Network.NetworkCode);
76 printf(" Network name for Gammu : %s\n", 76 printf(" Network name for Gammu : %s\n",
77 DecodeUnicodeString(GSM_GetNetworkName(Network.NetworkCode))); 77 DecodeUnicodeString(GSM_GetNetworkName(Network.NetworkCode)));
78 printf(" CID : %s\n",Network.CID); 78 printf(" CID : %s\n",Network.CID);
79 printf(" LAC : %s\n",Network.LAC); 79 printf(" LAC : %s\n",Network.LAC);
80 } 80 }
81 81
82 /* Network Measure */ 82 /* Network Measure */
83 if (buf[4]==02) { 83 if (buf[4]==02) {
84 84
85 for (i=0;i<24;i++) frequency[i]=0; 85 for (i=0;i<24;i++) frequency[i]=0;
86 if (!new_variable) { 86 if (!new_variable) {
87 GetBufferI(buf+32,&j,&result,7); 87 GetBufferI(buf+32,&j,&result,7);
88 result &= 0x67; 88 result &= 0x67;
89 if (result !=0x47) return ERR_NOTSUPPORTED; 89 if (result !=0x47) return ERR_NOTSUPPORTED;
90 } 90 }
91#ifdef DEBUG 91#ifdef DEBUG
92 if (new_variable)dbgprintf ("New variable Bitmap format\n"); 92 if (new_variable)dbgprintf ("New variable Bitmap format\n");
93 else dbgprintf ("Old variable Bitmap format\n"); 93 else dbgprintf ("Old variable Bitmap format\n");
94#endif 94#endif
95 GetBufferI(buf+32,&j,&origARFCN,10); 95 GetBufferI(buf+32,&j,&origARFCN,10);
96 /* 10 bit origin ARFCN or first frequency (new variable format) */ 96 /* 10 bit origin ARFCN or first frequency (new variable format) */
97#ifdef DEBUG 97#ifdef DEBUG
98 dbgprintf("Origin BCCH = %i\n",origARFCN); 98 dbgprintf("Origin BCCH = %i\n",origARFCN);
99#endif 99#endif
100 rep = buf[31]*8; 100 rep = buf[31]*8;
101 if (!new_variable ){ 101 if (!new_variable ){
102 for (i=0;i<rep;i++){ 102 for (i=0;i<rep;i++){
103 result = 0; 103 result = 0;
104 GetBufferI(buf+32,&j,&result,1); 104 GetBufferI(buf+32,&j,&result,1);
105 if (result) { 105 if (result) {
106 frequency[ChNo]=i+origARFCN+1; 106 frequency[ChNo]=i+origARFCN+1;
107 ChNo++; 107 ChNo++;
108 } 108 }
109 } 109 }
110 } 110 }
111 else { 111 else {
112 frequency[ChNo++]=origARFCN; 112 frequency[ChNo++]=origARFCN;
113 for (i=0; i<rep; i+=10){ 113 for (i=0; i<rep; i+=10){
114 result = 0; 114 result = 0;
115 GetBufferI(buf+32,&j,&result,10); 115 GetBufferI(buf+32,&j,&result,10);
116 if (!result) break; 116 if (!result) break;
117 frequency[ChNo++]=result; 117 frequency[ChNo++]=result;
118 } 118 }
119 j=1; 119 j=1;
120 while (j) { 120 while (j) {
121 j=0; 121 j=0;
122 for (i=0; i<ChNo-1; i++){ 122 for (i=0; i<ChNo-1; i++){
123 if (frequency[i] > frequency[i+1]){ 123 if (frequency[i] > frequency[i+1]){
124 freq_tmp=frequency[i]; 124 freq_tmp=frequency[i];
125 frequency[i]=frequency[i+1]; 125 frequency[i]=frequency[i+1];
126 frequency[i+1]=freq_tmp; 126 frequency[i+1]=freq_tmp;
127 j=1; 127 j=1;
128 } 128 }
129 } 129 }
130 } 130 }
131 }; 131 };
132#ifdef DEBUG 132#ifdef DEBUG
133 dbgprintf("Neighbor BCCH list: "); 133 dbgprintf("Neighbor BCCH list: ");
134 for (i=1;i<ChNo;i++) dbgprintf ("%d ",frequency[i]); 134 for (i=1;i<ChNo;i++) dbgprintf ("%d ",frequency[i]);
135 dbgprintf ("\n"); 135 dbgprintf ("\n");
136#endif 136#endif
137 j= 0; 137 j= 0;
138 result= 0; 138 result= 0;
139 GetBufferI(buf+14,&j,&result,1); 139 GetBufferI(buf+14,&j,&result,1);
140 if (result) MeasureResult.BA_used=true; 140 if (result) MeasureResult.BA_used=true;
141 else MeasureResult.BA_used=false; 141 else MeasureResult.BA_used=false;
142 142
143 result= 0; 143 result= 0;
144 GetBufferI(buf+14,&j,&result,1); 144 GetBufferI(buf+14,&j,&result,1);
145 if (result) MeasureResult.DTX_used=true; 145 if (result) MeasureResult.DTX_used=true;
146 else MeasureResult.DTX_used=false; 146 else MeasureResult.DTX_used=false;
147 147
148 result= 0; 148 result= 0;
149 GetBufferI(buf+14,&j,&result,6); 149 GetBufferI(buf+14,&j,&result,6);
150 MeasureResult.RXLEV_FullServicingCell=result-110; 150 MeasureResult.RXLEV_FullServicingCell=result-110;
151 151
152 j++;//skip spare bit 152 j++;//skip spare bit
153 result= 0; 153 result= 0;
154 GetBufferI(buf+14,&j,&result,1); 154 GetBufferI(buf+14,&j,&result,1);
155 if (result) MeasureResult.MeasValid=true; 155 if (result) MeasureResult.MeasValid=true;
156 else MeasureResult.MeasValid=false; 156 else MeasureResult.MeasValid=false;
157 157
158 result= 0; 158 result= 0;
159 GetBufferI(buf+14,&j,&result,6); 159 GetBufferI(buf+14,&j,&result,6);
160 MeasureResult.RXLEV_SubServicingCell=result-110; 160 MeasureResult.RXLEV_SubServicingCell=result-110;
161 161
162 j++;//skip spare bit 162 j++;//skip spare bit
163 result= 0; 163 result= 0;
164 GetBufferI(buf+14,&j,&result,3); 164 GetBufferI(buf+14,&j,&result,3);
165 MeasureResult.RXQUAL_FullServicingCell=result; 165 MeasureResult.RXQUAL_FullServicingCell=result;
166 166
167 result= 0; 167 result= 0;
168 GetBufferI(buf+14,&j,&result,3); 168 GetBufferI(buf+14,&j,&result,3);
169 MeasureResult.RXQUAL_SubServicingCell=result; 169 MeasureResult.RXQUAL_SubServicingCell=result;
170 170
171 printf ("RX Level FULL Servicing Cell = %i\n",MeasureResult.RXLEV_FullServicingCell); 171 printf ("RX Level FULL Servicing Cell = %i\n",MeasureResult.RXLEV_FullServicingCell);
172 printf ("RX Level Sub Servicing Cell = %i\n",MeasureResult.RXLEV_FullServicingCell); 172 printf ("RX Level Sub Servicing Cell = %i\n",MeasureResult.RXLEV_FullServicingCell);
173 173
174 printf ("RX Quality Full Servicing Cell = %i\n",MeasureResult.RXQUAL_FullServicingCell); 174 printf ("RX Quality Full Servicing Cell = %i\n",MeasureResult.RXQUAL_FullServicingCell);
175 printf ("RX Quality Sub Servicing Cell = %i\n",MeasureResult.RXQUAL_SubServicingCell); 175 printf ("RX Quality Sub Servicing Cell = %i\n",MeasureResult.RXQUAL_SubServicingCell);
176 176
177 result= 0; 177 result= 0;
178 GetBufferI(buf+14,&j,&result,3); 178 GetBufferI(buf+14,&j,&result,3);
179 MeasureResult.NO_NCELL_M=result; 179 MeasureResult.NO_NCELL_M=result;
180 180
181 rep=MeasureResult.NO_NCELL_M; 181 rep=MeasureResult.NO_NCELL_M;
182 182
183 for (i=0;i<MeasureResult.NO_NCELL_M;i++) { 183 for (i=0;i<MeasureResult.NO_NCELL_M;i++) {
184 result= 0; 184 result= 0;
185 GetBufferI(buf+14,&j,&result,6); 185 GetBufferI(buf+14,&j,&result,6);
186 MeasureResult.NeighbourCell[i].RxLev = result-110; 186 MeasureResult.NeighbourCell[i].RxLev = result-110;
187 187
188 result= 0; 188 result= 0;
189 GetBufferI(buf+14,&j,&result,5); 189 GetBufferI(buf+14,&j,&result,5);
190 if (new_variable) 190 if (new_variable)
191 MeasureResult.NeighbourCell[i].ChFreq = frequency[result+1]; 191 MeasureResult.NeighbourCell[i].ChFreq = frequency[result+1];
192 else MeasureResult.NeighbourCell[i].ChFreq = frequency[result]; 192 else MeasureResult.NeighbourCell[i].ChFreq = frequency[result];
193 193
194 result= 0; 194 result= 0;
195 GetBufferI(buf+14,&j,&result,3); 195 GetBufferI(buf+14,&j,&result,3);
196 MeasureResult.NeighbourCell[i].NB = 10 * result; 196 MeasureResult.NeighbourCell[i].NB = 10 * result;
197 result= 0; 197 result= 0;
198 GetBufferI(buf+14,&j,&result,3); 198 GetBufferI(buf+14,&j,&result,3);
199 MeasureResult.NeighbourCell[i].NB += result; 199 MeasureResult.NeighbourCell[i].NB += result;
200 200
201 if (MeasureResult.NeighbourCell[i].ChFreq) 201 if (MeasureResult.NeighbourCell[i].ChFreq)
202 printf("CH = %i,\t",MeasureResult.NeighbourCell[i].ChFreq); 202 printf("CH = %i,\t",MeasureResult.NeighbourCell[i].ChFreq);
203 else 203 else
204 printf("CH = Unknown\t"); 204 printf("CH = Unknown\t");
205 printf("RX Lev = %i dBm\t",MeasureResult.NeighbourCell[i].RxLev); 205 printf("RX Lev = %i dBm\t",MeasureResult.NeighbourCell[i].RxLev);
206 printf("BSIC CELL = %i\n",MeasureResult.NeighbourCell[i].NB); 206 printf("BSIC CELL = %i\n",MeasureResult.NeighbourCell[i].NB);
207 } 207 }
208 } 208 }
209#ifdef DEBUG 209#ifdef DEBUG
210 if (buf[4]==05) { //Timing Advance 210 if (buf[4]==05) { //Timing Advance
211 if (buf[11]) dbgprintf ("Unknown Timing Advance\n"); 211 if (buf[11]) dbgprintf ("Unknown Timing Advance\n");
212 else dbgprintf ("Timing Advance = %i\n",buf[14] & 0x3f); 212 else dbgprintf ("Timing Advance = %i\n",buf[14] & 0x3f);
213 } 213 }
214#endif 214#endif
215 return ERR_NONE; 215 return ERR_NONE;
216} 216}
217 217
218GSM_Error ATSIEMENS_Reply_GetNetmon(GSM_Protocol_Message msg, GSM_StateMachine *s) 218GSM_Error ATSIEMENS_Reply_GetNetmon(GSM_Protocol_Message msg, GSM_StateMachine *s)
219{ 219{
220 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; 220 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN;
221 int i=2; 221 int i=2;
222 222
223 if (!strstr(GetLineString(msg.Buffer,Priv->Lines,1),"AT^S^MI")) return ERR_UNKNOWN; 223 if (!strstr(GetLineString(msg.Buffer,Priv->Lines,1),"AT^S^MI")) return ERR_UNKNOWN;
224 while (strlen(GetLineString(msg.Buffer,Priv->Lines,i+1))) 224 while (strlen(GetLineString(msg.Buffer,Priv->Lines,i+1)))
225 printf("%s\n",GetLineString(msg.Buffer,Priv->Lines,i++)); 225 printf("%s\n",GetLineString(msg.Buffer,Priv->Lines,i++));
226 printf("\n"); 226 printf("\n");
227 return ERR_NONE; 227 return ERR_NONE;
228} 228}
229 229
230GSM_Error ATSIEMENS_GetSAT(GSM_StateMachine *s) 230GSM_Error ATSIEMENS_GetSAT(GSM_StateMachine *s)
231{ 231{
232 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; 232 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN;
233 GSM_Error error; 233 GSM_Error error;
234 unsigned char *reqSAT[]= {"D009810301260082028182", 234 unsigned char *reqSAT[]= {"D009810301260082028182",
235 "D009810301260282028182", 235 "D009810301260282028182",
236 "D009810301260582028182"},req[32]; 236 "D009810301260582028182"},req[32];
237 int i,len; 237 int i,len;
238 238
239 if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED; 239 if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
240 240
241 sprintf(req, "AT^SSTK=?\r"); 241 sprintf(req, "AT^SSTK=?\r");
242 error = GSM_WaitFor (s, req, strlen(req), 0x00, 3, ID_User1); 242 error = GSM_WaitFor (s, req, strlen(req), 0x00, 3, ID_User1);
243 243
244 for (i=0;i<3;i++){ 244 for (i=0;i<3;i++){
245 len = strlen(reqSAT[i]); 245 len = strlen(reqSAT[i]);
246 s->Protocol.Data.AT.EditMode = true; 246 s->Protocol.Data.AT.EditMode = true;
247 sprintf(req, "AT^SSTK=%i,1\r",len/2); 247 sprintf(req, "AT^SSTK=%i,1\r",len/2);
248 error = GSM_WaitFor (s, req, strlen(req), 0x00, 3, ID_User1); 248 error = GSM_WaitFor (s, req, strlen(req), 0x00, 3, ID_User1);
249 s->Phone.Data.DispatchError= ERR_TIMEOUT; 249 s->Phone.Data.DispatchError= ERR_TIMEOUT;
250 s->Phone.Data.RequestID = ID_User1; 250 s->Phone.Data.RequestID = ID_User1;
251 error = s->Protocol.Functions->WriteMessage(s, reqSAT[i], len, 0x00); 251 error = s->Protocol.Functions->WriteMessage(s, reqSAT[i], len, 0x00);
252 if (error!=ERR_NONE) return error; 252 if (error!=ERR_NONE) return error;
253 error = s->Protocol.Functions->WriteMessage(s, "\x1A", 1, 0x00); 253 error = s->Protocol.Functions->WriteMessage(s, "\x1A", 1, 0x00);
254 if (error!=ERR_NONE) return error; 254 if (error!=ERR_NONE) return error;
255 error = GSM_WaitForOnce (s, NULL,0x00, 0x00, 4); 255 error = GSM_WaitForOnce (s, NULL,0x00, 0x00, 4);
256 if (error!=ERR_NONE) return error; 256 if (error!=ERR_NONE) return error;
257 } 257 }
258 return ERR_NONE; 258 return ERR_NONE;
259} 259}
260 260
261GSM_Error ATSIEMENS_GetNetmon(GSM_StateMachine *s,int test_no) 261GSM_Error ATSIEMENS_GetNetmon(GSM_StateMachine *s,int test_no)
262{ 262{
263 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; 263 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN;
264 unsigned char req[32]; 264 unsigned char req[32];
265 265
266 if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED; 266 if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
267 sprintf(req, "AT^S^MI=%d\r",test_no); 267 sprintf(req, "AT^S^MI=%d\r",test_no);
268 printf ("Siemens NetMonitor test #%i\n",test_no); 268 printf ("Siemens NetMonitor test #%i\n",test_no);
269 return GSM_WaitFor(s, req, strlen(req), 0x00, 3, ID_User2); 269 return GSM_WaitFor(s, req, strlen(req), 0x00, 3, ID_User2);
270} 270}
271 271
272GSM_Error ATSIEMENS_ActivateNetmon (GSM_StateMachine *s,int netmon_type) 272GSM_Error ATSIEMENS_ActivateNetmon (GSM_StateMachine *s,int netmon_type)
273{ 273{
274 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; 274 GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN;
275 unsigned char req[32]; 275 unsigned char req[32];
276 276
277 if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED; 277 if (Priv->Manufacturer!=AT_Siemens) return ERR_NOTSUPPORTED;
278 278
279 sprintf(req, "AT\r"); 279 sprintf(req, "AT\r");
280 printf ("Activate Siemens NetMonitor\n"); 280 printf ("Activate Siemens NetMonitor\n");
281 siemens_code (req,req,2); 281 siemens_code (req,req,2);
282 282
283 return GSM_WaitFor(s, req, strlen(req), 0x00, 3, ID_User2); 283 return GSM_WaitFor(s, req, strlen(req), 0x00, 3, ID_User2);
284} 284}
285 285
286void ATSIEMENSActivateNetmon(int argc, char *argv[]) 286void ATSIEMENSActivateNetmon(int argc, char *argv[])
287{ 287{
288 GSM_MemoryStatus status; 288 GSM_MemoryStatus status;
289 GSM_MemoryEntry pbk; 289 GSM_MemoryEntry pbk;
290 int netmon_type, pbk_maxlocation; 290 int netmon_type, pbk_maxlocation;
291 char imsi[15], NetMonCode[32]; 291 char imsi[15], NetMonCode[32];
292 292
293 GSM_Init(true); 293 GSM_Init(true);
294 if (CheckSiemens()==ERR_NOTSUPPORTED) Print_Error(ERR_NOTSUPPORTED); 294 if (CheckSiemens()==ERR_NOTSUPPORTED) Print_Error(ERR_NOTSUPPORTED);
295 s.User.UserReplyFunctions=UserReplyFunctionsAtS; 295 s.User.UserReplyFunctions=UserReplyFunctionsAtS;
296 296
297 printf ("Activate NetMonitor...\n"); 297 printf ("Activate NetMonitor...\n");
298 netmon_type = atoi(argv[2]); 298 netmon_type = atoi(argv[2]);
299 299
300 if ((netmon_type==1) || (netmon_type==2)) { 300 if ((netmon_type==1) || (netmon_type==2)) {
301 error = ATGEN_GetSIMIMSI (&s,imsi); 301 error = ATGEN_GetSIMIMSI (&s,imsi);
302 Print_Error(error); 302 Print_Error(error);
303 siemens_code(imsi,NetMonCode,netmon_type); 303 siemens_code(imsi,NetMonCode,netmon_type);
304 304
305 status.MemoryType = MEM_SM; 305 status.MemoryType = MEM_SM;
306 error = ATGEN_GetMemoryStatus (&s,&status); 306 error = ATGEN_GetMemoryStatus (&s,&status);
307 Print_Error(error); 307 Print_Error(error);
308 308
309 pbk_maxlocation = status.MemoryUsed+status.MemoryFree; 309 pbk_maxlocation = status.MemoryUsed+status.MemoryFree;
310 pbk.MemoryType = MEM_SM; 310 pbk.MemoryType = MEM_SM;
311 pbk.Location = pbk_maxlocation; 311 pbk.Location = pbk_maxlocation;
312 pbk.EntriesNum = 2; 312 pbk.EntriesNum = 2;
313 pbk.Entries[0].EntryType = PBK_Number_General; 313 pbk.Entries[0].EntryType = PBK_Number_General;
314 EncodeUnicode (pbk.Entries[0].Text,NetMonCode,strlen(NetMonCode)); 314 EncodeUnicode (pbk.Entries[0].Text,NetMonCode,strlen(NetMonCode));
315 pbk.Entries[1].EntryType = PBK_Text_Name; 315 pbk.Entries[1].EntryType = PBK_Text_Name;
316 sprintf (NetMonCode,"Net Monitor"); 316 sprintf (NetMonCode,"Net Monitor");
317 EncodeUnicode (pbk.Entries[1].Text,NetMonCode,strlen(NetMonCode)); 317 EncodeUnicode (pbk.Entries[1].Text,NetMonCode,strlen(NetMonCode));
318 error = ATGEN_SetMemory (&s, &pbk); 318 error = ATGEN_SetMemory (&s, &pbk);
319 Print_Error(error); 319 Print_Error(error);
320 } 320 }
321 else printf ("NetMonitor type should be:\n1 - full Netmon\n2 - simple NetMon\n"); 321 else printf ("NetMonitor type should be:\n1 - full Netmon\n2 - simple NetMon\n");
322 322
323 GSM_Terminate(); 323 GSM_Terminate();
324} 324}
325 325
326void ATSIEMENSSATNetmon(int argc, char *argv[]) 326void ATSIEMENSSATNetmon(int argc, char *argv[])
327{ 327{
328 GSM_Init(true); 328 GSM_Init(true);
329 if (CheckSiemens()==ERR_NOTSUPPORTED) Print_Error(ERR_NOTSUPPORTED); 329 if (CheckSiemens()==ERR_NOTSUPPORTED) Print_Error(ERR_NOTSUPPORTED);
330 s.User.UserReplyFunctions=UserReplyFunctionsAtS; 330 s.User.UserReplyFunctions=UserReplyFunctionsAtS;
331 331
332 printf ("Getting Siemens Sim Aplication Toolkit NetMonitor...\n"); 332 printf ("Getting Siemens Sim Aplication Toolkit NetMonitor...\n");
333 333
334 error=ATSIEMENS_GetSAT(&s); 334 error=ATSIEMENS_GetSAT(&s);
335 Print_Error(error); 335 Print_Error(error);
336 GSM_Terminate(); 336 GSM_Terminate();
337} 337}
338 338
339void ATSIEMENSNetmonitor(int argc, char *argv[]) 339void ATSIEMENSNetmonitor(int argc, char *argv[])
340{ 340{
341 int test_no; 341 int test_no;
342 342
343 GSM_Init(true); 343 GSM_Init(true);
344 if (CheckSiemens()==ERR_NOTSUPPORTED) Print_Error(ERR_NOTSUPPORTED); 344 if (CheckSiemens()==ERR_NOTSUPPORTED) Print_Error(ERR_NOTSUPPORTED);
345 s.User.UserReplyFunctions=UserReplyFunctionsAtS; 345 s.User.UserReplyFunctions=UserReplyFunctionsAtS;
346 346
347 printf ("Getting Siemens NetMonitor...\n"); 347 printf ("Getting Siemens NetMonitor...\n");
348 test_no = atoi(argv[2]); 348 test_no = atoi(argv[2]);
349 error = ATSIEMENS_GetNetmon (&s,test_no+1); 349 error = ATSIEMENS_GetNetmon (&s,test_no+1);
350 Print_Error(error); 350 Print_Error(error);
351 GSM_Terminate(); 351 GSM_Terminate();
352} 352}
353 353
354static GSM_Reply_Function UserReplyFunctionsAtS[] = { 354static GSM_Reply_Function UserReplyFunctionsAtS[] = {
355 {ATSIEMENS_Reply_GetSAT, "AT^SSTK", 0x00,0x00,ID_User1}, 355 {ATSIEMENS_Reply_GetSAT, "AT^SSTK", 0x00,0x00,ID_User1},
356 {ATSIEMENS_Reply_GetNetmon, "AT^S^MI", 0x00,0x00,ID_User2}, 356 {ATSIEMENS_Reply_GetNetmon, "AT^S^MI", 0x00,0x00,ID_User2},
357 {NULL, "\x00", 0x00,0x00,ID_None} 357 {NULL, "\x00", 0x00,0x00,ID_None}
358}; 358};
359#endif 359#endif
360 360
361/* How should editor hadle tabs in this file? Add editor commands here. 361/* How should editor hadle tabs in this file? Add editor commands here.
362 * vim: noexpandtab sw=8 ts=8 sts=8: 362 * vim: noexpandtab sw=8 ts=8 sts=8:
363 */ 363 */