author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /gammu/emb/common | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-p1.zip kdepimpi-p1.tar.gz kdepimpi-p1.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | gammu/emb/common/common.pro | 4 | ||||
-rw-r--r-- | gammu/emb/common/device/bluetoth/blue_w32.c | 4 | ||||
-rw-r--r-- | gammu/emb/common/device/bluetoth/blue_w32.h | 4 | ||||
-rw-r--r-- | gammu/emb/common/device/serial/ser_w32.h | 2 |
4 files changed, 8 insertions, 6 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 | |||
@@ -161,34 +161,36 @@ phone/nokia/dct3/n9210.c \ | |||
161 | phone/nokia/dct3/dct3func.c \ | 161 | phone/nokia/dct3/dct3func.c \ |
162 | phone/nokia/dct4/n3320.c \ | 162 | phone/nokia/dct4/n3320.c \ |
163 | phone/nokia/dct4/n3650.c \ | 163 | phone/nokia/dct4/n3650.c \ |
164 | phone/nokia/dct4/n6510.c \ | 164 | phone/nokia/dct4/n6510.c \ |
165 | phone/nokia/dct4/dct4func.c \ | 165 | phone/nokia/dct4/dct4func.c \ |
166 | phone/nokia/nauto.c \ | 166 | phone/nokia/nauto.c \ |
167 | phone/nokia/nfunc.c \ | 167 | phone/nokia/nfunc.c \ |
168 | phone/nokia/nfuncold.c \ | 168 | phone/nokia/nfuncold.c \ |
169 | phone/obex/obexgen.c \ | 169 | phone/obex/obexgen.c \ |
170 | phone/symbian/mroutgen.c | 170 | phone/symbian/mroutgen.c |
171 | 171 | ||
172 | DEFINES += DESKTOP_VERSION | 172 | DEFINES += DESKTOP_VERSION |
173 | TARGET = microgammu | 173 | TARGET = xmicrogammu |
174 | CONFIG = warn_off release console | 174 | CONFIG = warn_off release console |
175 | DESTDIR = ../../../bin | 175 | DESTDIR = ../../../bin |
176 | OBJECTS_DIR = obj/unix | 176 | OBJECTS_DIR = obj/unix |
177 | MOC_DIR = moc/unix | 177 | MOC_DIR = moc/unix |
178 | 178 | ||
179 | unix: { | 179 | unix: { |
180 | HEADERS += device/serial/ser_unx.h \ | 180 | HEADERS += device/serial/ser_unx.h \ |
181 | device/irda/irda_unx.h | 181 | device/irda/irda_unx.h |
182 | 182 | ||
183 | SOURCES += device/serial/ser_unx.c \ | 183 | SOURCES += device/serial/ser_unx.c \ |
184 | 184 | ||
185 | } | 185 | } |
186 | win32:{ | 186 | win32:{ |
187 | 187 | ||
188 | HEADERS += device/serial/ser_w32.h \ | 188 | 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 | ||
192 | SOURCES += device/serial/ser_w32.c \ | 192 | SOURCES += 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 | ||
196 | QT += 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 | |||
@@ -79,25 +79,25 @@ GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device) | |||
79 | 79 | ||
80 | static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPROTOCOL_INFO *protocolInfo) | 80 | static 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; |
@@ -129,25 +129,25 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR | |||
129 | } | 129 | } |
130 | } | 130 | } |
131 | result = WSALookupServiceEnd(handle); | 131 | result = WSALookupServiceEnd(handle); |
132 | return ERR_NOTSUPPORTED; | 132 | return ERR_NOTSUPPORTED; |
133 | } | 133 | } |
134 | 134 | ||
135 | GSM_Error bluetooth_findchannel(GSM_StateMachine *s) | 135 | GSM_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) { |
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 | |||
@@ -110,33 +110,33 @@ DEFINE_GUID(L2CAP_PROTOCOL_UUID, 0x00000100, 0x0000, 0x1000, 0x80, 0x00, 0x00, | |||
110 | 110 | ||
111 | WINSOCK_API_LINKAGE INT WSAAPI | 111 | WINSOCK_API_LINKAGE INT WSAAPI |
112 | WSALookupServiceBeginA( | 112 | WSALookupServiceBeginA( |
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 | ||
120 | WINSOCK_API_LINKAGE INT WSAAPI | 120 | WINSOCK_API_LINKAGE INT WSAAPI |
121 | WSALookupServiceNextA( | 121 | WSALookupServiceNextA( |
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 | ||
130 | WINSOCK_API_LINKAGE INT WSAAPI WSALookupServiceEnd(IN HANDLE hLookup); | 130 | WINSOCK_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 | ||
134 | typedef struct _WSAPROTOCOLCHAIN { | 134 | typedef 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 |
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 | ||
8 | typedef struct { | 8 | typedef 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 | */ |