Commit 647f162b8e7e446c4bade031eb8a1a0a83d3de82
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
2bb785169e
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
serial: uapi: Declare all userspace-visible io types
ioctl(TIOCGSERIAL|TIOCSSERIAL) report and can change the port->iotype. UART drivers use the UPIO_* definitions, but the uapi header defines parallel values and userspace uses these parallel values for ioctls; thus the userspace values are definitive. Define UPIO_* iotypes in terms of the uapi defines, SERIAL_IO_*; extend the uapi defines to include all values in use by the serial core. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 2 changed files with 11 additions and 7 deletions Side-by-side Diff
include/linux/serial_core.h
| ... | ... | @@ -143,13 +143,13 @@ |
| 143 | 143 | unsigned char iotype; /* io access style */ |
| 144 | 144 | unsigned char unused1; |
| 145 | 145 | |
| 146 | -#define UPIO_PORT (0) /* 8b I/O port access */ | |
| 147 | -#define UPIO_HUB6 (1) /* Hub6 ISA card */ | |
| 148 | -#define UPIO_MEM (2) /* 8b MMIO access */ | |
| 149 | -#define UPIO_MEM32 (3) /* 32b little endian */ | |
| 150 | -#define UPIO_AU (4) /* Au1x00 and RT288x type IO */ | |
| 151 | -#define UPIO_TSI (5) /* Tsi108/109 type IO */ | |
| 152 | -#define UPIO_MEM32BE (6) /* 32b big endian */ | |
| 146 | +#define UPIO_PORT (SERIAL_IO_PORT) /* 8b I/O port access */ | |
| 147 | +#define UPIO_HUB6 (SERIAL_IO_HUB6) /* Hub6 ISA card */ | |
| 148 | +#define UPIO_MEM (SERIAL_IO_MEM) /* 8b MMIO access */ | |
| 149 | +#define UPIO_MEM32 (SERIAL_IO_MEM32) /* 32b little endian */ | |
| 150 | +#define UPIO_AU (SERIAL_IO_AU) /* Au1x00 and RT288x type IO */ | |
| 151 | +#define UPIO_TSI (SERIAL_IO_TSI) /* Tsi108/109 type IO */ | |
| 152 | +#define UPIO_MEM32BE (SERIAL_IO_MEM32BE) /* 32b big endian */ | |
| 153 | 153 | |
| 154 | 154 | unsigned int read_status_mask; /* driver specific */ |
| 155 | 155 | unsigned int ignore_status_mask; /* driver specific */ |
include/uapi/linux/serial.h
| ... | ... | @@ -65,6 +65,10 @@ |
| 65 | 65 | #define SERIAL_IO_PORT 0 |
| 66 | 66 | #define SERIAL_IO_HUB6 1 |
| 67 | 67 | #define SERIAL_IO_MEM 2 |
| 68 | +#define SERIAL_IO_MEM32 3 | |
| 69 | +#define SERIAL_IO_AU 4 | |
| 70 | +#define SERIAL_IO_TSI 5 | |
| 71 | +#define SERIAL_IO_MEM32BE 6 | |
| 68 | 72 | |
| 69 | 73 | #define UART_CLEAR_FIFO 0x01 |
| 70 | 74 | #define UART_USE_FIFO 0x02 |