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
@@ -167,13 +167,13 @@ phone/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: {
@@ -189,6 +189,8 @@ HEADERS += 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
@@ -85,13 +85,13 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
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;
@@ -135,13 +135,13 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR
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;
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
@@ -116,21 +116,21 @@ WSALookupServiceBeginA(
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, */
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
@@ -3,13 +3,13 @@
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
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
@@ -44,13 +44,13 @@ SOURCES += gammu.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
@@ -60,6 +60,8 @@ LIBS += libc.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