34 files changed, 1034 insertions, 85 deletions
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro index 797199b..af45382 100644 --- a/gammu/emb/common/common.pro +++ b/gammu/emb/common/common.pro | |||
@@ -71,15 +71,10 @@ HEADERS += config.h \ | |||
71 | service/gsmprof.h \ | 71 | service/gsmprof.h \ |
72 | service/gsmring.h \ | 72 | service/gsmring.h \ |
73 | device/bluetoth/affix.h \ | 73 | device/bluetoth/affix.h \ |
74 | device/bluetoth/blue_w32.h \ | ||
75 | device/bluetoth/bluetoth.h \ | 74 | device/bluetoth/bluetoth.h \ |
76 | device/bluetoth/bluez.h \ | 75 | device/bluetoth/bluez.h \ |
77 | device/irda/irda.h \ | 76 | device/irda/irda.h \ |
78 | device/irda/irda_unx.h \ | ||
79 | device/irda/irda_w32.h \ | ||
80 | device/serial/ser_djg.h \ | 77 | device/serial/ser_djg.h \ |
81 | device/serial/ser_unx.h \ | ||
82 | device/serial/ser_w32.h \ | ||
83 | misc/coding/coding.h \ | 78 | misc/coding/coding.h \ |
84 | misc/coding/md5.h \ | 79 | misc/coding/md5.h \ |
85 | phone/alcatel/alcatel.h \ | 80 | phone/alcatel/alcatel.h \ |
@@ -111,6 +106,7 @@ HEADERS += config.h \ | |||
111 | phone/nokia/dct3/dct3func.h \ | 106 | phone/nokia/dct3/dct3func.h \ |
112 | phone/nokia/dct3/n6110.h \ | 107 | phone/nokia/dct3/n6110.h \ |
113 | phone/nokia/dct3/n7110.h \ | 108 | phone/nokia/dct3/n7110.h \ |
109 | phone/nokia/dct3/n0650.h \ | ||
114 | phone/nokia/dct3/n9210.h \ | 110 | phone/nokia/dct3/n9210.h \ |
115 | phone/nokia/dct4/dct4func.h \ | 111 | phone/nokia/dct4/dct4func.h \ |
116 | phone/nokia/dct4/n3320.h \ | 112 | phone/nokia/dct4/n3320.h \ |
@@ -141,7 +137,6 @@ service/backup/backvcf.c \ | |||
141 | service/backup/backics.c \ | 137 | service/backup/backics.c \ |
142 | device/bluetoth/affix.c \ | 138 | device/bluetoth/affix.c \ |
143 | device/bluetoth/bluez.c \ | 139 | device/bluetoth/bluez.c \ |
144 | device/bluetoth/blue_w32.c \ | ||
145 | device/bluetoth/bluetoth.c \ | 140 | device/bluetoth/bluetoth.c \ |
146 | device/serial/ser_djg.c \ | 141 | device/serial/ser_djg.c \ |
147 | device/irda/irda.c \ | 142 | device/irda/irda.c \ |
@@ -161,6 +156,7 @@ phone/at/sonyeric.c \ | |||
161 | phone/alcatel/alcatel.c \ | 156 | phone/alcatel/alcatel.c \ |
162 | phone/nokia/dct3/n6110.c \ | 157 | phone/nokia/dct3/n6110.c \ |
163 | phone/nokia/dct3/n7110.c \ | 158 | phone/nokia/dct3/n7110.c \ |
159 | phone/nokia/dct3/n0650.c \ | ||
164 | phone/nokia/dct3/n9210.c \ | 160 | phone/nokia/dct3/n9210.c \ |
165 | phone/nokia/dct3/dct3func.c \ | 161 | phone/nokia/dct3/dct3func.c \ |
166 | phone/nokia/dct4/n3320.c \ | 162 | phone/nokia/dct4/n3320.c \ |
@@ -181,8 +177,18 @@ OBJECTS_DIR = obj/unix | |||
181 | MOC_DIR = moc/unix | 177 | MOC_DIR = moc/unix |
182 | 178 | ||
183 | unix: { | 179 | unix: { |
184 | SOURCES += device/serial/ser_unx.c | 180 | HEADERS += device/serial/ser_unx.h \ |
181 | device/irda/irda_unx.h | ||
182 | |||
183 | SOURCES += device/serial/ser_unx.c \ | ||
184 | |||
185 | } | 185 | } |
186 | win32:{ | 186 | win32:{ |
187 | SOURCES += device/serial/ser_w32.c | 187 | |
188 | HEADERS += device/serial/ser_w32.h \ | ||
189 | device/irda/irda_w32.h \ | ||
190 | device/bluetoth/blue_w32.h | ||
191 | |||
192 | SOURCES += device/serial/ser_w32.c \ | ||
193 | device/bluetoth/blue_w32.c | ||
188 | } | 194 | } |
diff --git a/gammu/emb/common/commonE.pro b/gammu/emb/common/commonE.pro index f5b559d..1512814 100644 --- a/gammu/emb/common/commonE.pro +++ b/gammu/emb/common/commonE.pro | |||
@@ -71,15 +71,12 @@ HEADERS += config.h \ | |||
71 | service/gsmprof.h \ | 71 | service/gsmprof.h \ |
72 | service/gsmring.h \ | 72 | service/gsmring.h \ |
73 | device/bluetoth/affix.h \ | 73 | device/bluetoth/affix.h \ |
74 | device/bluetoth/blue_w32.h \ | ||
75 | device/bluetoth/bluetoth.h \ | 74 | device/bluetoth/bluetoth.h \ |
76 | device/bluetoth/bluez.h \ | 75 | device/bluetoth/bluez.h \ |
77 | device/irda/irda.h \ | 76 | device/irda/irda.h \ |
78 | device/irda/irda_unx.h \ | 77 | device/irda/irda_unx.h \ |
79 | device/irda/irda_w32.h \ | ||
80 | device/serial/ser_djg.h \ | 78 | device/serial/ser_djg.h \ |
81 | device/serial/ser_unx.h \ | 79 | device/serial/ser_unx.h \ |
82 | device/serial/ser_w32.h \ | ||
83 | misc/coding/coding.h \ | 80 | misc/coding/coding.h \ |
84 | misc/coding/md5.h \ | 81 | misc/coding/md5.h \ |
85 | phone/alcatel/alcatel.h \ | 82 | phone/alcatel/alcatel.h \ |
@@ -114,6 +111,7 @@ HEADERS += config.h \ | |||
114 | phone/nokia/dct3/n9210.h \ | 111 | phone/nokia/dct3/n9210.h \ |
115 | phone/nokia/dct4/dct4func.h \ | 112 | phone/nokia/dct4/dct4func.h \ |
116 | phone/nokia/dct4/n3320.h \ | 113 | phone/nokia/dct4/n3320.h \ |
114 | phone/nokia/dct3/n0650.h \ | ||
117 | phone/nokia/dct4/n3650.h \ | 115 | phone/nokia/dct4/n3650.h \ |
118 | phone/nokia/dct4/n6510.h | 116 | phone/nokia/dct4/n6510.h |
119 | SOURCES +=gsmcomon.c \ | 117 | SOURCES +=gsmcomon.c \ |
@@ -141,7 +139,6 @@ service/backup/backvcf.c \ | |||
141 | service/backup/backics.c \ | 139 | service/backup/backics.c \ |
142 | device/bluetoth/affix.c \ | 140 | device/bluetoth/affix.c \ |
143 | device/bluetoth/bluez.c \ | 141 | device/bluetoth/bluez.c \ |
144 | device/bluetoth/blue_w32.c \ | ||
145 | device/bluetoth/bluetoth.c \ | 142 | device/bluetoth/bluetoth.c \ |
146 | device/serial/ser_unx.c \ | 143 | device/serial/ser_unx.c \ |
147 | device/serial/ser_djg.c \ | 144 | device/serial/ser_djg.c \ |
@@ -167,6 +164,7 @@ phone/nokia/dct3/dct3func.c \ | |||
167 | phone/nokia/dct4/n3320.c \ | 164 | phone/nokia/dct4/n3320.c \ |
168 | phone/nokia/dct4/n3650.c \ | 165 | phone/nokia/dct4/n3650.c \ |
169 | phone/nokia/dct4/n6510.c \ | 166 | phone/nokia/dct4/n6510.c \ |
167 | phone/nokia/dct3/n0650.c \ | ||
170 | phone/nokia/dct4/dct4func.c \ | 168 | phone/nokia/dct4/dct4func.c \ |
171 | phone/nokia/nauto.c \ | 169 | phone/nokia/nauto.c \ |
172 | phone/nokia/nfunc.c \ | 170 | phone/nokia/nfunc.c \ |
@@ -179,3 +177,11 @@ DESTDIR = $(QPEDIR)/lib | |||
179 | OBJECTS_DIR = obj/$(PLATFORM) | 177 | OBJECTS_DIR = obj/$(PLATFORM) |
180 | MOC_DIR = moc/$(PLATFORM) | 178 | MOC_DIR = moc/$(PLATFORM) |
181 | CONFIG = warn_off release console | 179 | CONFIG = warn_off release console |
180 | |||
181 | |||
182 | |||
183 | |||
184 | # device/bluetoth/blue_w32.h \ | ||
185 | # device/irda/irda_w32.h \ | ||
186 | # device/serial/ser_w32.h \ | ||
187 | # device/bluetoth/blue_w32.c \ \ No newline at end of file | ||
diff --git a/gammu/emb/common/device/serial/ser_djg.c b/gammu/emb/common/device/serial/ser_djg.c index 2524187..609deb8 100644 --- a/gammu/emb/common/device/serial/ser_djg.c +++ b/gammu/emb/common/device/serial/ser_djg.c | |||
@@ -1,3 +1,8 @@ | |||
1 | /* Some sources from SVAsync (c) 1996, 1997, Samuel Vincent | ||
2 | * 7337 Carioca Ct, Rohnert Park, Ca 94928 | ||
3 | * "you may freely use it in your programs without paying me anything" | ||
4 | */ | ||
5 | /* Some sources from DZCOMM */ | ||
1 | 6 | ||
2 | #include "../../gsmstate.h" | 7 | #include "../../gsmstate.h" |
3 | 8 | ||
@@ -5,55 +10,419 @@ | |||
5 | #ifdef DJGPP | 10 | #ifdef DJGPP |
6 | 11 | ||
7 | #include "../../gsmcomon.h" | 12 | #include "../../gsmcomon.h" |
13 | #include "../../misc/coding/coding.h" | ||
8 | #include "ser_djg.h" | 14 | #include "ser_djg.h" |
9 | 15 | ||
16 | #include <stdlib.h> | ||
17 | #include <stdio.h> | ||
18 | #include <string.h> | ||
19 | #include <dos.h> | ||
20 | #include <dpmi.h> | ||
21 | #include <pc.h> | ||
22 | #include <go32.h> | ||
23 | #include <sys/farptr.h> | ||
24 | #include <sys/movedata.h> | ||
25 | #include <conio.h> | ||
26 | |||
27 | extern unsigned short __djgpp_ds_alias; | ||
28 | extern void SVAsyncProtISR(void); | ||
29 | |||
30 | static unsigned char SVAsyncStatus=0; | ||
31 | |||
32 | static void lock_interrupt_memory(void); | ||
33 | static void unlock_interrupt_memory(void); | ||
34 | |||
35 | #define Ctrl8259_0 0x020 /* 8259 port */ | ||
36 | #define Ctrl8259_1 0x021 /* 8259 port (Masks) */ | ||
37 | #define BufSize 32768 /* Buffer Size */ | ||
38 | |||
39 | static unsigned char VectorNum; /* Vector Number */ | ||
40 | static unsigned char EnableIRQ; /* Mask to enable 8259 IRQ */ | ||
41 | static unsigned char DisableIRQ; /* Mask to disable 8259 IRQ */ | ||
42 | static _go32_dpmi_seginfo ProtVector; /* Old Protmode Vector */ | ||
43 | static _go32_dpmi_seginfo info; /* New Protmode Vector */ | ||
44 | |||
45 | /* Register Addresses for the UART */ | ||
46 | static unsigned short Port; /* Port Base Address */ | ||
47 | unsigned short THR; /* Transmitter Holding Register */ | ||
48 | unsigned short RDR; /* Reciever Data Register */ | ||
49 | unsigned short BRDL; /* Baud Rate Divisor, Low byte */ | ||
50 | unsigned short BRDH; /* Baud Rate Divisor, High Byte */ | ||
51 | unsigned short IER; /* Interupt Enable Register */ | ||
52 | unsigned short IIR; /* Interupt Identification Register */ | ||
53 | unsigned short FCR; /* FIFO Control Register */ | ||
54 | unsigned short LCR; /* Line Control Register */ | ||
55 | unsigned short MCR; /* Modem Control Register */ | ||
56 | unsigned short LSR; /* Line Status Register */ | ||
57 | unsigned short MSR; /* Modem Status Register */ | ||
58 | unsigned short SCR; /* SCR Register */ | ||
59 | |||
60 | /* Data Buffer */ | ||
61 | unsigned volatile char RecBuffer[BufSize] = { 0 }; | ||
62 | unsigned volatile int RecHead, RecTail; | ||
63 | |||
64 | /* This uninstalls the ISR and resets the serial port. */ | ||
65 | static void SVAsyncStop(void) | ||
66 | { | ||
67 | if(!SVAsyncStatus) return; | ||
68 | SVAsyncStatus = 0; | ||
69 | |||
70 | /***** Mask (disable) 8259 IRQ Interrupt */ | ||
71 | outportb(Ctrl8259_1, (inportb(Ctrl8259_1) | DisableIRQ)); | ||
72 | |||
73 | /***** Disable 8250 interrupt */ | ||
74 | outportb(LCR, (inportb(LCR) & 0x7F)); | ||
75 | outportb(IER, 0); | ||
76 | |||
77 | /***** Set bit 3 in MCR to 0 */ | ||
78 | outportb(MCR, (inportb(MCR) & 0xF7)); | ||
79 | |||
80 | /***** Interrupts are disabled. Restore saved interrupt vector. */ | ||
81 | _go32_dpmi_set_protected_mode_interrupt_vector(VectorNum, &ProtVector); | ||
82 | } | ||
83 | |||
84 | /* This will empty the receive buffer */ | ||
85 | static void SVAsyncClear(void) | ||
86 | { | ||
87 | disable(); | ||
88 | RecHead = 0; | ||
89 | RecTail = 0; | ||
90 | enable(); | ||
91 | } | ||
92 | |||
93 | |||
94 | /* Sets communication parameters | ||
95 | * Baud = 150, 300, 600, 1200, 2400, 4800, 9600, 19200, 28800, 38400, 57600 | ||
96 | * Control = The value to place in the LCR | ||
97 | */ | ||
98 | void SVAsyncSet(unsigned int Baud, unsigned int Control) | ||
99 | { | ||
100 | int divisor; | ||
101 | unsigned char divlow, divhigh; | ||
102 | |||
103 | if (!Baud) return; | ||
104 | |||
105 | divisor = 115200 / Baud; | ||
106 | |||
107 | disable(); | ||
108 | |||
109 | outportb(LCR, Control | 0x80); /* Set Port Toggle to BRDL/BRDH registers */ | ||
110 | divlow = divisor & 0x000000ff; | ||
111 | divhigh = (divisor >> 8) & 0x000000ff; | ||
112 | outportb(BRDL, divlow); /* Set Baud Rate */ | ||
113 | outportb(BRDH, divhigh); | ||
114 | |||
115 | outportb(LCR, Control & 0x007F); /* Set LCR and Port Toggle */ | ||
116 | |||
117 | enable(); | ||
118 | } | ||
119 | |||
120 | /* Sets various handshaking lines */ | ||
121 | void SVAsyncHand(unsigned int Hand) | ||
122 | { | ||
123 | outportb(MCR, Hand | 0x08); /* Keep interrupt enable ON */ | ||
124 | } | ||
125 | |||
126 | static void lock_interrupt_memory(void) | ||
127 | { | ||
128 | int errval; | ||
129 | __dpmi_meminfo info; | ||
130 | unsigned long address; | ||
131 | |||
132 | __dpmi_get_segment_base_address(_my_ds(), &address); | ||
133 | |||
134 | info.address = (int) address + (int) &RDR; | ||
135 | info.size = sizeof(RDR); | ||
136 | errval = __dpmi_lock_linear_region(&info); | ||
137 | if(errval == -1) printf("Error in locking memory\n!"); | ||
138 | |||
139 | info.address = (int) address + (int) &LSR; | ||
140 | info.size = sizeof(LSR); | ||
141 | errval = __dpmi_lock_linear_region(&info); | ||
142 | if(errval == -1) printf("Error in locking memory\n!"); | ||
143 | |||
144 | info.address = (int) address + (int) &RecHead; | ||
145 | info.size = sizeof(RecHead); | ||
146 | errval = __dpmi_lock_linear_region(&info); | ||
147 | if(errval == -1) printf("Error in locking memory\n!"); | ||
148 | |||
149 | info.address = (int) address + (int) &RecBuffer; | ||
150 | info.size = sizeof(RecBuffer); | ||
151 | errval = __dpmi_lock_linear_region(&info); | ||
152 | if(errval == -1) printf("Error in locking memory\n!"); | ||
153 | |||
154 | info.address = (int) address + (int) RecBuffer; | ||
155 | info.size = BufSize; | ||
156 | errval = __dpmi_lock_linear_region(&info); | ||
157 | if(errval == -1) printf("Error in locking memory\n!"); | ||
158 | |||
159 | __dpmi_get_segment_base_address(_my_cs(), &address); | ||
160 | |||
161 | info.address = (int) address + (int) SVAsyncProtISR; | ||
162 | info.size = 4096; /* 4096 bytes is probably overkill. */ | ||
163 | errval = __dpmi_lock_linear_region(&info); | ||
164 | if(errval == -1) printf("Error in locking memory\n!"); | ||
165 | } | ||
166 | |||
167 | static void unlock_interrupt_memory(void) | ||
168 | { | ||
169 | __dpmi_meminfo info; | ||
170 | unsigned long address; | ||
171 | |||
172 | __dpmi_get_segment_base_address(_my_ds(), &address); | ||
173 | info.address = (int) address + (int) &RDR; | ||
174 | info.size = sizeof(RDR); | ||
175 | __dpmi_unlock_linear_region(&info); | ||
176 | info.address = (int) address + (int) &LSR; | ||
177 | info.size = sizeof(LSR); | ||
178 | __dpmi_unlock_linear_region(&info); | ||
179 | info.address = (int) address + (int) &RecHead; | ||
180 | info.size = sizeof(RecHead); | ||
181 | __dpmi_unlock_linear_region(&info); | ||
182 | info.address = (int) address + (int) &RecBuffer; | ||
183 | info.size = sizeof(RecBuffer); | ||
184 | __dpmi_unlock_linear_region(&info); | ||
185 | info.address = (int) address + (int) RecBuffer; | ||
186 | info.size = BufSize; | ||
187 | __dpmi_unlock_linear_region(&info); | ||
188 | |||
189 | __dpmi_get_segment_base_address(_my_cs(), &address); | ||
190 | |||
191 | info.address = (int) address + (int) SVAsyncProtISR; | ||
192 | info.size = 4096; /* probably overkill */ | ||
193 | __dpmi_unlock_linear_region(&info); | ||
194 | } | ||
195 | |||
10 | static GSM_Error serial_close(GSM_StateMachine *s) | 196 | static GSM_Error serial_close(GSM_StateMachine *s) |
11 | { | 197 | { |
12 | GSM_Device_SerialData *d = &s->Device.Data.Serial; | 198 | SVAsyncStop(); |
13 | 199 | ||
14 | return ERR_NOTIMPLEMENTED; | 200 | return ERR_NONE; |
15 | } | 201 | } |
16 | 202 | ||
17 | static GSM_Error serial_open (GSM_StateMachine *s) | 203 | static GSM_Error serial_open (GSM_StateMachine *s) |
18 | { | 204 | { |
19 | GSM_Device_SerialData *d = &s->Device.Data.Serial; | 205 | GSM_Device_SerialData *d = &s->Device.Data.Serial; |
206 | unsigned char temp; | ||
207 | int i; | ||
208 | |||
209 | /**** Set various things according to com port number */ | ||
210 | if (mystrncasecmp(s->CurrentConfig->Device,"com1:",0)) { | ||
211 | Port = 0x03F8; | ||
212 | VectorNum = 0x0C; | ||
213 | EnableIRQ = 0xEF; | ||
214 | DisableIRQ = 0x10; | ||
215 | } else if (mystrncasecmp(s->CurrentConfig->Device,"com2:",0)) { | ||
216 | Port = 0x02F8; | ||
217 | VectorNum = 0x0B; | ||
218 | EnableIRQ = 0xF7; | ||
219 | DisableIRQ = 0x08; | ||
220 | } else if (mystrncasecmp(s->CurrentConfig->Device,"com3:",0)) { | ||
221 | Port = 0x03E8; | ||
222 | VectorNum = 0x0C; | ||
223 | EnableIRQ = 0xEF; | ||
224 | DisableIRQ = 0x10; | ||
225 | } else if (mystrncasecmp(s->CurrentConfig->Device,"com4:",0)) { | ||
226 | Port = 0x02E8; | ||
227 | VectorNum = 0x0B; | ||
228 | EnableIRQ = 0xF7; | ||
229 | DisableIRQ = 0x08; | ||
230 | } else return ERR_NOTSUPPORTED; | ||
231 | |||
232 | /**** Compute Register locations */ | ||
233 | THR = Port; | ||
234 | RDR = Port; | ||
235 | BRDL = Port; | ||
236 | BRDH = 1 + Port; | ||
237 | IER = 1 + Port; | ||
238 | IIR = 2 + Port; | ||
239 | FCR = 2 + Port; | ||
240 | LCR = 3 + Port; | ||
241 | MCR = 4 + Port; | ||
242 | LSR = 5 + Port; | ||
243 | MSR = 6 + Port; | ||
244 | SCR = 7 + Port; | ||
245 | |||
246 | /***** Initalize Buffer */ | ||
247 | SVAsyncClear(); | ||
248 | |||
249 | lock_interrupt_memory(); | ||
250 | atexit(unlock_interrupt_memory); | ||
251 | /***** Set bit 3 in MCR to 0 */ | ||
252 | outportb(MCR, (inportb(MCR) & 0xF7)); | ||
253 | |||
254 | /*** Save and reassign interrupt vectors */ | ||
255 | |||
256 | _go32_dpmi_get_protected_mode_interrupt_vector(VectorNum, &ProtVector); | ||
257 | |||
258 | info.pm_offset = (int) SVAsyncProtISR; | ||
259 | info.pm_selector = _my_cs(); | ||
260 | _go32_dpmi_set_protected_mode_interrupt_vector(VectorNum, &info); | ||
261 | |||
262 | atexit(SVAsyncStop); | ||
263 | |||
264 | /***** Enable 8259 interrupt (IRQ) line for this async adapter */ | ||
265 | outportb(Ctrl8259_1, (inportb(Ctrl8259_1) & EnableIRQ)); | ||
266 | |||
267 | /***** Enable 8250 Interrupt-on-data-ready */ | ||
268 | outportb(LCR, (inportb(LCR) & 0x7F)); | ||
269 | |||
270 | outportb(IER, 0); | ||
271 | if (inportb(IER)) { | ||
272 | SVAsyncStatus = 0; | ||
273 | return ERR_UNKNOWN; | ||
274 | } | ||
275 | outportb(IER, 0x01); | ||
276 | |||
277 | /***** Clear 8250 Status and data registers */ | ||
278 | do { | ||
279 | temp=inportb(RDR); | ||
280 | temp=inportb(LSR); | ||
281 | temp=inportb(MSR); | ||
282 | temp=inportb(IIR); | ||
283 | } while(!(temp & 1)); | ||
284 | |||
285 | /***** Set Bit 3 of MCR -- Enable interupts */ | ||
286 | outportb(MCR, (inportb(MCR) | 0x08)); | ||
287 | |||
288 | SVAsyncStatus = 1; | ||
289 | /***** Clear Buffer Just in case */ | ||
290 | SVAsyncClear(); | ||
291 | |||
292 | /* Code based on stuff from SVAsync lib. | ||
293 | * Clear UART Status and data registers | ||
294 | * setting up FIFO if possible | ||
295 | */ | ||
296 | outportb(SCR, 0x55); | ||
297 | if (inportb(SCR) == 0x55) { | ||
298 | /* On the off chance that SCR is actually hardwired to 0x55, | ||
299 | * do the same check with a different value. | ||
300 | */ | ||
301 | outportb(SCR, 0xAA); | ||
302 | if (inportb(SCR) == 0xAA) { | ||
303 | /* The chip is better than an 8250 - it has a scratch pad */ | ||
304 | outportb(SCR, i); /* Set SCR back to what it was before */ | ||
305 | inportb(SCR); /* Give slow motherboards a chance */ | ||
306 | |||
307 | /* Is there a FIFO ? - go through twice for slow motherboards */ | ||
308 | outportb(FCR, 0x01); | ||
309 | i = inportb(FCR); | ||
310 | outportb(FCR, 0x01); | ||
311 | i = inportb(FCR); | ||
20 | 312 | ||
21 | return ERR_NOTIMPLEMENTED; | 313 | /* Some old stuff relies on this (no idea why) */ |
314 | outportb(FCR, 0x00); | ||
315 | inportb(FCR); /* Give slow motherboards a chance */ | ||
316 | |||
317 | if ((i&0x80) == 0) { | ||
318 | smprintf(s,"UART 16450 or UART 8250 with scratch pad\n"); | ||
319 | } else if ((i&0x40) == 0) { | ||
320 | smprintf(s,"UART 16550 - broken FIFO\n"); | ||
321 | } else { | ||
322 | /* It's a 16450A series : try and start the FIFO. | ||
323 | * It appears that some chips need a two call protocol, but | ||
324 | * those that don't seem to work even if you do start it | ||
325 | * twice. The first call is simply to start it, the second | ||
326 | * starts it and sets an 8 byte FIFO trigger level. | ||
327 | */ | ||
328 | outportb(FCR, 0x01); | ||
329 | inportb(FCR); /* Give slow motherboards a chance */ | ||
330 | outportb(FCR, 0x87); | ||
331 | inportb(FCR); /* Give slow motherboards a chance */ | ||
332 | |||
333 | /* Check that the FIFO initialised */ | ||
334 | if ((inportb(IIR) & 0xc0) != 0xc0) { | ||
335 | /* | ||
336 | * It didn't so we assume it isn't there but disable it to | ||
337 | * be on the safe side. | ||
338 | */ | ||
339 | outportb(IIR, 0xfe); | ||
340 | inportb(IIR); /* Give slow motherboards a chance */ | ||
341 | smprintf(s,"UART 16450A - FIFO disabled\n"); | ||
342 | } else { | ||
343 | smprintf(s,"UART 16450A - FIFO enabled\n"); | ||
344 | } | ||
345 | } | ||
346 | } else { | ||
347 | smprintf(s,"UART 8250\n"); | ||
348 | } | ||
349 | } | ||
350 | |||
351 | d->Control = BITS_8 | STOP_1; | ||
352 | d->Parity = false; | ||
353 | d->Speed = 9600; | ||
354 | SVAsyncSet(d->Speed,d->Control | NO_PARITY); | ||
355 | |||
356 | return ERR_NONE; | ||
22 | } | 357 | } |
23 | 358 | ||
24 | static GSM_Error serial_setparity(GSM_StateMachine *s, bool parity) | 359 | static GSM_Error serial_setparity(GSM_StateMachine *s, bool parity) |
25 | { | 360 | { |
26 | GSM_Device_SerialData *d = &s->Device.Data.Serial; | 361 | GSM_Device_SerialData *d = &s->Device.Data.Serial; |
27 | 362 | ||
28 | return ERR_NOTIMPLEMENTED; | 363 | d->Parity = parity; |
364 | |||
365 | if (parity) { | ||
366 | SVAsyncSet(d->Speed, d->Control | ODD_PARITY); | ||
367 | } else { | ||
368 | SVAsyncSet(d->Speed, d->Control | NO_PARITY); | ||
369 | } | ||
370 | |||
371 | return ERR_NONE; | ||
29 | } | 372 | } |
30 | 373 | ||
31 | static GSM_Error serial_setdtrrts(GSM_StateMachine *s, bool dtr, bool rts) | 374 | static GSM_Error serial_setdtrrts(GSM_StateMachine *s, bool dtr, bool rts) |
32 | { | 375 | { |
33 | GSM_Device_SerialData *d = &s->Device.Data.Serial; | 376 | if (dtr && rts) { |
377 | SVAsyncHand(DTR | RTS); | ||
378 | } else if (dtr) { | ||
379 | SVAsyncHand(DTR); | ||
380 | } else if (rts) { | ||
381 | SVAsyncHand(RTS); | ||
382 | } else { | ||
383 | SVAsyncHand(0); | ||
384 | } | ||
34 | 385 | ||
35 | return ERR_NOTIMPLEMENTED; | 386 | return ERR_NONE; |
36 | } | 387 | } |
37 | 388 | ||
38 | static GSM_Error serial_setspeed(GSM_StateMachine *s, int speed) | 389 | static GSM_Error serial_setspeed(GSM_StateMachine *s, int speed) |
39 | { | 390 | { |
40 | GSM_Device_SerialData *d = &s->Device.Data.Serial; | 391 | GSM_Device_SerialData *d = &s->Device.Data.Serial; |
41 | 392 | ||
42 | return ERR_NOTIMPLEMENTED; | 393 | d->Speed = speed; |
394 | |||
395 | if (d->Parity) { | ||
396 | SVAsyncSet(d->Speed, d->Control | ODD_PARITY); | ||
397 | } else { | ||
398 | SVAsyncSet(d->Speed, d->Control | NO_PARITY); | ||
399 | } | ||
400 | |||
401 | return ERR_NONE; | ||
43 | } | 402 | } |
44 | 403 | ||
45 | static int serial_read(GSM_StateMachine *s, void *buf, size_t nbytes) | 404 | static int serial_read(GSM_StateMachine *s, char *buf, size_t nbytes) |
46 | { | 405 | { |
47 | GSM_Device_SerialData *d = &s->Device.Data.Serial; | 406 | if(RecTail == RecHead) return 0; |
407 | |||
408 | disable(); | ||
409 | buf[0] = RecBuffer[RecTail++]; | ||
410 | if(RecTail >= BufSize) RecTail = 0; | ||
411 | enable(); | ||
48 | 412 | ||
49 | return 0; | 413 | return 1; |
50 | } | 414 | } |
51 | 415 | ||
52 | static int serial_write(GSM_StateMachine *s, void *buf, size_t nbytes) | 416 | static int serial_write(GSM_StateMachine *s, char *buf, size_t nbytes) |
53 | { | 417 | { |
54 | GSM_Device_SerialData *d = &s->Device.Data.Serial; | 418 | int i; |
419 | |||
420 | for (i=0;i<nbytes;i++) { | ||
421 | while(~inportb(LSR) & 0x20); | ||
422 | outportb(THR, buf[i]); | ||
423 | } | ||
55 | 424 | ||
56 | return 0; | 425 | return i; |
57 | } | 426 | } |
58 | 427 | ||
59 | GSM_Device_Functions SerialDevice = { | 428 | GSM_Device_Functions SerialDevice = { |
diff --git a/gammu/emb/common/device/serial/ser_djg.h b/gammu/emb/common/device/serial/ser_djg.h index b35b282..3bb2a5b 100644 --- a/gammu/emb/common/device/serial/ser_djg.h +++ b/gammu/emb/common/device/serial/ser_djg.h | |||
@@ -1,3 +1,7 @@ | |||
1 | /* Some sources from SVAsync (c) 1996, 1997, Samuel Vincent | ||
2 | * 7337 Carioca Ct, Rohnert Park, Ca 94928 | ||
3 | * "you may freely use it in your programs without paying me anything" | ||
4 | */ | ||
1 | 5 | ||
2 | #ifdef DJGPP | 6 | #ifdef DJGPP |
3 | #ifndef djgppserial_h | 7 | #ifndef djgppserial_h |
@@ -5,8 +9,39 @@ | |||
5 | 9 | ||
6 | typedef struct { | 10 | typedef struct { |
7 | int hPhone; | 11 | int hPhone; |
12 | int Speed; | ||
13 | unsigned int Control; | ||
14 | bool Parity; | ||
8 | } GSM_Device_SerialData; | 15 | } GSM_Device_SerialData; |
9 | 16 | ||
17 | /* Defines for Com Port Paramaters, the second paramater to SVAsyncSet() */ | ||
18 | #define BITS_8 0x03 | ||
19 | #define BITS_7 0x02 | ||
20 | #define STOP_1 0x00 | ||
21 | #define STOP_2 0x04 | ||
22 | #define EVEN_PARITY 0x18 | ||
23 | #define ODD_PARITY 0x08 | ||
24 | #define NO_PARITY 0x00 | ||
25 | |||
26 | /* Defines for SVAsyncHand() */ | ||
27 | #define DTR 0x01 | ||
28 | #define RTS 0x02 | ||
29 | #define USER 0x04 | ||
30 | #define LOOPBACK 0x10 | ||
31 | |||
32 | /* Defines for SVAsyncStat() */ | ||
33 | #define D_CTS 0x0100 | ||
34 | #define D_DSR 0x0200 | ||
35 | #define D_RI 0x0400 | ||
36 | #define D_DCD 0x0800 | ||
37 | #define CTS 0x1000 | ||
38 | #define DSR 0x2000 | ||
39 | #define RI 0x4000 | ||
40 | #define DCD 0x8000 | ||
41 | #define PARITY 0x0004 | ||
42 | #define THREMPTY 0x0020 | ||
43 | #define BREAKDET 0x1000 | ||
44 | |||
10 | #endif | 45 | #endif |
11 | #endif | 46 | #endif |
12 | 47 | ||
diff --git a/gammu/emb/common/device/serial/ser_unx.c b/gammu/emb/common/device/serial/ser_unx.c index 69c7515..18b5f6f 100644 --- a/gammu/emb/common/device/serial/ser_unx.c +++ b/gammu/emb/common/device/serial/ser_unx.c | |||
@@ -4,6 +4,15 @@ | |||
4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include "../../gsmstate.h" | 17 | #include "../../gsmstate.h" |
9 | 18 | ||
diff --git a/gammu/emb/common/device/serial/ser_w32.c b/gammu/emb/common/device/serial/ser_w32.c index 7d88fc7..a7919fe 100644 --- a/gammu/emb/common/device/serial/ser_w32.c +++ b/gammu/emb/common/device/serial/ser_w32.c | |||
@@ -4,6 +4,15 @@ | |||
4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include "../../gsmstate.h" | 17 | #include "../../gsmstate.h" |
9 | 18 | ||
diff --git a/gammu/emb/common/gsmstate.c b/gammu/emb/common/gsmstate.c index 31e365d..c65dc01 100644 --- a/gammu/emb/common/gsmstate.c +++ b/gammu/emb/common/gsmstate.c | |||
@@ -870,6 +870,7 @@ static OnePhoneModel allmodels[] = { | |||
870 | #ifdef GSM_ENABLE_NOKIA6510 | 870 | #ifdef GSM_ENABLE_NOKIA6510 |
871 | {"3100" ,"RH-19" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme | 871 | {"3100" ,"RH-19" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme |
872 | {"3100b","RH-50" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme | 872 | {"3100b","RH-50" ,"", {F_PBKTONEGAL,F_PBKSMSLIST,0}},//fixme |
873 | {"3105" ,"RH-48" ,"Nokia 3105",{F_PBKTONEGAL,F_PBKSMSLIST,F_VOICETAGS,0}},//fixme | ||
873 | {"3108", "RH-6", "Nokia 3108",{0}}, //does it have irda ? | 874 | {"3108", "RH-6", "Nokia 3108",{0}}, //does it have irda ? |
874 | {"3200", "RH-30" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme | 875 | {"3200", "RH-30" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme |
875 | {"3200a","RH-31" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme | 876 | {"3200a","RH-31" ,"Nokia 3200",{F_PBKTONEGAL,0}},//fixme |
@@ -954,8 +955,8 @@ static OnePhoneModel allmodels[] = { | |||
954 | {"6610i","RM-37" ,"Nokia 6610i",{F_PBKTONEGAL,F_TODO66,F_RADIO,0}}, | 955 | {"6610i","RM-37" ,"Nokia 6610i",{F_PBKTONEGAL,F_TODO66,F_RADIO,0}}, |
955 | {"6800" ,"NSB-9" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}}, | 956 | {"6800" ,"NSB-9" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}}, |
956 | {"6800" ,"NHL-6" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}}, | 957 | {"6800" ,"NHL-6" ,"Nokia 6800", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}}, |
957 | {"6810" ,"RM-2" ,"Nokia 6810", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess | 958 | {"6810" ,"RM-2" ,"Nokia 6810", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,F_NOTES,0}},//quess |
958 | {"6820" ,"NHL-9" ,"Nokia 6820", {F_PBKTONEGAL,F_TODO66,F_RADIO,F_PBKSMSLIST,0}},//quess | 959 | {"6820" ,"NHL-9" ,"Nokia 6820", {F_PBKTONEGAL,F_TODO66,F_PBKSMSLIST,F_NOTES,0}},//quess |
959 | #endif | 960 | #endif |
960 | #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA7110) | 961 | #if defined(GSM_ENABLE_ATGEN) || defined(GSM_ENABLE_NOKIA7110) |
961 | {"7110" ,"NSE-5" ,"Nokia 7110", {F_CAL62,0}}, | 962 | {"7110" ,"NSE-5" ,"Nokia 7110", {F_CAL62,0}}, |
diff --git a/gammu/emb/common/gsmstate.h b/gammu/emb/common/gsmstate.h index 2b4806c..6861fbc 100644 --- a/gammu/emb/common/gsmstate.h +++ b/gammu/emb/common/gsmstate.h | |||
@@ -378,6 +378,7 @@ typedef enum { | |||
378 | ID_SetOBEX, | 378 | ID_SetOBEX, |
379 | ID_SetUSSD, | 379 | ID_SetUSSD, |
380 | ID_GetNote, | 380 | ID_GetNote, |
381 | ID_SetNote, | ||
381 | ID_GetSignalQuality, | 382 | ID_GetSignalQuality, |
382 | ID_GetBatteryCharge, | 383 | ID_GetBatteryCharge, |
383 | ID_GetSMSFolders, | 384 | ID_GetSMSFolders, |
@@ -1290,9 +1291,34 @@ typedef struct { | |||
1290 | */ | 1291 | */ |
1291 | GSM_Error (*SetCalendarSettings)(GSM_StateMachine *s, GSM_CalendarSettings *settings); | 1292 | GSM_Error (*SetCalendarSettings)(GSM_StateMachine *s, GSM_CalendarSettings *settings); |
1292 | /** | 1293 | /** |
1293 | * Gets note. | 1294 | * Retrieves notes status (number of used entries). |
1294 | */ | 1295 | */ |
1295 | GSM_Error (*GetNextNote)(GSM_StateMachine *s, GSM_NoteEntry *Note, bool refresh); | 1296 | GSM_Error (*GetNotesStatus) (GSM_StateMachine *s, GSM_ToDoStatus *status); |
1297 | /** | ||
1298 | * Retrieves notes entry. | ||
1299 | */ | ||
1300 | GSM_Error (*GetNote) (GSM_StateMachine *s, GSM_NoteEntry *Note); | ||
1301 | /** | ||
1302 | * Retrieves note entry. This is useful for continuous reading of all | ||
1303 | * notes entries. | ||
1304 | */ | ||
1305 | GSM_Error (*GetNextNote) (GSM_StateMachine *s, GSM_NoteEntry *Note, bool start); | ||
1306 | /** | ||
1307 | * Sets note entry | ||
1308 | */ | ||
1309 | GSM_Error (*SetNote) (GSM_StateMachine *s, GSM_NoteEntry *Note); | ||
1310 | /** | ||
1311 | * Adds note entry. | ||
1312 | */ | ||
1313 | GSM_Error (*AddNote) (GSM_StateMachine *s, GSM_NoteEntry *Note); | ||
1314 | /** | ||
1315 | * Deletes note entry. | ||
1316 | */ | ||
1317 | GSM_Error (*DeleteNote) (GSM_StateMachine *s, GSM_NoteEntry *Note); | ||
1318 | /** | ||
1319 | * Deletes all notes entries. | ||
1320 | */ | ||
1321 | GSM_Error (*DeleteAllNotes) (GSM_StateMachine *s); | ||
1296 | /** | 1322 | /** |
1297 | * Reads profile. | 1323 | * Reads profile. |
1298 | */ | 1324 | */ |
diff --git a/gammu/emb/common/phone/alcatel/alcatel.c b/gammu/emb/common/phone/alcatel/alcatel.c index 3821f13..b75077f 100644 --- a/gammu/emb/common/phone/alcatel/alcatel.c +++ b/gammu/emb/common/phone/alcatel/alcatel.c | |||
@@ -3979,7 +3979,13 @@ GSM_Phone_Functions ALCATELPhone = { | |||
3979 | ALCATEL_DeleteAllCalendar, | 3979 | ALCATEL_DeleteAllCalendar, |
3980 | NOTSUPPORTED, /* GetCalendarSettings*/ | 3980 | NOTSUPPORTED, /* GetCalendarSettings*/ |
3981 | NOTSUPPORTED, /* SetCalendarSettings*/ | 3981 | NOTSUPPORTED, /* SetCalendarSettings*/ |
3982 | NOTSUPPORTED, /* GetNoteStatus */ | ||
3983 | NOTSUPPORTED, /* GetNote */ | ||
3982 | NOTSUPPORTED, /* GetNextNote */ | 3984 | NOTSUPPORTED, /* GetNextNote */ |
3985 | NOTSUPPORTED, /* SetNote */ | ||
3986 | NOTSUPPORTED, /* AddNote */ | ||
3987 | NOTSUPPORTED, /* DeleteNote */ | ||
3988 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
3983 | NOTSUPPORTED, /* GetProfile */ | 3989 | NOTSUPPORTED, /* GetProfile */ |
3984 | NOTSUPPORTED, /* SetProfile */ | 3990 | NOTSUPPORTED, /* SetProfile */ |
3985 | NOTSUPPORTED, /* GetFMStation */ | 3991 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/at/atgen.c b/gammu/emb/common/phone/at/atgen.c index ba23eb2..a875f0a 100644 --- a/gammu/emb/common/phone/at/atgen.c +++ b/gammu/emb/common/phone/at/atgen.c | |||
@@ -696,7 +696,7 @@ GSM_Error ATGEN_SetSMSC(GSM_StateMachine *s, GSM_SMSC *smsc) | |||
696 | { | 696 | { |
697 | unsigned char req[50]; | 697 | unsigned char req[50]; |
698 | 698 | ||
699 | if (smsc->Location!=1) return ERR_NOTSUPPORTED; | 699 | if (smsc->Location!=1) return ERR_INVALIDLOCATION; |
700 | 700 | ||
701 | sprintf(req, "AT+CSCA=\"%s\"\r",DecodeUnicodeString(smsc->Number)); | 701 | sprintf(req, "AT+CSCA=\"%s\"\r",DecodeUnicodeString(smsc->Number)); |
702 | 702 | ||
@@ -3839,7 +3839,13 @@ GSM_Phone_Functions ATGENPhone = { | |||
3839 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ | 3839 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ |
3840 | NOTSUPPORTED, /* GetCalendarSettings*/ | 3840 | NOTSUPPORTED, /* GetCalendarSettings*/ |
3841 | NOTSUPPORTED, /* SetCalendarSettings*/ | 3841 | NOTSUPPORTED, /* SetCalendarSettings*/ |
3842 | NOTSUPPORTED, /* GetNoteStatus */ | ||
3843 | NOTSUPPORTED, /* GetNote */ | ||
3842 | NOTSUPPORTED, /* GetNextNote */ | 3844 | NOTSUPPORTED, /* GetNextNote */ |
3845 | NOTSUPPORTED, /* SetNote */ | ||
3846 | NOTSUPPORTED, /* AddNote */ | ||
3847 | NOTSUPPORTED, /* DeleteNote */ | ||
3848 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
3843 | NOTSUPPORTED, /* GetProfile */ | 3849 | NOTSUPPORTED, /* GetProfile */ |
3844 | NOTSUPPORTED, /* SetProfile */ | 3850 | NOTSUPPORTED, /* SetProfile */ |
3845 | NOTSUPPORTED, /* GetFMStation */ | 3851 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/at/sonyeric.c b/gammu/emb/common/phone/at/sonyeric.c index 8eeb39b..363e043 100644 --- a/gammu/emb/common/phone/at/sonyeric.c +++ b/gammu/emb/common/phone/at/sonyeric.c | |||
@@ -14,10 +14,11 @@ | |||
14 | #include "atgen.h" | 14 | #include "atgen.h" |
15 | #include "sonyeric.h" | 15 | #include "sonyeric.h" |
16 | 16 | ||
17 | #ifdef GSM_ENABLE_OBEXGEN | 17 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
18 | 18 | ||
19 | #include "../obex/obexgen.h" | 19 | #include "../obex/obexgen.h" |
20 | 20 | ||
21 | extern GSM_Protocol_Functions OBEXProtocol; | ||
21 | extern GSM_Reply_FunctionOBEXGENReplyFunctions[]; | 22 | extern GSM_Reply_FunctionOBEXGENReplyFunctions[]; |
22 | extern GSM_Reply_FunctionATGENReplyFunctions[]; | 23 | extern GSM_Reply_FunctionATGENReplyFunctions[]; |
23 | 24 | ||
@@ -124,7 +125,7 @@ static GSM_Error SONYERIC_SetFile(GSM_StateMachine *s, unsigned char *FileName, | |||
124 | 125 | ||
125 | GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start) | 126 | GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, bool start) |
126 | { | 127 | { |
127 | #ifdef GSM_ENABLE_OBEXGEN | 128 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
128 | GSM_Error error; | 129 | GSM_Error error; |
129 | GSM_ToDoEntry ToDo; | 130 | GSM_ToDoEntry ToDo; |
130 | int Pos, num, Loc; | 131 | int Pos, num, Loc; |
@@ -160,7 +161,7 @@ GSM_Error SONYERIC_GetNextCalendar(GSM_StateMachine *s, GSM_CalendarEntry *Note, | |||
160 | 161 | ||
161 | GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start) | 162 | GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool start) |
162 | { | 163 | { |
163 | #ifdef GSM_ENABLE_OBEXGEN | 164 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
164 | GSM_Error error; | 165 | GSM_Error error; |
165 | GSM_CalendarEntryCalendar; | 166 | GSM_CalendarEntryCalendar; |
166 | int Pos, num, Loc; | 167 | int Pos, num, Loc; |
@@ -199,7 +200,7 @@ GSM_Error SONYERIC_GetNextToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo, bool st | |||
199 | 200 | ||
200 | GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) | 201 | GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) |
201 | { | 202 | { |
202 | #ifdef GSM_ENABLE_OBEXGEN | 203 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
203 | GSM_Error error; | 204 | GSM_Error error; |
204 | GSM_ToDoEntry ToDo; | 205 | GSM_ToDoEntry ToDo; |
205 | GSM_CalendarEntry Calendar; | 206 | GSM_CalendarEntry Calendar; |
@@ -230,7 +231,7 @@ GSM_Error SONYERIC_GetToDoStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) | |||
230 | 231 | ||
231 | GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | 232 | GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) |
232 | { | 233 | { |
233 | #ifdef GSM_ENABLE_OBEXGEN | 234 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
234 | unsigned char req[5000]; | 235 | unsigned char req[5000]; |
235 | int size=0; | 236 | int size=0; |
236 | 237 | ||
@@ -246,7 +247,7 @@ GSM_Error SONYERIC_AddCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | |||
246 | 247 | ||
247 | GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) | 248 | GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) |
248 | { | 249 | { |
249 | #ifdef GSM_ENABLE_OBEXGEN | 250 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
250 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 251 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
251 | unsigned char req[5000]; | 252 | unsigned char req[5000]; |
252 | int size=0; | 253 | int size=0; |
@@ -265,7 +266,7 @@ GSM_Error SONYERIC_AddToDo(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) | |||
265 | 266 | ||
266 | GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s) | 267 | GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s) |
267 | { | 268 | { |
268 | #ifdef GSM_ENABLE_OBEXGEN | 269 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
269 | GSM_Error error; | 270 | GSM_Error error; |
270 | int Pos,Level = 0,Used; | 271 | int Pos,Level = 0,Used; |
271 | unsigned char *Buf; | 272 | unsigned char *Buf; |
@@ -317,7 +318,7 @@ GSM_Error SONYERIC_DeleteAllToDo(GSM_StateMachine *s) | |||
317 | 318 | ||
318 | GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | 319 | GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) |
319 | { | 320 | { |
320 | #ifdef GSM_ENABLE_OBEXGEN | 321 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
321 | GSM_Error error; | 322 | GSM_Error error; |
322 | int Pos,Level = 0,Loc=0,Used; | 323 | int Pos,Level = 0,Loc=0,Used; |
323 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; | 324 | GSM_Phone_ATGENData*Priv = &s->Phone.Data.Priv.ATGEN; |
@@ -372,7 +373,7 @@ GSM_Error SONYERIC_DelCalendarNote(GSM_StateMachine *s, GSM_CalendarEntry *Note) | |||
372 | 373 | ||
373 | GSM_Error SONYERIC_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *Status) | 374 | GSM_Error SONYERIC_GetCalendarStatus(GSM_StateMachine *s, GSM_CalendarStatus *Status) |
374 | { | 375 | { |
375 | #ifdef GSM_ENABLE_OBEXGEN | 376 | #if defined(GSM_ENABLE_BLUEOBEX) || defined(GSM_ENABLE_IRDAOBEX) |
376 | GSM_Error error; | 377 | GSM_Error error; |
377 | GSM_ToDoEntry ToDo; | 378 | GSM_ToDoEntry ToDo; |
378 | GSM_CalendarEntry Calendar; | 379 | GSM_CalendarEntry Calendar; |
diff --git a/gammu/emb/common/phone/nokia/dct3/dct3func.c b/gammu/emb/common/phone/nokia/dct3/dct3func.c index 17cd0a4..9810a35 100644 --- a/gammu/emb/common/phone/nokia/dct3/dct3func.c +++ b/gammu/emb/common/phone/nokia/dct3/dct3func.c | |||
@@ -4,6 +4,15 @@ | |||
4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include <string.h> /* memcpy only */ | 17 | #include <string.h> /* memcpy only */ |
9 | #include <stdio.h> | 18 | #include <stdio.h> |
@@ -457,10 +466,10 @@ GSM_Error DCT3_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMachine *s | |||
457 | smprintf(s, "\n"); | 466 | smprintf(s, "\n"); |
458 | smprintf(s, "Network selection : %s\n", msg.Buffer[9]==1?"manual":"automatic"); | 467 | smprintf(s, "Network selection : %s\n", msg.Buffer[9]==1?"manual":"automatic"); |
459 | if (msg.Buffer[8]<0x03) { | 468 | if (msg.Buffer[8]<0x03) { |
460 | sprintf(NetInfo.CID, "%02x%02x", msg.Buffer[10], msg.Buffer[11]); | 469 | sprintf(NetInfo.CID, "%02X%02X", msg.Buffer[10], msg.Buffer[11]); |
461 | smprintf(s, "CID : %s\n", NetInfo.CID); | 470 | smprintf(s, "CID : %s\n", NetInfo.CID); |
462 | 471 | ||
463 | sprintf(NetInfo.LAC, "%02x%02x", msg.Buffer[12], msg.Buffer[13]); | 472 | sprintf(NetInfo.LAC, "%02X%02X", msg.Buffer[12], msg.Buffer[13]); |
464 | smprintf(s, "LAC : %s\n", NetInfo.LAC); | 473 | smprintf(s, "LAC : %s\n", NetInfo.LAC); |
465 | 474 | ||
466 | NOKIA_DecodeNetworkCode(msg.Buffer+14,NetInfo.NetworkCode); | 475 | NOKIA_DecodeNetworkCode(msg.Buffer+14,NetInfo.NetworkCode); |
@@ -511,8 +520,8 @@ GSM_Error DCT3_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMachine *s | |||
511 | Data->NetworkInfo->NetworkName[msg.Buffer[17]*2+2]=0x00; | 520 | Data->NetworkInfo->NetworkName[msg.Buffer[17]*2+2]=0x00; |
512 | } | 521 | } |
513 | NOKIA_DecodeNetworkCode(msg.Buffer+14,Data->NetworkInfo->NetworkCode); | 522 | NOKIA_DecodeNetworkCode(msg.Buffer+14,Data->NetworkInfo->NetworkCode); |
514 | sprintf(Data->NetworkInfo->CID, "%02x%02x", msg.Buffer[10], msg.Buffer[11]); | 523 | sprintf(Data->NetworkInfo->CID, "%02X%02X", msg.Buffer[10], msg.Buffer[11]); |
515 | sprintf(Data->NetworkInfo->LAC, "%02x%02x", msg.Buffer[12], msg.Buffer[13]); | 524 | sprintf(Data->NetworkInfo->LAC, "%02X%02X", msg.Buffer[12], msg.Buffer[13]); |
516 | } | 525 | } |
517 | } | 526 | } |
518 | /* 6210/6250/7110 */ | 527 | /* 6210/6250/7110 */ |
diff --git a/gammu/emb/common/phone/nokia/dct3/n0650.c b/gammu/emb/common/phone/nokia/dct3/n0650.c new file mode 100644 index 0000000..3899a16 --- a/dev/null +++ b/gammu/emb/common/phone/nokia/dct3/n0650.c | |||
@@ -0,0 +1,150 @@ | |||
1 | /* (c) 2004 by Marcin Wiacek */ | ||
2 | |||
3 | #include <string.h> | ||
4 | #include <time.h> | ||
5 | |||
6 | #include "../../../gsmcomon.h" | ||
7 | #include "../../../gsmstate.h" | ||
8 | #include "../nfunc.h" | ||
9 | |||
10 | #ifdef GSM_ENABLE_NOKIA650 | ||
11 | |||
12 | static GSM_Reply_Function N650ReplyFunctions[] = { | ||
13 | {DCT3DCT4_ReplyGetModelFirmware,"\xD2",0x02,0x00,ID_GetModel }, | ||
14 | {DCT3DCT4_ReplyGetModelFirmware,"\xD2",0x02,0x00,ID_GetFirmware }, | ||
15 | |||
16 | {NULL, "\x00",0x00,0x00,ID_None } | ||
17 | }; | ||
18 | |||
19 | GSM_Phone_Functions N650Phone = { | ||
20 | "0650", | ||
21 | N650ReplyFunctions, | ||
22 | NONEFUNCTION, /* Initialise */ | ||
23 | NONEFUNCTION, /* Terminate */ | ||
24 | GSM_DispatchMessage, | ||
25 | NOTSUPPORTED, /* ShowStartInfo */ | ||
26 | NOKIA_GetManufacturer, | ||
27 | DCT3DCT4_GetModel, | ||
28 | DCT3DCT4_GetFirmware, | ||
29 | NOTSUPPORTED, /* GetIMEI */ | ||
30 | NOTSUPPORTED, /* GetOriginalIMEI */ | ||
31 | NOTSUPPORTED, /* GetManufactureMonth*/ | ||
32 | NOTSUPPORTED, /* GetProductCode */ | ||
33 | NOTSUPPORTED, /* GetHardware */ | ||
34 | NOTSUPPORTED, /* GetPPM */ | ||
35 | NOTSUPPORTED, /* GetSIMIMSI */ | ||
36 | NOTSUPPORTED, /* GetDateTime */ | ||
37 | NOTSUPPORTED, /* SetDateTime */ | ||
38 | NOTSUPPORTED, /* GetAlarm */ | ||
39 | NOTSUPPORTED, /* SetAlarm */ | ||
40 | NOTSUPPORTED, /* GetLocale */ | ||
41 | NOTSUPPORTED, /* SetLocale */ | ||
42 | NOTSUPPORTED, /* PressKey */ | ||
43 | NOTSUPPORTED, /* Reset */ | ||
44 | NOTSUPPORTED, /* ResetPhoneSettings*/ | ||
45 | NOTSUPPORTED, /* EnterSecurityCode*/ | ||
46 | NOTSUPPORTED, /* GetSecurityStatus*/ | ||
47 | NOTSUPPORTED, /* GetDisplayStatus*/ | ||
48 | NOTSUPPORTED, /* SetAutoNetworkLogin*/ | ||
49 | NOTSUPPORTED, /* GetBatteryCharge*/ | ||
50 | NOTSUPPORTED, /* GetSignalQuality*/ | ||
51 | NOTSUPPORTED, /* GetNetworkInfo */ | ||
52 | NOTSUPPORTED, /* GetCategory */ | ||
53 | NOTSUPPORTED, /* AddCategory */ | ||
54 | NOTSUPPORTED, /* GetCategoryStatus */ | ||
55 | NOTSUPPORTED, /* GetMemoryStatus */ | ||
56 | NOTSUPPORTED, /* GetMemory */ | ||
57 | NOTSUPPORTED, /* GetNextMemory */ | ||
58 | NOTSUPPORTED, /* SetMemory */ | ||
59 | NOTSUPPORTED, /* AddMemory */ | ||
60 | NOTSUPPORTED, /* DeleteMemory */ | ||
61 | NOTIMPLEMENTED, /* DeleteAllMemory */ | ||
62 | NOTSUPPORTED, /* GetSpeedDial */ | ||
63 | NOTSUPPORTED, /* SetSpeedDial */ | ||
64 | NOTSUPPORTED, /* GetSMSC */ | ||
65 | NOTSUPPORTED, /* SetSMSC */ | ||
66 | NOTSUPPORTED, /* GetSMSStatus */ | ||
67 | NOTSUPPORTED, /* GetSMS */ | ||
68 | NOTSUPPORTED, /* GetNextSMS */ | ||
69 | NOTSUPPORTED, /* SetSMS */ | ||
70 | NOTSUPPORTED, /* AddSMS */ | ||
71 | NOTSUPPORTED, /* DeleteSMS */ | ||
72 | NOTSUPPORTED, /* SendSMSMessage */ | ||
73 | NOTSUPPORTED, /* SendSavedSMS */ | ||
74 | NOTSUPPORTED, /* SetIncomingSMS */ | ||
75 | NOTSUPPORTED, /* SetIncomingCB */ | ||
76 | NOTSUPPORTED, /* GetSMSFolders */ | ||
77 | NOTSUPPORTED, /* AddSMSFolder */ | ||
78 | NOTSUPPORTED, /* DeleteSMSFolder */ | ||
79 | NOTSUPPORTED, /* DialVoice */ | ||
80 | NOTSUPPORTED, /* AnswerCall */ | ||
81 | NOTSUPPORTED, /* CancelCall */ | ||
82 | NOTSUPPORTED, /* HoldCall */ | ||
83 | NOTSUPPORTED, /* UnholdCall */ | ||
84 | NOTSUPPORTED, /* ConferenceCall */ | ||
85 | NOTSUPPORTED, /* SplitCall */ | ||
86 | NOTSUPPORTED, /* TransferCall */ | ||
87 | NOTSUPPORTED, /* SwitchCall */ | ||
88 | NOTSUPPORTED, /* GetCallDivert */ | ||
89 | NOTSUPPORTED, /* SetCallDivert */ | ||
90 | NOTSUPPORTED, /* CancelAllDiverts*/ | ||
91 | NOTSUPPORTED, /* SetIncomingCall */ | ||
92 | NOTSUPPORTED, /* SetIncomingUSSD */ | ||
93 | NOTSUPPORTED, /* SendDTMF */ | ||
94 | NOTSUPPORTED, /* GetRingtone */ | ||
95 | NOTSUPPORTED, /* SetRingtone */ | ||
96 | NOTSUPPORTED, /* GetRingtonesInfo*/ | ||
97 | NOTSUPPORTED, /* DeleteUserRingtones*/ | ||
98 | NOTSUPPORTED, /* PlayTone */ | ||
99 | NOTSUPPORTED, /* GetWAPBookmark */ | ||
100 | NOTSUPPORTED, /* SetWAPBookmark */ | ||
101 | NOTSUPPORTED, /* DeleteWAPBookmark */ | ||
102 | NOTSUPPORTED, /* GetWAPSettings */ | ||
103 | NOTSUPPORTED, /* SetWAPSettings */ | ||
104 | NOTSUPPORTED, /* GetMMSSettings */ | ||
105 | NOTSUPPORTED, /* SetMMSSettings */ | ||
106 | NOTSUPPORTED, /* GetBitmap */ | ||
107 | NOTSUPPORTED, /* SetBitmap */ | ||
108 | NOTSUPPORTED, /* GetToDoStatus */ | ||
109 | NOTSUPPORTED, /* GetToDo */ | ||
110 | NOTSUPPORTED, /* GetNextToDo */ | ||
111 | NOTSUPPORTED, /* SetToDo */ | ||
112 | NOTSUPPORTED, /* AddToDo */ | ||
113 | NOTSUPPORTED, /* DeleteToDo */ | ||
114 | NOTSUPPORTED, /* DeleteAllToDo */ | ||
115 | NOTSUPPORTED, /* GetCalendarStatus*/ | ||
116 | NOTSUPPORTED, /* GetCalendar */ | ||
117 | NOTSUPPORTED, /* GetNextCalendar */ | ||
118 | NOTSUPPORTED, /* SetCalendar */ | ||
119 | NOTSUPPORTED, /* AddCalendar */ | ||
120 | NOTSUPPORTED, /* DeleteCalendar */ | ||
121 | NOTSUPPORTED, /* DeleteAllCalendar*/ | ||
122 | NOTSUPPORTED, /* GetCalendarSettings*/ | ||
123 | NOTSUPPORTED, /* SetCalendarSettings*/ | ||
124 | NOTSUPPORTED, /* GetNoteStatus */ | ||
125 | NOTSUPPORTED, /* GetNote */ | ||
126 | NOTSUPPORTED, /* GetNextNote */ | ||
127 | NOTSUPPORTED, /* SetNote */ | ||
128 | NOTSUPPORTED, /* AddNote */ | ||
129 | NOTSUPPORTED, /* DeleteNote */ | ||
130 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
131 | NOTSUPPORTED, /* GetProfile */ | ||
132 | NOTSUPPORTED, /* SetProfile */ | ||
133 | NOTSUPPORTED, /* GetFMStation */ | ||
134 | NOTSUPPORTED, /* SetFMStation */ | ||
135 | NOTSUPPORTED, /* ClearFMStations */ | ||
136 | NOTSUPPORTED, /* GetNextFileFolder*/ | ||
137 | NOTSUPPORTED, /* GetFilePart */ | ||
138 | NOTSUPPORTED, /* AddFilePart */ | ||
139 | NOTSUPPORTED, /* GetFileSystemStatus*/ | ||
140 | NOTSUPPORTED, /* DeleteFile */ | ||
141 | NOTSUPPORTED, /* AddFolder */ | ||
142 | NOTSUPPORTED, /* GetGPRSAccessPoint*/ | ||
143 | NOTSUPPORTED /* SetGPRSAccessPoint*/ | ||
144 | }; | ||
145 | |||
146 | #endif | ||
147 | |||
148 | /* How should editor hadle tabs in this file? Add editor commands here. | ||
149 | * vim: noexpandtab sw=8 ts=8 sts=8: | ||
150 | */ | ||
diff --git a/gammu/emb/common/phone/nokia/dct3/n0650.h b/gammu/emb/common/phone/nokia/dct3/n0650.h new file mode 100644 index 0000000..be491eb --- a/dev/null +++ b/gammu/emb/common/phone/nokia/dct3/n0650.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* (c) 2004 by Marcin Wiacek */ | ||
2 | |||
3 | #ifndef n650_h | ||
4 | #define n650_h | ||
5 | |||
6 | typedef struct { | ||
7 | int fake; | ||
8 | } GSM_Phone_N650Data; | ||
9 | |||
10 | #ifndef GSM_USED_MBUS2 | ||
11 | # define GSM_USED_MBUS2 | ||
12 | #endif | ||
13 | |||
14 | #endif | ||
15 | |||
16 | /* How should editor hadle tabs in this file? Add editor commands here. | ||
17 | * vim: noexpandtab sw=8 ts=8 sts=8: | ||
18 | */ | ||
diff --git a/gammu/emb/common/phone/nokia/dct3/n6110.c b/gammu/emb/common/phone/nokia/dct3/n6110.c index dac6c12..c3ddfb6 100644 --- a/gammu/emb/common/phone/nokia/dct3/n6110.c +++ b/gammu/emb/common/phone/nokia/dct3/n6110.c | |||
@@ -4,6 +4,15 @@ | |||
4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include "../../../gsmstate.h" | 17 | #include "../../../gsmstate.h" |
9 | 18 | ||
@@ -2868,7 +2877,13 @@ GSM_Phone_Functions N6110Phone = { | |||
2868 | NOTIMPLEMENTED, /* DeleteAllCalendar */ | 2877 | NOTIMPLEMENTED, /* DeleteAllCalendar */ |
2869 | NOTSUPPORTED, /* GetCalendarSettings */ | 2878 | NOTSUPPORTED, /* GetCalendarSettings */ |
2870 | NOTSUPPORTED, /* SetCalendarSettings */ | 2879 | NOTSUPPORTED, /* SetCalendarSettings */ |
2880 | NOTSUPPORTED, /* GetNoteStatus */ | ||
2881 | NOTSUPPORTED, /* GetNote */ | ||
2871 | NOTSUPPORTED, /* GetNextNote */ | 2882 | NOTSUPPORTED, /* GetNextNote */ |
2883 | NOTSUPPORTED, /* SetNote */ | ||
2884 | NOTSUPPORTED, /* AddNote */ | ||
2885 | NOTSUPPORTED, /* DeleteNote */ | ||
2886 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
2872 | N6110_GetProfile, | 2887 | N6110_GetProfile, |
2873 | N6110_SetProfile, | 2888 | N6110_SetProfile, |
2874 | NOTSUPPORTED, /* GetFMStation */ | 2889 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/nokia/dct3/n7110.c b/gammu/emb/common/phone/nokia/dct3/n7110.c index b597f9b..a8e0545 100644 --- a/gammu/emb/common/phone/nokia/dct3/n7110.c +++ b/gammu/emb/common/phone/nokia/dct3/n7110.c | |||
@@ -3,6 +3,15 @@ | |||
3 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 3 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
4 | * GNU GPL version 2 or later | 4 | * GNU GPL version 2 or later |
5 | */ | 5 | */ |
6 | /* Due to a problem in the source code management, the names of some of | ||
7 | * the authors have unfortunately been lost. We do not mean to belittle | ||
8 | * their efforts and hope they will contact us to see their names | ||
9 | * properly added to the Copyright notice above. | ||
10 | * Having published their contributions under the terms of the GNU | ||
11 | * General Public License (GPL) [version 2], the Copyright of these | ||
12 | * authors will remain respected by adhering to the license they chose | ||
13 | * to publish their code under. | ||
14 | */ | ||
6 | 15 | ||
7 | #include "../../../gsmstate.h" | 16 | #include "../../../gsmstate.h" |
8 | 17 | ||
@@ -1706,7 +1715,13 @@ GSM_Phone_Functions N7110Phone = { | |||
1706 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ | 1715 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ |
1707 | NOTSUPPORTED, /* GetCalendarSettings*/ | 1716 | NOTSUPPORTED, /* GetCalendarSettings*/ |
1708 | NOTSUPPORTED, /* SetCalendarSettings*/ | 1717 | NOTSUPPORTED, /* SetCalendarSettings*/ |
1718 | NOTSUPPORTED, /* GetNoteStatus */ | ||
1719 | NOTSUPPORTED, /* GetNote */ | ||
1709 | NOTSUPPORTED, /* GetNextNote */ | 1720 | NOTSUPPORTED, /* GetNextNote */ |
1721 | NOTSUPPORTED, /* SetNote */ | ||
1722 | NOTSUPPORTED, /* AddNote */ | ||
1723 | NOTSUPPORTED, /* DeleteNote */ | ||
1724 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
1710 | N7110_GetProfile, | 1725 | N7110_GetProfile, |
1711 | N7110_SetProfile, | 1726 | N7110_SetProfile, |
1712 | NOTSUPPORTED, /* GetFMStation */ | 1727 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/nokia/dct3/n9210.c b/gammu/emb/common/phone/nokia/dct3/n9210.c index ff71ad3..f535c2a 100644 --- a/gammu/emb/common/phone/nokia/dct3/n9210.c +++ b/gammu/emb/common/phone/nokia/dct3/n9210.c | |||
@@ -374,7 +374,13 @@ GSM_Phone_Functions N9210Phone = { | |||
374 | NOTSUPPORTED, /* DeleteAllCalendar*/ | 374 | NOTSUPPORTED, /* DeleteAllCalendar*/ |
375 | NOTSUPPORTED, /* GetCalendarSettings*/ | 375 | NOTSUPPORTED, /* GetCalendarSettings*/ |
376 | NOTSUPPORTED, /* SetCalendarSettings*/ | 376 | NOTSUPPORTED, /* SetCalendarSettings*/ |
377 | NOTSUPPORTED, /* GetNoteStatus */ | ||
378 | NOTSUPPORTED, /* GetNote */ | ||
377 | NOTSUPPORTED, /* GetNextNote */ | 379 | NOTSUPPORTED, /* GetNextNote */ |
380 | NOTSUPPORTED, /* SetNote */ | ||
381 | NOTSUPPORTED, /* AddNote */ | ||
382 | NOTSUPPORTED, /* DeleteNote */ | ||
383 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
378 | NOTIMPLEMENTED, /* GetProfile */ | 384 | NOTIMPLEMENTED, /* GetProfile */ |
379 | NOTSUPPORTED, /* SetProfile */ | 385 | NOTSUPPORTED, /* SetProfile */ |
380 | NOTSUPPORTED, /* GetFMStation */ | 386 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/nokia/dct4/n3320.c b/gammu/emb/common/phone/nokia/dct4/n3320.c index 9b1d6cd..9dd9ffb 100644 --- a/gammu/emb/common/phone/nokia/dct4/n3320.c +++ b/gammu/emb/common/phone/nokia/dct4/n3320.c | |||
@@ -249,7 +249,13 @@ GSM_Phone_Functions N3320Phone = { | |||
249 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ | 249 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ |
250 | NOTSUPPORTED, /* GetCalendarSettings*/ | 250 | NOTSUPPORTED, /* GetCalendarSettings*/ |
251 | NOTSUPPORTED, /* SetCalendarSettings*/ | 251 | NOTSUPPORTED, /* SetCalendarSettings*/ |
252 | NOTSUPPORTED, /* GetNoteStatus */ | ||
253 | NOTSUPPORTED, /* GetNote */ | ||
252 | NOTSUPPORTED, /* GetNextNote */ | 254 | NOTSUPPORTED, /* GetNextNote */ |
255 | NOTSUPPORTED, /* SetNote */ | ||
256 | NOTSUPPORTED, /* AddNote */ | ||
257 | NOTSUPPORTED, /* DeleteNote */ | ||
258 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
253 | NOTSUPPORTED, /* GetProfile */ | 259 | NOTSUPPORTED, /* GetProfile */ |
254 | NOTSUPPORTED, /* SetProfile */ | 260 | NOTSUPPORTED, /* SetProfile */ |
255 | NOTSUPPORTED, /* GetFMStation */ | 261 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/nokia/dct4/n3650.c b/gammu/emb/common/phone/nokia/dct4/n3650.c index d4746a7..f1fa826 100644 --- a/gammu/emb/common/phone/nokia/dct4/n3650.c +++ b/gammu/emb/common/phone/nokia/dct4/n3650.c | |||
@@ -370,7 +370,13 @@ GSM_Phone_Functions N3650Phone = { | |||
370 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ | 370 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ |
371 | NOTSUPPORTED, /* GetCalendarSettings*/ | 371 | NOTSUPPORTED, /* GetCalendarSettings*/ |
372 | NOTSUPPORTED, /* SetCalendarSettings*/ | 372 | NOTSUPPORTED, /* SetCalendarSettings*/ |
373 | NOTSUPPORTED, /* GetNoteStatus */ | ||
374 | NOTSUPPORTED, /* GetNote */ | ||
373 | NOTSUPPORTED, /* GetNextNote */ | 375 | NOTSUPPORTED, /* GetNextNote */ |
376 | NOTSUPPORTED, /* SetNote */ | ||
377 | NOTSUPPORTED, /* AddNote */ | ||
378 | NOTSUPPORTED, /* DeleteNote */ | ||
379 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
374 | NOTSUPPORTED, /* GetProfile */ | 380 | NOTSUPPORTED, /* GetProfile */ |
375 | NOTSUPPORTED, /* SetProfile */ | 381 | NOTSUPPORTED, /* SetProfile */ |
376 | NOTSUPPORTED, /* GetFMStation */ | 382 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/nokia/dct4/n6510.c b/gammu/emb/common/phone/nokia/dct4/n6510.c index 2208def..c481863 100644 --- a/gammu/emb/common/phone/nokia/dct4/n6510.c +++ b/gammu/emb/common/phone/nokia/dct4/n6510.c | |||
@@ -4,6 +4,15 @@ | |||
4 | * GNU GPL version 2 or later | 4 | * GNU GPL version 2 or later |
5 | */ | 5 | */ |
6 | /* function for making CRC for filesystem (c) 2003 by Michael Schroeder */ | 6 | /* function for making CRC for filesystem (c) 2003 by Michael Schroeder */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include "../../../gsmstate.h" | 17 | #include "../../../gsmstate.h" |
9 | 18 | ||
@@ -286,10 +295,10 @@ static GSM_Error N6510_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMa | |||
286 | DecodeUnicodeString(GSM_GetNetworkName(NetInfo.NetworkCode))); | 295 | DecodeUnicodeString(GSM_GetNetworkName(NetInfo.NetworkCode))); |
287 | smprintf(s, "(%s)\n",DecodeUnicodeString(GSM_GetCountryName(NetInfo.NetworkCode))); | 296 | smprintf(s, "(%s)\n",DecodeUnicodeString(GSM_GetCountryName(NetInfo.NetworkCode))); |
288 | 297 | ||
289 | sprintf(NetInfo.LAC,"%02x%02x", msg.Buffer[current+1], msg.Buffer[current+2]); | 298 | sprintf(NetInfo.LAC,"%02X%02X", msg.Buffer[current+1], msg.Buffer[current+2]); |
290 | smprintf(s, "LAC : %s\n", NetInfo.LAC); | 299 | smprintf(s, "LAC : %s\n", NetInfo.LAC); |
291 | 300 | ||
292 | sprintf(NetInfo.CID, "%02x%02x", msg.Buffer[current+5], msg.Buffer[current+6]); | 301 | sprintf(NetInfo.CID, "%02X%02X", msg.Buffer[current+5], msg.Buffer[current+6]); |
293 | smprintf(s, "CID : %s\n", NetInfo.CID); | 302 | smprintf(s, "CID : %s\n", NetInfo.CID); |
294 | 303 | ||
295 | tmp = 10; | 304 | tmp = 10; |
@@ -311,8 +320,8 @@ static GSM_Error N6510_ReplyGetNetworkInfo(GSM_Protocol_Message msg, GSM_StateMa | |||
311 | if (Data->NetworkInfo->State == GSM_HomeNetwork || Data->NetworkInfo->State == GSM_RoamingNetwork) { | 320 | if (Data->NetworkInfo->State == GSM_HomeNetwork || Data->NetworkInfo->State == GSM_RoamingNetwork) { |
312 | tmp = 10; | 321 | tmp = 10; |
313 | NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,Data->NetworkInfo->NetworkName,true); | 322 | NOKIA_GetUnicodeString(s, &tmp, msg.Buffer,Data->NetworkInfo->NetworkName,true); |
314 | sprintf(Data->NetworkInfo->LAC, "%02x%02x", msg.Buffer[current+1], msg.Buffer[current+2]); | 323 | sprintf(Data->NetworkInfo->LAC, "%02X%02X", msg.Buffer[current+1], msg.Buffer[current+2]); |
315 | sprintf(Data->NetworkInfo->CID, "%02x%02x", msg.Buffer[current+5], msg.Buffer[current+6]); | 324 | sprintf(Data->NetworkInfo->CID, "%02X%02X", msg.Buffer[current+5], msg.Buffer[current+6]); |
316 | NOKIA_DecodeNetworkCode(msg.Buffer + (current+7),Data->NetworkInfo->NetworkCode); | 325 | NOKIA_DecodeNetworkCode(msg.Buffer + (current+7),Data->NetworkInfo->NetworkCode); |
317 | } | 326 | } |
318 | } | 327 | } |
@@ -1127,10 +1136,8 @@ static GSM_Error N6510_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap) | |||
1127 | GSM_SMSMessage sms; | 1136 | GSM_SMSMessage sms; |
1128 | GSM_Phone_Bitmap_TypesType; | 1137 | GSM_Phone_Bitmap_TypesType; |
1129 | int Width, Height, i, count; | 1138 | int Width, Height, i, count; |
1130 | #ifdef DEVELOP | ||
1131 | unsigned char folderid; | 1139 | unsigned char folderid; |
1132 | int location; | 1140 | int location; |
1133 | #endif | ||
1134 | GSM_NetworkInfo NetInfo; | 1141 | GSM_NetworkInfo NetInfo; |
1135 | GSM_Error error; | 1142 | GSM_Error error; |
1136 | unsigned char reqStartup[1000] = { | 1143 | unsigned char reqStartup[1000] = { |
@@ -1255,7 +1262,6 @@ static GSM_Error N6510_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap) | |||
1255 | case GSM_PictureImage: | 1262 | case GSM_PictureImage: |
1256 | error = N6510_GetPictureImage(s, Bitmap, &sms.Location); | 1263 | error = N6510_GetPictureImage(s, Bitmap, &sms.Location); |
1257 | if (error == ERR_NONE) { | 1264 | if (error == ERR_NONE) { |
1258 | #ifdef DEVELOP | ||
1259 | sms.Folder = 0; | 1265 | sms.Folder = 0; |
1260 | N6510_GetSMSLocation(s, &sms, &folderid, &location); | 1266 | N6510_GetSMSLocation(s, &sms, &folderid, &location); |
1261 | switch (folderid) { | 1267 | switch (folderid) { |
@@ -1265,9 +1271,6 @@ static GSM_Error N6510_SetBitmap(GSM_StateMachine *s, GSM_Bitmap *Bitmap) | |||
1265 | } | 1271 | } |
1266 | reqPicture[6]=location / 256; | 1272 | reqPicture[6]=location / 256; |
1267 | reqPicture[7]=location; | 1273 | reqPicture[7]=location; |
1268 | #else | ||
1269 | return ERR_NOTSUPPORTED; | ||
1270 | #endif | ||
1271 | } | 1274 | } |
1272 | Type = GSM_NokiaPictureImage; | 1275 | Type = GSM_NokiaPictureImage; |
1273 | count = 78; | 1276 | count = 78; |
@@ -2419,6 +2422,9 @@ static GSM_Error N6510_ReplySaveSMSMessage(GSM_Protocol_Message msg, GSM_StateMa | |||
2419 | case 0x02: | 2422 | case 0x02: |
2420 | printf("Incorrect location\n"); | 2423 | printf("Incorrect location\n"); |
2421 | return ERR_INVALIDLOCATION; | 2424 | return ERR_INVALIDLOCATION; |
2425 | case 0x03: | ||
2426 | printf("Memory full (for example no empty space in SIM)\n"); | ||
2427 | return ERR_FULL; | ||
2422 | case 0x05: | 2428 | case 0x05: |
2423 | printf("Incorrect folder\n"); | 2429 | printf("Incorrect folder\n"); |
2424 | return ERR_INVALIDLOCATION; | 2430 | return ERR_INVALIDLOCATION; |
@@ -2676,6 +2682,8 @@ static GSM_Error N6510_ReplyGetRingtonesInfo(GSM_Protocol_Message msg, GSM_State | |||
2676 | memset(Data->RingtonesInfo,0,sizeof(GSM_AllRingtonesInfo)); | 2682 | memset(Data->RingtonesInfo,0,sizeof(GSM_AllRingtonesInfo)); |
2677 | if (msg.Buffer[4] * 256 + msg.Buffer[5] == 0x00) return ERR_EMPTY; | 2683 | if (msg.Buffer[4] * 256 + msg.Buffer[5] == 0x00) return ERR_EMPTY; |
2678 | Data->RingtonesInfo->Number = msg.Buffer[4] * 256 + msg.Buffer[5]; | 2684 | Data->RingtonesInfo->Number = msg.Buffer[4] * 256 + msg.Buffer[5]; |
2685 | // allocate array of ringtones based on number | ||
2686 | Data->RingtonesInfo->Ringtone = calloc(Data->RingtonesInfo->Number, sizeof(GSM_RingtoneInfo)); | ||
2679 | tmp = 6; | 2687 | tmp = 6; |
2680 | for (i=0;i<Data->RingtonesInfo->Number;i++) { | 2688 | for (i=0;i<Data->RingtonesInfo->Number;i++) { |
2681 | Data->RingtonesInfo->Ringtone[i].Group = msg.Buffer[tmp+4]; | 2689 | Data->RingtonesInfo->Ringtone[i].Group = msg.Buffer[tmp+4]; |
@@ -2754,7 +2762,7 @@ static GSM_Error N6510_ReplyGetRingtone(GSM_Protocol_Message msg, GSM_StateMachi | |||
2754 | 2762 | ||
2755 | static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone) | 2763 | static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, bool PhoneRingtone) |
2756 | { | 2764 | { |
2757 | GSM_AllRingtonesInfo Info; | 2765 | GSM_AllRingtonesInfo Info = {0, NULL}; |
2758 | GSM_Error error; | 2766 | GSM_Error error; |
2759 | unsigned char req2[6] = {N7110_FRAME_HEADER, 0x12, | 2767 | unsigned char req2[6] = {N7110_FRAME_HEADER, 0x12, |
2760 | 0x00, 0xe7}; /* Location */ | 2768 | 0x00, 0xe7}; /* Location */ |
@@ -2774,7 +2782,9 @@ static GSM_Error N6510_GetRingtone(GSM_StateMachine *s, GSM_Ringtone *Ringtone, | |||
2774 | req2[4] = Info.Ringtone[Ringtone->Location-1].ID / 256; | 2782 | req2[4] = Info.Ringtone[Ringtone->Location-1].ID / 256; |
2775 | req2[5] = Info.Ringtone[Ringtone->Location-1].ID % 256; | 2783 | req2[5] = Info.Ringtone[Ringtone->Location-1].ID % 256; |
2776 | smprintf(s, "Getting binary ringtone\n"); | 2784 | smprintf(s, "Getting binary ringtone\n"); |
2777 | return GSM_WaitFor (s, req2, 6, 0x1f, 4, ID_GetRingtone); | 2785 | error = GSM_WaitFor (s, req2, 6, 0x1f, 4, ID_GetRingtone); |
2786 | if (Info.Ringtone) free(Info.Ringtone); | ||
2787 | return error; | ||
2778 | case RING_MIDI: | 2788 | case RING_MIDI: |
2779 | case RING_MMF: | 2789 | case RING_MMF: |
2780 | return ERR_NOTSUPPORTED; | 2790 | return ERR_NOTSUPPORTED; |
@@ -4054,6 +4064,97 @@ GSM_Error N6510_GetNextNote(GSM_StateMachine *s, GSM_NoteEntry *Note, bool start | |||
4054 | return N6510_PrivGetGenericCalendar3(s, LastNote->Location[Note->Location-1], ID_GetNote); | 4064 | return N6510_PrivGetGenericCalendar3(s, LastNote->Location[Note->Location-1], ID_GetNote); |
4055 | } | 4065 | } |
4056 | 4066 | ||
4067 | static GSM_Error N6510_DeleteNote(GSM_StateMachine *s, GSM_NoteEntry *Not) | ||
4068 | { | ||
4069 | GSM_Error error; | ||
4070 | GSM_NOKIACalToDoLocations *LastNote = &s->Phone.Data.Priv.N6510.LastNote; | ||
4071 | GSM_CalendarEntry Note; | ||
4072 | |||
4073 | if (!IsPhoneFeatureAvailable(s->Phone.Data.ModelInfo, F_NOTES)) return ERR_NOTSUPPORTED; | ||
4074 | |||
4075 | error=N6510_GetCalendarInfo3(s,LastNote,2); | ||
4076 | if (error!=ERR_NONE) return error; | ||
4077 | |||
4078 | smprintf(s, "Deleting Note\n"); | ||
4079 | |||
4080 | if (Not->Location > LastNote->Number || Not->Location == 0) return ERR_INVALIDLOCATION; | ||
4081 | |||
4082 | Note.Location = LastNote->Location[Not->Location-1]; | ||
4083 | return N71_65_DelCalendar(s,&Note); | ||
4084 | } | ||
4085 | |||
4086 | static GSM_Error N6510_ReplyGetNoteFirstLoc(GSM_Protocol_Message msg, GSM_StateMachine *s) | ||
4087 | { | ||
4088 | smprintf(s, "First Note location: %i\n",msg.Buffer[8]*256+msg.Buffer[9]); | ||
4089 | s->Phone.Data.Note->Location = msg.Buffer[8]*256+msg.Buffer[9]; | ||
4090 | return ERR_NONE; | ||
4091 | } | ||
4092 | |||
4093 | static GSM_Error N6510_ReplyAddNote(GSM_Protocol_Message msg, GSM_StateMachine *s) | ||
4094 | { | ||
4095 | smprintf(s, "ToDo added\n"); | ||
4096 | return ERR_NONE; | ||
4097 | } | ||
4098 | |||
4099 | static GSM_Error N6510_AddNote(GSM_StateMachine *s, GSM_NoteEntry *Not) | ||
4100 | { | ||
4101 | GSM_Error error; | ||
4102 | int count=54; | ||
4103 | unsigned char reqLoc[] = {N6110_FRAME_HEADER, 0x95, | ||
4104 | 0x02};/* 1 = todo, 2 = note */ | ||
4105 | unsigned char req[5000] = { | ||
4106 | N6110_FRAME_HEADER, 0x65, | ||
4107 | 0x02, /* 0 = calendar, 1 = todo, 2 = note */ | ||
4108 | 0x00, 0x00, 0x00, | ||
4109 | 0x00, 0x00, /* location */ | ||
4110 | 0x00, 0x00, 0x00, 0x00, | ||
4111 | 0xFF, 0xFF, 0xFF, 0xFF, /* alarm */ | ||
4112 | 0x80, 0x00, 0x00, | ||
4113 | 0xA9, /* note icon */ | ||
4114 | 0x00, 0x00, 0x00, 0x00, /* alarm type */ | ||
4115 | 0x00, /* 0x02 or 0x00 */ | ||
4116 | 0x80, /* note type */ | ||
4117 | 0x07, 0xD2, 0x01, 0x01, 0x00, 0x00, /* start date/time */ | ||
4118 | 0x07, 0xD2, 0x01, 0x11, 0x00, 0x00, /* end date/time */ | ||
4119 | 0x00, 0x00, /* recurrance */ | ||
4120 | 0xFF, 0xFF, /* birth year */ | ||
4121 | 0x00, /* ToDo priority */ | ||
4122 | 0x00, /* ToDo completed ? */ | ||
4123 | 0x00, 0x00, 0x00, | ||
4124 | 0x00, /* note text length */ | ||
4125 | 0x00, /* phone length/meeting place */ | ||
4126 | 0x00, 0x00, 0x00}; | ||
4127 | |||
4128 | s->Phone.Data.Note = Not; | ||
4129 | |||
4130 | smprintf(s, "Getting first free Note location\n"); | ||
4131 | error = GSM_WaitFor (s, reqLoc, 5, 0x13, 4, ID_SetNote); | ||
4132 | if (error!=ERR_NONE) return error; | ||
4133 | req[8] = Not->Location/256; | ||
4134 | req[9] = Not->Location%256; | ||
4135 | |||
4136 | req[49] = UnicodeLength(Not->Text); | ||
4137 | CopyUnicodeString(req+54,Not->Text); | ||
4138 | count+= req[49]*2; | ||
4139 | |||
4140 | req[count++] = 0x00; | ||
4141 | |||
4142 | smprintf(s, "Adding Note\n"); | ||
4143 | return GSM_WaitFor (s, req, count, 0x13, 4, ID_SetNote); | ||
4144 | } | ||
4145 | |||
4146 | static GSM_Error N6510_GetNoteStatus(GSM_StateMachine *s, GSM_ToDoStatus *status) | ||
4147 | { | ||
4148 | GSM_NOKIACalToDoLocations*LastNote = &s->Phone.Data.Priv.N6510.LastNote; | ||
4149 | GSM_Error error; | ||
4150 | |||
4151 | error = N6510_GetCalendarInfo3(s,LastNote,2); | ||
4152 | if (error!=ERR_NONE) return error; | ||
4153 | |||
4154 | status->Used = LastNote->Number; | ||
4155 | return ERR_NONE; | ||
4156 | } | ||
4157 | |||
4057 | static int N6510_FindFileCheckSum(unsigned char *ptr, int len) | 4158 | static int N6510_FindFileCheckSum(unsigned char *ptr, int len) |
4058 | { | 4159 | { |
4059 | int acc, i, accx; | 4160 | int acc, i, accx; |
@@ -5189,7 +5290,7 @@ static GSM_Error N6510_ReplyAddToDo2(GSM_Protocol_Message msg, GSM_StateMachine | |||
5189 | static GSM_Error N6510_ReplyGetToDoFirstLoc2(GSM_Protocol_Message msg, GSM_StateMachine *s) | 5290 | static GSM_Error N6510_ReplyGetToDoFirstLoc2(GSM_Protocol_Message msg, GSM_StateMachine *s) |
5190 | { | 5291 | { |
5191 | smprintf(s, "First ToDo location method 2: %i\n",msg.Buffer[8]*256+msg.Buffer[9]); | 5292 | smprintf(s, "First ToDo location method 2: %i\n",msg.Buffer[8]*256+msg.Buffer[9]); |
5192 | s->Phone.Data.ToDo->Location = msg.Buffer[9]; | 5293 | s->Phone.Data.ToDo->Location = msg.Buffer[8]*256+msg.Buffer[9]; |
5193 | return ERR_NONE; | 5294 | return ERR_NONE; |
5194 | } | 5295 | } |
5195 | 5296 | ||
@@ -5201,7 +5302,8 @@ static GSM_Error N6510_AddToDo2(GSM_StateMachine *s, GSM_ToDoEntry *ToDo) | |||
5201 | GSM_Error error; | 5302 | GSM_Error error; |
5202 | GSM_DateTime DT; | 5303 | GSM_DateTime DT; |
5203 | int Text, Alarm, EndTime, Completed, count=54, Phone; | 5304 | int Text, Alarm, EndTime, Completed, count=54, Phone; |
5204 | unsigned char reqLoc[] = {N6110_FRAME_HEADER, 0x95, 0x01}; | 5305 | unsigned char reqLoc[] = {N6110_FRAME_HEADER, 0x95, |
5306 | 0x01};/* 1 = todo, 2 = note */ | ||
5205 | unsigned char req[5000] = { | 5307 | unsigned char req[5000] = { |
5206 | N6110_FRAME_HEADER, 0x65, | 5308 | N6110_FRAME_HEADER, 0x65, |
5207 | 0x01, /* 0 = calendar, 1 = todo */ | 5309 | 0x01, /* 0 = calendar, 1 = todo */ |
@@ -5585,6 +5687,7 @@ static GSM_Reply_Function N6510ReplyFunctions[] = { | |||
5585 | {N71_65_ReplyAddCalendar2, "\x13",0x03,0x41,ID_SetCalendarNote },/*method 2*/ | 5687 | {N71_65_ReplyAddCalendar2, "\x13",0x03,0x41,ID_SetCalendarNote },/*method 2*/ |
5586 | {N6510_ReplyAddCalendar3, "\x13",0x03,0x66,ID_SetCalendarNote },/*method 3*/ | 5688 | {N6510_ReplyAddCalendar3, "\x13",0x03,0x66,ID_SetCalendarNote },/*method 3*/ |
5587 | {N6510_ReplyAddToDo2, "\x13",0x03,0x66,ID_SetToDo }, | 5689 | {N6510_ReplyAddToDo2, "\x13",0x03,0x66,ID_SetToDo }, |
5690 | {N6510_ReplyAddNote, "\x13",0x03,0x66,ID_SetNote }, | ||
5588 | {N6510_ReplyGetCalendar3, "\x13",0x03,0x7E,ID_GetCalendarNote },/*method 3*/ | 5691 | {N6510_ReplyGetCalendar3, "\x13",0x03,0x7E,ID_GetCalendarNote },/*method 3*/ |
5589 | {N6510_ReplyGetToDo2, "\x13",0x03,0x7E,ID_GetToDo }, | 5692 | {N6510_ReplyGetToDo2, "\x13",0x03,0x7E,ID_GetToDo }, |
5590 | {N6510_ReplyGetNote, "\x13",0x03,0x7E,ID_GetNote }, | 5693 | {N6510_ReplyGetNote, "\x13",0x03,0x7E,ID_GetNote }, |
@@ -5593,6 +5696,7 @@ static GSM_Reply_Function N6510ReplyFunctions[] = { | |||
5593 | {N6510_ReplyGetCalendarSettings, "\x13",0x03,0x8E,ID_GetCalendarSettings }, | 5696 | {N6510_ReplyGetCalendarSettings, "\x13",0x03,0x8E,ID_GetCalendarSettings }, |
5594 | {N6510_ReplyGetCalendarNotePos, "\x13",0x03,0x96,ID_GetCalendarNotePos },/*method 3*/ | 5697 | {N6510_ReplyGetCalendarNotePos, "\x13",0x03,0x96,ID_GetCalendarNotePos },/*method 3*/ |
5595 | {N6510_ReplyGetToDoFirstLoc2, "\x13",0x03,0x96,ID_SetToDo }, | 5698 | {N6510_ReplyGetToDoFirstLoc2, "\x13",0x03,0x96,ID_SetToDo }, |
5699 | {N6510_ReplyGetNoteFirstLoc, "\x13",0x03,0x96,ID_SetNote }, | ||
5596 | {N6510_ReplyGetCalendarInfo, "\x13",0x03,0x9F,ID_GetCalendarNotesInfo},/*method 3*/ | 5700 | {N6510_ReplyGetCalendarInfo, "\x13",0x03,0x9F,ID_GetCalendarNotesInfo},/*method 3*/ |
5597 | {N6510_ReplyGetToDoStatus2, "\x13",0x03,0x9F,ID_GetToDo }, | 5701 | {N6510_ReplyGetToDoStatus2, "\x13",0x03,0x9F,ID_GetToDo }, |
5598 | {N6510_ReplyGetNoteInfo, "\x13",0x03,0x9F,ID_GetNote }, | 5702 | {N6510_ReplyGetNoteInfo, "\x13",0x03,0x9F,ID_GetNote }, |
@@ -5732,7 +5836,7 @@ static GSM_Reply_Function N6510ReplyFunctions[] = { | |||
5732 | }; | 5836 | }; |
5733 | 5837 | ||
5734 | GSM_Phone_Functions N6510Phone = { | 5838 | GSM_Phone_Functions N6510Phone = { |
5735 | "1100|1100a|1100b|3100|3100b|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|5140|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6610i|6800|6810|6820|7210|7250|7250i|7600|8310|8390|8910|8910i", | 5839 | "1100|1100a|1100b|3100|3100b|3105|3108|3200|3200a|3300|3510|3510i|3530|3589i|3590|3595|5100|5140|6100|6200|6220|6230|6310|6310i|6385|6510|6610|6610i|6800|6810|6820|7210|7250|7250i|7600|8310|8390|8910|8910i", |
5736 | N6510ReplyFunctions, | 5840 | N6510ReplyFunctions, |
5737 | N6510_Initialise, | 5841 | N6510_Initialise, |
5738 | NONEFUNCTION, /* Terminate */ | 5842 | NONEFUNCTION, /* Terminate */ |
@@ -5841,7 +5945,13 @@ GSM_Phone_Functions N6510Phone = { | |||
5841 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ | 5945 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ |
5842 | N6510_GetCalendarSettings, | 5946 | N6510_GetCalendarSettings, |
5843 | NOTSUPPORTED, /* SetCalendarSettings*/ | 5947 | NOTSUPPORTED, /* SetCalendarSettings*/ |
5948 | N6510_GetNoteStatus, | ||
5949 | NOTIMPLEMENTED, /* GetNote */ | ||
5844 | N6510_GetNextNote, | 5950 | N6510_GetNextNote, |
5951 | NOTIMPLEMENTED, /* SetNote */ | ||
5952 | N6510_AddNote, | ||
5953 | N6510_DeleteNote, | ||
5954 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
5845 | N6510_GetProfile, | 5955 | N6510_GetProfile, |
5846 | N6510_SetProfile, | 5956 | N6510_SetProfile, |
5847 | N6510_GetFMStation, | 5957 | N6510_GetFMStation, |
diff --git a/gammu/emb/common/phone/nokia/nauto.c b/gammu/emb/common/phone/nokia/nauto.c index 3bb53ec..3c7f2cd 100644 --- a/gammu/emb/common/phone/nokia/nauto.c +++ b/gammu/emb/common/phone/nokia/nauto.c | |||
@@ -121,7 +121,13 @@ GSM_Phone_Functions NAUTOPhone = { | |||
121 | NOTSUPPORTED, /* DeleteAllCalendar*/ | 121 | NOTSUPPORTED, /* DeleteAllCalendar*/ |
122 | NOTSUPPORTED, /* GetCalendarSettings*/ | 122 | NOTSUPPORTED, /* GetCalendarSettings*/ |
123 | NOTSUPPORTED, /* SetCalendarSettings*/ | 123 | NOTSUPPORTED, /* SetCalendarSettings*/ |
124 | NOTSUPPORTED, /* GetNoteStatus */ | ||
125 | NOTSUPPORTED, /* GetNote */ | ||
124 | NOTSUPPORTED, /* GetNextNote */ | 126 | NOTSUPPORTED, /* GetNextNote */ |
127 | NOTSUPPORTED, /* SetNote */ | ||
128 | NOTSUPPORTED, /* AddNote */ | ||
129 | NOTSUPPORTED, /* DeleteNote */ | ||
130 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
125 | NOTSUPPORTED, /* GetProfile */ | 131 | NOTSUPPORTED, /* GetProfile */ |
126 | NOTSUPPORTED, /* SetProfile */ | 132 | NOTSUPPORTED, /* SetProfile */ |
127 | NOTSUPPORTED, /* GetFMStation */ | 133 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/obex/obexgen.c b/gammu/emb/common/phone/obex/obexgen.c index 3106369..b91afac 100644 --- a/gammu/emb/common/phone/obex/obexgen.c +++ b/gammu/emb/common/phone/obex/obexgen.c | |||
@@ -829,7 +829,13 @@ GSM_Phone_Functions OBEXGENPhone = { | |||
829 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ | 829 | NOTIMPLEMENTED, /* DeleteAllCalendar*/ |
830 | NOTSUPPORTED, /* GetCalendarSettings*/ | 830 | NOTSUPPORTED, /* GetCalendarSettings*/ |
831 | NOTSUPPORTED, /* SetCalendarSettings*/ | 831 | NOTSUPPORTED, /* SetCalendarSettings*/ |
832 | NOTSUPPORTED, /* GetNoteStatus */ | ||
833 | NOTSUPPORTED, /* GetNote */ | ||
832 | NOTSUPPORTED, /* GetNextNote */ | 834 | NOTSUPPORTED, /* GetNextNote */ |
835 | NOTSUPPORTED, /* SetNote */ | ||
836 | NOTSUPPORTED, /* AddNote */ | ||
837 | NOTSUPPORTED, /* DeleteNote */ | ||
838 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
833 | NOTIMPLEMENTED, /* GetProfile */ | 839 | NOTIMPLEMENTED, /* GetProfile */ |
834 | NOTIMPLEMENTED, /* SetProfile */ | 840 | NOTIMPLEMENTED, /* SetProfile */ |
835 | NOTIMPLEMENTED, /* GetFMStation */ | 841 | NOTIMPLEMENTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/phone/pfunc.c b/gammu/emb/common/phone/pfunc.c index a03a81d..fe890fc 100644 --- a/gammu/emb/common/phone/pfunc.c +++ b/gammu/emb/common/phone/pfunc.c | |||
@@ -61,6 +61,7 @@ GSM_Error PHONE_EncodeSMSFrame(GSM_StateMachine *s, GSM_SMSMessage *SMS, unsigne | |||
61 | } | 61 | } |
62 | if (SMS->PDU == SMS_Deliver) { | 62 | if (SMS->PDU == SMS_Deliver) { |
63 | if (SMS->SMSC.Number[0] == 0x00 && SMS->SMSC.Number[1] == 0x00) { | 63 | if (SMS->SMSC.Number[0] == 0x00 && SMS->SMSC.Number[1] == 0x00) { |
64 | smprintf(s,"No SMSC in SMS Deliver\n"); | ||
64 | return ERR_EMPTYSMSC; | 65 | return ERR_EMPTYSMSC; |
65 | } | 66 | } |
66 | } | 67 | } |
diff --git a/gammu/emb/common/phone/symbian/mroutgen.c b/gammu/emb/common/phone/symbian/mroutgen.c index a7382cf..63d26cf 100644 --- a/gammu/emb/common/phone/symbian/mroutgen.c +++ b/gammu/emb/common/phone/symbian/mroutgen.c | |||
@@ -198,7 +198,13 @@ GSM_Phone_Functions MROUTERGENPhone = { | |||
198 | NOTSUPPORTED, /* DeleteAllCalendar*/ | 198 | NOTSUPPORTED, /* DeleteAllCalendar*/ |
199 | NOTSUPPORTED, /* GetCalendarSettings*/ | 199 | NOTSUPPORTED, /* GetCalendarSettings*/ |
200 | NOTSUPPORTED, /* SetCalendarSettings*/ | 200 | NOTSUPPORTED, /* SetCalendarSettings*/ |
201 | NOTSUPPORTED, /* GetNoteStatus */ | ||
202 | NOTSUPPORTED, /* GetNote */ | ||
201 | NOTSUPPORTED, /* GetNextNote */ | 203 | NOTSUPPORTED, /* GetNextNote */ |
204 | NOTSUPPORTED, /* SetNote */ | ||
205 | NOTSUPPORTED, /* AddNote */ | ||
206 | NOTSUPPORTED, /* DeleteNote */ | ||
207 | NOTSUPPORTED, /* DeleteAllNotes */ | ||
202 | NOTSUPPORTED, /* GetProfile */ | 208 | NOTSUPPORTED, /* GetProfile */ |
203 | NOTSUPPORTED, /* SetProfile */ | 209 | NOTSUPPORTED, /* SetProfile */ |
204 | NOTSUPPORTED, /* GetFMStation */ | 210 | NOTSUPPORTED, /* GetFMStation */ |
diff --git a/gammu/emb/common/protocol/nokia/fbus2.c b/gammu/emb/common/protocol/nokia/fbus2.c index 2b41f8b..967eaa4 100644 --- a/gammu/emb/common/protocol/nokia/fbus2.c +++ b/gammu/emb/common/protocol/nokia/fbus2.c | |||
@@ -4,6 +4,15 @@ | |||
4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #include "../../gsmstate.h" | 17 | #include "../../gsmstate.h" |
9 | 18 | ||
@@ -145,6 +154,7 @@ static GSM_Error FBUS2_StateMachine(GSM_StateMachine *s, unsigned char rx_char) | |||
145 | s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE) { | 154 | s->di.dl==DL_TEXTDATE || s->di.dl==DL_TEXTALLDATE) { |
146 | smprintf(s, "[Received Ack of type %02x, seq %02x]\n",d->Msg.Buffer[0],seq_num); | 155 | smprintf(s, "[Received Ack of type %02x, seq %02x]\n",d->Msg.Buffer[0],seq_num); |
147 | } | 156 | } |
157 | free(d->Msg.Buffer); | ||
148 | 158 | ||
149 | d->MsgRXState = RX_Sync; | 159 | d->MsgRXState = RX_Sync; |
150 | return ERR_NONE; | 160 | return ERR_NONE; |
diff --git a/gammu/emb/common/protocol/nokia/fbus2.h b/gammu/emb/common/protocol/nokia/fbus2.h index 8dbcb07..3d31006 100644 --- a/gammu/emb/common/protocol/nokia/fbus2.h +++ b/gammu/emb/common/protocol/nokia/fbus2.h | |||
@@ -4,6 +4,15 @@ | |||
4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 4 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
5 | * GNU GPL version 2 or later | 5 | * GNU GPL version 2 or later |
6 | */ | 6 | */ |
7 | /* Due to a problem in the source code management, the names of some of | ||
8 | * the authors have unfortunately been lost. We do not mean to belittle | ||
9 | * their efforts and hope they will contact us to see their names | ||
10 | * properly added to the Copyright notice above. | ||
11 | * Having published their contributions under the terms of the GNU | ||
12 | * General Public License (GPL) [version 2], the Copyright of these | ||
13 | * authors will remain respected by adhering to the license they chose | ||
14 | * to publish their code under. | ||
15 | */ | ||
7 | 16 | ||
8 | #ifndef fbus2_h | 17 | #ifndef fbus2_h |
9 | #define fbus2_h | 18 | #define fbus2_h |
diff --git a/gammu/emb/common/protocol/nokia/phonet.c b/gammu/emb/common/protocol/nokia/phonet.c index db5bd72..495a1bf 100644 --- a/gammu/emb/common/protocol/nokia/phonet.c +++ b/gammu/emb/common/protocol/nokia/phonet.c | |||
@@ -3,6 +3,15 @@ | |||
3 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 3 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
4 | * GNU GPL version 2 or later | 4 | * GNU GPL version 2 or later |
5 | */ | 5 | */ |
6 | /* Due to a problem in the source code management, the names of some of | ||
7 | * the authors have unfortunately been lost. We do not mean to belittle | ||
8 | * their efforts and hope they will contact us to see their names | ||
9 | * properly added to the Copyright notice above. | ||
10 | * Having published their contributions under the terms of the GNU | ||
11 | * General Public License (GPL) [version 2], the Copyright of these | ||
12 | * authors will remain respected by adhering to the license they chose | ||
13 | * to publish their code under. | ||
14 | */ | ||
6 | 15 | ||
7 | #include "../../gsmstate.h" | 16 | #include "../../gsmstate.h" |
8 | 17 | ||
diff --git a/gammu/emb/common/protocol/nokia/phonet.h b/gammu/emb/common/protocol/nokia/phonet.h index e750bbd..7626c23 100644 --- a/gammu/emb/common/protocol/nokia/phonet.h +++ b/gammu/emb/common/protocol/nokia/phonet.h | |||
@@ -3,6 +3,15 @@ | |||
3 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot | 3 | * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot |
4 | * GNU GPL version 2 or later | 4 | * GNU GPL version 2 or later |
5 | */ | 5 | */ |
6 | /* Due to a problem in the source code management, the names of some of | ||
7 | * the authors have unfortunately been lost. We do not mean to belittle | ||
8 | * their efforts and hope they will contact us to see their names | ||
9 | * properly added to the Copyright notice above. | ||
10 | * Having published their contributions under the terms of the GNU | ||
11 | * General Public License (GPL) [version 2], the Copyright of these | ||
12 | * authors will remain respected by adhering to the license they chose | ||
13 | * to publish their code under. | ||
14 | */ | ||
6 | 15 | ||
7 | #ifndef PHONET_h | 16 | #ifndef PHONET_h |
8 | #define PHONET_h | 17 | #define PHONET_h |
diff --git a/gammu/emb/common/service/backup/backgen.h b/gammu/emb/common/service/backup/backgen.h index 9a930fc..9d97954 100644 --- a/gammu/emb/common/service/backup/backgen.h +++ b/gammu/emb/common/service/backup/backgen.h | |||
@@ -64,7 +64,7 @@ typedef struct { | |||
64 | } GSM_SMS_Backup; | 64 | } GSM_SMS_Backup; |
65 | 65 | ||
66 | extern GSM_Error GSM_ReadSMSBackupFile(char *FileName, GSM_SMS_Backup *backup); | 66 | extern GSM_Error GSM_ReadSMSBackupFile(char *FileName, GSM_SMS_Backup *backup); |
67 | extern GSM_Error GSM_SaveSMSBackupFile(char *FileName, GSM_SMS_Backup *backup); | 67 | extern GSM_Error GSM_AddSMSBackupFile (char *FileName, GSM_SMS_Backup *backup); |
68 | 68 | ||
69 | #endif | 69 | #endif |
70 | 70 | ||
diff --git a/gammu/emb/common/service/backup/backtext.c b/gammu/emb/common/service/backup/backtext.c index 4cb1bb7..07a3b22 100644 --- a/gammu/emb/common/service/backup/backtext.c +++ b/gammu/emb/common/service/backup/backtext.c | |||
@@ -2996,7 +2996,7 @@ GSM_Error GSM_ReadSMSBackupFile(char *FileName, GSM_SMS_Backup *backup) | |||
2996 | return GSM_ReadSMSBackupTextFile(FileName, backup); | 2996 | return GSM_ReadSMSBackupTextFile(FileName, backup); |
2997 | } | 2997 | } |
2998 | 2998 | ||
2999 | GSM_Error SaveSMSBackupTextFile(FILE *file, GSM_SMS_Backup *backup) | 2999 | static GSM_Error SaveSMSBackupTextFile(FILE *file, GSM_SMS_Backup *backup) |
3000 | { | 3000 | { |
3001 | int i,w,current; | 3001 | int i,w,current; |
3002 | unsigned char buffer[10000]; | 3002 | unsigned char buffer[10000]; |
@@ -3004,7 +3004,11 @@ GSM_Error SaveSMSBackupTextFile(FILE *file, GSM_SMS_Backup *backup) | |||
3004 | 3004 | ||
3005 | fprintf(file,"\n# File created by Gammu (www.mwiacek.com) version %s\n",VERSION); | 3005 | fprintf(file,"\n# File created by Gammu (www.mwiacek.com) version %s\n",VERSION); |
3006 | GSM_GetCurrentDateTime (&DT); | 3006 | GSM_GetCurrentDateTime (&DT); |
3007 | fprintf(file,"# Saved %s\n\n",OSDateTime(DT,false)); | 3007 | fprintf(file,"# Saved "); |
3008 | fprintf(file, "%04d%02d%02dT%02d%02d%02d", | ||
3009 | DT.Year, DT.Month, DT.Day, | ||
3010 | DT.Hour, DT.Minute, DT.Second); | ||
3011 | fprintf(file," (%s)\n\n",OSDateTime(DT,false)); | ||
3008 | 3012 | ||
3009 | i=0; | 3013 | i=0; |
3010 | while (backup->SMS[i]!=NULL) { | 3014 | while (backup->SMS[i]!=NULL) { |
@@ -3088,11 +3092,11 @@ GSM_Error SaveSMSBackupTextFile(FILE *file, GSM_SMS_Backup *backup) | |||
3088 | return ERR_NONE; | 3092 | return ERR_NONE; |
3089 | } | 3093 | } |
3090 | 3094 | ||
3091 | GSM_Error GSM_SaveSMSBackupFile(char *FileName, GSM_SMS_Backup *backup) | 3095 | GSM_Error GSM_AddSMSBackupFile(char *FileName, GSM_SMS_Backup *backup) |
3092 | { | 3096 | { |
3093 | FILE *file; | 3097 | FILE *file; |
3094 | 3098 | ||
3095 | file = fopen(FileName, "wb"); | 3099 | file = fopen(FileName, "ab"); |
3096 | if (file == NULL) return(ERR_CANTOPENFILE); | 3100 | if (file == NULL) return(ERR_CANTOPENFILE); |
3097 | 3101 | ||
3098 | SaveSMSBackupTextFile(file,backup); | 3102 | SaveSMSBackupTextFile(file,backup); |
diff --git a/gammu/emb/common/service/gsmring.h b/gammu/emb/common/service/gsmring.h index 2d2dd7a..33e5424 100644 --- a/gammu/emb/common/service/gsmring.h +++ b/gammu/emb/common/service/gsmring.h | |||
@@ -171,7 +171,7 @@ typedef struct { | |||
171 | 171 | ||
172 | typedef struct { | 172 | typedef struct { |
173 | int Number; | 173 | int Number; |
174 | GSM_RingtoneInfo Ringtone[100]; | 174 | GSM_RingtoneInfo *Ringtone; |
175 | } GSM_AllRingtonesInfo; | 175 | } GSM_AllRingtonesInfo; |
176 | 176 | ||
177 | GSM_Error GSM_SaveRingtoneFile(char *FileName, GSM_Ringtone *ringtone); | 177 | GSM_Error GSM_SaveRingtoneFile(char *FileName, GSM_Ringtone *ringtone); |
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c index 684e67c..4c6486d 100644 --- a/gammu/emb/gammu/gammu.c +++ b/gammu/emb/gammu/gammu.c | |||
@@ -435,7 +435,7 @@ static void SetAlarm(int argc, char *argv[]) | |||
435 | } | 435 | } |
436 | 436 | ||
437 | GSM_Bitmap caller[5]; | 437 | GSM_Bitmap caller[5]; |
438 | GSM_AllRingtonesInfo Info; | 438 | GSM_AllRingtonesInfo Info = {0, NULL}; |
439 | bool callerinit[5] = {false, false, false, false, false}; | 439 | bool callerinit[5] = {false, false, false, false, false}; |
440 | bool ringinit = false; | 440 | bool ringinit = false; |
441 | 441 | ||
@@ -564,12 +564,15 @@ static void GetAllMemory(int argc, char *argv[]) | |||
564 | while (!gshutdown) { | 564 | while (!gshutdown) { |
565 | error = Phone->GetNextMemory(&s, &Entry, start); | 565 | error = Phone->GetNextMemory(&s, &Entry, start); |
566 | if (error == ERR_EMPTY) break; | 566 | if (error == ERR_EMPTY) break; |
567 | if (error != ERR_NONE && Info.Ringtone) free(Info.Ringtone); | ||
567 | Print_Error(error); | 568 | Print_Error(error); |
568 | printmsg("Memory %s, Location %i\n",argv[2],Entry.Location); | 569 | printmsg("Memory %s, Location %i\n",argv[2],Entry.Location); |
569 | PrintMemoryEntry(&Entry); | 570 | PrintMemoryEntry(&Entry); |
570 | start = false; | 571 | start = false; |
571 | } | 572 | } |
572 | 573 | ||
574 | if (Info.Ringtone) free(Info.Ringtone); | ||
575 | |||
573 | GSM_Terminate(); | 576 | GSM_Terminate(); |
574 | } | 577 | } |
575 | 578 | ||
@@ -617,7 +620,10 @@ static void GetMemory(int argc, char *argv[]) | |||
617 | entry.Location=j; | 620 | entry.Location=j; |
618 | 621 | ||
619 | error=Phone->GetMemory(&s, &entry); | 622 | error=Phone->GetMemory(&s, &entry); |
620 | if (error != ERR_EMPTY) Print_Error(error); | 623 | if (error != ERR_EMPTY) { |
624 | if (Info.Ringtone) free(Info.Ringtone); | ||
625 | Print_Error(error); | ||
626 | } | ||
621 | 627 | ||
622 | if (error == ERR_EMPTY) { | 628 | if (error == ERR_EMPTY) { |
623 | emptynum++; | 629 | emptynum++; |
@@ -634,6 +640,8 @@ static void GetMemory(int argc, char *argv[]) | |||
634 | 640 | ||
635 | printmsg("%i entries empty, %i entries filled\n",emptynum,fillednum); | 641 | printmsg("%i entries empty, %i entries filled\n",emptynum,fillednum); |
636 | 642 | ||
643 | if (Info.Ringtone) free(Info.Ringtone); | ||
644 | |||
637 | GSM_Terminate(); | 645 | GSM_Terminate(); |
638 | } | 646 | } |
639 | 647 | ||
@@ -1623,17 +1631,20 @@ static void GetRingtone(int argc, char *argv[]) | |||
1623 | 1631 | ||
1624 | static void GetRingtonesList(int argc, char *argv[]) | 1632 | static void GetRingtonesList(int argc, char *argv[]) |
1625 | { | 1633 | { |
1626 | GSM_AllRingtonesInfo Info; | 1634 | GSM_AllRingtonesInfo Info = {0, NULL}; |
1627 | int i; | 1635 | int i; |
1628 | 1636 | ||
1629 | GSM_Init(true); | 1637 | GSM_Init(true); |
1630 | 1638 | ||
1631 | error=Phone->GetRingtonesInfo(&s,&Info); | 1639 | error=Phone->GetRingtonesInfo(&s,&Info); |
1640 | if (error != ERR_NONE && Info.Ringtone) free(Info.Ringtone); | ||
1632 | Print_Error(error); | 1641 | Print_Error(error); |
1633 | 1642 | ||
1634 | GSM_Terminate(); | 1643 | GSM_Terminate(); |
1635 | 1644 | ||
1636 | for (i=0;i<Info.Number;i++) printmsg("%i. \"%s\"\n",i,DecodeUnicodeConsole(Info.Ringtone[i].Name)); | 1645 | for (i=0;i<Info.Number;i++) printmsg("%i. \"%s\"\n",i,DecodeUnicodeConsole(Info.Ringtone[i].Name)); |
1646 | |||
1647 | if (Info.Ringtone) free(Info.Ringtone); | ||
1637 | } | 1648 | } |
1638 | 1649 | ||
1639 | static void DialVoice(int argc, char *argv[]) | 1650 | static void DialVoice(int argc, char *argv[]) |
@@ -2177,7 +2188,7 @@ static void GetBitmap(int argc, char *argv[]) | |||
2177 | GSM_File File; | 2188 | GSM_File File; |
2178 | GSM_MultiBitmap MultiBitmap; | 2189 | GSM_MultiBitmap MultiBitmap; |
2179 | int location=0; | 2190 | int location=0; |
2180 | GSM_AllRingtonesInfo Info; | 2191 | GSM_AllRingtonesInfo Info = {0, NULL}; |
2181 | 2192 | ||
2182 | if (mystrncasecmp(argv[2],"STARTUP",0)) { | 2193 | if (mystrncasecmp(argv[2],"STARTUP",0)) { |
2183 | MultiBitmap.Bitmap[0].Type=GSM_StartupLogo; | 2194 | MultiBitmap.Bitmap[0].Type=GSM_StartupLogo; |
@@ -2248,6 +2259,8 @@ static void GetBitmap(int argc, char *argv[]) | |||
2248 | } else { | 2259 | } else { |
2249 | printmsg("ID %i\n",MultiBitmap.Bitmap[0].RingtoneID); | 2260 | printmsg("ID %i\n",MultiBitmap.Bitmap[0].RingtoneID); |
2250 | } | 2261 | } |
2262 | |||
2263 | if (Info.Ringtone) free(Info.Ringtone); | ||
2251 | } | 2264 | } |
2252 | if (MultiBitmap.Bitmap[0].BitmapEnabled) { | 2265 | if (MultiBitmap.Bitmap[0].BitmapEnabled) { |
2253 | printmsg("Bitmap : enabled\n"); | 2266 | printmsg("Bitmap : enabled\n"); |
@@ -4645,6 +4658,7 @@ static void Restore(int argc, char *argv[]) | |||
4645 | GSM_MemoryStatusMemStatus; | 4658 | GSM_MemoryStatusMemStatus; |
4646 | GSM_ToDoEntry ToDo; | 4659 | GSM_ToDoEntry ToDo; |
4647 | GSM_ToDoStatus ToDoStatus; | 4660 | GSM_ToDoStatus ToDoStatus; |
4661 | GSM_NoteEntry Note; | ||
4648 | GSM_Profile Profile; | 4662 | GSM_Profile Profile; |
4649 | GSM_MultiWAPSettingsSettings; | 4663 | GSM_MultiWAPSettingsSettings; |
4650 | GSM_GPRSAccessPointGPRSPoint; | 4664 | GSM_GPRSAccessPointGPRSPoint; |
@@ -4914,6 +4928,42 @@ static void Restore(int argc, char *argv[]) | |||
4914 | printmsgerr("\n"); | 4928 | printmsgerr("\n"); |
4915 | } | 4929 | } |
4916 | 4930 | ||
4931 | DoRestore = false; | ||
4932 | if (Backup.ToDo[0] != NULL) { | ||
4933 | error = Phone->GetNotesStatus(&s,&ToDoStatus); | ||
4934 | if (error == ERR_NONE) { | ||
4935 | max = 0; | ||
4936 | while (Backup.Note[max]!=NULL) max++; | ||
4937 | printmsgerr("%i entries in backup file\n",max); | ||
4938 | |||
4939 | if (answer_yes("Restore Notes")) DoRestore = true; | ||
4940 | } | ||
4941 | } | ||
4942 | if (DoRestore) { | ||
4943 | printmsgerr("Deleting old Notes: "); | ||
4944 | while (1) { | ||
4945 | error = Phone->GetNextNote(&s,&Note,true); | ||
4946 | if (error != ERR_NONE) break; | ||
4947 | error = Phone->DeleteNote(&s,&Note); | ||
4948 | Print_Error(error); | ||
4949 | printmsgerr("*"); | ||
4950 | } | ||
4951 | printmsgerr("\n"); | ||
4952 | |||
4953 | for (i=0;i<max;i++) { | ||
4954 | Note = *Backup.Note[i]; | ||
4955 | Note.Location = 0; | ||
4956 | error=Phone->AddNote(&s,&Note); | ||
4957 | Print_Error(error); | ||
4958 | printmsgerr("%cWriting: %i percent",13,(i+1)*100/max); | ||
4959 | if (gshutdown) { | ||
4960 | GSM_Terminate(); | ||
4961 | exit(0); | ||
4962 | } | ||
4963 | } | ||
4964 | printmsgerr("\n"); | ||
4965 | } | ||
4966 | |||
4917 | if (Backup.SMSC[0] != NULL && answer_yes("Restore SMSC profiles")) { | 4967 | if (Backup.SMSC[0] != NULL && answer_yes("Restore SMSC profiles")) { |
4918 | max = 0; | 4968 | max = 0; |
4919 | while (Backup.SMSC[max]!=NULL) max++; | 4969 | while (Backup.SMSC[max]!=NULL) max++; |
@@ -5287,6 +5337,7 @@ static void ClearAll(int argc, char *argv[]) | |||
5287 | GSM_ToDoStatus ToDoStatus; | 5337 | GSM_ToDoStatus ToDoStatus; |
5288 | GSM_CalendarEntryCalendar; | 5338 | GSM_CalendarEntryCalendar; |
5289 | GSM_ToDoEntry ToDo; | 5339 | GSM_ToDoEntry ToDo; |
5340 | GSM_NoteEntry Note; | ||
5290 | GSM_WAPBookmark Bookmark; | 5341 | GSM_WAPBookmark Bookmark; |
5291 | GSM_FMStation Station; | 5342 | GSM_FMStation Station; |
5292 | GSM_MemoryEntry Pbk; | 5343 | GSM_MemoryEntry Pbk; |
@@ -5396,6 +5447,23 @@ static void ClearAll(int argc, char *argv[]) | |||
5396 | } | 5447 | } |
5397 | } | 5448 | } |
5398 | 5449 | ||
5450 | DoClear = false; | ||
5451 | error = Phone->GetNotesStatus(&s,&ToDoStatus); | ||
5452 | if (error == ERR_NONE && ToDoStatus.Used != 0) { | ||
5453 | if (answer_yes("Delete Notes")) DoClear = true; | ||
5454 | } | ||
5455 | if (DoClear) { | ||
5456 | printmsgerr("Deleting: "); | ||
5457 | while (1) { | ||
5458 | error = Phone->GetNextNote(&s,&Note,true); | ||
5459 | if (error != ERR_NONE) break; | ||
5460 | error = Phone->DeleteNote(&s,&Note); | ||
5461 | Print_Error(error); | ||
5462 | printmsgerr("*"); | ||
5463 | } | ||
5464 | printmsgerr("\n"); | ||
5465 | } | ||
5466 | |||
5399 | Bookmark.Location = 1; | 5467 | Bookmark.Location = 1; |
5400 | error = Phone->GetWAPBookmark(&s,&Bookmark); | 5468 | error = Phone->GetWAPBookmark(&s,&Bookmark); |
5401 | if (error == ERR_NONE || error == ERR_INVALIDLOCATION) { | 5469 | if (error == ERR_NONE || error == ERR_INVALIDLOCATION) { |
@@ -5644,16 +5712,9 @@ static void BackupSMS(int argc, char *argv[]) | |||
5644 | bool BackupFromFolder[GSM_MAX_SMS_FOLDERS]; | 5712 | bool BackupFromFolder[GSM_MAX_SMS_FOLDERS]; |
5645 | bool start = true; | 5713 | bool start = true; |
5646 | bool DeleteAfter; | 5714 | bool DeleteAfter; |
5647 | int j, smsnum; | 5715 | int j, smsnum = 0; |
5648 | char buffer[200]; | 5716 | char buffer[200]; |
5649 | 5717 | ||
5650 | /* We ignore return code, because (when file doesn't exist) we | ||
5651 | * will create new later | ||
5652 | */ | ||
5653 | GSM_ReadSMSBackupFile(argv[2], &Backup); | ||
5654 | smsnum = 0; | ||
5655 | while (Backup.SMS[smsnum]!=NULL) smsnum++; | ||
5656 | |||
5657 | GSM_Init(true); | 5718 | GSM_Init(true); |
5658 | 5719 | ||
5659 | error=Phone->GetSMSFolders(&s, &folders); | 5720 | error=Phone->GetSMSFolders(&s, &folders); |
@@ -5664,6 +5725,7 @@ static void BackupSMS(int argc, char *argv[]) | |||
5664 | for (j=0;j<folders.Number;j++) { | 5725 | for (j=0;j<folders.Number;j++) { |
5665 | BackupFromFolder[j] = false; | 5726 | BackupFromFolder[j] = false; |
5666 | sprintf(buffer,"Backup sms from folder \"%s\"",DecodeUnicodeConsole(folders.Folder[j].Name)); | 5727 | sprintf(buffer,"Backup sms from folder \"%s\"",DecodeUnicodeConsole(folders.Folder[j].Name)); |
5728 | if (folders.Folder[j].Memory == MEM_SM) strcat(buffer," (SIM)"); | ||
5667 | if (answer_yes(buffer)) BackupFromFolder[j] = true; | 5729 | if (answer_yes(buffer)) BackupFromFolder[j] = true; |
5668 | } | 5730 | } |
5669 | 5731 | ||
@@ -5702,7 +5764,7 @@ static void BackupSMS(int argc, char *argv[]) | |||
5702 | start=false; | 5764 | start=false; |
5703 | } | 5765 | } |
5704 | 5766 | ||
5705 | error = GSM_SaveSMSBackupFile(argv[2],&Backup); | 5767 | error = GSM_AddSMSBackupFile(argv[2],&Backup); |
5706 | Print_Error(error); | 5768 | Print_Error(error); |
5707 | 5769 | ||
5708 | if (DeleteAfter) { | 5770 | if (DeleteAfter) { |
@@ -5754,24 +5816,34 @@ static void RestoreSMS(int argc, char *argv[]) | |||
5754 | GSM_SMSFolders folders; | 5816 | GSM_SMSFolders folders; |
5755 | int smsnum = 0; | 5817 | int smsnum = 0; |
5756 | char buffer[200]; | 5818 | char buffer[200]; |
5819 | bool restore8bit,doit; | ||
5757 | 5820 | ||
5758 | error=GSM_ReadSMSBackupFile(argv[2], &Backup); | 5821 | error=GSM_ReadSMSBackupFile(argv[2], &Backup); |
5759 | Print_Error(error); | 5822 | Print_Error(error); |
5760 | 5823 | ||
5824 | sprintf(buffer,"Do you want to restore binary SMS"); | ||
5825 | restore8bit = answer_yes(buffer); | ||
5826 | |||
5761 | GSM_Init(true); | 5827 | GSM_Init(true); |
5762 | 5828 | ||
5763 | error=Phone->GetSMSFolders(&s, &folders); | 5829 | error=Phone->GetSMSFolders(&s, &folders); |
5764 | Print_Error(error); | 5830 | Print_Error(error); |
5765 | 5831 | ||
5766 | while (Backup.SMS[smsnum] != NULL) { | 5832 | while (Backup.SMS[smsnum] != NULL) { |
5833 | doit = true; | ||
5834 | if (!restore8bit && Backup.SMS[smsnum]->Coding == SMS_Coding_8bit) doit = false; | ||
5835 | if (doit) { | ||
5767 | SMS.Number = 1; | 5836 | SMS.Number = 1; |
5768 | memcpy(&SMS.SMS[0],Backup.SMS[smsnum],sizeof(GSM_SMSMessage)); | 5837 | memcpy(&SMS.SMS[0],Backup.SMS[smsnum],sizeof(GSM_SMSMessage)); |
5769 | displaymultismsinfo(SMS,false,false); | 5838 | displaymultismsinfo(SMS,false,false); |
5770 | sprintf(buffer,"Restore sms to folder \"%s\"",DecodeUnicodeConsole(folders.Folder[Backup.SMS[smsnum]->Folder-1].Name)); | 5839 | sprintf(buffer,"Restore %03i sms to folder \"%s\"",smsnum+1,DecodeUnicodeConsole(folders.Folder[Backup.SMS[smsnum]->Folder-1].Name)); |
5840 | if (folders.Folder[Backup.SMS[smsnum]->Folder-1].Memory == MEM_SM) strcat(buffer," (SIM)"); | ||
5771 | if (answer_yes(buffer)) { | 5841 | if (answer_yes(buffer)) { |
5842 | smprintf(&s,"saving %i SMS\n",smsnum); | ||
5772 | error=Phone->AddSMS(&s, Backup.SMS[smsnum]); | 5843 | error=Phone->AddSMS(&s, Backup.SMS[smsnum]); |
5773 | Print_Error(error); | 5844 | Print_Error(error); |
5774 | } | 5845 | } |
5846 | } | ||
5775 | smsnum++; | 5847 | smsnum++; |
5776 | } | 5848 | } |
5777 | 5849 | ||
@@ -6360,7 +6432,7 @@ static void GetProfile(int argc, char *argv[]) | |||
6360 | int start,stop,j,k; | 6432 | int start,stop,j,k; |
6361 | GSM_Bitmap caller[5]; | 6433 | GSM_Bitmap caller[5]; |
6362 | bool callerinit[5],special; | 6434 | bool callerinit[5],special; |
6363 | GSM_AllRingtonesInfo Info; | 6435 | GSM_AllRingtonesInfo Info = {0, NULL}; |
6364 | 6436 | ||
6365 | GetStartStop(&start, &stop, 2, argc, argv); | 6437 | GetStartStop(&start, &stop, 2, argc, argv); |
6366 | 6438 | ||
@@ -6374,6 +6446,7 @@ static void GetProfile(int argc, char *argv[]) | |||
6374 | for (i=start;i<=stop;i++) { | 6446 | for (i=start;i<=stop;i++) { |
6375 | Profile.Location=i; | 6447 | Profile.Location=i; |
6376 | error=Phone->GetProfile(&s,&Profile); | 6448 | error=Phone->GetProfile(&s,&Profile); |
6449 | if (error != ERR_NONE && Info.Ringtone) free(Info.Ringtone); | ||
6377 | Print_Error(error); | 6450 | Print_Error(error); |
6378 | 6451 | ||
6379 | printmsg("%i. \"%s\"",i,DecodeUnicodeConsole(Profile.Name)); | 6452 | printmsg("%i. \"%s\"",i,DecodeUnicodeConsole(Profile.Name)); |
@@ -6487,6 +6560,8 @@ static void GetProfile(int argc, char *argv[]) | |||
6487 | } | 6560 | } |
6488 | 6561 | ||
6489 | GSM_Terminate(); | 6562 | GSM_Terminate(); |
6563 | |||
6564 | if (Info.Ringtone) free(Info.Ringtone); | ||
6490 | } | 6565 | } |
6491 | 6566 | ||
6492 | static void GetSpeedDial(int argc, char *argv[]) | 6567 | static void GetSpeedDial(int argc, char *argv[]) |
@@ -7979,7 +8054,7 @@ static GSM_Parameters Parameters[] = { | |||
7979 | {"--nokiaaddfile", 2, 5, NokiaAddFile, {H_Filesystem,H_Nokia,0},"Gallery|Tones file [-name name][-protected][-readonly][-system][-hidden][-newtime]"}, | 8054 | {"--nokiaaddfile", 2, 5, NokiaAddFile, {H_Filesystem,H_Nokia,0},"Gallery|Tones file [-name name][-protected][-readonly][-system][-hidden][-newtime]"}, |
7980 | {"--deletefiles", 1,20, DeleteFiles, {H_Filesystem,0}, "fileID"}, | 8055 | {"--deletefiles", 1,20, DeleteFiles, {H_Filesystem,0}, "fileID"}, |
7981 | {"--playringtone", 1, 1, PlayRingtone, {H_Ringtone,0}, "file"}, | 8056 | {"--playringtone", 1, 1, PlayRingtone, {H_Ringtone,0}, "file"}, |
7982 | {"--playsavedringtone", 1, 1, DCT4PlaySavedRingtone, {H_Ringtone,0}, ""}, | 8057 | {"--playsavedringtone", 1, 1, DCT4PlaySavedRingtone, {H_Ringtone,0}, "number"}, |
7983 | {"--getdatetime", 0, 0, GetDateTime, {H_DateTime,0}, ""}, | 8058 | {"--getdatetime", 0, 0, GetDateTime, {H_DateTime,0}, ""}, |
7984 | {"--setdatetime", 0, 0, SetDateTime, {H_DateTime,0}, ""}, | 8059 | {"--setdatetime", 0, 0, SetDateTime, {H_DateTime,0}, ""}, |
7985 | {"--getalarm", 0, 0, GetAlarm, {H_DateTime,0}, ""}, | 8060 | {"--getalarm", 0, 0, GetAlarm, {H_DateTime,0}, ""}, |
diff --git a/gammu/emb/gammu/smsd/s_files.c b/gammu/emb/gammu/smsd/s_files.c index b791e58..e1c626f 100644 --- a/gammu/emb/gammu/smsd/s_files.c +++ b/gammu/emb/gammu/smsd/s_files.c | |||
@@ -66,7 +66,7 @@ static GSM_Error SMSDFiles_SaveInboxSMS(GSM_MultiSMSMessage sms, GSM_SMSDConfig | |||
66 | if (mystrncasecmp(Config->inboxformat, "detail", 0)) { | 66 | if (mystrncasecmp(Config->inboxformat, "detail", 0)) { |
67 | for (j=0;j<sms.Number;j++) backup.SMS[j] = &sms.SMS[j]; | 67 | for (j=0;j<sms.Number;j++) backup.SMS[j] = &sms.SMS[j]; |
68 | backup.SMS[sms.Number] = NULL; | 68 | backup.SMS[sms.Number] = NULL; |
69 | error = GSM_SaveSMSBackupFile(FullName, &backup); | 69 | error = GSM_AddSMSBackupFile(FullName, &backup); |
70 | done = true; | 70 | done = true; |
71 | } | 71 | } |
72 | #endif | 72 | #endif |
diff --git a/gammu/emb/gammu/smsd/smsdcore.c b/gammu/emb/gammu/smsd/smsdcore.c index cc9accc..e69a6e7 100644 --- a/gammu/emb/gammu/smsd/smsdcore.c +++ b/gammu/emb/gammu/smsd/smsdcore.c | |||
@@ -110,11 +110,11 @@ void SMSD_ReadConfig(char *filename, GSM_SMSDConfig *Config, bool log, char *ser | |||
110 | 110 | ||
111 | Config->PINCode=INI_GetValue(smsdcfgfile, "smsd", "PIN", false); | 111 | Config->PINCode=INI_GetValue(smsdcfgfile, "smsd", "PIN", false); |
112 | if (Config->PINCode == NULL) { | 112 | if (Config->PINCode == NULL) { |
113 | if (log) WriteSMSDLog("No PIN code in %s file",filename); | 113 | if (log) WriteSMSDLog("Warning: No PIN code in %s file",filename); |
114 | fprintf(stderr,"No PIN code in %s file\n",filename); | 114 | fprintf(stderr,"Warning: No PIN code in %s file\n",filename); |
115 | exit(-1); | 115 | } else { |
116 | } | ||
117 | if (log) WriteSMSDLog("PIN code is \"%s\"",Config->PINCode); | 116 | if (log) WriteSMSDLog("PIN code is \"%s\"",Config->PINCode); |
117 | } | ||
118 | 118 | ||
119 | str = INI_GetValue(smsdcfgfile, "smsd", "commtimeout", false); | 119 | str = INI_GetValue(smsdcfgfile, "smsd", "commtimeout", false); |
120 | if (str) Config->commtimeout=atoi(str); else Config->commtimeout = 1; | 120 | if (str) Config->commtimeout=atoi(str); else Config->commtimeout = 1; |
@@ -217,6 +217,10 @@ bool SMSD_CheckSecurity(GSM_SMSDConfig *Config) | |||
217 | /* If PIN, try to enter */ | 217 | /* If PIN, try to enter */ |
218 | switch (SecurityCode.Type) { | 218 | switch (SecurityCode.Type) { |
219 | case SEC_Pin: | 219 | case SEC_Pin: |
220 | if (Config->PINCode==NULL) { | ||
221 | WriteSMSDLog("Warning: no PIN in config"); | ||
222 | return false; | ||
223 | } else { | ||
220 | WriteSMSDLog("Trying to enter PIN"); | 224 | WriteSMSDLog("Trying to enter PIN"); |
221 | strcpy(SecurityCode.Code,Config->PINCode); | 225 | strcpy(SecurityCode.Code,Config->PINCode); |
222 | error=Phone->EnterSecurityCode(&s,SecurityCode); | 226 | error=Phone->EnterSecurityCode(&s,SecurityCode); |
@@ -227,6 +231,7 @@ bool SMSD_CheckSecurity(GSM_SMSDConfig *Config) | |||
227 | WriteSMSDLog("Error entering PIN (%i)", error); | 231 | WriteSMSDLog("Error entering PIN (%i)", error); |
228 | return false; | 232 | return false; |
229 | } | 233 | } |
234 | } | ||
230 | break; | 235 | break; |
231 | case SEC_SecurityCode: | 236 | case SEC_SecurityCode: |
232 | case SEC_Pin2: | 237 | case SEC_Pin2: |