diff options
Diffstat (limited to 'drivers/char/rio')
-rw-r--r-- | drivers/char/rio/cirrus.h | 3 | ||||
-rw-r--r-- | drivers/char/rio/cmdblk.h | 6 | ||||
-rw-r--r-- | drivers/char/rio/cmdpkt.h | 6 | ||||
-rw-r--r-- | drivers/char/rio/daemon.h | 6 | ||||
-rw-r--r-- | drivers/char/rio/errors.h | 6 | ||||
-rw-r--r-- | drivers/char/rio/func.h | 6 | ||||
-rw-r--r-- | drivers/char/rio/map.h | 4 | ||||
-rw-r--r-- | drivers/char/rio/param.h | 5 | ||||
-rw-r--r-- | drivers/char/rio/parmmap.h | 7 | ||||
-rw-r--r-- | drivers/char/rio/pci.h | 4 | ||||
-rw-r--r-- | drivers/char/rio/protsts.h | 7 | ||||
-rw-r--r-- | drivers/char/rio/rio_linux.c | 25 | ||||
-rw-r--r-- | drivers/char/rio/rioboard.h | 6 | ||||
-rw-r--r-- | drivers/char/rio/riocmd.c | 13 | ||||
-rw-r--r-- | drivers/char/rio/rioctrl.c | 4 | ||||
-rw-r--r-- | drivers/char/rio/riodrvr.h | 4 | ||||
-rw-r--r-- | drivers/char/rio/rioinfo.h | 4 | ||||
-rw-r--r-- | drivers/char/rio/rioinit.c | 3 | ||||
-rw-r--r-- | drivers/char/rio/riointr.c | 14 | ||||
-rw-r--r-- | drivers/char/rio/rioparam.c | 6 | ||||
-rw-r--r-- | drivers/char/rio/rioroute.c | 3 | ||||
-rw-r--r-- | drivers/char/rio/riospace.h | 4 | ||||
-rw-r--r-- | drivers/char/rio/riotable.c | 3 | ||||
-rw-r--r-- | drivers/char/rio/riotty.c | 20 | ||||
-rw-r--r-- | drivers/char/rio/route.h | 6 | ||||
-rw-r--r-- | drivers/char/rio/unixrup.h | 4 |
26 files changed, 29 insertions, 150 deletions
diff --git a/drivers/char/rio/cirrus.h b/drivers/char/rio/cirrus.h index a03a538a3efb..5ab51679caa2 100644 --- a/drivers/char/rio/cirrus.h +++ b/drivers/char/rio/cirrus.h | |||
@@ -35,9 +35,6 @@ | |||
35 | ***************************************************************************/ | 35 | ***************************************************************************/ |
36 | 36 | ||
37 | #ifndef _cirrus_h | 37 | #ifndef _cirrus_h |
38 | #ifndef lint | ||
39 | /* static char* _cirrus_h_sccs = "@(#)cirrus.h 1.16"; */ | ||
40 | #endif | ||
41 | #define _cirrus_h 1 | 38 | #define _cirrus_h 1 |
42 | 39 | ||
43 | /* Bit fields for particular registers shared with driver */ | 40 | /* Bit fields for particular registers shared with driver */ |
diff --git a/drivers/char/rio/cmdblk.h b/drivers/char/rio/cmdblk.h index c46b2fdb6626..9ed4f861675a 100644 --- a/drivers/char/rio/cmdblk.h +++ b/drivers/char/rio/cmdblk.h | |||
@@ -33,12 +33,6 @@ | |||
33 | #ifndef __rio_cmdblk_h__ | 33 | #ifndef __rio_cmdblk_h__ |
34 | #define __rio_cmdblk_h__ | 34 | #define __rio_cmdblk_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | #ifndef lint | ||
38 | static char *_cmdblk_h_sccs_ = "@(#)cmdblk.h 1.2"; | ||
39 | #endif | ||
40 | #endif | ||
41 | |||
42 | /* | 36 | /* |
43 | ** the structure of a command block, used to queue commands destined for | 37 | ** the structure of a command block, used to queue commands destined for |
44 | ** a rup. | 38 | ** a rup. |
diff --git a/drivers/char/rio/cmdpkt.h b/drivers/char/rio/cmdpkt.h index 357ae5722436..c1e7a2798070 100644 --- a/drivers/char/rio/cmdpkt.h +++ b/drivers/char/rio/cmdpkt.h | |||
@@ -32,12 +32,6 @@ | |||
32 | #ifndef __rio_cmdpkt_h__ | 32 | #ifndef __rio_cmdpkt_h__ |
33 | #define __rio_cmdpkt_h__ | 33 | #define __rio_cmdpkt_h__ |
34 | 34 | ||
35 | #ifdef SCCS_LABELS | ||
36 | #ifndef lint | ||
37 | static char *_cmdpkt_h_sccs_ = "@(#)cmdpkt.h 1.2"; | ||
38 | #endif | ||
39 | #endif | ||
40 | |||
41 | /* | 35 | /* |
42 | ** overlays for the data area of a packet. Used in both directions | 36 | ** overlays for the data area of a packet. Used in both directions |
43 | ** (to build a packet to send, and to interpret a packet that arrives) | 37 | ** (to build a packet to send, and to interpret a packet that arrives) |
diff --git a/drivers/char/rio/daemon.h b/drivers/char/rio/daemon.h index 6e63f8b2c479..4af90323fd00 100644 --- a/drivers/char/rio/daemon.h +++ b/drivers/char/rio/daemon.h | |||
@@ -33,12 +33,6 @@ | |||
33 | #ifndef __rio_daemon_h__ | 33 | #ifndef __rio_daemon_h__ |
34 | #define __rio_daemon_h__ | 34 | #define __rio_daemon_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | #ifndef lint | ||
38 | static char *_daemon_h_sccs_ = "@(#)daemon.h 1.3"; | ||
39 | #endif | ||
40 | #endif | ||
41 | |||
42 | 36 | ||
43 | /* | 37 | /* |
44 | ** structures used on /dev/rio | 38 | ** structures used on /dev/rio |
diff --git a/drivers/char/rio/errors.h b/drivers/char/rio/errors.h index 1d0d89144337..bdb05234090a 100644 --- a/drivers/char/rio/errors.h +++ b/drivers/char/rio/errors.h | |||
@@ -33,12 +33,6 @@ | |||
33 | #ifndef __rio_errors_h__ | 33 | #ifndef __rio_errors_h__ |
34 | #define __rio_errors_h__ | 34 | #define __rio_errors_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | #ifndef lint | ||
38 | static char *_errors_h_sccs_ = "@(#)errors.h 1.2"; | ||
39 | #endif | ||
40 | #endif | ||
41 | |||
42 | /* | 36 | /* |
43 | ** error codes | 37 | ** error codes |
44 | */ | 38 | */ |
diff --git a/drivers/char/rio/func.h b/drivers/char/rio/func.h index 9e7283bd81a0..078d44f85e45 100644 --- a/drivers/char/rio/func.h +++ b/drivers/char/rio/func.h | |||
@@ -35,12 +35,6 @@ | |||
35 | 35 | ||
36 | #include <linux/kdev_t.h> | 36 | #include <linux/kdev_t.h> |
37 | 37 | ||
38 | #ifdef SCCS_LABELS | ||
39 | #ifndef lint | ||
40 | static char *_func_h_sccs_ = "@(#)func.h 1.3"; | ||
41 | #endif | ||
42 | #endif | ||
43 | |||
44 | /* rioboot.c */ | 38 | /* rioboot.c */ |
45 | int RIOBootCodeRTA(struct rio_info *, struct DownLoad *); | 39 | int RIOBootCodeRTA(struct rio_info *, struct DownLoad *); |
46 | int RIOBootCodeHOST(struct rio_info *, struct DownLoad *); | 40 | int RIOBootCodeHOST(struct rio_info *, struct DownLoad *); |
diff --git a/drivers/char/rio/map.h b/drivers/char/rio/map.h index bdbcd09c8b81..8366978578c1 100644 --- a/drivers/char/rio/map.h +++ b/drivers/char/rio/map.h | |||
@@ -33,10 +33,6 @@ | |||
33 | #ifndef __rio_map_h__ | 33 | #ifndef __rio_map_h__ |
34 | #define __rio_map_h__ | 34 | #define __rio_map_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | static char *_map_h_sccs_ = "@(#)map.h 1.2"; | ||
38 | #endif | ||
39 | |||
40 | /* | 36 | /* |
41 | ** mapping structure passed to and from the config.rio program to | 37 | ** mapping structure passed to and from the config.rio program to |
42 | ** determine the current topology of the world | 38 | ** determine the current topology of the world |
diff --git a/drivers/char/rio/param.h b/drivers/char/rio/param.h index 675c200b2459..7e9b6283e8aa 100644 --- a/drivers/char/rio/param.h +++ b/drivers/char/rio/param.h | |||
@@ -33,11 +33,6 @@ | |||
33 | #ifndef __rio_param_h__ | 33 | #ifndef __rio_param_h__ |
34 | #define __rio_param_h__ | 34 | #define __rio_param_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | static char *_param_h_sccs_ = "@(#)param.h 1.2"; | ||
38 | #endif | ||
39 | |||
40 | |||
41 | /* | 36 | /* |
42 | ** the param command block, as used in OPEN and PARAM calls. | 37 | ** the param command block, as used in OPEN and PARAM calls. |
43 | */ | 38 | */ |
diff --git a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h index 9764ef85c5a6..acc8fa439df5 100644 --- a/drivers/char/rio/parmmap.h +++ b/drivers/char/rio/parmmap.h | |||
@@ -37,13 +37,6 @@ | |||
37 | #ifndef _parmap_h | 37 | #ifndef _parmap_h |
38 | #define _parmap_h | 38 | #define _parmap_h |
39 | 39 | ||
40 | |||
41 | #ifdef SCCS_LABELS | ||
42 | #ifndef lint | ||
43 | /* static char *_rio_parmmap_h_sccs = "@(#)parmmap.h 1.4"; */ | ||
44 | #endif | ||
45 | #endif | ||
46 | |||
47 | typedef struct PARM_MAP PARM_MAP; | 40 | typedef struct PARM_MAP PARM_MAP; |
48 | 41 | ||
49 | struct PARM_MAP { | 42 | struct PARM_MAP { |
diff --git a/drivers/char/rio/pci.h b/drivers/char/rio/pci.h index 1eba9118079b..6032f9135956 100644 --- a/drivers/char/rio/pci.h +++ b/drivers/char/rio/pci.h | |||
@@ -33,10 +33,6 @@ | |||
33 | #ifndef __rio_pci_h__ | 33 | #ifndef __rio_pci_h__ |
34 | #define __rio_pci_h__ | 34 | #define __rio_pci_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | static char *_pci_h_sccs_ = "@(#)pci.h 1.2"; | ||
38 | #endif | ||
39 | |||
40 | /* | 36 | /* |
41 | ** PCI stuff | 37 | ** PCI stuff |
42 | */ | 38 | */ |
diff --git a/drivers/char/rio/protsts.h b/drivers/char/rio/protsts.h index 69fc4bc34153..8ab79401d3ee 100644 --- a/drivers/char/rio/protsts.h +++ b/drivers/char/rio/protsts.h | |||
@@ -37,13 +37,6 @@ | |||
37 | #ifndef _protsts_h | 37 | #ifndef _protsts_h |
38 | #define _protsts_h 1 | 38 | #define _protsts_h 1 |
39 | 39 | ||
40 | |||
41 | #ifdef SCCS_LABELS | ||
42 | #ifndef lint | ||
43 | /* static char *_rio_protsts_h_sccs = "@(#)protsts.h 1.4"; */ | ||
44 | #endif | ||
45 | #endif | ||
46 | |||
47 | /************************************************* | 40 | /************************************************* |
48 | * ACK bit. Last Packet received OK. Set by | 41 | * ACK bit. Last Packet received OK. Set by |
49 | * rxpkt to indicate that the Packet has been | 42 | * rxpkt to indicate that the Packet has been |
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index 412777cd1e68..0cdfee152916 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c | |||
@@ -25,11 +25,6 @@ | |||
25 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, | 25 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, |
26 | * USA. | 26 | * USA. |
27 | * | 27 | * |
28 | * Revision history: | ||
29 | * $Log: rio.c,v $ | ||
30 | * Revision 1.1 1999/07/11 10:13:54 wolff | ||
31 | * Initial revision | ||
32 | * | ||
33 | * */ | 28 | * */ |
34 | 29 | ||
35 | #include <linux/module.h> | 30 | #include <linux/module.h> |
@@ -436,7 +431,7 @@ static void rio_disable_tx_interrupts(void *ptr) | |||
436 | { | 431 | { |
437 | func_enter(); | 432 | func_enter(); |
438 | 433 | ||
439 | /* port->gs.flags &= ~GS_TX_INTEN; */ | 434 | /* port->gs.port.flags &= ~GS_TX_INTEN; */ |
440 | 435 | ||
441 | func_exit(); | 436 | func_exit(); |
442 | } | 437 | } |
@@ -460,7 +455,7 @@ static void rio_enable_tx_interrupts(void *ptr) | |||
460 | * In general we cannot count on "tx empty" interrupts, although | 455 | * In general we cannot count on "tx empty" interrupts, although |
461 | * the interrupt routine seems to be able to tell the difference. | 456 | * the interrupt routine seems to be able to tell the difference. |
462 | */ | 457 | */ |
463 | PortP->gs.flags &= ~GS_TX_INTEN; | 458 | PortP->gs.port.flags &= ~GS_TX_INTEN; |
464 | 459 | ||
465 | func_exit(); | 460 | func_exit(); |
466 | } | 461 | } |
@@ -515,7 +510,7 @@ static void rio_shutdown_port(void *ptr) | |||
515 | func_enter(); | 510 | func_enter(); |
516 | 511 | ||
517 | PortP = (struct Port *) ptr; | 512 | PortP = (struct Port *) ptr; |
518 | PortP->gs.tty = NULL; | 513 | PortP->gs.port.tty = NULL; |
519 | func_exit(); | 514 | func_exit(); |
520 | } | 515 | } |
521 | 516 | ||
@@ -534,7 +529,7 @@ static void rio_hungup(void *ptr) | |||
534 | func_enter(); | 529 | func_enter(); |
535 | 530 | ||
536 | PortP = (struct Port *) ptr; | 531 | PortP = (struct Port *) ptr; |
537 | PortP->gs.tty = NULL; | 532 | PortP->gs.port.tty = NULL; |
538 | 533 | ||
539 | func_exit(); | 534 | func_exit(); |
540 | } | 535 | } |
@@ -554,12 +549,12 @@ static void rio_close(void *ptr) | |||
554 | 549 | ||
555 | riotclose(ptr); | 550 | riotclose(ptr); |
556 | 551 | ||
557 | if (PortP->gs.count) { | 552 | if (PortP->gs.port.count) { |
558 | printk(KERN_ERR "WARNING port count:%d\n", PortP->gs.count); | 553 | printk(KERN_ERR "WARNING port count:%d\n", PortP->gs.port.count); |
559 | PortP->gs.count = 0; | 554 | PortP->gs.port.count = 0; |
560 | } | 555 | } |
561 | 556 | ||
562 | PortP->gs.tty = NULL; | 557 | PortP->gs.port.tty = NULL; |
563 | func_exit(); | 558 | func_exit(); |
564 | } | 559 | } |
565 | 560 | ||
@@ -854,8 +849,8 @@ static int rio_init_datastructures(void) | |||
854 | /* | 849 | /* |
855 | * Initializing wait queue | 850 | * Initializing wait queue |
856 | */ | 851 | */ |
857 | init_waitqueue_head(&port->gs.open_wait); | 852 | init_waitqueue_head(&port->gs.port.open_wait); |
858 | init_waitqueue_head(&port->gs.close_wait); | 853 | init_waitqueue_head(&port->gs.port.close_wait); |
859 | } | 854 | } |
860 | #else | 855 | #else |
861 | /* We could postpone initializing them to when they are configured. */ | 856 | /* We could postpone initializing them to when they are configured. */ |
diff --git a/drivers/char/rio/rioboard.h b/drivers/char/rio/rioboard.h index 822c071a693b..252230043c82 100644 --- a/drivers/char/rio/rioboard.h +++ b/drivers/char/rio/rioboard.h | |||
@@ -29,12 +29,6 @@ | |||
29 | /* */ | 29 | /* */ |
30 | /************************************************************************/ | 30 | /************************************************************************/ |
31 | 31 | ||
32 | /* History... | ||
33 | |||
34 | 1.0.0 26/04/99 NPV Creation. | ||
35 | |||
36 | */ | ||
37 | |||
38 | #ifndef _rioboard_h /* If RIOBOARD.H not already defined */ | 32 | #ifndef _rioboard_h /* If RIOBOARD.H not already defined */ |
39 | #define _rioboard_h 1 | 33 | #define _rioboard_h 1 |
40 | 34 | ||
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c index 7b96e0814887..01f2654d5a2e 100644 --- a/drivers/char/rio/riocmd.c +++ b/drivers/char/rio/riocmd.c | |||
@@ -30,9 +30,6 @@ | |||
30 | ** | 30 | ** |
31 | ** ----------------------------------------------------------------------------- | 31 | ** ----------------------------------------------------------------------------- |
32 | */ | 32 | */ |
33 | #ifdef SCCS_LABELS | ||
34 | static char *_riocmd_c_sccs_ = "@(#)riocmd.c 1.2"; | ||
35 | #endif | ||
36 | 33 | ||
37 | #include <linux/module.h> | 34 | #include <linux/module.h> |
38 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
@@ -487,12 +484,12 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc | |||
487 | ** If the device is a modem, then check the modem | 484 | ** If the device is a modem, then check the modem |
488 | ** carrier. | 485 | ** carrier. |
489 | */ | 486 | */ |
490 | if (PortP->gs.tty == NULL) | 487 | if (PortP->gs.port.tty == NULL) |
491 | break; | 488 | break; |
492 | if (PortP->gs.tty->termios == NULL) | 489 | if (PortP->gs.port.tty->termios == NULL) |
493 | break; | 490 | break; |
494 | 491 | ||
495 | if (!(PortP->gs.tty->termios->c_cflag & CLOCAL) && ((PortP->State & (RIO_MOPEN | RIO_WOPEN)))) { | 492 | if (!(PortP->gs.port.tty->termios->c_cflag & CLOCAL) && ((PortP->State & (RIO_MOPEN | RIO_WOPEN)))) { |
496 | 493 | ||
497 | rio_dprintk(RIO_DEBUG_CMD, "Is there a Carrier?\n"); | 494 | rio_dprintk(RIO_DEBUG_CMD, "Is there a Carrier?\n"); |
498 | /* | 495 | /* |
@@ -509,7 +506,7 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc | |||
509 | ** wakeup anyone in WOPEN | 506 | ** wakeup anyone in WOPEN |
510 | */ | 507 | */ |
511 | if (PortP->State & (PORT_ISOPEN | RIO_WOPEN)) | 508 | if (PortP->State & (PORT_ISOPEN | RIO_WOPEN)) |
512 | wake_up_interruptible(&PortP->gs.open_wait); | 509 | wake_up_interruptible(&PortP->gs.port.open_wait); |
513 | } | 510 | } |
514 | } else { | 511 | } else { |
515 | /* | 512 | /* |
@@ -517,7 +514,7 @@ static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struc | |||
517 | */ | 514 | */ |
518 | if (PortP->State & RIO_CARR_ON) { | 515 | if (PortP->State & RIO_CARR_ON) { |
519 | if (PortP->State & (PORT_ISOPEN | RIO_WOPEN | RIO_MOPEN)) | 516 | if (PortP->State & (PORT_ISOPEN | RIO_WOPEN | RIO_MOPEN)) |
520 | tty_hangup(PortP->gs.tty); | 517 | tty_hangup(PortP->gs.port.tty); |
521 | PortP->State &= ~RIO_CARR_ON; | 518 | PortP->State &= ~RIO_CARR_ON; |
522 | rio_dprintk(RIO_DEBUG_CMD, "Carrirer just went down\n"); | 519 | rio_dprintk(RIO_DEBUG_CMD, "Carrirer just went down\n"); |
523 | } | 520 | } |
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c index d65ceb9a434a..eecee0f576d2 100644 --- a/drivers/char/rio/rioctrl.c +++ b/drivers/char/rio/rioctrl.c | |||
@@ -29,10 +29,6 @@ | |||
29 | ** | 29 | ** |
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | #ifdef SCCS_LABELS | ||
33 | static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c 1.3"; | ||
34 | #endif | ||
35 | |||
36 | 32 | ||
37 | #include <linux/module.h> | 33 | #include <linux/module.h> |
38 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
diff --git a/drivers/char/rio/riodrvr.h b/drivers/char/rio/riodrvr.h index 3cffe275f216..0907e711b355 100644 --- a/drivers/char/rio/riodrvr.h +++ b/drivers/char/rio/riodrvr.h | |||
@@ -35,10 +35,6 @@ | |||
35 | 35 | ||
36 | #include <asm/param.h> /* for HZ */ | 36 | #include <asm/param.h> /* for HZ */ |
37 | 37 | ||
38 | #ifdef SCCS_LABELS | ||
39 | static char *_riodrvr_h_sccs_ = "@(#)riodrvr.h 1.3"; | ||
40 | #endif | ||
41 | |||
42 | #define MEMDUMP_SIZE 32 | 38 | #define MEMDUMP_SIZE 32 |
43 | #define MOD_DISABLE (RIO_NOREAD|RIO_NOWRITE|RIO_NOXPRINT) | 39 | #define MOD_DISABLE (RIO_NOREAD|RIO_NOWRITE|RIO_NOXPRINT) |
44 | 40 | ||
diff --git a/drivers/char/rio/rioinfo.h b/drivers/char/rio/rioinfo.h index 8de7966e603a..42ff1e79d96f 100644 --- a/drivers/char/rio/rioinfo.h +++ b/drivers/char/rio/rioinfo.h | |||
@@ -33,10 +33,6 @@ | |||
33 | #ifndef __rioinfo_h | 33 | #ifndef __rioinfo_h |
34 | #define __rioinfo_h | 34 | #define __rioinfo_h |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | static char *_rioinfo_h_sccs_ = "@(#)rioinfo.h 1.2"; | ||
38 | #endif | ||
39 | |||
40 | /* | 36 | /* |
41 | ** Host card data structure | 37 | ** Host card data structure |
42 | */ | 38 | */ |
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c index add1718295ef..be0ba401966e 100644 --- a/drivers/char/rio/rioinit.c +++ b/drivers/char/rio/rioinit.c | |||
@@ -29,9 +29,6 @@ | |||
29 | ** | 29 | ** |
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | #ifdef SCCS_LABELS | ||
33 | static char *_rioinit_c_sccs_ = "@(#)rioinit.c 1.3"; | ||
34 | #endif | ||
35 | 32 | ||
36 | #include <linux/module.h> | 33 | #include <linux/module.h> |
37 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c index ea21686c69a4..71f87600907c 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/char/rio/riointr.c | |||
@@ -29,10 +29,6 @@ | |||
29 | ** | 29 | ** |
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | #ifdef SCCS_LABELS | ||
33 | static char *_riointr_c_sccs_ = "@(#)riointr.c 1.2"; | ||
34 | #endif | ||
35 | |||
36 | 32 | ||
37 | #include <linux/module.h> | 33 | #include <linux/module.h> |
38 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
@@ -106,7 +102,7 @@ void RIOTxEnable(char *en) | |||
106 | 102 | ||
107 | PortP = (struct Port *) en; | 103 | PortP = (struct Port *) en; |
108 | p = (struct rio_info *) PortP->p; | 104 | p = (struct rio_info *) PortP->p; |
109 | tty = PortP->gs.tty; | 105 | tty = PortP->gs.port.tty; |
110 | 106 | ||
111 | 107 | ||
112 | rio_dprintk(RIO_DEBUG_INTR, "tx port %d: %d chars queued.\n", PortP->PortNum, PortP->gs.xmit_cnt); | 108 | rio_dprintk(RIO_DEBUG_INTR, "tx port %d: %d chars queued.\n", PortP->PortNum, PortP->gs.xmit_cnt); |
@@ -162,7 +158,7 @@ void RIOTxEnable(char *en) | |||
162 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 158 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); |
163 | 159 | ||
164 | if (PortP->gs.xmit_cnt <= (PortP->gs.wakeup_chars + 2 * PKT_MAX_DATA_LEN)) | 160 | if (PortP->gs.xmit_cnt <= (PortP->gs.wakeup_chars + 2 * PKT_MAX_DATA_LEN)) |
165 | tty_wakeup(PortP->gs.tty); | 161 | tty_wakeup(PortP->gs.port.tty); |
166 | 162 | ||
167 | } | 163 | } |
168 | 164 | ||
@@ -245,7 +241,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP) | |||
245 | ** find corresponding tty structure. The process of mapping | 241 | ** find corresponding tty structure. The process of mapping |
246 | ** the ports puts these here. | 242 | ** the ports puts these here. |
247 | */ | 243 | */ |
248 | ttyP = PortP->gs.tty; | 244 | ttyP = PortP->gs.port.tty; |
249 | 245 | ||
250 | /* | 246 | /* |
251 | ** Lock the port before we begin working on it. | 247 | ** Lock the port before we begin working on it. |
@@ -339,7 +335,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP) | |||
339 | ** find corresponding tty structure. The process of mapping | 335 | ** find corresponding tty structure. The process of mapping |
340 | ** the ports puts these here. | 336 | ** the ports puts these here. |
341 | */ | 337 | */ |
342 | ttyP = PortP->gs.tty; | 338 | ttyP = PortP->gs.port.tty; |
343 | /* If ttyP is NULL, the port is getting closed. Forget about it. */ | 339 | /* If ttyP is NULL, the port is getting closed. Forget about it. */ |
344 | if (!ttyP) { | 340 | if (!ttyP) { |
345 | rio_dprintk(RIO_DEBUG_INTR, "no tty, so skipping.\n"); | 341 | rio_dprintk(RIO_DEBUG_INTR, "no tty, so skipping.\n"); |
@@ -546,7 +542,7 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
546 | 542 | ||
547 | intCount++; | 543 | intCount++; |
548 | 544 | ||
549 | TtyP = PortP->gs.tty; | 545 | TtyP = PortP->gs.port.tty; |
550 | if (!TtyP) { | 546 | if (!TtyP) { |
551 | rio_dprintk(RIO_DEBUG_INTR, "RIOReceive: tty is null. \n"); | 547 | rio_dprintk(RIO_DEBUG_INTR, "RIOReceive: tty is null. \n"); |
552 | return; | 548 | return; |
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c index 4810b845cc21..d687c17be152 100644 --- a/drivers/char/rio/rioparam.c +++ b/drivers/char/rio/rioparam.c | |||
@@ -30,10 +30,6 @@ | |||
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #ifdef SCCS_LABELS | ||
34 | static char *_rioparam_c_sccs_ = "@(#)rioparam.c 1.3"; | ||
35 | #endif | ||
36 | |||
37 | #include <linux/module.h> | 33 | #include <linux/module.h> |
38 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
39 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
@@ -164,7 +160,7 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag) | |||
164 | 160 | ||
165 | func_enter(); | 161 | func_enter(); |
166 | 162 | ||
167 | TtyP = PortP->gs.tty; | 163 | TtyP = PortP->gs.port.tty; |
168 | 164 | ||
169 | rio_dprintk(RIO_DEBUG_PARAM, "RIOParam: Port:%d cmd:%d Modem:%d SleepFlag:%d Mapped: %d, tty=%p\n", PortP->PortNum, cmd, Modem, SleepFlag, PortP->Mapped, TtyP); | 165 | rio_dprintk(RIO_DEBUG_PARAM, "RIOParam: Port:%d cmd:%d Modem:%d SleepFlag:%d Mapped: %d, tty=%p\n", PortP->PortNum, cmd, Modem, SleepFlag, PortP->Mapped, TtyP); |
170 | 166 | ||
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c index 7a9df7dcf9a8..706c2a25f7aa 100644 --- a/drivers/char/rio/rioroute.c +++ b/drivers/char/rio/rioroute.c | |||
@@ -29,9 +29,6 @@ | |||
29 | ** | 29 | ** |
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | #ifdef SCCS_LABELS | ||
33 | static char *_rioroute_c_sccs_ = "@(#)rioroute.c 1.3"; | ||
34 | #endif | ||
35 | 32 | ||
36 | #include <linux/module.h> | 33 | #include <linux/module.h> |
37 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
diff --git a/drivers/char/rio/riospace.h b/drivers/char/rio/riospace.h index 534f1f5b9f53..ffb31d4332b9 100644 --- a/drivers/char/rio/riospace.h +++ b/drivers/char/rio/riospace.h | |||
@@ -33,10 +33,6 @@ | |||
33 | #ifndef __rio_riospace_h__ | 33 | #ifndef __rio_riospace_h__ |
34 | #define __rio_riospace_h__ | 34 | #define __rio_riospace_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | static char *_riospace_h_sccs_ = "@(#)riospace.h 1.2"; | ||
38 | #endif | ||
39 | |||
40 | #define RIO_LOCATOR_LEN 16 | 36 | #define RIO_LOCATOR_LEN 16 |
41 | #define MAX_RIO_BOARDS 4 | 37 | #define MAX_RIO_BOARDS 4 |
42 | 38 | ||
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c index 2b24488e95f2..3d15802dc0f3 100644 --- a/drivers/char/rio/riotable.c +++ b/drivers/char/rio/riotable.c | |||
@@ -29,9 +29,6 @@ | |||
29 | ** | 29 | ** |
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | #ifdef SCCS_LABELS | ||
33 | static char *_riotable_c_sccs_ = "@(#)riotable.c 1.2"; | ||
34 | #endif | ||
35 | 32 | ||
36 | #include <linux/module.h> | 33 | #include <linux/module.h> |
37 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c index c99354843be1..2fb49e89b324 100644 --- a/drivers/char/rio/riotty.c +++ b/drivers/char/rio/riotty.c | |||
@@ -29,10 +29,6 @@ | |||
29 | ** | 29 | ** |
30 | ** ----------------------------------------------------------------------------- | 30 | ** ----------------------------------------------------------------------------- |
31 | */ | 31 | */ |
32 | #ifdef SCCS_LABELS | ||
33 | static char *_riotty_c_sccs_ = "@(#)riotty.c 1.3"; | ||
34 | #endif | ||
35 | |||
36 | 32 | ||
37 | #define __EXPLICIT_DEF_H__ | 33 | #define __EXPLICIT_DEF_H__ |
38 | 34 | ||
@@ -144,14 +140,14 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
144 | 140 | ||
145 | tty->driver_data = PortP; | 141 | tty->driver_data = PortP; |
146 | 142 | ||
147 | PortP->gs.tty = tty; | 143 | PortP->gs.port.tty = tty; |
148 | PortP->gs.count++; | 144 | PortP->gs.port.count++; |
149 | 145 | ||
150 | rio_dprintk(RIO_DEBUG_TTY, "%d bytes in tx buffer\n", PortP->gs.xmit_cnt); | 146 | rio_dprintk(RIO_DEBUG_TTY, "%d bytes in tx buffer\n", PortP->gs.xmit_cnt); |
151 | 147 | ||
152 | retval = gs_init_port(&PortP->gs); | 148 | retval = gs_init_port(&PortP->gs); |
153 | if (retval) { | 149 | if (retval) { |
154 | PortP->gs.count--; | 150 | PortP->gs.port.count--; |
155 | return -ENXIO; | 151 | return -ENXIO; |
156 | } | 152 | } |
157 | /* | 153 | /* |
@@ -297,7 +293,7 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
297 | ** insert test for carrier here. -- ??? | 293 | ** insert test for carrier here. -- ??? |
298 | ** I already see that test here. What's the deal? -- REW | 294 | ** I already see that test here. What's the deal? -- REW |
299 | */ | 295 | */ |
300 | if ((PortP->gs.tty->termios->c_cflag & CLOCAL) || | 296 | if ((PortP->gs.port.tty->termios->c_cflag & CLOCAL) || |
301 | (PortP->ModemState & RIOC_MSVR1_CD)) { | 297 | (PortP->ModemState & RIOC_MSVR1_CD)) { |
302 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) Modem carr on\n", SysPort); | 298 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) Modem carr on\n", SysPort); |
303 | /* | 299 | /* |
@@ -305,16 +301,16 @@ int riotopen(struct tty_struct *tty, struct file *filp) | |||
305 | wakeup((caddr_t) &tp->tm.c_canq); | 301 | wakeup((caddr_t) &tp->tm.c_canq); |
306 | */ | 302 | */ |
307 | PortP->State |= RIO_CARR_ON; | 303 | PortP->State |= RIO_CARR_ON; |
308 | wake_up_interruptible(&PortP->gs.open_wait); | 304 | wake_up_interruptible(&PortP->gs.port.open_wait); |
309 | } else { /* no carrier - wait for DCD */ | 305 | } else { /* no carrier - wait for DCD */ |
310 | /* | 306 | /* |
311 | while (!(PortP->gs.tty->termios->c_state & CARR_ON) && | 307 | while (!(PortP->gs.port.tty->termios->c_state & CARR_ON) && |
312 | !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted ) | 308 | !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted ) |
313 | */ | 309 | */ |
314 | while (!(PortP->State & RIO_CARR_ON) && !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted) { | 310 | while (!(PortP->State & RIO_CARR_ON) && !(filp->f_flags & O_NONBLOCK) && !p->RIOHalted) { |
315 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) sleeping for carr on\n", SysPort); | 311 | rio_dprintk(RIO_DEBUG_TTY, "open(%d) sleeping for carr on\n", SysPort); |
316 | /* | 312 | /* |
317 | PortP->gs.tty->termios->c_state |= WOPEN; | 313 | PortP->gs.port.tty->termios->c_state |= WOPEN; |
318 | */ | 314 | */ |
319 | PortP->State |= RIO_WOPEN; | 315 | PortP->State |= RIO_WOPEN; |
320 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 316 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); |
@@ -384,7 +380,7 @@ int riotclose(void *ptr) | |||
384 | /* PortP = p->RIOPortp[SysPort]; */ | 380 | /* PortP = p->RIOPortp[SysPort]; */ |
385 | rio_dprintk(RIO_DEBUG_TTY, "Port is at address %p\n", PortP); | 381 | rio_dprintk(RIO_DEBUG_TTY, "Port is at address %p\n", PortP); |
386 | /* tp = PortP->TtyP; *//* Get tty */ | 382 | /* tp = PortP->TtyP; *//* Get tty */ |
387 | tty = PortP->gs.tty; | 383 | tty = PortP->gs.port.tty; |
388 | rio_dprintk(RIO_DEBUG_TTY, "TTY is at address %p\n", tty); | 384 | rio_dprintk(RIO_DEBUG_TTY, "TTY is at address %p\n", tty); |
389 | 385 | ||
390 | if (PortP->gs.closing_wait) | 386 | if (PortP->gs.closing_wait) |
diff --git a/drivers/char/rio/route.h b/drivers/char/rio/route.h index 769744e575ab..20ed73f3fd7b 100644 --- a/drivers/char/rio/route.h +++ b/drivers/char/rio/route.h | |||
@@ -37,12 +37,6 @@ | |||
37 | #ifndef _route_h | 37 | #ifndef _route_h |
38 | #define _route_h | 38 | #define _route_h |
39 | 39 | ||
40 | #ifdef SCCS_LABELS | ||
41 | #ifndef lint | ||
42 | /* static char *_rio_route_h_sccs = "@(#)route.h 1.3"; */ | ||
43 | #endif | ||
44 | #endif | ||
45 | |||
46 | #define MAX_LINKS 4 | 40 | #define MAX_LINKS 4 |
47 | #define MAX_NODES 17 /* Maximum nodes in a subnet */ | 41 | #define MAX_NODES 17 /* Maximum nodes in a subnet */ |
48 | #define NODE_BYTES ((MAX_NODES / 8) + 1) /* Number of bytes needed for | 42 | #define NODE_BYTES ((MAX_NODES / 8) + 1) /* Number of bytes needed for |
diff --git a/drivers/char/rio/unixrup.h b/drivers/char/rio/unixrup.h index 46bd532f7746..7abf0cba0f2c 100644 --- a/drivers/char/rio/unixrup.h +++ b/drivers/char/rio/unixrup.h | |||
@@ -33,10 +33,6 @@ | |||
33 | #ifndef __rio_unixrup_h__ | 33 | #ifndef __rio_unixrup_h__ |
34 | #define __rio_unixrup_h__ | 34 | #define __rio_unixrup_h__ |
35 | 35 | ||
36 | #ifdef SCCS_LABELS | ||
37 | static char *_unixrup_h_sccs_ = "@(#)unixrup.h 1.2"; | ||
38 | #endif | ||
39 | |||
40 | /* | 36 | /* |
41 | ** UnixRup data structure. This contains pointers to actual RUPs on the | 37 | ** UnixRup data structure. This contains pointers to actual RUPs on the |
42 | ** host card, and all the command/boot control stuff. | 38 | ** host card, and all the command/boot control stuff. |