Skip to content

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

staging: dgap: Fix white space errors as reported by checkpatch 

This patch fixes white space errors in dgap.c
as reported by checkpatch. It also changes
unnecessary mutliple empty lines with a single
empty line
Signed-off-by: default avatarMark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 305ec874
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 228 deletions
drivers/staging/dgap/dgap.c
View file @ b115b024
...@@ -102,17 +102,17 @@ PARM_INT(rawreadok, 1, 0644, "Bypass flip buffers on input"); ...@@ -102,17 +102,17 @@ PARM_INT(rawreadok, 1, 0644, "Bypass flip buffers on input");
* *
*/ */
static int dgap_start(void); static int dgap_start(void);
static void dgap_init_globals(void); static void dgap_init_globals(void);
static int dgap_found_board(struct pci_dev *pdev, int id); static int dgap_found_board(struct pci_dev *pdev, int id);
static void dgap_cleanup_board(struct board_t *brd); static void dgap_cleanup_board(struct board_t *brd);
static void dgap_poll_handler(ulong dummy); static void dgap_poll_handler(ulong dummy);
static int dgap_init_pci(void); static int dgap_init_pci(void);
static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
static void dgap_remove_one(struct pci_dev *dev); static void dgap_remove_one(struct pci_dev *dev);
static int dgap_probe1(struct pci_dev *pdev, int card_type); static int dgap_probe1(struct pci_dev *pdev, int card_type);
static int dgap_do_remap(struct board_t *brd); static int dgap_do_remap(struct board_t *brd);
static irqreturn_t dgap_intr(int irq, void *voidbrd); static irqreturn_t dgap_intr(int irq, void *voidbrd);
/* Our function prototypes */ /* Our function prototypes */
static int dgap_tty_open(struct tty_struct *tty, struct file *file); static int dgap_tty_open(struct tty_struct *tty, struct file *file);
...@@ -146,13 +146,13 @@ static void dgap_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te ...@@ -146,13 +146,13 @@ static void dgap_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te
static int dgap_tty_put_char(struct tty_struct *tty, unsigned char c); static int dgap_tty_put_char(struct tty_struct *tty, unsigned char c);
static void dgap_tty_send_xchar(struct tty_struct *tty, char ch); static void dgap_tty_send_xchar(struct tty_struct *tty, char ch);
static int dgap_tty_register(struct board_t *brd); static int dgap_tty_register(struct board_t *brd);
static int dgap_tty_preinit(void); static int dgap_tty_preinit(void);
static int dgap_tty_init(struct board_t *); static int dgap_tty_init(struct board_t *);
static void dgap_tty_post_uninit(void); static void dgap_tty_post_uninit(void);
static void dgap_tty_uninit(struct board_t *); static void dgap_tty_uninit(struct board_t *);
static void dgap_carrier(struct channel_t *ch); static void dgap_carrier(struct channel_t *ch);
static void dgap_input(struct channel_t *ch); static void dgap_input(struct channel_t *ch);
/* /*
* Our function prototypes from dgap_fep5 * Our function prototypes from dgap_fep5
...@@ -207,14 +207,14 @@ static char *dgap_create_config_string(struct board_t *bd, char *string); ...@@ -207,14 +207,14 @@ static char *dgap_create_config_string(struct board_t *bd, char *string);
static uint dgap_config_get_useintr(struct board_t *bd); static uint dgap_config_get_useintr(struct board_t *bd);
static uint dgap_config_get_altpin(struct board_t *bd); static uint dgap_config_get_altpin(struct board_t *bd);
static int dgap_ms_sleep(ulong ms); static int dgap_ms_sleep(ulong ms);
static void dgap_do_bios_load(struct board_t *brd, uchar __user *ubios, int len); static void dgap_do_bios_load(struct board_t *brd, uchar __user *ubios, int len);
static void dgap_do_fep_load(struct board_t *brd, uchar __user *ufep, int len); static void dgap_do_fep_load(struct board_t *brd, uchar __user *ufep, int len);
#ifdef DIGI_CONCENTRATORS_SUPPORTED #ifdef DIGI_CONCENTRATORS_SUPPORTED
static void dgap_do_conc_load(struct board_t *brd, uchar *uaddr, int len); static void dgap_do_conc_load(struct board_t *brd, uchar *uaddr, int len);
#endif #endif
static int dgap_after_config_loaded(int board); static int dgap_after_config_loaded(int board);
static int dgap_finalize_board_init(struct board_t *brd); static int dgap_finalize_board_init(struct board_t *brd);
static void dgap_get_vpd(struct board_t *brd); static void dgap_get_vpd(struct board_t *brd);
static void dgap_do_reset_board(struct board_t *brd); static void dgap_do_reset_board(struct board_t *brd);
...@@ -230,7 +230,6 @@ void dgap_cleanup_module(void); ...@@ -230,7 +230,6 @@ void dgap_cleanup_module(void);
module_init(dgap_init_module); module_init(dgap_init_module);
module_exit(dgap_cleanup_module); module_exit(dgap_cleanup_module);
/* /*
* File operations permitted on Control/Management major. * File operations permitted on Control/Management major.
*/ */
...@@ -238,31 +237,30 @@ static const struct file_operations DgapBoardFops = { ...@@ -238,31 +237,30 @@ static const struct file_operations DgapBoardFops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
/* /*
* Globals * Globals
*/ */
static uint dgap_NumBoards; static uint dgap_NumBoards;
static struct board_t *dgap_Board[MAXBOARDS]; static struct board_t *dgap_Board[MAXBOARDS];
DEFINE_SPINLOCK(dgap_global_lock); DEFINE_SPINLOCK(dgap_global_lock);
static ulong dgap_poll_counter; static ulong dgap_poll_counter;
static char *dgap_config_buf; static char *dgap_config_buf;
static int dgap_driver_state = DRIVER_INITIALIZED; static int dgap_driver_state = DRIVER_INITIALIZED;
DEFINE_SPINLOCK(dgap_dl_lock); DEFINE_SPINLOCK(dgap_dl_lock);
static wait_queue_head_t dgap_dl_wait; static wait_queue_head_t dgap_dl_wait;
static int dgap_dl_action; static int dgap_dl_action;
static int dgap_poll_tick = 20; /* Poll interval - 20 ms */ static int dgap_poll_tick = 20; /* Poll interval - 20 ms */
/* /*
* Static vars. * Static vars.
*/ */
static int dgap_Major_Control_Registered = FALSE; static int dgap_Major_Control_Registered = FALSE;
static uint dgap_driver_start = FALSE; static uint dgap_driver_start = FALSE;
static struct class * dgap_class; static struct class *dgap_class;
static struct board_t *dgap_BoardsByMajor[256]; static struct board_t *dgap_BoardsByMajor[256];
static uchar *dgap_TmpWriteBuf = NULL; static uchar *dgap_TmpWriteBuf = NULL;
DECLARE_MUTEX(dgap_TmpWriteSem); DECLARE_MUTEX(dgap_TmpWriteSem);
static uint dgap_count = 500; static uint dgap_count = 500;
...@@ -270,8 +268,8 @@ static uint dgap_count = 500; ...@@ -270,8 +268,8 @@ static uint dgap_count = 500;
* Poller stuff * Poller stuff
*/ */
DEFINE_SPINLOCK(dgap_poll_lock); /* Poll scheduling lock */ DEFINE_SPINLOCK(dgap_poll_lock); /* Poll scheduling lock */
static ulong dgap_poll_time; /* Time of next poll */ static ulong dgap_poll_time; /* Time of next poll */
static uint dgap_poll_stop; /* Used to tell poller to stop */ static uint dgap_poll_stop; /* Used to tell poller to stop */
static struct timer_list dgap_poll_timer; static struct timer_list dgap_poll_timer;
/* /*
...@@ -313,7 +311,6 @@ static struct pci_device_id dgap_pci_tbl[] = { ...@@ -313,7 +311,6 @@ static struct pci_device_id dgap_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, dgap_pci_tbl); MODULE_DEVICE_TABLE(pci, dgap_pci_tbl);
/* /*
* A generic list of Product names, PCI Vendor ID, and PCI Device ID. * A generic list of Product names, PCI Vendor ID, and PCI Device ID.
*/ */
...@@ -380,7 +377,6 @@ static struct firmware_info fw_info[] = { ...@@ -380,7 +377,6 @@ static struct firmware_info fw_info[] = {
{0,} {0,}
}; };
static char *dgap_driver_state_text[] = { static char *dgap_driver_state_text[] = {
"Driver Initialized", "Driver Initialized",
"Driver needs configuration load.", "Driver needs configuration load.",
...@@ -403,7 +399,6 @@ static struct digi_t dgap_digi_init = { ...@@ -403,7 +399,6 @@ static struct digi_t dgap_digi_init = {
.digi_term = "ansi" /* default terminal type */ .digi_term = "ansi" /* default terminal type */
}; };
/* /*
* Define a local default termios struct. All ports will be created * Define a local default termios struct. All ports will be created
* with this termios initially. * with this termios initially.
...@@ -558,7 +553,6 @@ int dgap_init_module(void) ...@@ -558,7 +553,6 @@ int dgap_init_module(void)
return rc; return rc;
} }
/* /*
* Start of driver. * Start of driver.
*/ */
...@@ -626,7 +620,6 @@ static int dgap_start(void) ...@@ -626,7 +620,6 @@ static int dgap_start(void)
return rc; return rc;
} }
/* /*
* Register pci driver, and return how many boards we have. * Register pci driver, and return how many boards we have.
*/ */
...@@ -635,7 +628,6 @@ static int dgap_init_pci(void) ...@@ -635,7 +628,6 @@ static int dgap_init_pci(void)
return pci_register_driver(&dgap_driver); return pci_register_driver(&dgap_driver);
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
...@@ -656,19 +648,16 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -656,19 +648,16 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return rc; return rc;
} }
static int dgap_probe1(struct pci_dev *pdev, int card_type) static int dgap_probe1(struct pci_dev *pdev, int card_type)
{ {
return dgap_found_board(pdev, card_type); return dgap_found_board(pdev, card_type);
} }
static void dgap_remove_one(struct pci_dev *dev) static void dgap_remove_one(struct pci_dev *dev)
{ {
/* Do Nothing */ /* Do Nothing */
} }
/* /*
* dgap_cleanup_module() * dgap_cleanup_module()
* *
...@@ -684,7 +673,7 @@ void dgap_cleanup_module(void) ...@@ -684,7 +673,7 @@ void dgap_cleanup_module(void)
DGAP_UNLOCK(dgap_poll_lock, lock_flags); DGAP_UNLOCK(dgap_poll_lock, lock_flags);
/* Turn off poller right away. */ /* Turn off poller right away. */
del_timer_sync( &dgap_poll_timer); del_timer_sync(&dgap_poll_timer);
dgap_remove_driver_sysfiles(&dgap_driver); dgap_remove_driver_sysfiles(&dgap_driver);
...@@ -714,7 +703,6 @@ void dgap_cleanup_module(void) ...@@ -714,7 +703,6 @@ void dgap_cleanup_module(void)
pci_unregister_driver(&dgap_driver); pci_unregister_driver(&dgap_driver);
} }
/* /*
* dgap_cleanup_board() * dgap_cleanup_board()
* *
...@@ -771,7 +759,6 @@ static void dgap_cleanup_board(struct board_t *brd) ...@@ -771,7 +759,6 @@ static void dgap_cleanup_board(struct board_t *brd)
kfree(brd); kfree(brd);
} }
/* /*
* dgap_found_board() * dgap_found_board()
* *
...@@ -793,7 +780,7 @@ static int dgap_found_board(struct pci_dev *pdev, int id) ...@@ -793,7 +780,7 @@ static int dgap_found_board(struct pci_dev *pdev, int id)
/* make a temporary message buffer for the boot messages */ /* make a temporary message buffer for the boot messages */
brd->msgbuf = brd->msgbuf_head = brd->msgbuf = brd->msgbuf_head =
(char *) kzalloc(sizeof(char) * 8192, GFP_KERNEL); (char *) kzalloc(sizeof(char) * 8192, GFP_KERNEL);
if(!brd->msgbuf) { if (!brd->msgbuf) {
kfree(brd); kfree(brd);
return -ENOMEM; return -ENOMEM;
} }
...@@ -863,7 +850,6 @@ static int dgap_found_board(struct pci_dev *pdev, int id) ...@@ -863,7 +850,6 @@ static int dgap_found_board(struct pci_dev *pdev, int id)
brd->port = brd->membase + PCI_IO_OFFSET; brd->port = brd->membase + PCI_IO_OFFSET;
brd->port_end = brd->port + PCI_IO_SIZE; brd->port_end = brd->port + PCI_IO_SIZE;
/* /*
* Special initialization for non-PLX boards * Special initialization for non-PLX boards
*/ */
...@@ -907,7 +893,6 @@ static int dgap_found_board(struct pci_dev *pdev, int id) ...@@ -907,7 +893,6 @@ static int dgap_found_board(struct pci_dev *pdev, int id)
static int dgap_finalize_board_init(struct board_t *brd) static int dgap_finalize_board_init(struct board_t *brd)
{ {
int rc; int rc;
if (!brd || brd->magic != DGAP_BOARD_MAGIC) if (!brd || brd->magic != DGAP_BOARD_MAGIC)
...@@ -1113,7 +1098,6 @@ static int dgap_do_remap(struct board_t *brd) ...@@ -1113,7 +1098,6 @@ static int dgap_do_remap(struct board_t *brd)
return 0; return 0;
} }
/***************************************************************************** /*****************************************************************************
* *
* Function: * Function:
...@@ -1149,7 +1133,6 @@ static void dgap_poll_handler(ulong dummy) ...@@ -1149,7 +1133,6 @@ static void dgap_poll_handler(ulong dummy)
dgap_poll_counter++; dgap_poll_counter++;
/* /*
* Do not start the board state machine until * Do not start the board state machine until
* driver tells us its up and running, and has * driver tells us its up and running, and has
...@@ -1164,7 +1147,7 @@ static void dgap_poll_handler(ulong dummy) ...@@ -1164,7 +1147,7 @@ static void dgap_poll_handler(ulong dummy)
* Otherwise, use our new tasklet based poller, which should * Otherwise, use our new tasklet based poller, which should
* speed things up for multiple boards. * speed things up for multiple boards.
*/ */
if ( (dgap_NumBoards == 1) || (num_online_cpus() <= 1) ) { if ((dgap_NumBoards == 1) || (num_online_cpus() <= 1)) {
for (i = 0; i < dgap_NumBoards; i++) { for (i = 0; i < dgap_NumBoards; i++) {
brd = dgap_Board[i]; brd = dgap_Board[i];
...@@ -1213,7 +1196,7 @@ static void dgap_poll_handler(ulong dummy) ...@@ -1213,7 +1196,7 @@ static void dgap_poll_handler(ulong dummy)
/* /*
* Schedule ourself back at the nominal wakeup interval. * Schedule ourself back at the nominal wakeup interval.
*/ */
DGAP_LOCK(dgap_poll_lock, lock_flags ); DGAP_LOCK(dgap_poll_lock, lock_flags);
dgap_poll_time += dgap_jiffies_from_ms(dgap_poll_tick); dgap_poll_time += dgap_jiffies_from_ms(dgap_poll_tick);
new_time = dgap_poll_time - jiffies; new_time = dgap_poll_time - jiffies;
...@@ -1224,15 +1207,12 @@ static void dgap_poll_handler(ulong dummy) ...@@ -1224,15 +1207,12 @@ static void dgap_poll_handler(ulong dummy)
dgap_poll_timer.function = dgap_poll_handler; dgap_poll_timer.function = dgap_poll_handler;
dgap_poll_timer.data = 0; dgap_poll_timer.data = 0;
dgap_poll_timer.expires = dgap_poll_time; dgap_poll_timer.expires = dgap_poll_time;
DGAP_UNLOCK(dgap_poll_lock, lock_flags ); DGAP_UNLOCK(dgap_poll_lock, lock_flags);
if (!dgap_poll_stop) if (!dgap_poll_stop)
add_timer(&dgap_poll_timer); add_timer(&dgap_poll_timer);
} }
/* /*
* dgap_intr() * dgap_intr()
* *
...@@ -1260,7 +1240,6 @@ static irqreturn_t dgap_intr(int irq, void *voidbrd) ...@@ -1260,7 +1240,6 @@ static irqreturn_t dgap_intr(int irq, void *voidbrd)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* /*
* dgap_init_globals() * dgap_init_globals()
* *
...@@ -1277,13 +1256,12 @@ static void dgap_init_globals(void) ...@@ -1277,13 +1256,12 @@ static void dgap_init_globals(void)
for (i = 0; i < MAXBOARDS; i++) for (i = 0; i < MAXBOARDS; i++)
dgap_Board[i] = NULL; dgap_Board[i] = NULL;
init_timer( &dgap_poll_timer ); init_timer(&dgap_poll_timer);
init_waitqueue_head(&dgap_dl_wait); init_waitqueue_head(&dgap_dl_wait);
dgap_dl_action = 0; dgap_dl_action = 0;
} }
/************************************************************************ /************************************************************************
* *
* Utility functions * Utility functions
...@@ -1304,9 +1282,6 @@ static int dgap_ms_sleep(ulong ms) ...@@ -1304,9 +1282,6 @@ static int dgap_ms_sleep(ulong ms)
return signal_pending(current); return signal_pending(current);
} }
/************************************************************************ /************************************************************************
* *
* TTY Initialization/Cleanup Functions * TTY Initialization/Cleanup Functions
...@@ -1341,7 +1316,6 @@ static int dgap_tty_preinit(void) ...@@ -1341,7 +1316,6 @@ static int dgap_tty_preinit(void)
return 0; return 0;
} }
/* /*
* dgap_tty_register() * dgap_tty_register()
* *
...@@ -1427,7 +1401,6 @@ static int dgap_tty_register(struct board_t *brd) ...@@ -1427,7 +1401,6 @@ static int dgap_tty_register(struct board_t *brd)
return rc; return rc;
} }
/* /*
* dgap_tty_init() * dgap_tty_init()
* *
...@@ -1593,7 +1566,6 @@ static int dgap_tty_init(struct board_t *brd) ...@@ -1593,7 +1566,6 @@ static int dgap_tty_init(struct board_t *brd)
return 0; return 0;
} }
/* /*
* dgap_tty_post_uninit() * dgap_tty_post_uninit()
* *
...@@ -1605,7 +1577,6 @@ static void dgap_tty_post_uninit(void) ...@@ -1605,7 +1577,6 @@ static void dgap_tty_post_uninit(void)
dgap_TmpWriteBuf = NULL; dgap_TmpWriteBuf = NULL;
} }
/* /*
* dgap_tty_uninit() * dgap_tty_uninit()
* *
...@@ -1649,9 +1620,7 @@ static void dgap_tty_uninit(struct board_t *brd) ...@@ -1649,9 +1620,7 @@ static void dgap_tty_uninit(struct board_t *brd)
} }
} }
#define TMPBUFLEN (1024) #define TMPBUFLEN (1024)
/* /*
* dgap_sniff - Dump data out to the "sniff" buffer if the * dgap_sniff - Dump data out to the "sniff" buffer if the
* proc sniff file is opened... * proc sniff file is opened...
...@@ -1764,7 +1733,6 @@ static void dgap_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *b ...@@ -1764,7 +1733,6 @@ static void dgap_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *b
} while (too_much_data); } while (too_much_data);
} }
/*======================================================================= /*=======================================================================
* *
* dgap_input - Process received data. * dgap_input - Process received data.
...@@ -1802,7 +1770,7 @@ static void dgap_input(struct channel_t *ch) ...@@ -1802,7 +1770,7 @@ static void dgap_input(struct channel_t *ch)
return; return;
bd = ch->ch_bd; bd = ch->ch_bd;
if(!bd || bd->magic != DGAP_BOARD_MAGIC) if (!bd || bd->magic != DGAP_BOARD_MAGIC)
return; return;
DGAP_LOCK(bd->bd_lock, lock_flags); DGAP_LOCK(bd->bd_lock, lock_flags);
...@@ -1973,7 +1941,6 @@ static void dgap_input(struct channel_t *ch) ...@@ -1973,7 +1941,6 @@ static void dgap_input(struct channel_t *ch)
} }
/************************************************************************ /************************************************************************
* Determines when CARRIER changes state and takes appropriate * Determines when CARRIER changes state and takes appropriate
* action. * action.
...@@ -2088,7 +2055,6 @@ static void dgap_carrier(struct channel_t *ch) ...@@ -2088,7 +2055,6 @@ static void dgap_carrier(struct channel_t *ch)
ch->ch_flags &= ~CH_CD; ch->ch_flags &= ~CH_CD;
} }
/************************************************************************ /************************************************************************
* *
* TTY Entry points and helper functions * TTY Entry points and helper functions
...@@ -2250,7 +2216,6 @@ static int dgap_tty_open(struct tty_struct *tty, struct file *file) ...@@ -2250,7 +2216,6 @@ static int dgap_tty_open(struct tty_struct *tty, struct file *file)
return rc; return rc;
} }
/* /*
* dgap_block_til_ready() * dgap_block_til_ready()
* *
...@@ -2380,7 +2345,6 @@ static int dgap_block_til_ready(struct tty_struct *tty, struct file *file, struc ...@@ -2380,7 +2345,6 @@ static int dgap_block_til_ready(struct tty_struct *tty, struct file *file, struc
return 0; return 0;
} }
/* /*
* dgap_tty_hangup() * dgap_tty_hangup()
* *
...@@ -2412,8 +2376,6 @@ static void dgap_tty_hangup(struct tty_struct *tty) ...@@ -2412,8 +2376,6 @@ static void dgap_tty_hangup(struct tty_struct *tty)
} }
/* /*
* dgap_tty_close() * dgap_tty_close()
* *
...@@ -2501,9 +2463,9 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file) ...@@ -2501,9 +2463,9 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
/* /*
* If we have HUPCL set, lower DTR and RTS * If we have HUPCL set, lower DTR and RTS
*/ */
if (ch->ch_c_cflag & HUPCL ) { if (ch->ch_c_cflag & HUPCL) {
ch->ch_mostat &= ~(D_RTS(ch)|D_DTR(ch)); ch->ch_mostat &= ~(D_RTS(ch)|D_DTR(ch));
dgap_cmdb( ch, SMODEM, 0, D_DTR(ch)|D_RTS(ch), 0 ); dgap_cmdb(ch, SMODEM, 0, D_DTR(ch)|D_RTS(ch), 0);
/* /*
* Go to sleep to ensure RTS/DTR * Go to sleep to ensure RTS/DTR
...@@ -2525,7 +2487,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file) ...@@ -2525,7 +2487,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
/* /*
* turn off print device when closing print device. * turn off print device when closing print device.
*/ */
if ((un->un_type == DGAP_PRINT) && (ch->ch_flags & CH_PRON) ) { if ((un->un_type == DGAP_PRINT) && (ch->ch_flags & CH_PRON)) {
dgap_wmove(ch, ch->ch_digi.digi_offstr, dgap_wmove(ch, ch->ch_digi.digi_offstr,
(int) ch->ch_digi.digi_offlen); (int) ch->ch_digi.digi_offlen);
ch->ch_flags &= ~CH_PRON; ch->ch_flags &= ~CH_PRON;
...@@ -2541,7 +2503,6 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file) ...@@ -2541,7 +2503,6 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
DGAP_UNLOCK(ch->ch_lock, lock_flags); DGAP_UNLOCK(ch->ch_lock, lock_flags);
} }
/* /*
* dgap_tty_chars_in_buffer() * dgap_tty_chars_in_buffer()
* *
...@@ -2641,7 +2602,6 @@ static int dgap_tty_chars_in_buffer(struct tty_struct *tty) ...@@ -2641,7 +2602,6 @@ static int dgap_tty_chars_in_buffer(struct tty_struct *tty)
return chars; return chars;
} }
static int dgap_wait_for_drain(struct tty_struct *tty) static int dgap_wait_for_drain(struct tty_struct *tty)
{ {
struct channel_t *ch; struct channel_t *ch;
...@@ -2696,7 +2656,6 @@ static int dgap_wait_for_drain(struct tty_struct *tty) ...@@ -2696,7 +2656,6 @@ static int dgap_wait_for_drain(struct tty_struct *tty)
return ret; return ret;
} }
/* /*
* dgap_maxcps_room * dgap_maxcps_room
* *
...@@ -2728,7 +2687,7 @@ static int dgap_maxcps_room(struct tty_struct *tty, int bytes_available) ...@@ -2728,7 +2687,7 @@ static int dgap_maxcps_room(struct tty_struct *tty, int bytes_available)
if (un->un_type != DGAP_PRINT) if (un->un_type != DGAP_PRINT)
return bytes_available; return bytes_available;
if (ch->ch_digi.digi_maxcps > 0 && ch->ch_digi.digi_bufsize > 0 ) { if (ch->ch_digi.digi_maxcps > 0 && ch->ch_digi.digi_bufsize > 0) {
int cps_limit = 0; int cps_limit = 0;
unsigned long current_time = jiffies; unsigned long current_time = jiffies;
unsigned long buffer_time = current_time + unsigned long buffer_time = current_time +
...@@ -2752,7 +2711,6 @@ static int dgap_maxcps_room(struct tty_struct *tty, int bytes_available) ...@@ -2752,7 +2711,6 @@ static int dgap_maxcps_room(struct tty_struct *tty, int bytes_available)
return bytes_available; return bytes_available;
} }
static inline void dgap_set_firmware_event(struct un_t *un, unsigned int event) static inline void dgap_set_firmware_event(struct un_t *un, unsigned int event)
{ {
struct channel_t *ch = NULL; struct channel_t *ch = NULL;
...@@ -2781,7 +2739,6 @@ static inline void dgap_set_firmware_event(struct un_t *un, unsigned int event) ...@@ -2781,7 +2739,6 @@ static inline void dgap_set_firmware_event(struct un_t *un, unsigned int event)
} }
} }
/* /*
* dgap_tty_write_room() * dgap_tty_write_room()
* *
...@@ -2853,7 +2810,6 @@ static int dgap_tty_write_room(struct tty_struct *tty) ...@@ -2853,7 +2810,6 @@ static int dgap_tty_write_room(struct tty_struct *tty)
return ret; return ret;
} }
/* /*
* dgap_tty_put_char() * dgap_tty_put_char()
* *
...@@ -2870,7 +2826,6 @@ static int dgap_tty_put_char(struct tty_struct *tty, unsigned char c) ...@@ -2870,7 +2826,6 @@ static int dgap_tty_put_char(struct tty_struct *tty, unsigned char c)
return 1; return 1;
} }
/* /*
* dgap_tty_write() * dgap_tty_write()
* *
...@@ -3043,7 +2998,6 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, int ...@@ -3043,7 +2998,6 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, int
writew(head, &(bs->tx_head)); writew(head, &(bs->tx_head));
} }
dgap_set_firmware_event(un, UN_LOW | UN_EMPTY); dgap_set_firmware_event(un, UN_LOW | UN_EMPTY);
/* /*
...@@ -3082,8 +3036,6 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, int ...@@ -3082,8 +3036,6 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, int
return count; return count;
} }
/* /*
* Return modem signals to ld. * Return modem signals to ld.
*/ */
...@@ -3132,13 +3084,11 @@ static int dgap_tty_tiocmget(struct tty_struct *tty) ...@@ -3132,13 +3084,11 @@ static int dgap_tty_tiocmget(struct tty_struct *tty)
return result; return result;
} }
/* /*
* dgap_tty_tiocmset() * dgap_tty_tiocmset()
* *
* Set modem signals, called by ld. * Set modem signals, called by ld.
*/ */
static int dgap_tty_tiocmset(struct tty_struct *tty, static int dgap_tty_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear) unsigned int set, unsigned int clear)
{ {
...@@ -3195,8 +3145,6 @@ static int dgap_tty_tiocmset(struct tty_struct *tty, ...@@ -3195,8 +3145,6 @@ static int dgap_tty_tiocmset(struct tty_struct *tty,
return 0; return 0;
} }
/* /*
* dgap_tty_send_break() * dgap_tty_send_break()
* *
...@@ -3251,9 +3199,6 @@ static int dgap_tty_send_break(struct tty_struct *tty, int msec) ...@@ -3251,9 +3199,6 @@ static int dgap_tty_send_break(struct tty_struct *tty, int msec)
return 0; return 0;
} }
/* /*
* dgap_tty_wait_until_sent() * dgap_tty_wait_until_sent()
* *
...@@ -3264,8 +3209,6 @@ static void dgap_tty_wait_until_sent(struct tty_struct *tty, int timeout) ...@@ -3264,8 +3209,6 @@ static void dgap_tty_wait_until_sent(struct tty_struct *tty, int timeout)
dgap_wait_for_drain(tty); dgap_wait_for_drain(tty);
} }
/* /*
* dgap_send_xchar() * dgap_send_xchar()
* *
...@@ -3321,9 +3264,6 @@ static void dgap_tty_send_xchar(struct tty_struct *tty, char c) ...@@ -3321,9 +3264,6 @@ static void dgap_tty_send_xchar(struct tty_struct *tty, char c)
return; return;
} }
/* /*
* Return modem signals to ld. * Return modem signals to ld.
*/ */
...@@ -3365,7 +3305,6 @@ static int dgap_get_modem_info(struct channel_t *ch, unsigned int __user *value) ...@@ -3365,7 +3305,6 @@ static int dgap_get_modem_info(struct channel_t *ch, unsigned int __user *value)
return rc; return rc;
} }
/* /*
* dgap_set_modem_info() * dgap_set_modem_info()
* *
...@@ -3457,7 +3396,6 @@ static int dgap_set_modem_info(struct tty_struct *tty, unsigned int command, uns ...@@ -3457,7 +3396,6 @@ static int dgap_set_modem_info(struct tty_struct *tty, unsigned int command, uns
return 0; return 0;
} }
/* /*
* dgap_tty_digigeta() * dgap_tty_digigeta()
* *
...@@ -3499,7 +3437,6 @@ static int dgap_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retin ...@@ -3499,7 +3437,6 @@ static int dgap_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retin
return 0; return 0;
} }
/* /*
* dgap_tty_digiseta() * dgap_tty_digiseta()
* *
...@@ -3569,7 +3506,6 @@ static int dgap_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i ...@@ -3569,7 +3506,6 @@ static int dgap_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i
return 0; return 0;
} }
/* /*
* dgap_tty_digigetedelay() * dgap_tty_digigetedelay()
* *
...@@ -3611,7 +3547,6 @@ static int dgap_tty_digigetedelay(struct tty_struct *tty, int __user *retinfo) ...@@ -3611,7 +3547,6 @@ static int dgap_tty_digigetedelay(struct tty_struct *tty, int __user *retinfo)
return 0; return 0;
} }
/* /*
* dgap_tty_digisetedelay() * dgap_tty_digisetedelay()
* *
...@@ -3658,7 +3593,6 @@ static int dgap_tty_digisetedelay(struct tty_struct *tty, int __user *new_info) ...@@ -3658,7 +3593,6 @@ static int dgap_tty_digisetedelay(struct tty_struct *tty, int __user *new_info)
return 0; return 0;
} }
/* /*
* dgap_tty_digigetcustombaud() * dgap_tty_digigetcustombaud()
* *
...@@ -3697,7 +3631,6 @@ static int dgap_tty_digigetcustombaud(struct tty_struct *tty, int __user *retinf ...@@ -3697,7 +3631,6 @@ static int dgap_tty_digigetcustombaud(struct tty_struct *tty, int __user *retinf
return 0; return 0;
} }
/* /*
* dgap_tty_digisetcustombaud() * dgap_tty_digisetcustombaud()
* *
...@@ -3747,7 +3680,6 @@ static int dgap_tty_digisetcustombaud(struct tty_struct *tty, int __user *new_in ...@@ -3747,7 +3680,6 @@ static int dgap_tty_digisetcustombaud(struct tty_struct *tty, int __user *new_in
return 0; return 0;
} }
/* /*
* dgap_set_termios() * dgap_set_termios()
*/ */
...@@ -3791,7 +3723,6 @@ static void dgap_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te ...@@ -3791,7 +3723,6 @@ static void dgap_tty_set_termios(struct tty_struct *tty, struct ktermios *old_te
DGAP_UNLOCK(bd->bd_lock, lock_flags); DGAP_UNLOCK(bd->bd_lock, lock_flags);
} }
static void dgap_tty_throttle(struct tty_struct *tty) static void dgap_tty_throttle(struct tty_struct *tty)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -3828,7 +3759,6 @@ static void dgap_tty_throttle(struct tty_struct *tty) ...@@ -3828,7 +3759,6 @@ static void dgap_tty_throttle(struct tty_struct *tty)
} }
static void dgap_tty_unthrottle(struct tty_struct *tty) static void dgap_tty_unthrottle(struct tty_struct *tty)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -3865,7 +3795,6 @@ static void dgap_tty_unthrottle(struct tty_struct *tty) ...@@ -3865,7 +3795,6 @@ static void dgap_tty_unthrottle(struct tty_struct *tty)
DGAP_UNLOCK(bd->bd_lock, lock_flags); DGAP_UNLOCK(bd->bd_lock, lock_flags);
} }
static void dgap_tty_start(struct tty_struct *tty) static void dgap_tty_start(struct tty_struct *tty)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -3899,7 +3828,6 @@ static void dgap_tty_start(struct tty_struct *tty) ...@@ -3899,7 +3828,6 @@ static void dgap_tty_start(struct tty_struct *tty)
} }
static void dgap_tty_stop(struct tty_struct *tty) static void dgap_tty_stop(struct tty_struct *tty)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -3933,7 +3861,6 @@ static void dgap_tty_stop(struct tty_struct *tty) ...@@ -3933,7 +3861,6 @@ static void dgap_tty_stop(struct tty_struct *tty)
} }
/* /*
* dgap_tty_flush_chars() * dgap_tty_flush_chars()
* *
...@@ -3979,8 +3906,6 @@ static void dgap_tty_flush_chars(struct tty_struct *tty) ...@@ -3979,8 +3906,6 @@ static void dgap_tty_flush_chars(struct tty_struct *tty)
DGAP_UNLOCK(bd->bd_lock, lock_flags); DGAP_UNLOCK(bd->bd_lock, lock_flags);
} }
/* /*
* dgap_tty_flush_buffer() * dgap_tty_flush_buffer()
* *
...@@ -4033,8 +3958,6 @@ static void dgap_tty_flush_buffer(struct tty_struct *tty) ...@@ -4033,8 +3958,6 @@ static void dgap_tty_flush_buffer(struct tty_struct *tty)
tty_wakeup(tty); tty_wakeup(tty);
} }
/***************************************************************************** /*****************************************************************************
* *
* The IOCTL function and all of its helpers * The IOCTL function and all of its helpers
...@@ -4117,7 +4040,6 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, ...@@ -4117,7 +4040,6 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
return 0; return 0;
case TCSBRKP: case TCSBRKP:
/* support for POSIX tcsendbreak() /* support for POSIX tcsendbreak()
...@@ -4252,7 +4174,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, ...@@ -4252,7 +4174,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
if ((arg == TCOFLUSH) || (arg == TCIOFLUSH)) { if ((arg == TCOFLUSH) || (arg == TCIOFLUSH)) {
ch->ch_flags &= ~CH_STOP; ch->ch_flags &= ~CH_STOP;
head = readw(&(ch->ch_bs->tx_head)); head = readw(&(ch->ch_bs->tx_head));
dgap_cmdw(ch, FLUSHTX, (u16) head, 0 ); dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
dgap_cmdw(ch, RESUMETX, 0, 0); dgap_cmdw(ch, RESUMETX, 0, 0);
if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) { if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) {
ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY); ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY);
...@@ -4447,8 +4369,6 @@ static int dgap_after_config_loaded(int board) ...@@ -4447,8 +4369,6 @@ static int dgap_after_config_loaded(int board)
return 0; return 0;
} }
/* /*
* Create pr and tty device entries * Create pr and tty device entries
*/ */
...@@ -4497,7 +4417,6 @@ static int dgap_tty_register_ports(struct board_t *brd) ...@@ -4497,7 +4417,6 @@ static int dgap_tty_register_ports(struct board_t *brd)
return 0; return 0;
} }
/* /*
* Copies the BIOS code from the user to the board, * Copies the BIOS code from the user to the board,
* and starts the BIOS running. * and starts the BIOS running.
...@@ -4532,7 +4451,6 @@ static void dgap_do_bios_load(struct board_t *brd, uchar __user *ubios, int len) ...@@ -4532,7 +4451,6 @@ static void dgap_do_bios_load(struct board_t *brd, uchar __user *ubios, int len)
writeb(FEPCLR, brd->re_map_port); writeb(FEPCLR, brd->re_map_port);
} }
/* /*
* Checks to see if the BIOS completed running on the card. * Checks to see if the BIOS completed running on the card.
*/ */
...@@ -4575,7 +4493,6 @@ static void dgap_do_wait_for_bios(struct board_t *brd) ...@@ -4575,7 +4493,6 @@ static void dgap_do_wait_for_bios(struct board_t *brd)
brd->dpastatus = BD_NOBIOS; brd->dpastatus = BD_NOBIOS;
} }
/* /*
* Copies the FEP code from the user to the board, * Copies the FEP code from the user to the board,
* and starts the FEP running. * and starts the FEP running.
...@@ -4621,7 +4538,6 @@ static void dgap_do_fep_load(struct board_t *brd, uchar *ufep, int len) ...@@ -4621,7 +4538,6 @@ static void dgap_do_fep_load(struct board_t *brd, uchar *ufep, int len)
} }
/* /*
* Waits for the FEP to report thats its ready for us to use. * Waits for the FEP to report thats its ready for us to use.
*/ */
...@@ -4670,7 +4586,6 @@ static void dgap_do_wait_for_fep(struct board_t *brd) ...@@ -4670,7 +4586,6 @@ static void dgap_do_wait_for_fep(struct board_t *brd)
brd->dpastatus = BD_NOFEP; brd->dpastatus = BD_NOFEP;
} }
/* /*
* Physically forces the FEP5 card to reset itself. * Physically forces the FEP5 card to reset itself.
*/ */
...@@ -4722,7 +4637,6 @@ static void dgap_do_reset_board(struct board_t *brd) ...@@ -4722,7 +4637,6 @@ static void dgap_do_reset_board(struct board_t *brd)
brd->state = FINISHED_RESET; brd->state = FINISHED_RESET;
} }
#ifdef DIGI_CONCENTRATORS_SUPPORTED #ifdef DIGI_CONCENTRATORS_SUPPORTED
/* /*
* Sends a concentrator image into the FEP5 board. * Sends a concentrator image into the FEP5 board.
...@@ -4853,7 +4767,6 @@ static void dgap_get_vpd(struct board_t *brd) ...@@ -4853,7 +4767,6 @@ static void dgap_get_vpd(struct board_t *brd)
pci_write_config_dword(brd->pdev, PCI_ROM_ADDRESS, magic); pci_write_config_dword(brd->pdev, PCI_ROM_ADDRESS, magic);
} }
/* /*
* Our board poller function. * Our board poller function.
*/ */
...@@ -5069,7 +4982,6 @@ static void dgap_poll_tasklet(unsigned long data) ...@@ -5069,7 +4982,6 @@ static void dgap_poll_tasklet(unsigned long data)
DGAP_UNLOCK(bd->bd_lock, lock_flags); DGAP_UNLOCK(bd->bd_lock, lock_flags);
} }
/*======================================================================= /*=======================================================================
* *
* dgap_cmdb - Sends a 2 byte command to the FEP. * dgap_cmdb - Sends a 2 byte command to the FEP.
...@@ -5156,7 +5068,6 @@ static void dgap_cmdb(struct channel_t *ch, uchar cmd, uchar byte1, uchar byte2, ...@@ -5156,7 +5068,6 @@ static void dgap_cmdb(struct channel_t *ch, uchar cmd, uchar byte1, uchar byte2,
} }
} }
/*======================================================================= /*=======================================================================
* *
* dgap_cmdw - Sends a 1 word command to the FEP. * dgap_cmdw - Sends a 1 word command to the FEP.
...@@ -5240,8 +5151,6 @@ static void dgap_cmdw(struct channel_t *ch, uchar cmd, u16 word, uint ncmds) ...@@ -5240,8 +5151,6 @@ static void dgap_cmdw(struct channel_t *ch, uchar cmd, u16 word, uint ncmds)
} }
} }
/*======================================================================= /*=======================================================================
* *
* dgap_cmdw_ext - Sends a extended word command to the FEP. * dgap_cmdw_ext - Sends a extended word command to the FEP.
...@@ -5337,7 +5246,6 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds) ...@@ -5337,7 +5246,6 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds)
} }
} }
/*======================================================================= /*=======================================================================
* *
* dgap_wmove - Write data to FEP buffer. * dgap_wmove - Write data to FEP buffer.
...@@ -5432,7 +5340,6 @@ static uint dgap_get_custom_baud(struct channel_t *ch) ...@@ -5432,7 +5340,6 @@ static uint dgap_get_custom_baud(struct channel_t *ch)
return value; return value;
} }
/* /*
* Calls the firmware to reset this channel. * Calls the firmware to reset this channel.
*/ */
...@@ -5459,7 +5366,6 @@ static void dgap_firmware_reset_port(struct channel_t *ch) ...@@ -5459,7 +5366,6 @@ static void dgap_firmware_reset_port(struct channel_t *ch)
ch->ch_hflow = 0; ch->ch_hflow = 0;
} }
/*======================================================================= /*=======================================================================
* *
* dgap_param - Set Digi parameters. * dgap_param - Set Digi parameters.
...@@ -5599,7 +5505,6 @@ static int dgap_param(struct tty_struct *tty) ...@@ -5599,7 +5505,6 @@ static int dgap_param(struct tty_struct *tty)
ch->ch_baud_info = baud; ch->ch_baud_info = baud;
/* /*
* CBAUD has bit position 0x1000 set these days to indicate Linux * CBAUD has bit position 0x1000 set these days to indicate Linux
* baud rate remap. * baud rate remap.
...@@ -5615,7 +5520,6 @@ static int dgap_param(struct tty_struct *tty) ...@@ -5615,7 +5520,6 @@ static int dgap_param(struct tty_struct *tty)
if ((ch->ch_digi.digi_flags & DIGI_FAST) || (ch->ch_c_cflag & CBAUDEX)) if ((ch->ch_digi.digi_flags & DIGI_FAST) || (ch->ch_c_cflag & CBAUDEX))
cflag |= HUPCL; cflag |= HUPCL;
if ((ch->ch_c_cflag & CBAUDEX) && !(ch->ch_digi.digi_flags & DIGI_FAST)) { if ((ch->ch_c_cflag & CBAUDEX) && !(ch->ch_digi.digi_flags & DIGI_FAST)) {
/* /*
* The below code is trying to guarantee that only baud rates * The below code is trying to guarantee that only baud rates
...@@ -5628,25 +5532,25 @@ static int dgap_param(struct tty_struct *tty) ...@@ -5628,25 +5532,25 @@ static int dgap_param(struct tty_struct *tty)
/* Map high speed requests to index into FEP's baud table */ /* Map high speed requests to index into FEP's baud table */
switch (tcflag) { switch (tcflag) {
case B57600 : case B57600:
baudpart = 1; baudpart = 1;
break; break;
#ifdef B76800 #ifdef B76800
case B76800 : case B76800:
baudpart = 2; baudpart = 2;
break; break;
#endif #endif
case B115200 : case B115200:
baudpart = 3; baudpart = 3;
break; break;
case B230400 : case B230400:
baudpart = 9; baudpart = 9;
break; break;
case B460800 : case B460800:
baudpart = 11; baudpart = 11;
break; break;
#ifdef B921600 #ifdef B921600
case B921600 : case B921600:
baudpart = 12; baudpart = 12;
break; break;
#endif #endif
...@@ -5697,7 +5601,7 @@ static int dgap_param(struct tty_struct *tty) ...@@ -5697,7 +5601,7 @@ static int dgap_param(struct tty_struct *tty)
} }
if (ch->ch_digi.digi_flags & DIGI_ALTPIN) if (ch->ch_digi.digi_flags & DIGI_ALTPIN)
iflag |= IALTPIN ; iflag |= IALTPIN;
if (iflag != ch->ch_fepiflag) { if (iflag != ch->ch_fepiflag) {
ch->ch_fepiflag = iflag; ch->ch_fepiflag = iflag;
...@@ -5789,7 +5693,6 @@ static int dgap_param(struct tty_struct *tty) ...@@ -5789,7 +5693,6 @@ static int dgap_param(struct tty_struct *tty)
return 0; return 0;
} }
/* /*
* dgap_parity_scan() * dgap_parity_scan()
* *
...@@ -5867,9 +5770,6 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf, unsigned ...@@ -5867,9 +5770,6 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf, unsigned
*len = count; *len = count;
} }
/*======================================================================= /*=======================================================================
* *
* dgap_event - FEP to host event processing routine. * dgap_event - FEP to host event processing routine.
...@@ -6180,7 +6080,6 @@ static ssize_t dgap_driver_pollrate_store(struct device_driver *ddp, const char ...@@ -6180,7 +6080,6 @@ static ssize_t dgap_driver_pollrate_store(struct device_driver *ddp, const char
} }
static DRIVER_ATTR(pollrate, (S_IRUSR | S_IWUSR), dgap_driver_pollrate_show, dgap_driver_pollrate_store); static DRIVER_ATTR(pollrate, (S_IRUSR | S_IWUSR), dgap_driver_pollrate_show, dgap_driver_pollrate_store);
static void dgap_create_driver_sysfiles(struct pci_driver *dgap_driver) static void dgap_create_driver_sysfiles(struct pci_driver *dgap_driver)
{ {
int rc = 0; int rc = 0;
...@@ -6197,7 +6096,6 @@ static void dgap_create_driver_sysfiles(struct pci_driver *dgap_driver) ...@@ -6197,7 +6096,6 @@ static void dgap_create_driver_sysfiles(struct pci_driver *dgap_driver)
printk(KERN_ERR "DGAP: sysfs driver_create_file failed!\n"); printk(KERN_ERR "DGAP: sysfs driver_create_file failed!\n");
} }
static void dgap_remove_driver_sysfiles(struct pci_driver *dgap_driver) static void dgap_remove_driver_sysfiles(struct pci_driver *dgap_driver)
{ {
struct device_driver *driverfs = &dgap_driver->driver; struct device_driver *driverfs = &dgap_driver->driver;
...@@ -6210,7 +6108,6 @@ static void dgap_remove_driver_sysfiles(struct pci_driver *dgap_driver) ...@@ -6210,7 +6108,6 @@ static void dgap_remove_driver_sysfiles(struct pci_driver *dgap_driver)
driver_remove_file(driverfs, &driver_attr_state); driver_remove_file(driverfs, &driver_attr_state);
} }
#define DGAP_VERIFY_BOARD(p, bd) \ #define DGAP_VERIFY_BOARD(p, bd) \
if (!p) \ if (!p) \
return 0; \ return 0; \
...@@ -6221,7 +6118,6 @@ static void dgap_remove_driver_sysfiles(struct pci_driver *dgap_driver) ...@@ -6221,7 +6118,6 @@ static void dgap_remove_driver_sysfiles(struct pci_driver *dgap_driver)
if (bd->state != BOARD_READY) \ if (bd->state != BOARD_READY) \
return 0; \ return 0; \
static ssize_t dgap_ports_state_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_state_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6239,7 +6135,6 @@ static ssize_t dgap_ports_state_show(struct device *p, struct device_attribute * ...@@ -6239,7 +6135,6 @@ static ssize_t dgap_ports_state_show(struct device *p, struct device_attribute *
} }
static DEVICE_ATTR(ports_state, S_IRUSR, dgap_ports_state_show, NULL); static DEVICE_ATTR(ports_state, S_IRUSR, dgap_ports_state_show, NULL);
static ssize_t dgap_ports_baud_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_baud_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6256,7 +6151,6 @@ static ssize_t dgap_ports_baud_show(struct device *p, struct device_attribute *a ...@@ -6256,7 +6151,6 @@ static ssize_t dgap_ports_baud_show(struct device *p, struct device_attribute *a
} }
static DEVICE_ATTR(ports_baud, S_IRUSR, dgap_ports_baud_show, NULL); static DEVICE_ATTR(ports_baud, S_IRUSR, dgap_ports_baud_show, NULL);
static ssize_t dgap_ports_msignals_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_msignals_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6283,7 +6177,6 @@ static ssize_t dgap_ports_msignals_show(struct device *p, struct device_attribut ...@@ -6283,7 +6177,6 @@ static ssize_t dgap_ports_msignals_show(struct device *p, struct device_attribut
} }
static DEVICE_ATTR(ports_msignals, S_IRUSR, dgap_ports_msignals_show, NULL); static DEVICE_ATTR(ports_msignals, S_IRUSR, dgap_ports_msignals_show, NULL);
static ssize_t dgap_ports_iflag_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_iflag_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6299,7 +6192,6 @@ static ssize_t dgap_ports_iflag_show(struct device *p, struct device_attribute * ...@@ -6299,7 +6192,6 @@ static ssize_t dgap_ports_iflag_show(struct device *p, struct device_attribute *
} }
static DEVICE_ATTR(ports_iflag, S_IRUSR, dgap_ports_iflag_show, NULL); static DEVICE_ATTR(ports_iflag, S_IRUSR, dgap_ports_iflag_show, NULL);
static ssize_t dgap_ports_cflag_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_cflag_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6315,7 +6207,6 @@ static ssize_t dgap_ports_cflag_show(struct device *p, struct device_attribute * ...@@ -6315,7 +6207,6 @@ static ssize_t dgap_ports_cflag_show(struct device *p, struct device_attribute *
} }
static DEVICE_ATTR(ports_cflag, S_IRUSR, dgap_ports_cflag_show, NULL); static DEVICE_ATTR(ports_cflag, S_IRUSR, dgap_ports_cflag_show, NULL);
static ssize_t dgap_ports_oflag_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_oflag_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6331,7 +6222,6 @@ static ssize_t dgap_ports_oflag_show(struct device *p, struct device_attribute * ...@@ -6331,7 +6222,6 @@ static ssize_t dgap_ports_oflag_show(struct device *p, struct device_attribute *
} }
static DEVICE_ATTR(ports_oflag, S_IRUSR, dgap_ports_oflag_show, NULL); static DEVICE_ATTR(ports_oflag, S_IRUSR, dgap_ports_oflag_show, NULL);
static ssize_t dgap_ports_lflag_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_lflag_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6347,7 +6237,6 @@ static ssize_t dgap_ports_lflag_show(struct device *p, struct device_attribute * ...@@ -6347,7 +6237,6 @@ static ssize_t dgap_ports_lflag_show(struct device *p, struct device_attribute *
} }
static DEVICE_ATTR(ports_lflag, S_IRUSR, dgap_ports_lflag_show, NULL); static DEVICE_ATTR(ports_lflag, S_IRUSR, dgap_ports_lflag_show, NULL);
static ssize_t dgap_ports_digi_flag_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_digi_flag_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6363,7 +6252,6 @@ static ssize_t dgap_ports_digi_flag_show(struct device *p, struct device_attribu ...@@ -6363,7 +6252,6 @@ static ssize_t dgap_ports_digi_flag_show(struct device *p, struct device_attribu
} }
static DEVICE_ATTR(ports_digi_flag, S_IRUSR, dgap_ports_digi_flag_show, NULL); static DEVICE_ATTR(ports_digi_flag, S_IRUSR, dgap_ports_digi_flag_show, NULL);
static ssize_t dgap_ports_rxcount_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_rxcount_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6379,7 +6267,6 @@ static ssize_t dgap_ports_rxcount_show(struct device *p, struct device_attribute ...@@ -6379,7 +6267,6 @@ static ssize_t dgap_ports_rxcount_show(struct device *p, struct device_attribute
} }
static DEVICE_ATTR(ports_rxcount, S_IRUSR, dgap_ports_rxcount_show, NULL); static DEVICE_ATTR(ports_rxcount, S_IRUSR, dgap_ports_rxcount_show, NULL);
static ssize_t dgap_ports_txcount_show(struct device *p, struct device_attribute *attr, char *buf) static ssize_t dgap_ports_txcount_show(struct device *p, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6395,7 +6282,6 @@ static ssize_t dgap_ports_txcount_show(struct device *p, struct device_attribute ...@@ -6395,7 +6282,6 @@ static ssize_t dgap_ports_txcount_show(struct device *p, struct device_attribute
} }
static DEVICE_ATTR(ports_txcount, S_IRUSR, dgap_ports_txcount_show, NULL); static DEVICE_ATTR(ports_txcount, S_IRUSR, dgap_ports_txcount_show, NULL);
/* this function creates the sys files that will export each signal status /* this function creates the sys files that will export each signal status
* to sysfs each value will be put in a separate filename * to sysfs each value will be put in a separate filename
*/ */
...@@ -6418,7 +6304,6 @@ static void dgap_create_ports_sysfiles(struct board_t *bd) ...@@ -6418,7 +6304,6 @@ static void dgap_create_ports_sysfiles(struct board_t *bd)
printk(KERN_ERR "DGAP: sysfs device_create_file failed!\n"); printk(KERN_ERR "DGAP: sysfs device_create_file failed!\n");
} }
/* removes all the sys files created for that port */ /* removes all the sys files created for that port */
static void dgap_remove_ports_sysfiles(struct board_t *bd) static void dgap_remove_ports_sysfiles(struct board_t *bd)
{ {
...@@ -6434,7 +6319,6 @@ static void dgap_remove_ports_sysfiles(struct board_t *bd) ...@@ -6434,7 +6319,6 @@ static void dgap_remove_ports_sysfiles(struct board_t *bd)
device_remove_file(&(bd->pdev->dev), &dev_attr_ports_txcount); device_remove_file(&(bd->pdev->dev), &dev_attr_ports_txcount);
} }
static ssize_t dgap_tty_state_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_state_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6459,7 +6343,6 @@ static ssize_t dgap_tty_state_show(struct device *d, struct device_attribute *at ...@@ -6459,7 +6343,6 @@ static ssize_t dgap_tty_state_show(struct device *d, struct device_attribute *at
} }
static DEVICE_ATTR(state, S_IRUSR, dgap_tty_state_show, NULL); static DEVICE_ATTR(state, S_IRUSR, dgap_tty_state_show, NULL);
static ssize_t dgap_tty_baud_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_baud_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6484,7 +6367,6 @@ static ssize_t dgap_tty_baud_show(struct device *d, struct device_attribute *att ...@@ -6484,7 +6367,6 @@ static ssize_t dgap_tty_baud_show(struct device *d, struct device_attribute *att
} }
static DEVICE_ATTR(baud, S_IRUSR, dgap_tty_baud_show, NULL); static DEVICE_ATTR(baud, S_IRUSR, dgap_tty_baud_show, NULL);
static ssize_t dgap_tty_msignals_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_msignals_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6518,7 +6400,6 @@ static ssize_t dgap_tty_msignals_show(struct device *d, struct device_attribute ...@@ -6518,7 +6400,6 @@ static ssize_t dgap_tty_msignals_show(struct device *d, struct device_attribute
} }
static DEVICE_ATTR(msignals, S_IRUSR, dgap_tty_msignals_show, NULL); static DEVICE_ATTR(msignals, S_IRUSR, dgap_tty_msignals_show, NULL);
static ssize_t dgap_tty_iflag_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_iflag_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6543,7 +6424,6 @@ static ssize_t dgap_tty_iflag_show(struct device *d, struct device_attribute *at ...@@ -6543,7 +6424,6 @@ static ssize_t dgap_tty_iflag_show(struct device *d, struct device_attribute *at
} }
static DEVICE_ATTR(iflag, S_IRUSR, dgap_tty_iflag_show, NULL); static DEVICE_ATTR(iflag, S_IRUSR, dgap_tty_iflag_show, NULL);
static ssize_t dgap_tty_cflag_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_cflag_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6568,7 +6448,6 @@ static ssize_t dgap_tty_cflag_show(struct device *d, struct device_attribute *at ...@@ -6568,7 +6448,6 @@ static ssize_t dgap_tty_cflag_show(struct device *d, struct device_attribute *at
} }
static DEVICE_ATTR(cflag, S_IRUSR, dgap_tty_cflag_show, NULL); static DEVICE_ATTR(cflag, S_IRUSR, dgap_tty_cflag_show, NULL);
static ssize_t dgap_tty_oflag_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_oflag_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6593,7 +6472,6 @@ static ssize_t dgap_tty_oflag_show(struct device *d, struct device_attribute *at ...@@ -6593,7 +6472,6 @@ static ssize_t dgap_tty_oflag_show(struct device *d, struct device_attribute *at
} }
static DEVICE_ATTR(oflag, S_IRUSR, dgap_tty_oflag_show, NULL); static DEVICE_ATTR(oflag, S_IRUSR, dgap_tty_oflag_show, NULL);
static ssize_t dgap_tty_lflag_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_lflag_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6618,7 +6496,6 @@ static ssize_t dgap_tty_lflag_show(struct device *d, struct device_attribute *at ...@@ -6618,7 +6496,6 @@ static ssize_t dgap_tty_lflag_show(struct device *d, struct device_attribute *at
} }
static DEVICE_ATTR(lflag, S_IRUSR, dgap_tty_lflag_show, NULL); static DEVICE_ATTR(lflag, S_IRUSR, dgap_tty_lflag_show, NULL);
static ssize_t dgap_tty_digi_flag_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_digi_flag_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6643,7 +6520,6 @@ static ssize_t dgap_tty_digi_flag_show(struct device *d, struct device_attribute ...@@ -6643,7 +6520,6 @@ static ssize_t dgap_tty_digi_flag_show(struct device *d, struct device_attribute
} }
static DEVICE_ATTR(digi_flag, S_IRUSR, dgap_tty_digi_flag_show, NULL); static DEVICE_ATTR(digi_flag, S_IRUSR, dgap_tty_digi_flag_show, NULL);
static ssize_t dgap_tty_rxcount_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_rxcount_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6668,7 +6544,6 @@ static ssize_t dgap_tty_rxcount_show(struct device *d, struct device_attribute * ...@@ -6668,7 +6544,6 @@ static ssize_t dgap_tty_rxcount_show(struct device *d, struct device_attribute *
} }
static DEVICE_ATTR(rxcount, S_IRUSR, dgap_tty_rxcount_show, NULL); static DEVICE_ATTR(rxcount, S_IRUSR, dgap_tty_rxcount_show, NULL);
static ssize_t dgap_tty_txcount_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_txcount_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6693,7 +6568,6 @@ static ssize_t dgap_tty_txcount_show(struct device *d, struct device_attribute * ...@@ -6693,7 +6568,6 @@ static ssize_t dgap_tty_txcount_show(struct device *d, struct device_attribute *
} }
static DEVICE_ATTR(txcount, S_IRUSR, dgap_tty_txcount_show, NULL); static DEVICE_ATTR(txcount, S_IRUSR, dgap_tty_txcount_show, NULL);
static ssize_t dgap_tty_name_show(struct device *d, struct device_attribute *attr, char *buf) static ssize_t dgap_tty_name_show(struct device *d, struct device_attribute *attr, char *buf)
{ {
struct board_t *bd; struct board_t *bd;
...@@ -6789,7 +6663,6 @@ static ssize_t dgap_tty_name_show(struct device *d, struct device_attribute *att ...@@ -6789,7 +6663,6 @@ static ssize_t dgap_tty_name_show(struct device *d, struct device_attribute *att
} }
static DEVICE_ATTR(custom_name, S_IRUSR, dgap_tty_name_show, NULL); static DEVICE_ATTR(custom_name, S_IRUSR, dgap_tty_name_show, NULL);
static struct attribute *dgap_sysfs_tty_entries[] = { static struct attribute *dgap_sysfs_tty_entries[] = {
&dev_attr_state.attr, &dev_attr_state.attr,
&dev_attr_baud.attr, &dev_attr_baud.attr,
...@@ -6805,15 +6678,11 @@ static struct attribute *dgap_sysfs_tty_entries[] = { ...@@ -6805,15 +6678,11 @@ static struct attribute *dgap_sysfs_tty_entries[] = {
NULL NULL
}; };
static struct attribute_group dgap_tty_attribute_group = { static struct attribute_group dgap_tty_attribute_group = {
.name = NULL, .name = NULL,
.attrs = dgap_sysfs_tty_entries, .attrs = dgap_sysfs_tty_entries,
}; };
static void dgap_create_tty_sysfs(struct un_t *un, struct device *c) static void dgap_create_tty_sysfs(struct un_t *un, struct device *c)
{ {
int ret; int ret;
...@@ -6829,7 +6698,6 @@ static void dgap_create_tty_sysfs(struct un_t *un, struct device *c) ...@@ -6829,7 +6698,6 @@ static void dgap_create_tty_sysfs(struct un_t *un, struct device *c)
} }
static void dgap_remove_tty_sysfs(struct device *c) static void dgap_remove_tty_sysfs(struct device *c)
{ {
sysfs_remove_group(&c->kobj, &dgap_tty_attribute_group); sysfs_remove_group(&c->kobj, &dgap_tty_attribute_group);
...@@ -6853,15 +6721,15 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -6853,15 +6721,15 @@ static int dgap_parsefile(char **in, int Remove)
p = p->next; p = p->next;
/* file must start with a BEGIN */ /* file must start with a BEGIN */
while ( (rc = dgap_gettok(in,p)) != BEGIN ) { while ((rc = dgap_gettok(in, p)) != BEGIN) {
if (rc == 0) { if (rc == 0) {
dgap_err("unexpected EOF"); dgap_err("unexpected EOF");
return -1; return -1;
} }
} }
for (; ; ) { for (; ;) {
rc = dgap_gettok(in,p); rc = dgap_gettok(in, p);
if (rc == 0) { if (rc == 0) {
dgap_err("unexpected EOF"); dgap_err("unexpected EOF");
return -1; return -1;
...@@ -6882,7 +6750,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -6882,7 +6750,7 @@ static int dgap_parsefile(char **in, int Remove)
case BOARD: /* board info */ case BOARD: /* board info */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(BNODE)) == NULL ) { if ((p->next = dgap_newnode(BNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7182,16 +7050,16 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7182,16 +7050,16 @@ static int dgap_parsefile(char **in, int Remove)
case TTYN: /* tty name prefix */ case TTYN: /* tty name prefix */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(TNODE)) == NULL ) { if ((p->next = dgap_newnode(TNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
p = p->next; p = p->next;
if ( (s = dgap_getword(in)) == NULL ) { if ((s = dgap_getword(in)) == NULL) {
dgap_err("unexpeced end of file"); dgap_err("unexpeced end of file");
return -1; return -1;
} }
if ( (p->u.ttyname = dgap_savestring(s)) == NULL ) { if ((p->u.ttyname = dgap_savestring(s)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7200,16 +7068,16 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7200,16 +7068,16 @@ static int dgap_parsefile(char **in, int Remove)
case CU: /* cu name prefix */ case CU: /* cu name prefix */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(CUNODE)) == NULL ) { if ((p->next = dgap_newnode(CUNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
p = p->next; p = p->next;
if ( (s = dgap_getword(in)) == NULL ) { if ((s = dgap_getword(in)) == NULL) {
dgap_err("unexpeced end of file"); dgap_err("unexpeced end of file");
return -1; return -1;
} }
if ( (p->u.cuname = dgap_savestring(s)) == NULL ) { if ((p->u.cuname = dgap_savestring(s)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7227,7 +7095,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7227,7 +7095,7 @@ static int dgap_parsefile(char **in, int Remove)
dgap_err("line not vaild for PC/em"); dgap_err("line not vaild for PC/em");
return -1; return -1;
} }
if ( (p->next = dgap_newnode(LNODE)) == NULL ) { if ((p->next = dgap_newnode(LNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7244,7 +7112,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7244,7 +7112,7 @@ static int dgap_parsefile(char **in, int Remove)
dgap_err("must specify line info before concentrator"); dgap_err("must specify line info before concentrator");
return -1; return -1;
} }
if ( (p->next = dgap_newnode(CNODE)) == NULL ) { if ((p->next = dgap_newnode(CNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7292,7 +7160,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7292,7 +7160,7 @@ static int dgap_parsefile(char **in, int Remove)
return -1; return -1;
} }
} }
if ( (p->next = dgap_newnode(MNODE)) == NULL ) { if ((p->next = dgap_newnode(MNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7377,16 +7245,16 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7377,16 +7245,16 @@ static int dgap_parsefile(char **in, int Remove)
case PRINT: /* transparent print name prefix */ case PRINT: /* transparent print name prefix */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(PNODE)) == NULL ) { if ((p->next = dgap_newnode(PNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
p = p->next; p = p->next;
if ( (s = dgap_getword(in)) == NULL ) { if ((s = dgap_getword(in)) == NULL) {
dgap_err("unexpeced end of file"); dgap_err("unexpeced end of file");
return -1; return -1;
} }
if ( (p->u.printname = dgap_savestring(s)) == NULL ) { if ((p->u.printname = dgap_savestring(s)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7395,7 +7263,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7395,7 +7263,7 @@ static int dgap_parsefile(char **in, int Remove)
case CMAJOR: /* major number */ case CMAJOR: /* major number */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(JNODE)) == NULL ) { if ((p->next = dgap_newnode(JNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7415,7 +7283,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7415,7 +7283,7 @@ static int dgap_parsefile(char **in, int Remove)
case ALTPIN: /* altpin setting */ case ALTPIN: /* altpin setting */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(ANODE)) == NULL ) { if ((p->next = dgap_newnode(ANODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7435,7 +7303,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7435,7 +7303,7 @@ static int dgap_parsefile(char **in, int Remove)
case USEINTR: /* enable interrupt setting */ case USEINTR: /* enable interrupt setting */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(INTRNODE)) == NULL ) { if ((p->next = dgap_newnode(INTRNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7455,7 +7323,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7455,7 +7323,7 @@ static int dgap_parsefile(char **in, int Remove)
case TTSIZ: /* size of tty structure */ case TTSIZ: /* size of tty structure */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(TSNODE)) == NULL ) { if ((p->next = dgap_newnode(TSNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7475,7 +7343,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7475,7 +7343,7 @@ static int dgap_parsefile(char **in, int Remove)
case CHSIZ: /* channel structure size */ case CHSIZ: /* channel structure size */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(CSNODE)) == NULL ) { if ((p->next = dgap_newnode(CSNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7495,7 +7363,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7495,7 +7363,7 @@ static int dgap_parsefile(char **in, int Remove)
case BSSIZ: /* board structure size */ case BSSIZ: /* board structure size */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(BSNODE)) == NULL ) { if ((p->next = dgap_newnode(BSNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7515,7 +7383,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7515,7 +7383,7 @@ static int dgap_parsefile(char **in, int Remove)
case UNTSIZ: /* sched structure size */ case UNTSIZ: /* sched structure size */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(USNODE)) == NULL ) { if ((p->next = dgap_newnode(USNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7535,7 +7403,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7535,7 +7403,7 @@ static int dgap_parsefile(char **in, int Remove)
case F2SIZ: /* f2200 structure size */ case F2SIZ: /* f2200 structure size */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(FSNODE)) == NULL ) { if ((p->next = dgap_newnode(FSNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7555,7 +7423,7 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7555,7 +7423,7 @@ static int dgap_parsefile(char **in, int Remove)
case VPSIZ: /* vpix structure size */ case VPSIZ: /* vpix structure size */
if (dgap_checknode(p)) if (dgap_checknode(p))
return -1; return -1;
if ( (p->next = dgap_newnode(VSNODE)) == NULL ) { if ((p->next = dgap_newnode(VSNODE)) == NULL) {
dgap_err("out of memory"); dgap_err("out of memory");
return -1; return -1;
} }
...@@ -7575,7 +7443,6 @@ static int dgap_parsefile(char **in, int Remove) ...@@ -7575,7 +7443,6 @@ static int dgap_parsefile(char **in, int Remove)
} }
} }
/* /*
* dgap_sindex: much like index(), but it looks for a match of any character in * dgap_sindex: much like index(), but it looks for a match of any character in
* the group, and returns that position. If the first character is a ^, then * the group, and returns that position. If the first character is a ^, then
...@@ -7610,7 +7477,6 @@ static char *dgap_sindex (char *string, char *group) ...@@ -7610,7 +7477,6 @@ static char *dgap_sindex (char *string, char *group)
return (char *) NULL; return (char *) NULL;
} }
/* /*
* Get a token from the input file; return 0 if end of file is reached * Get a token from the input file; return 0 if end of file is reached
*/ */
...@@ -7623,7 +7489,7 @@ static int dgap_gettok(char **in, struct cnode *p) ...@@ -7623,7 +7489,7 @@ static int dgap_gettok(char **in, struct cnode *p)
w = dgap_getword(in); w = dgap_getword(in);
snprintf(dgap_cword, MAXCWORD, "%s", w); snprintf(dgap_cword, MAXCWORD, "%s", w);
for (t = dgap_tlist; t->token != 0; t++) { for (t = dgap_tlist; t->token != 0; t++) {
if ( !strcmp(w, t->string)) if (!strcmp(w, t->string))
return t->token; return t->token;
} }
dgap_err("board !!type not specified"); dgap_err("board !!type not specified");
...@@ -7632,7 +7498,7 @@ static int dgap_gettok(char **in, struct cnode *p) ...@@ -7632,7 +7498,7 @@ static int dgap_gettok(char **in, struct cnode *p)
while ( (w = dgap_getword(in)) != NULL ) { while ( (w = dgap_getword(in)) != NULL ) {
snprintf(dgap_cword, MAXCWORD, "%s", w); snprintf(dgap_cword, MAXCWORD, "%s", w);
for (t = dgap_tlist; t->token != 0; t++) { for (t = dgap_tlist; t->token != 0; t++) {
if ( !strcmp(w, t->string) ) if (!strcmp(w, t->string))
return t->token; return t->token;
} }
} }
...@@ -7640,7 +7506,6 @@ static int dgap_gettok(char **in, struct cnode *p) ...@@ -7640,7 +7506,6 @@ static int dgap_gettok(char **in, struct cnode *p)
} }
} }
/* /*
* get a word from the input stream, also keep track of current line number. * get a word from the input stream, also keep track of current line number.
* words are separated by whitespace. * words are separated by whitespace.
...@@ -7668,7 +7533,6 @@ static char *dgap_getword(char **in) ...@@ -7668,7 +7533,6 @@ static char *dgap_getword(char **in)
return ret_ptr; return ret_ptr;
} }
/* /*
* print an error message, giving the line number in the file where * print an error message, giving the line number in the file where
* the error occurred. * the error occurred.
...@@ -7678,7 +7542,6 @@ static void dgap_err(char *s) ...@@ -7678,7 +7542,6 @@ static void dgap_err(char *s)
printk("DGAP: parse: %s\n", s); printk("DGAP: parse: %s\n", s);
} }
/* /*
* allocate a new configuration node of type t * allocate a new configuration node of type t
*/ */
...@@ -7694,7 +7557,6 @@ static struct cnode *dgap_newnode(int t) ...@@ -7694,7 +7557,6 @@ static struct cnode *dgap_newnode(int t)
return n; return n;
} }
/* /*
* dgap_checknode: see if all the necessary info has been supplied for a node * dgap_checknode: see if all the necessary info has been supplied for a node
* before creating the next node. * before creating the next node.
...@@ -7767,7 +7629,6 @@ static char *dgap_savestring(char *s) ...@@ -7767,7 +7629,6 @@ static char *dgap_savestring(char *s)
return p; return p;
} }
/* /*
* Given a board pointer, returns whether we should use interrupts or not. * Given a board pointer, returns whether we should use interrupts or not.
*/ */
...@@ -7794,7 +7655,6 @@ static uint dgap_config_get_useintr(struct board_t *bd) ...@@ -7794,7 +7655,6 @@ static uint dgap_config_get_useintr(struct board_t *bd)
return 0; return 0;
} }
/* /*
* Given a board pointer, returns whether we turn on altpin or not. * Given a board pointer, returns whether we turn on altpin or not.
*/ */
...@@ -7821,8 +7681,6 @@ static uint dgap_config_get_altpin(struct board_t *bd) ...@@ -7821,8 +7681,6 @@ static uint dgap_config_get_altpin(struct board_t *bd)
return 0; return 0;
} }
/* /*
* Given a specific type of board, if found, detached link and * Given a specific type of board, if found, detached link and
* returns the first occurrence in the list. * returns the first occurrence in the list.
...@@ -7946,7 +7804,7 @@ static char *dgap_create_config_string(struct board_t *bd, char *string) ...@@ -7946,7 +7804,7 @@ static char *dgap_create_config_string(struct board_t *bd, char *string)
*/ */
speed = p->u.conc.speed; speed = p->u.conc.speed;
q = p->next; q = p->next;
if ((q != NULL) && (q->type == MNODE) ) { if ((q != NULL) && (q->type == MNODE)) {
*ptr = (p->u.conc.nport + 0x80); *ptr = (p->u.conc.nport + 0x80);
ptr++; ptr++;
p = q; p = q;
......
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