author | zautrix <zautrix> | 2004-10-06 19:43:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-06 19:43:06 (UTC) |
commit | ed4675de07d947f55d2672c721599e3a0af1e24b (patch) (unidiff) | |
tree | f143fd171dab8a8d05bf08ffd7efb84cffe3cb97 | |
parent | be3a5ea82c9a160eeeaad187a357c9a085fdb20a (diff) | |
download | kdepimpi-ed4675de07d947f55d2672c721599e3a0af1e24b.zip kdepimpi-ed4675de07d947f55d2672c721599e3a0af1e24b.tar.gz kdepimpi-ed4675de07d947f55d2672c721599e3a0af1e24b.tar.bz2 |
bugfixes
-rw-r--r-- | gammu/emb/common/gsmstate.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gammu/emb/common/gsmstate.h b/gammu/emb/common/gsmstate.h index f15a6a7..2b4806c 100644 --- a/gammu/emb/common/gsmstate.h +++ b/gammu/emb/common/gsmstate.h | |||
@@ -116,96 +116,97 @@ typedef struct _GSM_Reply_Function GSM_Reply_Function; | |||
116 | #ifdef GSM_ENABLE_MBUS2 | 116 | #ifdef GSM_ENABLE_MBUS2 |
117 | # include "protocol/nokia/mbus2.h" | 117 | # include "protocol/nokia/mbus2.h" |
118 | #endif | 118 | #endif |
119 | #if defined(GSM_ENABLE_PHONETBLUE) || defined(GSM_ENABLE_IRDAPHONET) || defined(GSM_ENABLE_BLUEPHONET) | 119 | #if defined(GSM_ENABLE_PHONETBLUE) || defined(GSM_ENABLE_IRDAPHONET) || defined(GSM_ENABLE_BLUEPHONET) |
120 | # include "protocol/nokia/phonet.h" | 120 | # include "protocol/nokia/phonet.h" |
121 | #endif | 121 | #endif |
122 | #if defined(GSM_ENABLE_AT) || defined(GSM_ENABLE_BLUEAT) || defined(GSM_ENABLE_IRDAAT) | 122 | #if defined(GSM_ENABLE_AT) || defined(GSM_ENABLE_BLUEAT) || defined(GSM_ENABLE_IRDAAT) |
123 | # include "protocol/at/at.h" | 123 | # include "protocol/at/at.h" |
124 | #endif | 124 | #endif |
125 | #ifdef GSM_ENABLE_ALCABUS | 125 | #ifdef GSM_ENABLE_ALCABUS |
126 | # include "protocol/alcatel/alcabus.h" | 126 | # include "protocol/alcatel/alcabus.h" |
127 | #endif | 127 | #endif |
128 | #if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX) | 128 | #if defined(GSM_ENABLE_IRDAOBEX) || defined(GSM_ENABLE_BLUEOBEX) |
129 | # include "protocol/obex/obex.h" | 129 | # include "protocol/obex/obex.h" |
130 | #endif | 130 | #endif |
131 | #if defined(GSM_ENABLE_MROUTERBLUE) | 131 | #if defined(GSM_ENABLE_MROUTERBLUE) |
132 | # include "protocol/symbian/mrouter.h" | 132 | # include "protocol/symbian/mrouter.h" |
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | #define GSM_ENABLE_SERIALDEVICE | 135 | #define GSM_ENABLE_SERIALDEVICE |
136 | #ifndef GSM_USED_SERIALDEVICE | 136 | #ifndef GSM_USED_SERIALDEVICE |
137 | # undef GSM_ENABLE_SERIALDEVICE | 137 | # undef GSM_ENABLE_SERIALDEVICE |
138 | #endif | 138 | #endif |
139 | #define GSM_ENABLE_IRDADEVICE | 139 | #define GSM_ENABLE_IRDADEVICE |
140 | #ifndef GSM_USED_IRDADEVICE | 140 | #ifndef GSM_USED_IRDADEVICE |
141 | # undef GSM_ENABLE_IRDADEVICE | 141 | # undef GSM_ENABLE_IRDADEVICE |
142 | #endif | 142 | #endif |
143 | #define GSM_ENABLE_BLUETOOTHDEVICE | 143 | #define GSM_ENABLE_BLUETOOTHDEVICE |
144 | #ifndef GSM_USED_BLUETOOTHDEVICE | 144 | #ifndef GSM_USED_BLUETOOTHDEVICE |
145 | # undef GSM_ENABLE_BLUETOOTHDEVICE | 145 | # undef GSM_ENABLE_BLUETOOTHDEVICE |
146 | #endif | 146 | #endif |
147 | 147 | ||
148 | #ifdef DJGPP | 148 | #ifdef DJGPP |
149 | # undef GSM_ENABLE_IRDADEVICE | 149 | # undef GSM_ENABLE_IRDADEVICE |
150 | # undef GSM_ENABLE_IRDAPHONET | 150 | # undef GSM_ENABLE_IRDAPHONET |
151 | # undef GSM_ENABLE_IRDAOBEX | 151 | # undef GSM_ENABLE_IRDAOBEX |
152 | # undef GSM_ENABLE_IRDAAT | 152 | # undef GSM_ENABLE_IRDAAT |
153 | # undef GSM_ENABLE_FBUS2IRDA | 153 | # undef GSM_ENABLE_FBUS2IRDA |
154 | 154 | ||
155 | # undef GSM_ENABLE_BLUETOOTHDEVICE | 155 | # undef GSM_ENABLE_BLUETOOTHDEVICE |
156 | # undef GSM_ENABLE_BLUEPHONET | 156 | # undef GSM_ENABLE_BLUEPHONET |
157 | # undef GSM_ENABLE_BLUEOBEX | 157 | # undef GSM_ENABLE_BLUEOBEX |
158 | # undef GSM_ENABLE_BLUEAT | 158 | # undef GSM_ENABLE_BLUEAT |
159 | # undef GSM_ENABLE_BLUEFBUS2 | 159 | # undef GSM_ENABLE_BLUEFBUS2 |
160 | # undef GSM_ENABLE_PHONETBLUE | 160 | # undef GSM_ENABLE_PHONETBLUE |
161 | # undef GSM_ENABLE_FBUS2BLUE | 161 | # undef GSM_ENABLE_FBUS2BLUE |
162 | # undef GSM_ENABLE_MROUTERBLUE | 162 | # undef GSM_ENABLE_MROUTERBLUE |
163 | #endif | 163 | #endif |
164 | |||
164 | #ifndef WIN32 | 165 | #ifndef WIN32 |
165 | # ifdef ENABLE_LGPL | 166 | # ifdef ENABLE_LGPL |
166 | # undef GSM_ENABLE_IRDADEVICE | 167 | # undef GSM_ENABLE_IRDADEVICE |
167 | # undef GSM_ENABLE_IRDAPHONET | 168 | # undef GSM_ENABLE_IRDAPHONET |
168 | # undef GSM_ENABLE_IRDAOBEX | 169 | # undef GSM_ENABLE_IRDAOBEX |
169 | # undef GSM_ENABLE_IRDAAT | 170 | # undef GSM_ENABLE_IRDAAT |
170 | # undef GSM_ENABLE_FBUS2IRDA | 171 | # undef GSM_ENABLE_FBUS2IRDA |
171 | 172 | ||
172 | # undef GSM_ENABLE_BLUETOOTHDEVICE | 173 | # undef GSM_ENABLE_BLUETOOTHDEVICE |
173 | # undef GSM_ENABLE_BLUEPHONET | 174 | # undef GSM_ENABLE_BLUEPHONET |
174 | # undef GSM_ENABLE_BLUEOBEX | 175 | # undef GSM_ENABLE_BLUEOBEX |
175 | # undef GSM_ENABLE_BLUEAT | 176 | # undef GSM_ENABLE_BLUEAT |
176 | # undef GSM_ENABLE_BLUEFBUS2 | 177 | # undef GSM_ENABLE_BLUEFBUS2 |
177 | # undef GSM_ENABLE_PHONETBLUE | 178 | # undef GSM_ENABLE_PHONETBLUE |
178 | # undef GSM_ENABLE_FBUS2BLUE | 179 | # undef GSM_ENABLE_FBUS2BLUE |
179 | # undef GSM_ENABLE_MROUTERBLUE | 180 | # undef GSM_ENABLE_MROUTERBLUE |
180 | # endif | 181 | # endif |
181 | #endif | 182 | #endif |
182 | 183 | ||
183 | #ifdef GSM_ENABLE_SERIALDEVICE | 184 | #ifdef GSM_ENABLE_SERIALDEVICE |
184 | # include "device/serial/ser_w32.h" | 185 | # include "device/serial/ser_w32.h" |
185 | # include "device/serial/ser_unx.h" | 186 | # include "device/serial/ser_unx.h" |
186 | # include "device/serial/ser_djg.h" | 187 | # include "device/serial/ser_djg.h" |
187 | #endif | 188 | #endif |
188 | #ifdef GSM_ENABLE_IRDADEVICE | 189 | #ifdef GSM_ENABLE_IRDADEVICE |
189 | # include "device/irda/irda.h" | 190 | # include "device/irda/irda.h" |
190 | #endif | 191 | #endif |
191 | #ifdef GSM_ENABLE_BLUETOOTHDEVICE | 192 | #ifdef GSM_ENABLE_BLUETOOTHDEVICE |
192 | # include "device/bluetoth/bluetoth.h" | 193 | # include "device/bluetoth/bluetoth.h" |
193 | #endif | 194 | #endif |
194 | 195 | ||
195 | #include "service/gsmpbk.h" | 196 | #include "service/gsmpbk.h" |
196 | #include "service/gsmnet.h" | 197 | #include "service/gsmnet.h" |
197 | #include "service/gsmring.h" | 198 | #include "service/gsmring.h" |
198 | #include "service/gsmcal.h" | 199 | #include "service/gsmcal.h" |
199 | #include "service/gsmdata.h" | 200 | #include "service/gsmdata.h" |
200 | #include "service/gsmlogo.h" | 201 | #include "service/gsmlogo.h" |
201 | #include "service/gsmmisc.h" | 202 | #include "service/gsmmisc.h" |
202 | #include "service/gsmprof.h" | 203 | #include "service/gsmprof.h" |
203 | #include "service/gsmcall.h" | 204 | #include "service/gsmcall.h" |
204 | #include "service/sms/gsmsms.h" | 205 | #include "service/sms/gsmsms.h" |
205 | #include "service/sms/gsmems.h" | 206 | #include "service/sms/gsmems.h" |
206 | #include "service/sms/gsmmulti.h" | 207 | #include "service/sms/gsmmulti.h" |
207 | #include "service/backup/gsmback.h" | 208 | #include "service/backup/gsmback.h" |
208 | 209 | ||
209 | 210 | ||
210 | /* ------------------------- Device layer ---------------------------------- */ | 211 | /* ------------------------- Device layer ---------------------------------- */ |
211 | 212 | ||
@@ -1531,49 +1532,48 @@ typedef enum { | |||
1531 | F_NOFILESYSTEM, /* No images, ringtones, java saved in special filesystem*/ | 1532 | F_NOFILESYSTEM, /* No images, ringtones, java saved in special filesystem*/ |
1532 | F_NOMMS, /* No MMS sets in phone */ | 1533 | F_NOMMS, /* No MMS sets in phone */ |
1533 | F_NOGPRSPOINT, /* GPRS point are not useable */ | 1534 | F_NOGPRSPOINT, /* GPRS point are not useable */ |
1534 | F_CAL35, /* Calendar,3510 style - Reminder,Call,Birthday */ | 1535 | F_CAL35, /* Calendar,3510 style - Reminder,Call,Birthday */ |
1535 | F_CAL65, /* Calendar,6510 style - CBMM, method 3 */ | 1536 | F_CAL65, /* Calendar,6510 style - CBMM, method 3 */ |
1536 | F_WAPMMSPROXY, /* WAP & MMS settings contains first & second proxy */ | 1537 | F_WAPMMSPROXY, /* WAP & MMS settings contains first & second proxy */ |
1537 | 1538 | ||
1538 | /* n6510.c && n7110.c */ | 1539 | /* n6510.c && n7110.c */ |
1539 | F_VOICETAGS, /* Voice tags available */ | 1540 | F_VOICETAGS, /* Voice tags available */ |
1540 | F_CAL62, /* Calendar,6210 style - Call,Birthday,Memo,Meeting */ | 1541 | F_CAL62, /* Calendar,6210 style - Call,Birthday,Memo,Meeting */ |
1541 | F_NOTES, | 1542 | F_NOTES, |
1542 | 1543 | ||
1543 | /* AT modules */ | 1544 | /* AT modules */ |
1544 | F_SMSONLYSENT, /* Phone supports only sent/unsent messages */ | 1545 | F_SMSONLYSENT, /* Phone supports only sent/unsent messages */ |
1545 | F_BROKENCPBS, /* CPBS on some memories can hang phone */ | 1546 | F_BROKENCPBS, /* CPBS on some memories can hang phone */ |
1546 | F_M20SMS, /* Siemens M20 like SMS handling */ | 1547 | F_M20SMS, /* Siemens M20 like SMS handling */ |
1547 | F_SLOWWRITE, /* Use slower writing which some phone need */ | 1548 | F_SLOWWRITE, /* Use slower writing which some phone need */ |
1548 | F_SMSME900, /* SMS in ME start from location 900 - case of Sagem */ | 1549 | F_SMSME900, /* SMS in ME start from location 900 - case of Sagem */ |
1549 | F_ALCATEL /* Phone supports Alcatel protocol */ | 1550 | F_ALCATEL /* Phone supports Alcatel protocol */ |
1550 | } Feature; | 1551 | } Feature; |
1551 | 1552 | ||
1552 | /* For models table */ | 1553 | /* For models table */ |
1553 | struct _OnePhoneModel { | 1554 | struct _OnePhoneModel { |
1554 | char *model; | 1555 | char *model; |
1555 | char *number; | 1556 | char *number; |
1556 | char *irdamodel; | 1557 | char *irdamodel; |
1557 | Feature features[12]; | 1558 | Feature features[12]; |
1558 | }; | 1559 | }; |
1559 | 1560 | ||
1560 | bool IsPhoneFeatureAvailable(OnePhoneModel *model, Feature feature); | 1561 | bool IsPhoneFeatureAvailable(OnePhoneModel *model, Feature feature); |
1561 | OnePhoneModel *GetModelData (char *model, char *number, char *irdamodel); | 1562 | OnePhoneModel *GetModelData (char *model, char *number, char *irdamodel); |
1562 | 1563 | ||
1563 | #ifdef __GNUC__ | 1564 | #ifdef __GNUC__ |
1564 | __attribute__((format(printf, 2, 3))) | 1565 | __attribute__((format(printf, 2, 3))) |
1565 | #endif | 1566 | #endif |
1566 | int smprintf(GSM_StateMachine *s, const char *format, ...); | 1567 | int smprintf(GSM_StateMachine *s, const char *format, ...); |
1567 | 1568 | ||
1568 | void GSM_OSErrorInfo(GSM_StateMachine *s, char *description); | 1569 | void GSM_OSErrorInfo(GSM_StateMachine *s, char *description); |
1569 | 1570 | ||
1570 | #ifdef GSM_ENABLE_BACKUP | 1571 | #ifdef GSM_ENABLE_BACKUP |
1571 | void GSM_GetPhoneFeaturesForBackup(GSM_StateMachine *s, GSM_Backup_Info *info); | 1572 | void GSM_GetPhoneFeaturesForBackup(GSM_StateMachine *s, GSM_Backup_Info *info); |
1572 | #endif | 1573 | #endif |
1573 | 1574 | ||
1574 | #endif | 1575 | #endif |
1575 | 1576 | ||
1576 | /* How should editor hadle tabs in this file? Add editor commands here. | 1577 | /* How should editor hadle tabs in this file? Add editor commands here. |
1577 | * vim: noexpandtab sw=8 ts=8 sts=8: | 1578 | * vim: noexpandtab sw=8 ts=8 sts=8: |
1578 | */ | 1579 | */ |
1579 | |||