include: Add missing definitions in af_irda.h. (try 2)
Thomas Trummer
th.trummer at gmail.com
Sat Aug 29 04:02:32 CDT 2009
Fixed trailing white space errors and made a smaller patch, though, the
resulting file will be unordered. Without feedback this will be the last
try, since I don't have the time for the guessing game which seems to be the
Wine development model.
Tom
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20090829/8b7c3dc2/attachment.htm>
-------------- next part --------------
From 4fb4c75089ae39b50cc022d70fd385c26b1800ca Mon Sep 17 00:00:00 2001
From: Thomas Trummer <th.trummer at gmail.com>
Date: Sun, 23 Aug 2009 16:45:10 +0200
Subject: include: Add missing definitions in af_irda.h
---
include/af_irda.h | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 166 insertions(+), 8 deletions(-)
diff --git a/include/af_irda.h b/include/af_irda.h
index 3be5b39..99a9699 100644
--- a/include/af_irda.h
+++ b/include/af_irda.h
@@ -18,20 +18,20 @@
#ifndef AF_IRDA_H
#define AF_IRDA_H
-typedef struct _IRDA_DEVICE_INFO
+typedef struct _WINDOWS_IRDA_DEVICE_INFO
{
UCHAR irdaDeviceID[4];
char irdaDeviceName[22];
UCHAR irdaDeviceHints1;
UCHAR irdaDeviceHints2;
UCHAR irdaCharSet;
-} IRDA_DEVICE_INFO, *PIRDA_DEVICE_INFO;
+} WINDOWS_IRDA_DEVICE_INFO, *PWINDOWS_IRDA_DEVICE_INFO, *LPWINDOWS_IRDA_DEVICE_INFO;
-typedef struct _DEVICELIST
+typedef struct _WINDOWS_DEVICELIST
{
- ULONG numDevice;
- IRDA_DEVICE_INFO Device[1];
-} DEVICELIST, *PDEVICELIST;
+ ULONG numDevice;
+ WINDOWS_IRDA_DEVICE_INFO Device[1];
+} WINDOWS_DEVICELIST, *PWINDOWS_DEVICELIST, *LPWINDOWS_DEVICELIST;
typedef struct _SOCKADDR_IRDA
{
@@ -59,6 +59,9 @@ typedef struct _SOCKADDR_IRDA
#define WS_IAS_MAX_CLASSNAME 64
#define WS_IAS_MAX_ATTRIBNAME 256
+#define WS_IAS_MAX_OCTET_STRING 1024
+#define WS_IAS_MAX_USER_STRING 256
+
#else
@@ -79,11 +82,11 @@ typedef struct _SOCKADDR_IRDA
#define IAS_MAX_CLASSNAME 64
#define IAS_MAX_ATTRIBNAME 256
+#define IAS_MAX_OCTET_STRING 1024
+#define IAS_MAX_USER_STRING 256
#endif
-#define IAS_MAX_OCTET_STRING 1024
-#define IAS_MAX_USER_STRING 256
#define LmCharSetASCII 0x00
#define LmCharSetISO_8859_1 0x01
@@ -97,4 +100,159 @@ typedef struct _SOCKADDR_IRDA
#define LmCharSetISO_8859_9 0x09
#define LmCharSetUNICODE 0xff
+#define SIO_LAZY_DISCOVERY _IOR('t', 127, ULONG)
+
+#define WINDOWS_AF_IRDA 26
+#define WINDOWS_PF_IRDA WINDOWS_AF_IRDA
+
+#define WCE_AF_IRDA 22
+#define WCE_PF_IRDA WCE_AF_IRDA
+
+#ifndef AF_IRDA
+#define AF_IRDA WINDOWS_AF_IRDA
+#endif
+
+#ifndef PF_IRDA
+#define PF_IRDA AF_IRDA
+#endif
+
+#define IRDA_PROTO_SOCK_STREAM 1
+
+#define LM_BAUD_1200 1200
+#define LM_BAUD_2400 2400
+#define LM_BAUD_9600 9600
+#define LM_BAUD_19200 19200
+#define LM_BAUD_38400 38400
+#define LM_BAUD_57600 57600
+#define LM_BAUD_115200 115200
+#define LM_BAUD_576K 576000
+#define LM_BAUD_1152K 1152000
+#define LM_BAUD_4M 4000000
+#define LM_BAUD_16M 16000000
+
+
+#define IAS_ATTRIB_NO_ATTRIB ((ULONG)0x00)
+#define IAS_ATTRIB_INT ((ULONG)0x01)
+#define IAS_ATTRIB_OCTETSEQ ((ULONG)0x02)
+#define IAS_ATTRIB_STR ((ULONG)0x03)
+#define IAS_ATTRIB_NO_CLASS ((ULONG)0x10)
+
+
+enum
+{
+ LM_HB1_PnP = 1,
+ LM_HB1_PDA_Palmtop = 2,
+ LM_HB1_Computer = 4,
+ LM_HB1_Printer = 8,
+ LM_HB1_Modem = 16,
+ LM_HB1_Fax = 32,
+ LM_HB1_LANAccess = 64,
+
+ LM_HB_Extension = 128,
+
+ LM_HB2_Telephony = 1,
+ LM_HB2_FileServer = 2
+};
+
+typedef ULONG LM_BAUD_RATE;
+
+typedef struct
+{
+ ULONG nTXDataBytes;
+ ULONG nRXDataBytes;
+ LM_BAUD_RATE nBaudRate;
+ ULONG thresholdTime;
+ ULONG discTime;
+ USHORT nMSLinkTurn;
+ UCHAR nTXPackets;
+ UCHAR nRXPackets;
+} LM_IRPARMS, *PLM_IRPARMS;
+
+
+
+#ifdef USE_WS_PREFIX
+# define WS(x) WS_##x
+#else
+# define WS(x) x
+#endif
+
+
+typedef struct _WCE_IRDA_DEVICE_INFO
+{
+ UCHAR irdaDeviceID[4];
+ char irdaDeviceName[22];
+ UCHAR Reserved[2];
+} WCE_IRDA_DEVICE_INFO, *PWCE_IRDA_DEVICE_INFO;
+
+
+typedef struct _WCE_DEVICELIST
+{
+ ULONG numDevice;
+ WCE_IRDA_DEVICE_INFO Device[1];
+} WCE_DEVICELIST, *PWCE_DEVICELIST;
+
+typedef struct _WINDOWS_IAS_SET
+{
+ char irdaClassName[WS(IAS_MAX_CLASSNAME)];
+ char irdaAttribName[WS(IAS_MAX_ATTRIBNAME)];
+ ULONG irdaAttribType;
+
+ union
+ {
+ LONG irdaAttribInt;
+
+ struct
+ {
+ USHORT Len;
+ UCHAR OctetSeq[WS(IAS_MAX_OCTET_STRING)];
+ }
+ irdaAttribOctetSeq;
+
+ struct
+ {
+ UCHAR Len;
+ UCHAR CharSet;
+ UCHAR UsrStr[WS(IAS_MAX_USER_STRING)];
+ }
+ irdaAttribUsrStr;
+ }
+ irdaAttribute;
+
+} WINDOWS_IAS_SET, *PWINDOWS_IAS_SET, *LPWINDOWS_IAS_SET;
+
+typedef struct _WINDOWS_IAS_QUERY
+{
+ UCHAR irdaDeviceID[4];
+ char irdaClassName[WS(IAS_MAX_CLASSNAME)];
+ char irdaAttribName[WS(IAS_MAX_ATTRIBNAME)];
+ ULONG irdaAttribType;
+
+ union
+ {
+ LONG irdaAttribInt;
+
+ struct
+ {
+ ULONG Len;
+ UCHAR OctetSeq[WS(IAS_MAX_OCTET_STRING)];
+ }
+ irdaAttribOctetSeq;
+
+ struct
+ {
+ ULONG Len;
+ ULONG CharSet;
+ UCHAR UsrStr[WS(IAS_MAX_USER_STRING)];
+ }
+ irdaAttribUsrStr;
+ }
+ irdaAttribute;
+
+} WINDOWS_IAS_QUERY, *PWINDOWS_IAS_QUERY, *LPWINDOWS_IAS_QUERY;
+
+typedef WINDOWS_DEVICELIST DEVICELIST, *PDEVICELIST, *LPDEVICELIST;
+typedef WINDOWS_IAS_SET IAS_SET, *PIAS_SET, *LPIASSET;
+typedef WINDOWS_IAS_QUERY IAS_QUERY, *PIAS_QUERY, *LPIASQUERY;
+typedef WINDOWS_IRDA_DEVICE_INFO IRDA_DEVICE_INFO, *PIRDA_DEVICE_INFO, *LPIRDA_DEVICE_INFO;
+
#endif /* AF_IRDA_H */
--
1.6.3.3
More information about the wine-patches
mailing list