-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 |
3 files changed, 5 insertions, 5 deletions
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 | |||
@@ -75,33 +75,33 @@ GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device) | |||
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 | ||
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; |
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 | ||
@@ -125,33 +125,33 @@ static GSM_Error bluetooth_checkdevice(GSM_StateMachine *s, char *address, WSAPR | |||
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 | ||
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) { |
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; |
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 | |||
@@ -106,41 +106,41 @@ DEFINE_GUID(L2CAP_PROTOCOL_UUID, 0x00000100, 0x0000, 0x1000, 0x80, 0x00, 0x00, | |||
106 | #else | 106 | #else |
107 | #define WINSOCK_API_LINKAGE | 107 | #define WINSOCK_API_LINKAGE |
108 | #endif | 108 | #endif |
109 | #endif | 109 | #endif |
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 |
143 | 143 | ||
144 | typedef struct _WSAPROTOCOL_INFOA { | 144 | typedef struct _WSAPROTOCOL_INFOA { |
145 | DWORD dwServiceFlags1; | 145 | DWORD dwServiceFlags1; |
146 | DWORD dwServiceFlags2; | 146 | DWORD dwServiceFlags2; |
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 | */ |