Skip to content

L
linux
Commit d68dcfc1 authored by Mark Hounschell's avatar Mark Hounschell Committed by Greg Kroah-Hartman
Browse files
Options

staging: dgap: Fix several 80+ line warnings in dgap.h 

This patch fixes several 80+ char line warnings as reported
by checkpatch in dgap.h
Signed-off-by: default avatarMark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 084eb9d7
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 115 deletions
drivers/staging/dgap/dgap.h
View file @ d68dcfc1
......@@ -207,9 +207,10 @@ typedef unsigned char uchar;
#define EVSTART 0x0800L /* Start of event buffer */
#define EVMAX 0x0c00L /* End of event buffer */
#define FEP5_PLUS 0x0E40 /* ASCII '5' and ASCII 'A' is here */
#define ECS_SEG 0x0E44 /* Segment of the extended channel structure */
#define LINE_SPEED 0x10 /* Offset into ECS_SEG for line speed */
/* if the fep has extended */
#define ECS_SEG 0x0E44 /* Segment of the extended */
/* channel structure */
#define LINE_SPEED 0x10 /* Offset into ECS_SEG for line */
/* speed if the fep has extended */
/* capabilities */
/* BIOS MAGIC SPOTS */
......@@ -572,7 +573,8 @@ struct board_t {
ulong irq; /* Interrupt request number */
ulong intr_count; /* Count of interrupts */
u32 intr_used; /* Non-zero if using interrupts */
u32 intr_running; /* Non-zero if FEP knows its doing interrupts */
u32 intr_running; /* Non-zero if FEP knows its doing */
/* interrupts */
ulong port; /* Start of base io port of the card */
ulong port_end; /* End of base io port of the card */
......@@ -585,7 +587,8 @@ struct board_t {
uchar runwait; /* # Processes waiting for FEP */
uchar inhibit_poller; /* Tells the poller to leave us alone */
struct channel_t *channels[MAXPORTS]; /* array of pointers to our channels. */
struct channel_t *channels[MAXPORTS]; /* array of pointers to our */
/* channels. */
struct tty_driver *SerialDriver;
struct tty_port *SerialPorts;
......@@ -602,14 +605,19 @@ struct board_t {
struct bs_t *bd_bs; /* Base structure pointer */
char *flipbuf; /* Our flip buffer, alloced if board is found */
char *flipflagbuf; /* Our flip flag buffer, alloced if board is found */
char *flipbuf; /* Our flip buffer, alloced if */
/* board is found */
char *flipflagbuf; /* Our flip flag buffer, alloced */
/* if board is found */
u16 dpatype; /* The board "type", as defined by DPA */
u16 dpastatus; /* The board "status", as defined by DPA */
u16 dpatype; /* The board "type", as defined */
/* by DPA */
u16 dpastatus; /* The board "status", as defined */
/* by DPA */
wait_queue_head_t kme_wait; /* Needed for DPA support */
u32 conc_dl_status; /* Status of any pending conc download */
u32 conc_dl_status; /* Status of any pending conc */
/* download */
};
......@@ -853,9 +861,9 @@ struct shrink_buf_struct {
unsigned long shrink_buf_vaddr; /* Virtual address of board */
unsigned long shrink_buf_phys; /* Physical address of board */
unsigned long shrink_buf_bseg; /* Amount of board memory */
unsigned long shrink_buf_hseg; /* '186 Beginning of Dual-Port */
unsigned long shrink_buf_hseg; /* 186 Beginning of Dual-Port */
unsigned long shrink_buf_lseg; /* '186 Beginning of freed memory */
unsigned long shrink_buf_lseg; /* 186 Beginning of freed mem */
unsigned long shrink_buf_mseg; /* Linear address from start of
dual-port were freed memory
begins, host viewpoint. */
......@@ -1016,7 +1024,8 @@ struct digi_cmd {
#define BD_TRIBOOT 0x8
#define BD_BADKME 0x80
#define DIGI_LOOPBACK (('d'<<8) | 252) /* Enable/disable UART internal loopback */
#define DIGI_LOOPBACK (('d'<<8) | 252) /* Enable/disable UART */
/* internal loopback */
#define DIGI_SPOLL (('d'<<8) | 254) /* change poller rate */
#define DIGI_SETCUSTOMBAUD _IOW('e', 106, int) /* Set integer baud rate */
......@@ -1049,7 +1058,8 @@ struct channel_t {
u32 ch_flags; /* Channel flags */
u32 ch_close_delay; /* How long we should drop RTS/DTR for */
u32 ch_close_delay; /* How long we should drop */
/* RTS/DTR for */
u32 ch_cpstime; /* Time for CPS calculations */
......@@ -1170,8 +1180,8 @@ struct bs_t {
volatile unsigned short tx_lw; /* W Tx buffer low water mark */
volatile unsigned short rx_lw; /* W Rx buffer low water mark */
volatile unsigned short rx_hw; /* W Rx buffer high water mark */
volatile unsigned short incr; /* W Increment to next channel */
volatile unsigned short rx_hw; /* W Rx buffer high water mark*/
volatile unsigned short incr; /* W Increment to next channel*/
volatile unsigned short fepdev; /* U SCC device base address */
volatile unsigned short edelay; /* W Exception delay */
......@@ -1187,9 +1197,12 @@ struct bs_t {
volatile unsigned char ract; /* U Receiver active counter */
volatile unsigned char bstat; /* U Break status bits */
volatile unsigned char tbusy; /* W Transmit busy */
volatile unsigned char iempty; /* W Transmit empty event enable */
volatile unsigned char ilow; /* W Transmit low-water event enable */
volatile unsigned char idata; /* W Receive data interrupt enable */
volatile unsigned char iempty; /* W Transmit empty event */
/* enable */
volatile unsigned char ilow; /* W Transmit low-water event */
/* enable */
volatile unsigned char idata; /* W Receive data interrupt */
/* enable */
volatile unsigned char eflag; /* U Host event flags */
volatile unsigned char tflag; /* U Transmit flags */
......@@ -1198,7 +1211,8 @@ struct bs_t {
volatile unsigned char xval; /* U Transmit ready value */
volatile unsigned char m_stat; /* RC Modem status bits */
volatile unsigned char m_change; /* U Modem bits which changed */
volatile unsigned char m_int; /* W Modem interrupt enable bits */
volatile unsigned char m_int; /* W Modem interrupt enable */
/* bits */
volatile unsigned char m_last; /* U Last modem status */
volatile unsigned char mtran; /* C Unreported modem trans */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7