aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-07-02 15:45:51 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-07-02 15:45:51 -0400
commit947deee8904b3c2edc7f59ab6e6242499e4dc434 (patch)
tree76f7c5b98508df4b6dea7b8dc01d973b9df43e60 /include/linux
parent4faf4e0e7d4e1935fbfc5043d3ebd8d51a3d898d (diff)
[SERIAL] Convert fifosize to an unsigned int
Some UARTs have more than 255 bytes of FIFO, which can't be represented by an unsigned char. Change the kernel's internal structure to be an unsigned int, but still export an unsigned char via the TIOCGSERIAL ioctl. If the TIOCSSERIAL ioctl provides a fifo size of 0, assume this means "don't change" otherwise we'll corrupt the larger fifo sizes. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/serial_core.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index bd14858121ea..966e2e8a1740 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -214,10 +214,11 @@ struct uart_port {
214 unsigned char __iomem *membase; /* read/write[bwl] */ 214 unsigned char __iomem *membase; /* read/write[bwl] */
215 unsigned int irq; /* irq number */ 215 unsigned int irq; /* irq number */
216 unsigned int uartclk; /* base uart clock */ 216 unsigned int uartclk; /* base uart clock */
217 unsigned char fifosize; /* tx fifo size */ 217 unsigned int fifosize; /* tx fifo size */
218 unsigned char x_char; /* xon/xoff char */ 218 unsigned char x_char; /* xon/xoff char */
219 unsigned char regshift; /* reg offset shift */ 219 unsigned char regshift; /* reg offset shift */
220 unsigned char iotype; /* io access style */ 220 unsigned char iotype; /* io access style */
221 unsigned char unused1;
221 222
222#define UPIO_PORT (0) 223#define UPIO_PORT (0)
223#define UPIO_HUB6 (1) 224#define UPIO_HUB6 (1)