Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647f162b authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

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: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bb78516

include/linux/serial_core.h

+7 −7
Original line number Diff line number Diff line
@@ -143,13 +143,13 @@ struct uart_port { 
	unsigned char		iotype;			/* io access style */

	unsigned char		unused1;



#define UPIO_PORT		(0)			/* 8b I/O port access */

#define UPIO_HUB6		(1)			/* Hub6 ISA card */

#define UPIO_MEM		(2)			/* 8b MMIO access */

#define UPIO_MEM32		(3)			/* 32b little endian */

#define UPIO_AU			(4)			/* Au1x00 and RT288x type IO */

#define UPIO_TSI		(5)			/* Tsi108/109 type IO */

#define UPIO_MEM32BE		(6)			/* 32b big endian */

#define UPIO_PORT		(SERIAL_IO_PORT)	/* 8b I/O port access */

#define UPIO_HUB6		(SERIAL_IO_HUB6)	/* Hub6 ISA card */

#define UPIO_MEM		(SERIAL_IO_MEM)		/* 8b MMIO access */

#define UPIO_MEM32		(SERIAL_IO_MEM32)	/* 32b little endian */

#define UPIO_AU			(SERIAL_IO_AU)		/* Au1x00 and RT288x type IO */

#define UPIO_TSI		(SERIAL_IO_TSI)		/* Tsi108/109 type IO */

#define UPIO_MEM32BE		(SERIAL_IO_MEM32BE)	/* 32b big endian */



	unsigned int		read_status_mask;	/* driver specific */

	unsigned int		ignore_status_mask;	/* driver specific */

include/uapi/linux/serial.h

+4 −0
Original line number Diff line number Diff line
@@ -65,6 +65,10 @@ struct serial_struct { 
#define SERIAL_IO_PORT	0

#define SERIAL_IO_HUB6	1

#define SERIAL_IO_MEM	2

#define SERIAL_IO_MEM32	  3

#define SERIAL_IO_AU	  4

#define SERIAL_IO_TSI	  5

#define SERIAL_IO_MEM32BE 6



#define UART_CLEAR_FIFO		0x01

#define UART_USE_FIFO		0x02