git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
net
/
irda
/
irda_device.h
diff --git
a/include/net/irda/irda_device.h
b/include/net/irda/irda_device.h
index
1d4cd8e
..
bca19ca
100644
(file)
--- a/
include/net/irda/irda_device.h
+++ b/
include/net/irda/irda_device.h
@@
-44,6
+44,7
@@
#include <linux/spinlock.h>
#include <linux/skbuff.h> /* struct sk_buff */
#include <linux/irda.h>
#include <linux/spinlock.h>
#include <linux/skbuff.h> /* struct sk_buff */
#include <linux/irda.h>
+#include <linux/types.h>
#include <net/pkt_sched.h>
#include <net/irda/irda.h>
#include <net/pkt_sched.h>
#include <net/irda/irda.h>
@@
-159,7
+160,7
@@
typedef struct {
int irq, irq2; /* Interrupts used */
int dma, dma2; /* DMA channel(s) used */
int fifo_size; /* FIFO size */
int irq, irq2; /* Interrupts used */
int dma, dma2; /* DMA channel(s) used */
int fifo_size; /* FIFO size */
- int irqflags; /* interrupt flags (ie,
SA_SHIRQ|SA_INTERRUPT
) */
+ int irqflags; /* interrupt flags (ie,
IRQF_SHARED|IRQF_DISABLED
) */
int direction; /* Link direction, used by some FIR drivers */
int enabled; /* Powered on? */
int suspended; /* Suspended by APM */
int direction; /* Link direction, used by some FIR drivers */
int enabled; /* Powered on? */
int suspended; /* Suspended by APM */
@@
-222,11
+223,9
@@
int irda_device_is_receiving(struct net_device *dev);
/* Interface for internal use */
static inline int irda_device_txqueue_empty(const struct net_device *dev)
{
/* Interface for internal use */
static inline int irda_device_txqueue_empty(const struct net_device *dev)
{
- return
(skb_queue_len(&dev->qdisc->q) == 0
);
+ return
skb_queue_empty(&dev->qdisc->q
);
}
int irda_device_set_raw_mode(struct net_device* self, int status);
}
int irda_device_set_raw_mode(struct net_device* self, int status);
-int irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts);
-int irda_device_change_speed(struct net_device *dev, __u32 speed);
struct net_device *alloc_irdadev(int sizeof_priv);
/* Dongle interface */
struct net_device *alloc_irdadev(int sizeof_priv);
/* Dongle interface */
@@
-235,9
+234,7
@@
int irda_device_register_dongle(struct dongle_reg *dongle);
dongle_t *irda_device_dongle_init(struct net_device *dev, int type);
int irda_device_dongle_cleanup(dongle_t *dongle);
dongle_t *irda_device_dongle_init(struct net_device *dev, int type);
int irda_device_dongle_cleanup(dongle_t *dongle);
-#ifdef CONFIG_ISA
-void irda_setup_dma(int channel, char *buffer, int count, int mode);
-#endif
+void irda_setup_dma(int channel, dma_addr_t buffer, int count, int mode);
void irda_task_delete(struct irda_task *task);
struct irda_task *irda_task_execute(void *instance,
void irda_task_delete(struct irda_task *task);
struct irda_task *irda_task_execute(void *instance,