summaryrefslogtreecommitdiffabout
path: root/gammu/emb
Unidiff
Diffstat (limited to 'gammu/emb') (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/common.pro4
-rw-r--r--gammu/emb/common/device/bluetoth/blue_w32.c4
-rw-r--r--gammu/emb/common/device/bluetoth/blue_w32.h4
-rw-r--r--gammu/emb/common/device/serial/ser_w32.h2
-rw-r--r--gammu/emb/gammu/gammu.pro4
5 files changed, 11 insertions, 7 deletions
diff --git a/gammu/emb/common/common.pro b/gammu/emb/common/common.pro
index af45382..65fd303 100644
--- a/gammu/emb/common/common.pro
+++ b/gammu/emb/common/common.pro
@@ -149,46 +149,48 @@ protocol/nokia/phonet.c \
149protocol/obex/obex.c \ 149protocol/obex/obex.c \
150protocol/symbian/mrouter.c \ 150protocol/symbian/mrouter.c \
151phone/pfunc.c \ 151phone/pfunc.c \
152phone/at/atgen.c \ 152phone/at/atgen.c \
153phone/at/siemens.c \ 153phone/at/siemens.c \
154phone/at/samsung.c \ 154phone/at/samsung.c \
155phone/at/sonyeric.c \ 155phone/at/sonyeric.c \
156phone/alcatel/alcatel.c \ 156phone/alcatel/alcatel.c \
157phone/nokia/dct3/n6110.c \ 157phone/nokia/dct3/n6110.c \
158phone/nokia/dct3/n7110.c \ 158phone/nokia/dct3/n7110.c \
159phone/nokia/dct3/n0650.c \ 159phone/nokia/dct3/n0650.c \
160phone/nokia/dct3/n9210.c \ 160phone/nokia/dct3/n9210.c \
161phone/nokia/dct3/dct3func.c \ 161phone/nokia/dct3/dct3func.c \
162phone/nokia/dct4/n3320.c \ 162phone/nokia/dct4/n3320.c \
163phone/nokia/dct4/n3650.c \ 163phone/nokia/dct4/n3650.c \
164phone/nokia/dct4/n6510.c \ 164phone/nokia/dct4/n6510.c \
165phone/nokia/dct4/dct4func.c \ 165phone/nokia/dct4/dct4func.c \
166phone/nokia/nauto.c \ 166phone/nokia/nauto.c \
167phone/nokia/nfunc.c \ 167phone/nokia/nfunc.c \
168phone/nokia/nfuncold.c \ 168phone/nokia/nfuncold.c \
169phone/obex/obexgen.c \ 169phone/obex/obexgen.c \
170phone/symbian/mroutgen.c 170phone/symbian/mroutgen.c
171 171
172DEFINES += DESKTOP_VERSION 172DEFINES += DESKTOP_VERSION
173TARGET = microgammu 173TARGET = xmicrogammu
174CONFIG = warn_off release console 174CONFIG = warn_off release console
175DESTDIR = ../../../bin 175DESTDIR = ../../../bin
176OBJECTS_DIR = obj/unix 176OBJECTS_DIR = obj/unix
177MOC_DIR = moc/unix 177MOC_DIR = moc/unix
178 178
179unix: { 179unix: {
180HEADERS += device/serial/ser_unx.h \ 180HEADERS += device/serial/ser_unx.h \
181 device/irda/irda_unx.h 181 device/irda/irda_unx.h
182 182
183SOURCES += device/serial/ser_unx.c \ 183SOURCES += device/serial/ser_unx.c \
184 184
185} 185}
186win32:{ 186win32:{
187 187
188HEADERS += device/serial/ser_w32.h \ 188HEADERS += device/serial/ser_w32.h \
189 device/irda/irda_w32.h \ 189 device/irda/irda_w32.h \
190 device/bluetoth/blue_w32.h 190 device/bluetoth/blue_w32.h
191 191
192SOURCES += device/serial/ser_w32.c \ 192SOURCES += device/serial/ser_w32.c \
193 device/bluetoth/blue_w32.c 193 device/bluetoth/blue_w32.c
194} 194}
195#The following line was inserted by qt3to4
196QT += xml qt3support
diff --git a/gammu/emb/common/device/bluetoth/blue_w32.c b/gammu/emb/common/device/bluetoth/blue_w32.c
index a631c9f..8a367f4 100644
--- a/gammu/emb/common/device/bluetoth/blue_w32.c
+++ b/gammu/emb/common/device/bluetoth/blue_w32.c
@@ -67,49 +67,49 @@ GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
67 //noauth 67 //noauth
68 close(d->hPhone); 68 close(d->hPhone);
69 return ERR_UNKNOWN; 69 return ERR_UNKNOWN;
70 } 70 }
71 71
72 return ERR_NONE; 72 return ERR_NONE;
73} 73}
74 74
75#ifdef BLUETOOTH_RF_SEARCHING 75#ifdef BLUETOOTH_RF_SEARCHING
76 76
77#pragma comment(lib, "irprops.lib") 77#pragma comment(lib, "irprops.lib")
78#pragma comment(lib, "ws2_32.lib") 78#pragma comment(lib, "ws2_32.lib")
79 79
80static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPROTOCOL_INFO *protocolInfo) 80static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPROTOCOL_INFO *protocolInfo)
81{ 81{
82 GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth; 82 GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
83 WSAQUERYSET querySet; 83 WSAQUERYSET querySet;
84 DWORD flags; 84 DWORD flags;
85 GUID protocol; 85 GUID protocol;
86 int i, result; 86 int i, result;
87 BYTE buffer[2000]; 87 BYTE buffer[2000];
88 char addressAsString[1000]; 88 char addressAsString[1000];
89 DWORD bufferLength, addressSize; 89 DWORD bufferLength, addressSize;
90 WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer; 90 WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer;
91 HANDLE handle; 91 Qt::HANDLE handle;
92 GSM_Error error; 92 GSM_Error error;
93 93
94 memset(&querySet, 0, sizeof(querySet)); 94 memset(&querySet, 0, sizeof(querySet));
95 querySet.dwSize = sizeof(querySet); 95 querySet.dwSize = sizeof(querySet);
96 protocol = L2CAP_PROTOCOL_UUID; 96 protocol = L2CAP_PROTOCOL_UUID;
97 querySet.lpServiceClassId = &protocol; 97 querySet.lpServiceClassId = &protocol;
98 querySet.dwNameSpace = NS_BTH; 98 querySet.dwNameSpace = NS_BTH;
99 querySet.lpszContext = address; 99 querySet.lpszContext = address;
100 100
101 flags = LUP_FLUSHCACHE | LUP_RETURN_NAME | 101 flags = LUP_FLUSHCACHE | LUP_RETURN_NAME |
102 LUP_RETURN_TYPE | LUP_RETURN_ADDR | 102 LUP_RETURN_TYPE | LUP_RETURN_ADDR |
103 LUP_RETURN_BLOB | LUP_RETURN_COMMENT; 103 LUP_RETURN_BLOB | LUP_RETURN_COMMENT;
104 104
105 result = WSALookupServiceBegin(&querySet, flags, &handle); 105 result = WSALookupServiceBegin(&querySet, flags, &handle);
106 if (result != 0) return ERR_UNKNOWN; 106 if (result != 0) return ERR_UNKNOWN;
107 107
108 bufferLength = sizeof(buffer); 108 bufferLength = sizeof(buffer);
109 while (1) { 109 while (1) {
110 result = WSALookupServiceNext(handle, flags, &bufferLength, pResults); 110 result = WSALookupServiceNext(handle, flags, &bufferLength, pResults);
111 if (result != 0) break; 111 if (result != 0) break;
112 addressSize = sizeof(addressAsString); 112 addressSize = sizeof(addressAsString);
113 addressAsString[0] = 0; 113 addressAsString[0] = 0;
114 if (WSAAddressToString(pResults->lpcsaBuffer->RemoteAddr.lpSockaddr, 114 if (WSAAddressToString(pResults->lpcsaBuffer->RemoteAddr.lpSockaddr,
115 pResults->lpcsaBuffer->RemoteAddr.iSockaddrLength, protocolInfo, 115 pResults->lpcsaBuffer->RemoteAddr.iSockaddrLength, protocolInfo,
@@ -117,49 +117,49 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
117 smprintf(s, "%s - ", addressAsString); 117 smprintf(s, "%s - ", addressAsString);
118 } 118 }
119 smprintf(s, "\"%s\"\n", pResults->lpszServiceInstanceName); 119 smprintf(s, "\"%s\"\n", pResults->lpszServiceInstanceName);
120 if (addressAsString[0] != 0) { 120 if (addressAsString[0] != 0) {
121 for (i=strlen(addressAsString)-1;i>0;i--) { 121 for (i=strlen(addressAsString)-1;i>0;i--) {
122 if (addressAsString[i] == ':') break; 122 if (addressAsString[i] == ':') break;
123 } 123 }
124 if (bluetooth_checkservicename(s, pResults->lpszServiceInstanceName) == ERR_NONE) { 124 if (bluetooth_checkservicename(s, pResults->lpszServiceInstanceName) == ERR_NONE) {
125 error = bluetooth_connect(s,atoi(addressAsString+i+1),address+1); 125 error = bluetooth_connect(s,atoi(addressAsString+i+1),address+1);
126 result = WSALookupServiceEnd(handle); 126 result = WSALookupServiceEnd(handle);
127 return error; 127 return error;
128 } 128 }
129 } 129 }
130 } 130 }
131 result = WSALookupServiceEnd(handle); 131 result = WSALookupServiceEnd(handle);
132 return ERR_NOTSUPPORTED; 132 return ERR_NOTSUPPORTED;
133} 133}
134 134
135GSM_Error bluetooth_findchannel(GSM_StateMachine *s) 135GSM_Error bluetooth_findchannel(GSM_StateMachine *s)
136{ 136{
137 GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth; 137 GSM_Device_BlueToothData *d = &s->Device.Data.BlueTooth;
138 WSADATA wsaData; 138 WSADATA wsaData;
139 int i, protocolInfoSize, result; 139 int i, protocolInfoSize, result;
140 WSAPROTOCOL_INFO protocolInfo; 140 WSAPROTOCOL_INFO protocolInfo;
141 HANDLE handle; 141 Qt::HANDLE handle;
142 DWORD flags; 142 DWORD flags;
143 WSAQUERYSET querySet; 143 WSAQUERYSET querySet;
144 BYTE buffer[2000]; 144 BYTE buffer[2000];
145 char addressAsString[1000]; 145 char addressAsString[1000];
146 DWORD bufferLength, addressSize; 146 DWORD bufferLength, addressSize;
147 WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer; 147 WSAQUERYSET *pResults = (WSAQUERYSET*)&buffer;
148 GSM_Error error; 148 GSM_Error error;
149 149
150 if (WSAStartup(MAKEWORD(2,2), &wsaData)!=0x00) return ERR_DEVICENODRIVER; 150 if (WSAStartup(MAKEWORD(2,2), &wsaData)!=0x00) return ERR_DEVICENODRIVER;
151 151
152 d->hPhone = socket(AF_BTH, SOCK_STREAM, BTHPROTO_RFCOMM); 152 d->hPhone = socket(AF_BTH, SOCK_STREAM, BTHPROTO_RFCOMM);
153 if (d->hPhone == INVALID_SOCKET) { 153 if (d->hPhone == INVALID_SOCKET) {
154 i = GetLastError(); 154 i = GetLastError();
155 GSM_OSErrorInfo(s, "Socket in bluetooth_open"); 155 GSM_OSErrorInfo(s, "Socket in bluetooth_open");
156 if (i == 10041) return ERR_DEVICENODRIVER;//unknown socket type 156 if (i == 10041) return ERR_DEVICENODRIVER;//unknown socket type
157 return ERR_UNKNOWN; 157 return ERR_UNKNOWN;
158 } 158 }
159 159
160 protocolInfoSize = sizeof(protocolInfo); 160 protocolInfoSize = sizeof(protocolInfo);
161 if (getsockopt(d->hPhone, SOL_SOCKET, SO_PROTOCOL_INFO, 161 if (getsockopt(d->hPhone, SOL_SOCKET, SO_PROTOCOL_INFO,
162 (char*)&protocolInfo, &protocolInfoSize) != 0) 162 (char*)&protocolInfo, &protocolInfoSize) != 0)
163 { 163 {
164 close(d->hPhone); 164 close(d->hPhone);
165 return ERR_UNKNOWN; 165 return ERR_UNKNOWN;
diff --git a/gammu/emb/common/device/bluetoth/blue_w32.h b/gammu/emb/common/device/bluetoth/blue_w32.h
index e457c92..409f4b1 100644
--- a/gammu/emb/common/device/bluetoth/blue_w32.h
+++ b/gammu/emb/common/device/bluetoth/blue_w32.h
@@ -98,57 +98,57 @@ DEFINE_GUID(L2CAP_PROTOCOL_UUID, 0x00000100, 0x0000, 0x1000, 0x80, 0x00, 0x00,
98 #define LUP_FLUSHCACHE 0x1000 98 #define LUP_FLUSHCACHE 0x1000
99#define LUP_RES_SERVICE 0x8000 99#define LUP_RES_SERVICE 0x8000
100 100
101#define WSAAPI FAR PASCAL 101#define WSAAPI FAR PASCAL
102 102
103#ifndef WINSOCK_API_LINKAGE 103#ifndef WINSOCK_API_LINKAGE
104#ifdef DECLSPEC_IMPORT 104#ifdef DECLSPEC_IMPORT
105#define WINSOCK_API_LINKAGE DECLSPEC_IMPORT 105#define WINSOCK_API_LINKAGE DECLSPEC_IMPORT
106#else 106#else
107#define WINSOCK_API_LINKAGE 107#define WINSOCK_API_LINKAGE
108#endif 108#endif
109#endif 109#endif
110 110
111WINSOCK_API_LINKAGE INT WSAAPI 111WINSOCK_API_LINKAGE INT WSAAPI
112WSALookupServiceBeginA( 112WSALookupServiceBeginA(
113 IN LPWSAQUERYSETA lpqsRestrictions, 113 IN LPWSAQUERYSETA lpqsRestrictions,
114 IN DWORD dwControlFlags, 114 IN DWORD dwControlFlags,
115 OUT LPHANDLE lphLookup 115 OUT LPHANDLE lphLookup
116 ); 116 );
117 117
118#define WSALookupServiceBegin WSALookupServiceBeginA 118#define WSALookupServiceBegin WSALookupServiceBeginA
119 119
120WINSOCK_API_LINKAGE INT WSAAPI 120WINSOCK_API_LINKAGE INT WSAAPI
121WSALookupServiceNextA( 121WSALookupServiceNextA(
122 IN HANDLE hLookup, 122 IN Qt::HANDLE hLookup,
123 IN DWORD dwControlFlags, 123 IN DWORD dwControlFlags,
124 IN OUT LPDWORD lpdwBufferLength, 124 IN OUT LPDWORD lpdwBufferLength,
125 OUT LPWSAQUERYSETA lpqsResults 125 OUT LPWSAQUERYSETA lpqsResults
126 ); 126 );
127 127
128#define WSALookupServiceNext WSALookupServiceNextA 128#define WSALookupServiceNext WSALookupServiceNextA
129 129
130WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN HANDLE hLookup); 130WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN Qt::HANDLE hLookup);
131 131
132#define MAX_PROTOCOL_CHAIN 7 132#define MAX_PROTOCOL_CHAIN 7
133 133
134typedef struct _WSAPROTOCOLCHAIN { 134typedef struct _WSAPROTOCOLCHAIN {
135 int ChainLen; /* the length of the chain, */ 135 int ChainLen; /* the length of the chain, */
136 /* length = 0 means layered protocol, */ 136 /* length = 0 means layered protocol, */
137 /* length = 1 means base protocol, */ 137 /* length = 1 means base protocol, */
138 /* length > 1 means protocol chain */ 138 /* length > 1 means protocol chain */
139 DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; /* a list of dwCatalogEntryIds */ 139 DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; /* a list of dwCatalogEntryIds */
140} WSAPROTOCOLCHAIN, FAR * LPWSAPROTOCOLCHAIN; 140} WSAPROTOCOLCHAIN, FAR * LPWSAPROTOCOLCHAIN;
141 141
142#define WSAPROTOCOL_LEN 255 142#define WSAPROTOCOL_LEN 255
143 143
144typedef struct _WSAPROTOCOL_INFOA { 144typedef struct _WSAPROTOCOL_INFOA {
145 DWORD dwServiceFlags1; 145 DWORD dwServiceFlags1;
146 DWORD dwServiceFlags2; 146 DWORD dwServiceFlags2;
147 DWORD dwServiceFlags3; 147 DWORD dwServiceFlags3;
148 DWORD dwServiceFlags4; 148 DWORD dwServiceFlags4;
149 DWORD dwProviderFlags; 149 DWORD dwProviderFlags;
150 GUID ProviderId; 150 GUID ProviderId;
151 DWORD dwCatalogEntryId; 151 DWORD dwCatalogEntryId;
152 WSAPROTOCOLCHAIN ProtocolChain; 152 WSAPROTOCOLCHAIN ProtocolChain;
153 int iVersion; 153 int iVersion;
154 int iAddressFamily; 154 int iAddressFamily;
diff --git a/gammu/emb/common/device/serial/ser_w32.h b/gammu/emb/common/device/serial/ser_w32.h
index d226f32..d1aa37a 100644
--- a/gammu/emb/common/device/serial/ser_w32.h
+++ b/gammu/emb/common/device/serial/ser_w32.h
@@ -1,19 +1,19 @@
1 1
2#ifdef WIN32 2#ifdef WIN32
3#ifndef winserial_h 3#ifndef winserial_h
4#define winserial_h 4#define winserial_h
5 5
6#include <windows.h> 6#include <windows.h>
7 7
8typedef struct { 8typedef struct {
9 HANDLE hPhone; 9 Qt::HANDLE hPhone;
10 DCB old_settings; 10 DCB old_settings;
11 OVERLAPPED osWrite,osRead; 11 OVERLAPPED osWrite,osRead;
12} GSM_Device_SerialData; 12} GSM_Device_SerialData;
13 13
14#endif 14#endif
15#endif 15#endif
16 16
17/* How should editor hadle tabs in this file? Add editor commands here. 17/* How should editor hadle tabs in this file? Add editor commands here.
18 * vim: noexpandtab sw=8 ts=8 sts=8: 18 * vim: noexpandtab sw=8 ts=8 sts=8:
19 */ 19 */
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index c8aa3f0..e8ccac3 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -26,40 +26,42 @@ HEADERS += gammu.h \
26 depend/nokia/dct3trac/type-cc.h \ 26 depend/nokia/dct3trac/type-cc.h \
27 depend/nokia/dct3trac/type-mm.h \ 27 depend/nokia/dct3trac/type-mm.h \
28 depend/nokia/dct3trac/type-rr.h \ 28 depend/nokia/dct3trac/type-rr.h \
29 depend/nokia/dct3trac/type-sms.h \ 29 depend/nokia/dct3trac/type-sms.h \
30 depend/nokia/dct3trac/type-ss.h \ 30 depend/nokia/dct3trac/type-ss.h \
31 depend/nokia/dct3trac/wmx-gsm.h \ 31 depend/nokia/dct3trac/wmx-gsm.h \
32 depend/nokia/dct3trac/wmx-list.h \ 32 depend/nokia/dct3trac/wmx-list.h \
33 depend/nokia/dct3trac/wmx-sim.h \ 33 depend/nokia/dct3trac/wmx-sim.h \
34 depend/nokia/dct3trac/wmx-util.h \ 34 depend/nokia/dct3trac/wmx-util.h \
35 depend/nokia/dct3trac/wmx.h 35 depend/nokia/dct3trac/wmx.h
36SOURCES += gammu.c \ 36SOURCES += gammu.c \
37 sniff.c \ 37 sniff.c \
38 smsd/s_files.c \ 38 smsd/s_files.c \
39 smsd/smsdcore.c \ 39 smsd/smsdcore.c \
40 depend/nokia/dct3.c \ 40 depend/nokia/dct3.c \
41 depend/nokia/dct4.c \ 41 depend/nokia/dct4.c \
42 depend/siemens/chiffre.c \ 42 depend/siemens/chiffre.c \
43 depend/siemens/dsiemens.c \ 43 depend/siemens/dsiemens.c \
44 depend/nokia/dct3trac/wmx-gsm.c \ 44 depend/nokia/dct3trac/wmx-gsm.c \
45 depend/nokia/dct3trac/wmx-list.c \ 45 depend/nokia/dct3trac/wmx-list.c \
46 depend/nokia/dct3trac/wmx-sim.c \ 46 depend/nokia/dct3trac/wmx-sim.c \
47 depend/nokia/dct3trac/wmx-util.c \ 47 depend/nokia/dct3trac/wmx-util.c \
48 depend/nokia/dct3trac/wmx.c 48 depend/nokia/dct3trac/wmx.c
49unix : { 49unix : {
50LIBS += ../../../bin/libmicrogammu.so /usr/lib/libpthread.so 50LIBS += ../../../bin/libxmicrogammu.so -lpthread
51# bluetooth disabled for now 51# bluetooth disabled for now
52#/usr/lib/libbluetooth.so /usr/lib/libsdp.so 52#/usr/lib/libbluetooth.so /usr/lib/libsdp.so
53OBJECTS_DIR = obj/unix 53OBJECTS_DIR = obj/unix
54} 54}
55win32 : { 55win32 : {
56 CONFIG += qt warn_on 56 CONFIG += qt warn_on
57#LIBS += mfc71u.lib 57#LIBS += mfc71u.lib
58LIBS += libc.lib 58LIBS += libc.lib
59#LIBS += msvcrt.lib 59#LIBS += msvcrt.lib
60QMAKE_LINK += /NODEFAULTLIB:msvcrt 60QMAKE_LINK += /NODEFAULTLIB:msvcrt
61LIBS += ../../../bin/microgammu.lib 61LIBS += ../../../bin/microgammu.lib
62OBJECTS_DIR = obj/win 62OBJECTS_DIR = obj/win
63} 63}
64DESTDIR = ../../../bin 64DESTDIR = ../../../bin
65TARGET = kammu 65TARGET = kammu
66#The following line was inserted by qt3to4
67QT += xml qt3support