diff options
Diffstat (limited to 'include/net/irda/ircomm_common.h')
| -rw-r--r-- | include/net/irda/ircomm_common.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/include/net/irda/ircomm_common.h b/include/net/irda/ircomm_common.h index cd1c41f86..44d1b1774 100644 --- a/include/net/irda/ircomm_common.h +++ b/include/net/irda/ircomm_common.h @@ -6,7 +6,7 @@ * Status: Experimental. * Author: Takahide Higuchi <thiguchi@pluto.dti.ne.jp> * - * Copyright (c) 1998, Takahide Higuchi, <thiguchi@pluto.dti.ne.jp>, + * Copyright (c) 1998-1999, Takahide Higuchi, <thiguchi@pluto.dti.ne.jp>, * All Rights Reserved. * * This program is free software; you can redistribute it and/or @@ -77,9 +77,9 @@ typedef enum { #define IRCOMM_MAGIC 0x434f4d4d #define COMM_INIT_CTRL_PARAM 3 /* length of initial control parameters */ -#define COMM_HEADER 1 /* length of clen field */ -#define COMM_HEADER_SIZE (LAP_HEADER+LMP_HEADER+TTP_HEADER+COMM_HEADER) -#define COMM_DEFAULT_DATA_SIZE 64 +#define COMM_HEADER_SIZE 1 /* length of clen field */ +#define COMM_MAX_HEADER_SIZE (TTP_MAX_HEADER+COMM_HEADER_SIZE) +#define COMM_DEFAULT_SDU_SIZE (64 - COMM_HEADER_SIZE) #define IRCOMM_MAX_CONNECTION 1 /* Don't change for now */ @@ -167,7 +167,7 @@ typedef enum { #define LSR_BI 0x01 /* Break interrupt indicator */ -struct ircomm_cb{ +struct ircomm_cb { int magic; int state; /* Current state of IrCOMM layer: * DISCOVERY,COMM_IDLE, COMM_WAITR, @@ -177,8 +177,9 @@ struct ircomm_cb{ int null_modem_mode; /* switch for null modem emulation */ int ttp_stop; - int max_txbuff_size; - __u32 maxsdusize; + __u32 tx_max_sdu_size; + __u32 rx_max_sdu_size; + __u8 max_header_size; __u32 daddr; /* Device address of the peer device */ __u32 saddr; @@ -201,8 +202,8 @@ struct ircomm_cb{ see Irlmp.c or somewhere :p)*/ int peer_cap; /* capability of peer device */ - struct wait_queue *discovery_wait; - struct wait_queue *ias_wait; + wait_queue_head_t discovery_wait; + wait_queue_head_t ias_wait; /* statistics */ int tx_packets; @@ -211,8 +212,6 @@ struct ircomm_cb{ int pending_control_tuples; int ignored_control_tuples; - - __u8 pi ; /* instruction of control channel*/ __u8 port_type; @@ -253,8 +252,6 @@ struct ircomm_cb{ int port_name_critical; }; - - void ircomm_connect_request(struct ircomm_cb *self, __u8 servicetype); void ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata, __u32 maxsdusize); |