TTY: amiserial no longer needs serialP (6fe18d26) · Commits · 戴 / test

drivers/tty/amiserial.c

+19 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,6 @@

	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/serial.h>		#include <linux/serial.h>
	#include <linux/serialP.h>
	#include <linux/serial_reg.h>		#include <linux/serial_reg.h>
	static char *serial_version = "4.30";		static char *serial_version = "4.30";

	@@ -70,6 +69,7 @@ static char *serial_version = "4.30";
	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/tty.h>		#include <linux/tty.h>
	#include <linux/tty_flip.h>		#include <linux/tty_flip.h>
			#include <linux/circ_buf.h>
	#include <linux/console.h>		#include <linux/console.h>
	#include <linux/major.h>		#include <linux/major.h>
	#include <linux/string.h>		#include <linux/string.h>
	@@ -92,6 +92,24 @@ static char *serial_version = "4.30";
	#include <asm/amigahw.h>		#include <asm/amigahw.h>
	#include <asm/amigaints.h>		#include <asm/amigaints.h>

			struct serial_state {
			struct tty_port tport;
			struct circ_buf xmit;
			struct async_icount icount;

			unsigned long port;
			int baud_base;
			int xmit_fifo_size;
			int custom_divisor;
			int read_status_mask;
			int ignore_status_mask;
			int timeout;
			int quot;
			int IER; /* Interrupt Enable Register */
			int MCR; /* Modem control register */
			int x_char; /* xon/xoff character */
			};

	#define custom amiga_custom		#define custom amiga_custom
	static char *serial_name = "Amiga-builtin serial driver";		static char *serial_name = "Amiga-builtin serial driver";

deleted100644 → 0

+0 −49

Original line number	Original line	Diff line number	Diff line
	/*
	* Private header file for the (dumb) serial driver
	*
	* Copyright (C) 1997 by Theodore Ts'o.
	*
	* Redistribution of this file is permitted under the terms of the GNU
	* Public License (GPL)
	*/

	#ifndef _LINUX_SERIALP_H
	#define _LINUX_SERIALP_H

	/*
	* This is our internal structure for each serial port's state.
	*
	* Many fields are paralleled by the structure used by the serial_struct
	* structure.
	*
	* For definitions of the flags field, see tty.h
	*/

	#include <linux/termios.h>
	#include <linux/workqueue.h>
	#include <linux/interrupt.h>
	#include <linux/circ_buf.h>
	#include <linux/tty.h>
	#include <linux/wait.h>

	struct serial_state {
	int baud_base;
	unsigned long port;
	int xmit_fifo_size;
	int custom_divisor;
	struct async_icount icount;
	struct tty_port tport;

	/* amiserial */
	int read_status_mask;
	int ignore_status_mask;
	int timeout;
	int quot;
	int IER; /* Interrupt Enable Register */
	int MCR; /* Modem control register */
	int x_char; /* xon/xoff character */
	struct circ_buf xmit;
	/* /amiserial */
	};

	#endif /* _LINUX_SERIAL_H */