irda.h from kernel source 2.2.14 updated by patch-2_2_14-irda1.gz
differs from irda.h from irda-utils-0.9.10.tgz
compilation of obex needs the second.
could the difference be merged to have only one irda.h
diff -rub irda-utils/irda.h linux/irda.h
--- irda-utils/irda.h Thu Jan 6 08:55:40 2000
+++ linux/irda.h Tue Mar 7 23:57:30 2000
@@ -1,12 +1,12 @@
/*********************************************************************
*
* Filename: irda.h
- * Version: 1.0
- * Description: IrDA header file to be used by IrDA applications
+ * Version:
+ * Description:
* Status: Experimental.
* Author: Dag Brattli <[EMAIL PROTECTED]>
* Created at: Mon Mar 8 14:06:12 1999
- * Modified at: Sat Dec 25 16:07:54 1999
+ * Modified at: Sat Dec 25 16:06:42 1999
* Modified by: Dag Brattli <[EMAIL PROTECTED]>
*
* Copyright (c) 1999 Dag Brattli, All Rights Reserved.
@@ -22,10 +22,8 @@
*
********************************************************************/
-#ifndef IRDA_H
-#define IRDA_H
-
-#include <sys/types.h>
+#ifndef KERNEL_IRDA_H
+#define KERNEL_IRDA_H
/* Hint bit positions for first hint byte */
#define HINT_PNP 0x01
@@ -91,37 +89,30 @@
#define IRTTP_MAX_SDU_SIZE IRLMP_MAX_SDU_SIZE /* Compatibility */
-/* LM-IAS Limits */
#define IAS_MAX_STRING 256
#define IAS_MAX_OCTET_STRING 1024
#define IAS_MAX_CLASSNAME 64
#define IAS_MAX_ATTRIBNAME 256
-/* LM-IAS Attribute types */
-#define IAS_MISSING 0
-#define IAS_INTEGER 1
-#define IAS_OCT_SEQ 2
-#define IAS_STRING 3
-
#define LSAP_ANY 0xff
struct sockaddr_irda {
sa_family_t sir_family; /* AF_IRDA */
- u_int8_t sir_lsap_sel; /* LSAP selector */
- u_int32_t sir_addr; /* Device address */
+ __u8 sir_lsap_sel; /* LSAP selector */
+ __u32 sir_addr; /* Device address */
char sir_name[25]; /* Usually <service>:IrDA:TinyTP */
};
struct irda_device_info {
- u_int32_t saddr; /* Address of local interface */
- u_int32_t daddr; /* Address of remote device */
+ __u32 saddr; /* Address of local interface */
+ __u32 daddr; /* Address of remote device */
char info[22]; /* Description */
- u_int8_t charset; /* Charset used for description */
- u_int8_t hints[2]; /* Hint bits */
+ __u8 charset; /* Charset used for description */
+ __u8 hints[2]; /* Hint bits */
};
struct irda_device_list {
- u_int32_t len;
+ __u32 len;
struct irda_device_info dev[1];
};
@@ -133,12 +124,12 @@
unsigned int irda_attrib_int;
struct {
unsigned short len;
- u_char octet_seq[IAS_MAX_OCTET_STRING];
+ __u8 octet_seq[IAS_MAX_OCTET_STRING];
} irda_attrib_octet_seq;
struct {
- unsigned char len;
- unsigned char charset;
- unsigned char string[IAS_MAX_STRING];
+ __u8 len;
+ __u8 charset;
+ __u8 string[IAS_MAX_STRING];
} irda_attrib_string;
} attribute;
};
@@ -160,19 +151,19 @@
/* IrDA quality of service information (must not exceed 16 bytes) */
struct if_irda_qos {
- u_int32_t baudrate;
- u_int16_t data_size;
- u_int16_t window_size;
- u_int16_t min_turn_time;
- u_int16_t max_turn_time;
- u_int8_t add_bofs;
- u_int8_t link_disc;
+ unsigned long baudrate;
+ unsigned short data_size;
+ unsigned short window_size;
+ unsigned short min_turn_time;
+ unsigned short max_turn_time;
+ unsigned char add_bofs;
+ unsigned char link_disc;
};
/* For setting RTS and DTR lines of a dongle */
struct if_irda_line {
- unsigned char dtr;
- unsigned char rts;
+ __u8 dtr;
+ __u8 rts;
};
/* IrDA interface configuration (data part must not exceed 16 bytes) */
@@ -199,7 +190,7 @@
#define ifr_dtr ifr_ifru.ifru_line.dtr
#define ifr_rts ifr_ifru.ifru_line.rts
-#endif /* IRDA_H */
+#endif /* KERNEL_IRDA_H */
