fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / net / irda / irlap_frame.h

diff --git a/include/net/irda/irlap_frame.h b/include/net/irda/irlap_frame.h
index 3452ae2..641f88e 100644 (file)
--- a/include/net/irda/irlap_frame.h
+++ b/include/net/irda/irlap_frame.h
@@ -74,12 +74,25 @@ struct discovery_t;
 
 #define PF_BIT    0x10 /* Poll/final bit */
 
+/* Some IrLAP field lengths */
+/*
+ * Only baud rate triplet is 4 bytes (PV can be 2 bytes).
+ * All others params (7) are 3 bytes, so that's 7*3 + 1*4 bytes.
+ */
+#define IRLAP_NEGOCIATION_PARAMS_LEN 25
+#define IRLAP_DISCOVERY_INFO_LEN     32
+
+struct disc_frame {
+       __u8 caddr;          /* Connection address */
+       __u8 control;
+} IRDA_PACK;
+
 struct xid_frame {
        __u8  caddr; /* Connection address */
        __u8  control;
        __u8  ident; /* Should always be XID_FORMAT */ 
-       __u32 saddr; /* Source device address */
-       __u32 daddr; /* Destination device address */
+       __le32 saddr; /* Source device address */
+       __le32 daddr; /* Destination device address */
        __u8  flags; /* Discovery flags */
        __u8  slotnr;
        __u8  version;
@@ -88,18 +101,32 @@ struct xid_frame {
 struct test_frame {
        __u8 caddr;          /* Connection address */
        __u8 control;
-       __u32 saddr;         /* Source device address */
-       __u32 daddr;         /* Destination device address */
+       __le32 saddr;         /* Source device address */
+       __le32 daddr;         /* Destination device address */
 } IRDA_PACK;
 
 struct ua_frame {
        __u8 caddr;
        __u8 control;
+       __le32 saddr; /* Source device address */
+       __le32 daddr; /* Dest device address */
+} IRDA_PACK;
+
+struct dm_frame {
+       __u8 caddr;          /* Connection address */
+       __u8 control;
+} IRDA_PACK;
+
+struct rd_frame {
+       __u8 caddr;          /* Connection address */
+       __u8 control;
+} IRDA_PACK;
 
-       __u32 saddr; /* Source device address */
-       __u32 daddr; /* Dest device address */
+struct rr_frame {
+       __u8 caddr;          /* Connection address */
+       __u8 control;
 } IRDA_PACK;
-       
+
 struct i_frame {
        __u8 caddr;
        __u8 control;
@@ -108,8 +135,8 @@ struct i_frame {
 struct snrm_frame {
        __u8  caddr;
        __u8  control;
-       __u32 saddr;
-       __u32 daddr;
+       __le32 saddr;
+       __le32 daddr;
        __u8  ncaddr;
 } IRDA_PACK;