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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
char
/
specialix_io8.h
diff --git
a/drivers/char/specialix_io8.h
b/drivers/char/specialix_io8.h
index
77c3180
..
895bd90
100644
(file)
--- a/
drivers/char/specialix_io8.h
+++ b/
drivers/char/specialix_io8.h
@@
-93,9
+93,11
@@
struct specialix_board {
unsigned long flags;
unsigned short base;
unsigned char irq;
unsigned long flags;
unsigned short base;
unsigned char irq;
- signed char count;
+ //signed char count;
+ int count;
unsigned char DTR;
int reg;
unsigned char DTR;
int reg;
+ spinlock_t lock;
};
#define SX_BOARD_PRESENT 0x00000001
};
#define SX_BOARD_PRESENT 0x00000001
@@
-124,17
+126,14
@@
struct specialix_port {
struct work_struct tqueue_hangup;
short wakeup_chars;
short break_length;
struct work_struct tqueue_hangup;
short wakeup_chars;
short break_length;
- unsigned
int
closing_wait;
+ unsigned
short
closing_wait;
unsigned char mark_mask;
unsigned char IER;
unsigned char MSVR;
unsigned char COR2;
unsigned char mark_mask;
unsigned char IER;
unsigned char MSVR;
unsigned char COR2;
-#ifdef SX_REPORT_OVERRUN
unsigned long overrun;
unsigned long overrun;
-#endif
-#ifdef SX_REPORT_FIFO
unsigned long hits[10];
unsigned long hits[10];
-#endif
+ spinlock_t lock;
};
#endif /* __KERNEL__ */
};
#endif /* __KERNEL__ */