summaryrefslogtreecommitdiffabout
path: root/gammu/emb/common/device/bluetoth
Unidiff
Diffstat (limited to 'gammu/emb/common/device/bluetoth') (more/less context) (ignore whitespace changes)
-rw-r--r--gammu/emb/common/device/bluetoth/blue_w32.c4
-rw-r--r--gammu/emb/common/device/bluetoth/blue_w32.h4
2 files changed, 4 insertions, 4 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
@@ -79,25 +79,25 @@ GSM_Error bluetooth_connect(GSM_StateMachine *s, int port, char *device)
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;
@@ -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
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) {
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
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