TTY: simserial no longer needs serialP
Let's do a spin-off of serial_state structure with only needed elements. And remove serialP crap from includes. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
98e3a9e6dd
commit
3c4782dcd9
@ -27,10 +27,10 @@
|
|||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/capability.h>
|
#include <linux/capability.h>
|
||||||
|
#include <linux/circ_buf.h>
|
||||||
#include <linux/console.h>
|
#include <linux/console.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/serial.h>
|
#include <linux/serial.h>
|
||||||
#include <linux/serialP.h>
|
|
||||||
#include <linux/sysrq.h>
|
#include <linux/sysrq.h>
|
||||||
|
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
@ -46,6 +46,13 @@
|
|||||||
|
|
||||||
#define NR_PORTS 1 /* only one port for now */
|
#define NR_PORTS 1 /* only one port for now */
|
||||||
|
|
||||||
|
struct serial_state {
|
||||||
|
struct tty_port tport;
|
||||||
|
struct circ_buf xmit;
|
||||||
|
int irq;
|
||||||
|
int x_char;
|
||||||
|
};
|
||||||
|
|
||||||
static char *serial_name = "SimSerial driver";
|
static char *serial_name = "SimSerial driver";
|
||||||
static char *serial_version = "0.6";
|
static char *serial_version = "0.6";
|
||||||
|
|
||||||
|
@ -44,10 +44,8 @@ struct serial_state {
|
|||||||
int quot;
|
int quot;
|
||||||
int IER; /* Interrupt Enable Register */
|
int IER; /* Interrupt Enable Register */
|
||||||
int MCR; /* Modem control register */
|
int MCR; /* Modem control register */
|
||||||
/* simserial */
|
|
||||||
int x_char; /* xon/xoff character */
|
int x_char; /* xon/xoff character */
|
||||||
struct circ_buf xmit;
|
struct circ_buf xmit;
|
||||||
/* /simserial */
|
|
||||||
/* /amiserial */
|
/* /amiserial */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user