cleanup header and machine dependency.

SCCS-vsn: sys/news3400/iodev/psd.c 7.3
SCCS-vsn: sys/news3400/iodev/scsi.c 7.3
SCCS-vsn: sys/news3400/iodev/scsireg.h 7.3
SCCS-vsn: sys/news3400/iodev/sd.c 7.5
SCCS-vsn: sys/news3400/iodev/sd_var.c 7.3
SCCS-vsn: sys/news3400/iodev/sdreg.h 7.3
SCCS-vsn: sys/news3400/iop/fb.c 7.3
SCCS-vsn: sys/news3400/iop/fb_sub.c 7.3
SCCS-vsn: sys/news3400/iop/fbreg.h 7.3
SCCS-vsn: sys/news3400/iop/iop.c 7.3
SCCS-vsn: sys/news3400/iop/kb.c 7.3
SCCS-vsn: sys/news3400/iop/kbreg.h 7.3
SCCS-vsn: sys/news3400/iop/rs.c 7.4
SCCS-vsn: sys/news3400/news3400/clock.c 7.7
SCCS-vsn: sys/news3400/news3400/genassym.c 7.5
SCCS-vsn: sys/news3400/news3400/kbms_if.c 7.3

diff --git a/usr/src/sys/news3400/iodev/psd.c b/usr/src/sys/news3400/iodev/psd.c
index d76096b..2425ffb 100644 (file)
--- a/usr/src/sys/news3400/iodev/psd.c
+++ b/usr/src/sys/news3400/iodev/psd.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: psd.c,v 4.300 91/06/09 06:38:07 root Rel41 $ SONY
  *
  *
  * from: $Hdr: psd.c,v 4.300 91/06/09 06:38:07 root Rel41 $ SONY
  *

- *     @(#)psd.c       7.2 (Berkeley) %G%
+ *     @(#)psd.c       7.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -24,8 +24,6 @@
  *
  */
 
  *
  */
 

-#include <machine/fix_machine_type.h>
-

 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>


@@ -65,22 +63,6 @@
 
 #define        NOSUCHDEV       0x7f
 
 
 #define        NOSUCHDEV       0x7f
 

-#ifdef news800
-#define        MAXCTLR         8
-#endif
-
-#ifdef news1200
-#define        MAXCTLR         8
-#endif
-
-#ifdef news1700
-#define        MAXCTLR         8
-#endif
-
-#ifdef news1800
-#define        MAXCTLR         8
-#endif
-

 #ifdef news3400
 #define        MAXCTLR         8
 #endif
 #ifdef news3400
 #define        MAXCTLR         8
 #endif


@@ -195,7 +177,7 @@ psdprobe_loop:
        }
 #ifndef NO_STATUS_BYTE_MASK
        sc->sc_tstatus &= TGSTMASK;
        }
 #ifndef NO_STATUS_BYTE_MASK
        sc->sc_tstatus &= TGSTMASK;

-#endif /* !NO_STATUS_BYTE_MASK */
+#endif

        if (sc->sc_tstatus != TGST_GOOD) {
                if (sc->sc_tstatus == TGST_CC)
                        scop_rsense(intr, sc, 0, SCSI_INTDIS, 18, 0);
        if (sc->sc_tstatus != TGST_GOOD) {
                if (sc->sc_tstatus == TGST_CC)
                        scop_rsense(intr, sc, 0, SCSI_INTDIS, 18, 0);

diff --git a/usr/src/sys/news3400/iodev/scsi.c b/usr/src/sys/news3400/iodev/scsi.c
index c411156..5b7dcaa 100644 (file)
--- a/usr/src/sys/news3400/iodev/scsi.c
+++ b/usr/src/sys/news3400/iodev/scsi.c
@@ -9,14 +9,13 @@
  *
  * from: $Hdr: scsi.c,v 4.300 91/06/27 20:42:51 root Rel41 $ SONY
  *
  *
  * from: $Hdr: scsi.c,v 4.300 91/06/27 20:42:51 root Rel41 $ SONY
  *

- *     @(#)scsi.c      7.2 (Berkeley) %G%
+ *     @(#)scsi.c      7.3 (Berkeley) %G%

  */
 
 /*
  *     scsi.c  ver 1.1         
  */
 
  */
 
 /*
  *     scsi.c  ver 1.1         
  */
 

-#include <machine/fix_machine_type.h>

 #include <machine/param.h>
 
 #include <sys/param.h>
 #include <machine/param.h>
 
 #include <sys/param.h>


@@ -64,186 +63,100 @@ struct msg_list {
 };
 
 #ifdef NO_SHRINK_RSENSE_MSG
 };
 
 #ifdef NO_SHRINK_RSENSE_MSG

+#      define MSG(m) m
+#else
+#      define MSG(m) NULL
+#endif
+

 struct msg_list skeylist[] = {
 struct msg_list skeylist[] = {

-       { 0x00, 1, "No Sense" },
-       { 0x01, 0, "Recoverable Error" },
-       { 0x02, 0, "Not Ready" },
-       { 0x03, 0, "Medium Error" },
-       { 0x04, 0, "Hardware Error" },
-       { 0x05, 0, "Illegal Request" },
-       { 0x06, 1, "Unit Attention" },
-       { 0x07, 1, "Data protect" },
-       { 0x08, 0, "Blank Check" },
-       { 0x09, 0, "Vendor Unique" },
-       { 0x0a, 0, "Copy/Compare Aborted" },
-       { 0x0b, 0, "Aborted Command" },
-       { 0x0c, 0, "Equal" },
-       { 0x0d, 0, "Volume Overflow" },
-       { 0x0e, 0, "Miscompare" },
+       { 0x00, 1, MSG("No Sense") },
+       { 0x01, 0, MSG("Recoverable Error") },
+       { 0x02, 0, MSG("Not Ready") },
+       { 0x03, 0, MSG("Medium Error") },
+       { 0x04, 0, MSG("Hardware Error") },
+       { 0x05, 0, MSG("Illegal Request") },
+       { 0x06, 1, MSG("Unit Attention") },
+       { 0x07, 1, MSG("Data protect") },
+       { 0x08, 0, MSG("Blank Check") },
+       { 0x09, 0, MSG("Vendor Unique") },
+       { 0x0a, 0, MSG("Copy/Compare Aborted") },
+       { 0x0b, 0, MSG("Aborted Command") },
+       { 0x0c, 0, MSG("Equal") },
+       { 0x0d, 0, MSG("Volume Overflow") },
+       { 0x0e, 0, MSG("Miscompare") },

        { -1,   0, (caddr_t)0 }
 };
        { -1,   0, (caddr_t)0 }
 };

-#else /* NO_SHRINK_RSENSE_MSG */
-struct msg_list skeylist[] = {
-       { 0x00, 1, NULL },
-       { 0x01, 0, NULL },
-       { 0x02, 0, NULL },
-       { 0x03, 0, NULL },
-       { 0x04, 0, NULL },
-       { 0x05, 0, NULL },
-       { 0x06, 1, NULL },
-       { 0x07, 1, NULL },
-       { 0x08, 0, NULL },
-       { 0x09, 0, NULL },
-       { 0x0a, 0, NULL },
-       { 0x0b, 0, NULL },
-       { 0x0c, 0, NULL },
-       { 0x0d, 0, NULL },
-       { 0x0e, 0, NULL },
-       { -1,   0, NULL }
-};
-#endif /* NO_SHRINK_RSENSE_MSG */

 
 

-#ifdef NO_SHRINK_RSENSE_MSG

 struct msg_list ecodelist[] = {
 struct msg_list ecodelist[] = {

-       { 0x00, 9, "No Additional Sense Information" },
-/*HD*/ { 0x01, 1, "No Index/Address Mark Found signal" },
-       { 0x02, 0, "No Seek Complete" },
-       { 0x03, 0, "Write Fault" },
-       { 0x04, 9, "Drive Not Ready" },
-       { 0x05, 0, "Drive Not Selected" },
-/*HD*/ { 0x06, 0, "No Track Zero" },
-       { 0x07, 0, "Multiple Drives Selected" },
-       { 0x08, 0, "Logical Unit Communication Failure" },
-       { 0x09, 2, "Track Following Error" },
-/*MO*/ { 0x0a, 1, "No Disk" },
-/*MO*/ { 0x0b, 1, "Load/Unload Failure" },
-/*MO*/ { 0x0c, 1, "Spindle Failure" },
-/*MO*/ { 0x0d, 1, "Focus Failure" },
-/*MO*/ { 0x0e, 1, "Tracking Failure" },
-/*MO*/ { 0x0f, 0, "Drive Initialization Failure" },
-       { 0x10, 1, "ID CRC or ECC error" },
-       { 0x11, 0, "Unrecoverd Read error" },
-/*HD*/ { 0x12, 0, "No Address Mark (byte sync byte) found in ID field" },
-/*HD*/ { 0x13, 0, "No Address Mark (byte sync byte) found in Data field" },
-/*HD*/ { 0x14, 0, "No record found" },
-       { 0x15, 1, "Seek Positioning Error" },
-
-/*HD*/ { 0x17, 0, "Recovered Read data with Read retries" },
-       { 0x18, 0, "Recovered Read data with ECC procedure" },
-/*HD*/ { 0x19, 0, "Defect List error" },
-/*HD*/ { 0x1a, 0, "Parameter overrun" },
-/*HD*/ { 0x1b, 0, "Synchronous transfer error" },
-/*HD*/ { 0x1c, 0, "Primary Defect List not found" },
-/*HD*/ { 0x1d, 0, "Compare error" },
-
-       { 0x20, 0, "Invalid Command Operation Code" },
-       { 0x21, 0, "Illegal Logical Block Address" },
-/*HD*/ { 0x22, 0, "Illegal function for device type" },
-/*MO*/ { 0x23, 0, "Illegal function for Medium Type" },
-       { 0x24, 0, "Illegal Field in CDB" },
-       { 0x25, 0, "Invalid LUN" },
-       { 0x26, 0, "Invalid field in Parameter List" },
-       { 0x27, 0, "Write Protected" },
-       { 0x28, 1, "Medium Changed" },
-       { 0x29, 1, "Power On or Reset or Bus Device Reset Occured" },
-       { 0x2a, 1, "Mode Select Parameters Changed" },
-/*HD*/ { 0x2b, 0, "Host cannot Disconnect" },
-
-       { 0x31, 0, "Medium Format Corrupted" },
-       { 0x32, 0, "No Defect Spare Location Available" },
-
-/*MO*/ { 0x38, 1, "Recovered with Automatic Reallocation" },
-/*MO*/ { 0x39, 0, "Automatic Reallocation Failure" },
-/*MO*/ { 0x3a, 1, "Defect List Update Failure" },
-
-/*MO*/ { 0x3d, 0, "Defect List Not Available" },
-
-/*HD*/ { 0x40, 0, "RAM failure" },
-/*HD*/ { 0x41, 0, "Data Path diagnostic failure" },
-       { 0x42, 0, "Power On Diagnostic Failure" },
-       { 0x43, 0, "Message Reject Error" },
-       { 0x44, 9, "Internal Controller Error" },
-/*HD*/ { 0x45, 0, "Selection/Reselection failure" },
-
-       { 0x47, 0, "SCSI Interface Parity Error" },
-       { 0x48, 0, "Initiator Detected Error" },
-       { 0x49, 0, "Inappropriate/Illegal Message" },
-
-       { 0x64, 1, "Illegal mode for this track" },
+       { 0x00, 9, MSG("No Additional Sense Information") },
+/*HD*/ { 0x01, 1, MSG("No Index/Address Mark Found signal") },
+       { 0x02, 0, MSG("No Seek Complete") },
+       { 0x03, 0, MSG("Write Fault") },
+       { 0x04, 9, MSG("Drive Not Ready") },
+       { 0x05, 0, MSG("Drive Not Selected") },
+/*HD*/ { 0x06, 0, MSG("No Track Zero") },
+       { 0x07, 0, MSG("Multiple Drives Selected") },
+       { 0x08, 0, MSG("Logical Unit Communication Failure") },
+       { 0x09, 2, MSG("Track Following Error") },
+/*MO*/ { 0x0a, 1, MSG("No Disk") },
+/*MO*/ { 0x0b, 1, MSG("Load/Unload Failure") },
+/*MO*/ { 0x0c, 1, MSG("Spindle Failure") },
+/*MO*/ { 0x0d, 1, MSG("Focus Failure") },
+/*MO*/ { 0x0e, 1, MSG("Tracking Failure") },
+/*MO*/ { 0x0f, 0, MSG("Drive Initialization Failure") },
+       { 0x10, 1, MSG("ID CRC or ECC error") },
+       { 0x11, 0, MSG("Unrecoverd Read error") },
+/*HD*/ { 0x12, 0, MSG("No Address Mark (byte sync byte) found in ID field") },
+/*HD*/ { 0x13, 0, MSG("No Address Mark (byte sync byte) found in Data field") },
+/*HD*/ { 0x14, 0, MSG("No record found") },
+       { 0x15, 1, MSG("Seek Positioning Error") },
+
+/*HD*/ { 0x17, 0, MSG("Recovered Read data with Read retries") },
+       { 0x18, 0, MSG("Recovered Read data with ECC procedure") },
+/*HD*/ { 0x19, 0, MSG("Defect List error") },
+/*HD*/ { 0x1a, 0, MSG("Parameter overrun") },
+/*HD*/ { 0x1b, 0, MSG("Synchronous transfer error") },
+/*HD*/ { 0x1c, 0, MSG("Primary Defect List not found") },
+/*HD*/ { 0x1d, 0, MSG("Compare error") },
+
+       { 0x20, 0, MSG("Invalid Command Operation Code") },
+       { 0x21, 0, MSG("Illegal Logical Block Address") },
+/*HD*/ { 0x22, 0, MSG("Illegal function for device type") },
+/*MO*/ { 0x23, 0, MSG("Illegal function for Medium Type") },
+       { 0x24, 0, MSG("Illegal Field in CDB") },
+       { 0x25, 0, MSG("Invalid LUN") },
+       { 0x26, 0, MSG("Invalid field in Parameter List") },
+       { 0x27, 0, MSG("Write Protected") },
+       { 0x28, 1, MSG("Medium Changed") },
+       { 0x29, 1, MSG("Power On or Reset or Bus Device Reset Occured") },
+       { 0x2a, 1, MSG("Mode Select Parameters Changed") },
+/*HD*/ { 0x2b, 0, MSG("Host cannot Disconnect") },
+
+       { 0x31, 0, MSG("Medium Format Corrupted") },
+       { 0x32, 0, MSG("No Defect Spare Location Available") },
+
+/*MO*/ { 0x38, 1, MSG("Recovered with Automatic Reallocation") },
+/*MO*/ { 0x39, 0, MSG("Automatic Reallocation Failure") },
+/*MO*/ { 0x3a, 1, MSG("Defect List Update Failure") },
+
+/*MO*/ { 0x3d, 0, MSG("Defect List Not Available") },
+
+/*HD*/ { 0x40, 0, MSG("RAM failure") },
+/*HD*/ { 0x41, 0, MSG("Data Path diagnostic failure") },
+       { 0x42, 0, MSG("Power On Diagnostic Failure") },
+       { 0x43, 0, MSG("Message Reject Error") },
+       { 0x44, 9, MSG("Internal Controller Error") },
+/*HD*/ { 0x45, 0, MSG("Selection/Reselection failure") },
+
+       { 0x47, 0, MSG("SCSI Interface Parity Error") },
+       { 0x48, 0, MSG("Initiator Detected Error") },
+       { 0x49, 0, MSG("Inappropriate/Illegal Message") },
+
+       { 0x64, 1, MSG("Illegal mode for this track") },

 
        { -1,   0, (caddr_t)0 }
 };
 
        { -1,   0, (caddr_t)0 }
 };

-#else /* NO_SHRINK_RSENSE_MSG */
-struct msg_list ecodelist[] = {
-       { 0x00, 9, NULL },
-/*HD*/ { 0x01, 1, NULL },
-       { 0x02, 0, NULL },
-       { 0x03, 0, NULL },
-       { 0x04, 9, NULL },
-       { 0x05, 0, NULL },
-/*HD*/ { 0x06, 0, NULL },
-       { 0x07, 0, NULL },
-       { 0x08, 0, NULL },
-       { 0x09, 2, NULL },
-/*MO*/ { 0x0a, 1, NULL },
-/*MO*/ { 0x0b, 1, NULL },
-/*MO*/ { 0x0c, 1, NULL },
-/*MO*/ { 0x0d, 1, NULL },
-/*MO*/ { 0x0e, 1, NULL },
-/*MO*/ { 0x0f, 0, NULL },
-       { 0x10, 1, NULL },
-       { 0x11, 0, NULL },
-/*HD*/ { 0x12, 0, NULL },
-/*HD*/ { 0x13, 0, NULL },
-/*HD*/ { 0x14, 0, NULL },
-       { 0x15, 1, NULL },
-
-/*HD*/ { 0x17, 0, NULL },
-       { 0x18, 0, NULL },
-/*HD*/ { 0x19, 0, NULL },
-/*HD*/ { 0x1a, 0, NULL },
-/*HD*/ { 0x1b, 0, NULL },
-/*HD*/ { 0x1c, 0, NULL },
-/*HD*/ { 0x1d, 0, NULL },
-
-       { 0x20, 0, NULL },
-       { 0x21, 0, NULL },
-/*HD*/ { 0x22, 0, NULL },
-/*MO*/ { 0x23, 0, NULL },
-       { 0x24, 0, NULL },
-       { 0x25, 0, NULL },
-       { 0x26, 0, NULL },
-       { 0x27, 0, NULL },
-       { 0x28, 1, NULL },
-       { 0x29, 1, NULL },
-       { 0x2a, 1, NULL },
-/*HD*/ { 0x2b, 0, NULL },
-
-       { 0x31, 0, NULL },
-       { 0x32, 0, NULL },
-
-/*MO*/ { 0x38, 1, NULL },
-/*MO*/ { 0x39, 0, NULL },
-/*MO*/ { 0x3a, 1, NULL },
-
-/*MO*/ { 0x3d, 0, NULL },
-
-/*HD*/ { 0x40, 0, NULL },
-/*HD*/ { 0x41, 0, NULL },
-       { 0x42, 0, NULL },
-       { 0x43, 0, NULL },
-       { 0x44, 9, NULL },
-/*HD*/ { 0x45, 0, NULL },
-
-       { 0x47, 0, NULL },
-       { 0x48, 0, NULL },
-       { 0x49, 0, NULL },
-
-       { 0x64, 1, NULL },
-
-       { -1,   0, NULL }
-};
-#endif /* NO_SHRINK_RSENSE_MSG */
+#undef MSG

 
 /*
  * Init a scsi bus.
 
 /*
  * Init a scsi bus.


@@ -1101,5 +1014,4 @@ struct scsi_berr_bug_table {
        int serial_h;
        int value;      /* 1:BUG, 0:NOBUG */
 };
        int serial_h;
        int value;      /* 1:BUG, 0:NOBUG */
 };

-

 /***/
 /***/

diff --git a/usr/src/sys/news3400/iodev/scsireg.h b/usr/src/sys/news3400/iodev/scsireg.h
index 7b6032b..7b9c01d 100644 (file)
--- a/usr/src/sys/news3400/iodev/scsireg.h
+++ b/usr/src/sys/news3400/iodev/scsireg.h
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: scsireg.h,v 4.300 91/06/09 06:38:12 root Rel41 $ SONY
  *
  *
  * from: $Hdr: scsireg.h,v 4.300 91/06/09 06:38:12 root Rel41 $ SONY
  *

- *     @(#)scsireg.h   7.2 (Berkeley) %G%
+ *     @(#)scsireg.h   7.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -19,8 +19,6 @@
 #ifndef __SCSIREG__
 #define __SCSIREG__ 1
 
 #ifndef __SCSIREG__
 #define __SCSIREG__ 1
 

-#include <machine/fix_machine_type.h>
-

 /*
  *     initiator status byte bit image
  */
 /*
  *     initiator status byte bit image
  */


@@ -262,32 +260,18 @@ struct scsi {
 /*
  *     scsi map table format
  */
 /*
  *     scsi map table format
  */

-#if defined(news800) || defined(news1800)
-#define        NSCMAP  510
-#endif /* defined(news800) || defined(news1800) */
-
-#if defined(news1200) || defined(news1700)
-#define        NSCMAP  129
-#endif /* news1200 || news1700 */
-

 #ifdef news3400
 #define        NSCMAP  120
 #ifdef news3400
 #define        NSCMAP  120

-#endif /* news3400 */
+#endif

 
 #ifdef news3800
 #define        NSCMAP  129
 
 #ifdef news3800
 #define        NSCMAP  129

-#endif /* news3800 */
+#endif

 
 struct sc_map {
 /*000*/        unsigned        mp_offset;
 /*004*/        unsigned        mp_pages;
 /*008*/        unsigned        mp_addr[NSCMAP];
 
 struct sc_map {
 /*000*/        unsigned        mp_offset;
 /*004*/        unsigned        mp_pages;
 /*008*/        unsigned        mp_addr[NSCMAP];

-#if defined(news800) || defined(news1800)
-/*800*/
-#endif /* defined(news800) || defined(news1800) */
-#if defined(news1200) || defined(news1700)
-/*20c*/
-#endif /* news1200 || news1700 */

 };
 
 
 };
 
 


@@ -516,16 +500,6 @@ struct sc_rab {
 #  define      ipc_phys(x)     (caddr_t)((int)(x) & ~0x80000000)
 # endif
 
 #  define      ipc_phys(x)     (caddr_t)((int)(x) & ~0x80000000)
 # endif
 

-# ifdef news800
-#  define      splsc           spl3
-#  define      splscon         spl2
-# endif
-
-# ifdef news1800
-#  define      splsc           spl5
-#  define      splscon         spl4
-# endif
-

 # ifdef news3800
 #  define      splsc           spl4
 #  define      splscon         spl3
 # ifdef news3800
 #  define      splsc           spl4
 #  define      splscon         spl3


@@ -547,14 +521,12 @@ struct sc_rab {
 #define        SCSI_INTEN      1
 #define        SCSI_INTDIS     0
 
 #define        SCSI_INTEN      1
 #define        SCSI_INTDIS     0
 

-

 struct scintsw {
 /*00*/ int     (*sci_inthandler)();    /* pointer to interrupt handler */
 /*04*/ int     sci_ctlr;               /* controller number */
 /*08*/
 };
 
 struct scintsw {
 /*00*/ int     (*sci_inthandler)();    /* pointer to interrupt handler */
 /*04*/ int     sci_ctlr;               /* controller number */
 /*08*/
 };
 

-

 struct sc_data {
 /*00*/ caddr_t scd_scaddr;             /* pointer to struct scsi */
 /*04*/ caddr_t scd_vaddr;              /* pointer to buffer address */
 struct sc_data {
 /*00*/ caddr_t scd_scaddr;             /* pointer to struct scsi */
 /*04*/ caddr_t scd_vaddr;              /* pointer to buffer address */

diff --git a/usr/src/sys/news3400/iodev/sd.c b/usr/src/sys/news3400/iodev/sd.c
index 8599c24..419ad1a 100644 (file)
--- a/usr/src/sys/news3400/iodev/sd.c
+++ b/usr/src/sys/news3400/iodev/sd.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: sd.c,v 4.300 91/06/27 20:42:56 root Rel41 $ SONY
  *
  *
  * from: $Hdr: sd.c,v 4.300 91/06/27 20:42:56 root Rel41 $ SONY
  *

- *     @(#)sd.c        7.4 (Berkeley) %G%
+ *     @(#)sd.c        7.5 (Berkeley) %G%

  */
 #define        dkblock(bp)     bp->b_blkno
 
  */
 #define        dkblock(bp)     bp->b_blkno
 


@@ -20,8 +20,6 @@
 #include "sd.h"
 #if NSD > 0
 
 #include "sd.h"
 #if NSD > 0
 

-#include <machine/fix_machine_type.h>
-

 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/proc.h>


@@ -56,9 +54,6 @@
 #include <news3400/iodev/scu.h>
 #include <news3400/iodev/dkio.h>
 #include <news3400/iodev/sdreg.h>
 #include <news3400/iodev/scu.h>
 #include <news3400/iodev/dkio.h>
 #include <news3400/iodev/sdreg.h>

-/* #ifdef DISKINFO KU:XXX */
-#include <news3400/iodev/diskinfo.h>
-/* #endif /* DISKINFO */

 
 #define        sce_sdecode     sce_hdecode
 
 
 #define        sce_sdecode     sce_hdecode
 


@@ -683,53 +678,6 @@ loop_tst:
        return (1);
 }
 
        return (1);
 }
 

-#ifdef NEWSOS4
-static
-sd_setup_cmds(ii, sc)
-       register struct iop/**/_device *ii;
-       register struct scsi *sc;
-{
-       register struct sddevinfo *sdi;
-       register struct sc_extnd *sce;
-       struct sc_ureq **p;
-       struct sc_ureq *scu;
-       int error;
-       extern struct sc_ureq scu_rsense;
-
-       if ((p = sddevinfo[ii->ii_type].setup_cmds) == NULL)
-               return (0);
-
-       /*
-        * Do setup commands
-        */
-       while (scu = *p) {
-               bcopy((caddr_t)scu, sdtmp, sizeof(struct sc_ureq));
-               scu = (struct sc_ureq *)sdtmp;
-               scu->scu_cdb[1] |= (ii->ii_slave & 0x07) << 5;
-               error = sd_scu_exec((ii->ii_unit << 3), scu, sc);
-               if (error != 0)
-                       return (-1);
-               if ((scu->scu_istatus != INST_EP)
-                   || (scu->scu_tstatus != TGST_GOOD)) {
-                       bcopy((caddr_t)&scu_rsense, sdtmp, sizeof(struct sc_ureq));
-                       scu = (struct sc_ureq *)sdtmp;
-                       scu->scu_cdb[1] |= (ii->ii_slave & 0x07) << 5;
-                       sce = (scu->scu_addr == NULL) ?
-                               (struct sc_extnd *)scu->scu_param :
-                               (struct sc_extnd *)scu->scu_addr;
-                       if (sd_scu_exec((ii->ii_unit << 3), scu, sc) == 0) {
-                               /* UNIT ATTENTION */
-                               /* retry same command */
-                               if (sce->sce_skey == 0x06)
-                                       continue;
-                       }
-               }
-               p++;
-       }
-       return (1);
-}
-#endif /* NEWSOS4 */
-

 static
 sd_other_pages(ii, sc)
        register struct iop/**/_device *ii;
 static
 sd_other_pages(ii, sc)
        register struct iop/**/_device *ii;


@@ -942,14 +890,6 @@ sdattach(ii)
                timeout(sdstop, (caddr_t)0, hz);
        }
 
                timeout(sdstop, (caddr_t)0, hz);
        }
 

-#ifdef NEWSOS4
-       /*
-        * Do setup commands
-        */
-       if (sd_setup_cmds(ii, get_scsi(ii->ii_intr)) < 0)
-               printf("sd%d: setup failure\n", ii->ii_unit);
-#endif
-

        /*
         * initialize open flag
         */
        /*
         * initialize open flag
         */


@@ -1535,9 +1475,6 @@ sdrpartinfo(ii)
        struct sdc_softc *sdc;
        struct sdd_softc *sdd;
        struct sddevinfo *sdi;
        struct sdc_softc *sdc;
        struct sdd_softc *sdd;
        struct sddevinfo *sdi;

-#ifdef DISKINFO
-       struct diskinfo *dip;
-#endif

        struct scsi uscsi;
        int s;
 
        struct scsi uscsi;
        int s;
 


@@ -1581,9 +1518,6 @@ sdrpartinfo(ii)
 
        fsp = (struct firstsector *)sdtmp;
        dlp = (struct disklabel *)(sdtmp + LABELOFFSET);
 
        fsp = (struct firstsector *)sdtmp;
        dlp = (struct disklabel *)(sdtmp + LABELOFFSET);

-#ifdef DISKINFO
-       dip = &fsp->diskinfo;
-#endif

 
        s = splclock();
        hsp = &sdstdrv[unit];
 
        s = splclock();
        hsp = &sdstdrv[unit];


@@ -1594,12 +1528,6 @@ sdrpartinfo(ii)
            && ((ii->ii_flags & SD_F_IGNLABEL) == 0)) {
                sdlabel[unit] = *dlp;
                disklabel2sdst(unit, dlp, hsp);
            && ((ii->ii_flags & SD_F_IGNLABEL) == 0)) {
                sdlabel[unit] = *dlp;
                disklabel2sdst(unit, dlp, hsp);

-#ifdef DISKINFO
-       } else if ((dip->di_magic == DISKINFO_MAGIC)
-                   && ((ii->ii_flags & SD_F_IGNLABEL) == 0)) {
-               diskinfo2sdst(unit, dip, hsp);
-               diskinfo2disklabel(unit, dip, &sdlabel[unit]);
-#endif

        } else {
                if ((ii->ii_type == UNKNOWN_DISK)
                                || (sdi->sdstp->sizes == calc_disk_sizes)) {
        } else {
                if ((ii->ii_type == UNKNOWN_DISK)
                                || (sdi->sdstp->sizes == calc_disk_sizes)) {


@@ -1730,97 +1658,6 @@ disklabel2sdst(unit, dlp, st)
        }
 }
 
        }
 }
 

-#ifdef DISKINFO
-static
-diskinfo2sdst(unit, dip, st)
-       int unit;
-       register struct diskinfo *dip;
-       register struct sdst *st;
-{
-       register int i;
-       int msg_header_printed;
-
-       msg_header_printed = 0;
-
-       st->nsect = dip->di_dkst.dks_nsect;     /* # sectors/track */
-       st->ntrak = dip->di_dkst.dks_ntrak;     /* # tracks/cylinder */
-       st->nspc = dip->di_dkst.dks_nsect * dip->di_dkst.dks_ntrak;
-                                               /* # sectors/cylinder */
-       st->ncyl = dip->di_dkst.dks_ncyl;       /* # cylinders */
-       st->rps = dip->di_dkst.dks_rps;         /* # revolutions / second */
-       st->sizes = sdsizedrv[unit];            /* partition table */
-
-       check_sdst(unit, st);
-
-       for (i = 0; i < PNUM; i++) {
-               if (msg_header_printed == 0) {
-                       if (((stsz(i) != 0) || (stof(i) != 0))
-                           && ((stsz(i) != disz(i)) || (stof(i) != diof(i)))) {
-                               msg_header_printed = 1;
-                       }
-               }
-       }
-
-       for (i = 0; i < PNUM; i++) {
-               stsz(i) = disz(i);
-               stof(i) = diof(i);
-       }
-
-       if (msg_header_printed) {
-               printf(Warn_Part, unit);
-               for (i = 0; i < PNUM; i++)
-                       printf(Pr_Part_Fmt, unit, pname[i], stsz(i), stof(i));
-       }
-}
-
-static
-diskinfo2disklabel(unit, dip, dlp)
-       int unit;
-       register struct diskinfo *dip;
-       register struct disklabel *dlp;
-{
-       register int i;
-
-       dlp->d_type = DTYPE_SCSI;                       /* drive type */
-       dlp->d_secsize = sdd_softc[unit].sdd_sectsize;  /* # of bytes per sector */
-       dlp->d_nsectors = dip->di_dkst.dks_nsect;       /* # sectors/track */
-       dlp->d_ntracks = dip->di_dkst.dks_ntrak;        /* # tracks/cylinder */
-       dlp->d_ncylinders = dip->di_dkst.dks_ncyl;      /* # cylinders */
-       dlp->d_secpercyl = dip->di_dkst.dks_nsect * dip->di_dkst.dks_ntrak;
-                                                       /* # sectors/cylinder */
-       dlp->d_rpm = dip->di_dkst.dks_rps * 60;         /* # revolutions / second */
-       dlp->d_bbsize = BBSIZE; /*XXX*/ /* size of boot area at sn0, bytes */
-       dlp->d_sbsize = SBSIZE; /*XXX*/ /* max size of fs superblock, bytes */
-
-       for (i = 0; i < PNUM; i++) {
-               dlsz(i) = disz(i);
-               dlof(i) = diof(i);
-       }
-}
-#endif /* DISKINFO */
-
-/* #ifdef DISKINFO KU:XXX */
-static
-disklabel2diskinfo(unit, dlp, dip)
-       int unit;
-       register struct disklabel *dlp;
-       register struct diskinfo *dip;
-{
-       register int i;
-
-       dip->di_magic = DISKINFO_MAGIC;
-       dip->di_dkst.dks_nsect = dlp->d_nsectors;       /* # sectors/track */
-       dip->di_dkst.dks_ntrak = dlp->d_ntracks;        /* # tracks/cylinder */
-       dip->di_dkst.dks_ncyl = dlp->d_ncylinders;      /* # cylinders */
-       dip->di_dkst.dks_rps = dlp->d_rpm / 60;         /* # revolutions/second */
-
-       for (i = 0; i < PNUM; i++) {
-               disz(i) = dlsz(i);
-               diof(i) = dlof(i);
-       }
-}
-/* #endif /* DISKINFO */
-

 static
 sdst2disklabel(unit, st, dlp)
        int unit;       /*XXX*/
 static
 sdst2disklabel(unit, st, dlp)
        int unit;       /*XXX*/


@@ -3160,6 +2997,20 @@ sdwrite(dev, uio, flag)
 
 #define MAXBL 256
 
 
 #define MAXBL 256
 

+struct Partinfo {
+/*00*/ daddr_t dp_nblocks;             /* partition size (sector #) */
+/*04*/ daddr_t dp_blkoff;              /* partition start block */
+/*08*/
+};
+
+struct dkst {
+/*00*/ int dks_ncyl;                   /* # cylinders / drive */
+/*04*/ int dks_ntrak;                  /* # tracks / cylinder */
+/*08*/ int dks_nsect;                  /* # sectors / track */
+/*0c*/ int dks_rps;                    /* # revolutions / second */
+/*10*/
+};
+

 /*ARGSUSED*/
 sdioctl(dev, cmd, data, flag)
        dev_t dev;
 /*ARGSUSED*/
 sdioctl(dev, cmd, data, flag)
        dev_t dev;


@@ -3288,8 +3139,6 @@ sdioctl(dev, cmd, data, flag)
                }
 
                *(struct disklabel *)(sdtmp + LABELOFFSET) = sdlabel[unit];
                }
 
                *(struct disklabel *)(sdtmp + LABELOFFSET) = sdlabel[unit];

-               disklabel2diskinfo(unit, &sdlabel[unit],
-                                   &((struct firstsector *)sdtmp)->diskinfo);

 
                /**** WRITE sector 0 ****/
 
 
                /**** WRITE sector 0 ****/
 

diff --git a/usr/src/sys/news3400/iodev/sd_var.c b/usr/src/sys/news3400/iodev/sd_var.c
index cfdb7c0..44668ec 100644 (file)
--- a/usr/src/sys/news3400/iodev/sd_var.c
+++ b/usr/src/sys/news3400/iodev/sd_var.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: sd_var.c,v 4.300 91/06/09 06:38:23 root Rel41 $ SONY
  *
  *
  * from: $Hdr: sd_var.c,v 4.300 91/06/09 06:38:23 root Rel41 $ SONY
  *

- *     @(#)sd_var.c    7.2 (Berkeley) %G%
+ *     @(#)sd_var.c    7.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -23,8 +23,6 @@
 #include "sd.h"
 #if NSD > 0
 
 #include "sd.h"
 #if NSD > 0
 

-#include <machine/fix_machine_type.h>
-

 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>

diff --git a/usr/src/sys/news3400/iodev/sdreg.h b/usr/src/sys/news3400/iodev/sdreg.h
index 5d817dc..1245335 100644 (file)
--- a/usr/src/sys/news3400/iodev/sdreg.h
+++ b/usr/src/sys/news3400/iodev/sdreg.h
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: sdreg.h,v 4.300 91/06/09 06:38:28 root Rel41 $ SONY
  *
  *
  * from: $Hdr: sdreg.h,v 4.300 91/06/09 06:38:28 root Rel41 $ SONY
  *

- *     @(#)sdreg.h     7.2 (Berkeley) %G%
+ *     @(#)sdreg.h     7.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -22,8 +22,6 @@
 #ifndef __SDREG__
 #define __SDREG__ 1
 
 #ifndef __SDREG__
 #define __SDREG__ 1
 

-#include <machine/fix_machine_type.h>
-

 #define        MAXSLAVE        8
 #define        PNUM            8
 #define        RSEN_CNT        32
 #define        MAXSLAVE        8
 #define        PNUM            8
 #define        RSEN_CNT        32

diff --git a/usr/src/sys/news3400/iop/fb.c b/usr/src/sys/news3400/iop/fb.c
index 8b28a10..9b0db9b 100644 (file)
--- a/usr/src/sys/news3400/iop/fb.c
+++ b/usr/src/sys/news3400/iop/fb.c
@@ -9,11 +9,9 @@
  *
  * from: $Hdr: fb.c,v 4.300 91/06/27 20:43:06 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fb.c,v 4.300 91/06/27 20:43:06 root Rel41 $ SONY
  *

- *     @(#)fb.c        7.2 (Berkeley) %G%
+ *     @(#)fb.c        7.3 (Berkeley) %G%

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

 #include "fb.h"
 #if NFB > 0
 /*
 #include "fb.h"
 #if NFB > 0
 /*

diff --git a/usr/src/sys/news3400/iop/fb_sub.c b/usr/src/sys/news3400/iop/fb_sub.c
index 7e16803..3e3305c 100644 (file)
--- a/usr/src/sys/news3400/iop/fb_sub.c
+++ b/usr/src/sys/news3400/iop/fb_sub.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: fb_sub.c,v 4.300 91/06/27 20:43:09 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fb_sub.c,v 4.300 91/06/27 20:43:09 root Rel41 $ SONY
  *

- *     @(#)fb_sub.c    7.2 (Berkeley) %G%
+ *     @(#)fb_sub.c    7.3 (Berkeley) %G%

  */
 
 #include "fb.h"
  */
 
 #include "fb.h"


@@ -18,8 +18,6 @@
  * Frame buffer driver
  */
 
  * Frame buffer driver
  */
 

-#include <machine/fix_machine_type.h>
-

 #include <sys/types.h>
 #include <machine/pte.h>
 #include <machine/cpu.h>
 #include <sys/types.h>
 #include <machine/pte.h>
 #include <machine/cpu.h>

diff --git a/usr/src/sys/news3400/iop/fbreg.h b/usr/src/sys/news3400/iop/fbreg.h
index cd8ff6c..20ab21d 100644 (file)
--- a/usr/src/sys/news3400/iop/fbreg.h
+++ b/usr/src/sys/news3400/iop/fbreg.h
@@ -9,13 +9,11 @@
  *
  * from: $Hdr: fbreg.h,v 4.300 91/06/27 20:43:07 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fbreg.h,v 4.300 91/06/27 20:43:07 root Rel41 $ SONY
  *

- *     @(#)fbreg.h     7.2 (Berkeley) %G%
+ *     @(#)fbreg.h     7.3 (Berkeley) %G%

  */
 
 #ifdef KERNEL
 
  */
 
 #ifdef KERNEL
 

-#include <machine/fix_machine_type.h>
-

 struct fb_softc {
        int     fbs_state;
        int     fbs_device;
 struct fb_softc {
        int     fbs_state;
        int     fbs_device;


@@ -23,15 +21,6 @@ struct fb_softc {
        int     fbs_flag;
 };
 
        int     fbs_flag;
 };
 

-#ifdef news700
-#define        splfb           spl4
-#endif
-#if defined(news800) || defined(news1800)
-#define        splfb           spl5
-#endif
-#if defined(news1200) || defined(news1700)
-#define        splfb           spl3
-#endif

 #if defined(news3200) || defined(news3400)
 #define        splfb           spl3
 #endif
 #if defined(news3200) || defined(news3400)
 #define        splfb           spl3
 #endif


@@ -73,19 +62,19 @@ struct fbreg {
        u_char  fb_unit;        /* unit no */
 
        union {
        u_char  fb_unit;        /* unit no */
 
        union {

-           lBitblt     _fb_bitblt;     /* bitblt command */
-           lBatchBitblt _fb_batchbitblt; /* batch bitblt command */
-           lTileBitblt _fb_tilebitblt; /* tile bitblt command */
-           lBitblt3    _fb_bitblt3;    /* 3 operand bitblt command */
-           lPrimLine   _fb_polyline;   /* (disjoint) polyline */
-           lPrimRect   _fb_rectangle;  /* rectangle */
-           lPrimFill   _fb_fillscan;   /* fill pattern */
-           lPrimMarker _fb_polymarker; /* polymarker */
-           lPrimText   _fb_text;       /* text display */
-           lPrimDot    _fb_polydot;    /* polydot */
-           lScrType    _fb_scrtype;    /* screen type */
-           lCursor2    _fb_cursor;     /* cursor area */
-           lPalette    _fb_palette;    /* get/set palette */
+           lBitblt     _fb_bitblt;             /* bitblt command */
+           lBatchBitblt _fb_batchbitblt;       /* batch bitblt command */
+           lTileBitblt _fb_tilebitblt;         /* tile bitblt command */
+           lBitblt3    _fb_bitblt3;            /* 3 operand bitblt command */
+           lPrimLine   _fb_polyline;           /* (disjoint) polyline */
+           lPrimRect   _fb_rectangle;          /* rectangle */
+           lPrimFill   _fb_fillscan;           /* fill pattern */
+           lPrimMarker _fb_polymarker;         /* polymarker */
+           lPrimText   _fb_text;               /* text display */
+           lPrimDot    _fb_polydot;            /* polydot */
+           lScrType    _fb_scrtype;            /* screen type */
+           lCursor2    _fb_cursor;             /* cursor area */
+           lPalette    _fb_palette;            /* get/set palette */

            lPoint      _fb_point;
            int         _fb_data;
            lVideoCtl   _fb_videoctl;
            lPoint      _fb_point;
            int         _fb_data;
            lVideoCtl   _fb_videoctl;


@@ -93,6 +82,7 @@ struct fbreg {
            lFbIoctl    _fb_ioctl;
        } fb_un;
 };
            lFbIoctl    _fb_ioctl;
        } fb_un;
 };

+

 #define fb_bitblt      fb_un._fb_bitblt
 #define fb_batchbitblt fb_un._fb_batchbitblt
 #define fb_tilebitblt  fb_un._fb_tilebitblt
 #define fb_bitblt      fb_un._fb_bitblt
 #define fb_batchbitblt fb_un._fb_batchbitblt
 #define fb_tilebitblt  fb_un._fb_tilebitblt


@@ -162,8 +152,8 @@ struct fbreg {
 #define FB_ROK         0       /* OK */
 #define FB_RERROR      1       /* some error occurred */
 
 #define FB_ROK         0       /* OK */
 #define FB_RERROR      1       /* some error occurred */
 

-#define        FBUNIT(dev) (minor(dev) & 0x7f)
-#define        FBVIDEO(dev) (minor(dev) & 0x80)
+#define        FBUNIT(dev)     (minor(dev) & 0x7f)
+#define        FBVIDEO(dev)    (minor(dev) & 0x80)

 
 #define FBPRI  (PRIBIO+1)
 
 
 #define FBPRI  (PRIBIO+1)
 

diff --git a/usr/src/sys/news3400/iop/iop.c b/usr/src/sys/news3400/iop/iop.c
index fe74544..a8b5c91 100644 (file)
--- a/usr/src/sys/news3400/iop/iop.c
+++ b/usr/src/sys/news3400/iop/iop.c
@@ -9,14 +9,13 @@
  *
  * from: $Hdr: iop.c,v 4.300 91/06/09 06:42:37 root Rel41 $ SONY
  *
  *
  * from: $Hdr: iop.c,v 4.300 91/06/09 06:42:37 root Rel41 $ SONY
  *

- *     @(#)iop.c       7.2 (Berkeley) %G%
+ *     @(#)iop.c       7.3 (Berkeley) %G%

  */
 
 /*
  *     iop.c / hb.c    ver 0.0
  */
 
  */
 
 /*
  *     iop.c / hb.c    ver 0.0
  */
 

-#include <machine/fix_machine_type.h>

 #include <machine/machConst.h>
 
 #include <sys/param.h>
 #include <machine/machConst.h>
 
 #include <sys/param.h>


@@ -33,8 +32,6 @@
 #include <machine/pte.h>
 #include <machine/cpu.h>
 
 #include <machine/pte.h>
 #include <machine/cpu.h>
 

-#ifndef news700
-

 #include <news3400/iodev/scsireg.h>
 
 #ifdef CPU_DOUBLE
 #include <news3400/iodev/scsireg.h>
 
 #ifdef CPU_DOUBLE


@@ -94,11 +91,7 @@ iopgo(ii, map)
        register int unit;
        int s;
 
        register int unit;
        int s;
 

-#ifdef PMAXSPL
-       s = Mach_spl3();
-#else

        s = spl6();
        s = spl6();

-#endif

        if (map)
                (void)iopsetup(im->im_tab.b_actf->b_actf, map, NSCMAP);
        splx(s);
        if (map)
                (void)iopsetup(im->im_tab.b_actf->b_actf, map, NSCMAP);
        splx(s);


@@ -218,8 +211,6 @@ scsend(chan, flag, sc)
 }
 #endif /* CPU_SINGLE */
 
 }
 #endif /* CPU_SINGLE */
 

-#endif /* !news700 */
-

 #ifdef CPU_SINGLE
 /*kos000*/
 int
 #ifdef CPU_SINGLE
 /*kos000*/
 int

diff --git a/usr/src/sys/news3400/iop/kb.c b/usr/src/sys/news3400/iop/kb.c
index 835ae70..c0fd19f 100644 (file)
--- a/usr/src/sys/news3400/iop/kb.c
+++ b/usr/src/sys/news3400/iop/kb.c
@@ -9,13 +9,12 @@
  *
  * from: $Hdr: kb.c,v 4.300 91/06/09 06:42:44 root Rel41 $ SONY
  *
  *
  * from: $Hdr: kb.c,v 4.300 91/06/09 06:42:44 root Rel41 $ SONY
  *

- *     @(#)kb.c        7.2 (Berkeley) %G%
+ *     @(#)kb.c        7.3 (Berkeley) %G%

  */
 
 #include "kb.h"
 
 #if NKB > 0
  */
 
 #include "kb.h"
 
 #if NKB > 0

-#include <machine/fix_machine_type.h>

 
 #include <sys/param.h>
 #include <sys/proc.h>
 
 #include <sys/param.h>
 #include <sys/proc.h>


@@ -238,20 +237,16 @@ kb_attach(hi)
 kb_open()
 {
 
 kb_open()
 {
 

-#ifndef news700

        if (tty00_is_console)
                kbm_open(SCC_KEYBOARD);
        if (tty00_is_console)
                kbm_open(SCC_KEYBOARD);

-#endif

        return (0);
 }
 
 kb_close()
 {
 
        return (0);
 }
 
 kb_close()
 {
 

-#ifndef news700

        if (tty00_is_console)
                kbm_close(SCC_KEYBOARD);
        if (tty00_is_console)
                kbm_close(SCC_KEYBOARD);

-#endif

        return (0);
 }
 
        return (0);
 }
 


@@ -296,9 +291,6 @@ kb_ctrl(func, arg)
 #include "../ipc/newsipc.h"
 #include "../mrx/h/kbms.h"
 
 #include "../ipc/newsipc.h"
 #include "../mrx/h/kbms.h"
 

-#ifdef news1800
-#define ipc_phys(x)    (caddr_t)((int)(x) & ~0x80000000)
-#endif

 #ifdef news3800
 #define ipc_phys(x)    (caddr_t)(K0_TT0(x))
 #endif
 #ifdef news3800
 #define ipc_phys(x)    (caddr_t)(K0_TT0(x))
 #endif

diff --git a/usr/src/sys/news3400/iop/kbreg.h b/usr/src/sys/news3400/iop/kbreg.h
index 27f6c2f..fd97666 100644 (file)
--- a/usr/src/sys/news3400/iop/kbreg.h
+++ b/usr/src/sys/news3400/iop/kbreg.h
@@ -9,21 +9,16 @@
  *
  * from: $Hdr: kbreg.h,v 4.300 91/06/09 06:42:47 root Rel41 $ SONY
  *
  *
  * from: $Hdr: kbreg.h,v 4.300 91/06/09 06:42:47 root Rel41 $ SONY
  *

- *     @(#)kbreg.h     7.2 (Berkeley) %G%
+ *     @(#)kbreg.h     7.3 (Berkeley) %G%

  */
 
 #ifndef __KEYBOARD__
 #define __KEYBOARD__ 1
 
  */
 
 #ifndef __KEYBOARD__
 #define __KEYBOARD__ 1
 

-#include <machine/fix_machine_type.h>
-

 #define        key_any(x)      ((x) != -1)
 #define        key_down(x)     (((x) & 0x80) == 0)
 #define        key_up(x)       ((x) & 0x80)
 
 #define        key_any(x)      ((x) != -1)
 #define        key_down(x)     (((x) & 0x80) == 0)
 #define        key_up(x)       ((x) & 0x80)
 

-/*
- *
- */

 typedef        struct key_string {
        int     key_length;
        char    *key_string;
 typedef        struct key_string {
        int     key_length;
        char    *key_string;


@@ -43,10 +38,6 @@ typedef      struct pfk_string {
 
 #define        KBDPRI          28
 
 
 #define        KBDPRI          28
 

-#ifdef news800
-#define        KB_TEST         0
-#endif news800
-

 #define        KIOCSETS        0               /* set pfk string       */
 #define        KIOCBELL        1               /* ring bell            */
 #define        KIOCBACK        2               /* push back string     */
 #define        KIOCSETS        0               /* set pfk string       */
 #define        KIOCBELL        1               /* ring bell            */
 #define        KIOCBACK        2               /* push back string     */


@@ -67,13 +58,7 @@ typedef      struct pfk_string {
 #define        KIOCGETSTAT     17              /* get keyboard status  */
 #define        KIOCSETSTAT     18              /* set keyboard status  */
 
 #define        KIOCGETSTAT     17              /* get keyboard status  */
 #define        KIOCSETSTAT     18              /* set keyboard status  */
 

-/*
- *
- */

 #define        OFF             0x80
 #define        OFF             0x80

-#ifndef SS2
-#define        SS2             0x8e
-#endif

 
 extern int N_Pfk;
 #define        N_PFK           N_Pfk
 
 extern int N_Pfk;
 #define        N_PFK           N_Pfk


@@ -81,7 +66,7 @@ extern int N_Pfk;
 #define        N_KEY           93
 
 /*
 #define        N_KEY           93
 
 /*

- *     Programmable function key
+ * Programmable function key

  */
 #define        F1              1
 #define        F2              2
  */
 #define        F1              1
 #define        F2              2


@@ -132,5 +117,4 @@ extern int N_Pfk;
 #define        RIGHT           43
 #define        LEFT            44
 
 #define        RIGHT           43
 #define        LEFT            44
 

-

 #endif /* !__KEYBOARD__ */
 #endif /* !__KEYBOARD__ */

diff --git a/usr/src/sys/news3400/iop/rs.c b/usr/src/sys/news3400/iop/rs.c
index 4da9495..7bf2eff 100644 (file)
--- a/usr/src/sys/news3400/iop/rs.c
+++ b/usr/src/sys/news3400/iop/rs.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: rs.c,v 4.300 91/06/09 06:43:03 root Rel41 $ SONY
  *
  *
  * from: $Hdr: rs.c,v 4.300 91/06/09 06:43:03 root Rel41 $ SONY
  *

- *     @(#)rs.c        7.3 (Berkeley) %G%
+ *     @(#)rs.c        7.4 (Berkeley) %G%

  */
 
 /*     rs.c    6.1     83/07/29        */
  */
 
 /*     rs.c    6.1     83/07/29        */


@@ -20,8 +20,6 @@
  * RS driver
  *
  */
  * RS driver
  *
  */

-#include <machine/fix_machine_type.h>
-

 #if NBK > 0
 #include "bk.h"
 #endif
 #if NBK > 0
 #include "bk.h"
 #endif

diff --git a/usr/src/sys/news3400/news3400/clock.c b/usr/src/sys/news3400/news3400/clock.c
index 733cdff..78e9140 100644 (file)
--- a/usr/src/sys/news3400/news3400/clock.c
+++ b/usr/src/sys/news3400/news3400/clock.c
@@ -12,10 +12,9 @@
  *
  * from: Utah $Hdr: clock.c 1.18 91/01/21$
  *
  *
  * from: Utah $Hdr: clock.c 1.18 91/01/21$
  *

- *     @(#)clock.c     7.6 (Berkeley) %G%
+ *     @(#)clock.c     7.7 (Berkeley) %G%

  */
 
  */
 

-#include <machine/fix_machine_type.h>

 #include <machine/adrsmap.h>
 
 #include <sys/param.h>
 #include <machine/adrsmap.h>
 
 #include <sys/param.h>

diff --git a/usr/src/sys/news3400/news3400/genassym.c b/usr/src/sys/news3400/news3400/genassym.c
index 03584bd..b57468f 100644 (file)
--- a/usr/src/sys/news3400/news3400/genassym.c
+++ b/usr/src/sys/news3400/news3400/genassym.c
@@ -4,13 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)genassym.c  7.4 (Berkeley) %G%
+ *     @(#)genassym.c  7.5 (Berkeley) %G%

  */
 
 #define KERNEL
 
  */
 
 #define KERNEL
 

-#include <machine/fix_machine_type.h>
-

 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/map.h>
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/map.h>

diff --git a/usr/src/sys/news3400/news3400/kbms_if.c b/usr/src/sys/news3400/news3400/kbms_if.c
index fc95ac5..fee14ca 100644 (file)
--- a/usr/src/sys/news3400/news3400/kbms_if.c
+++ b/usr/src/sys/news3400/news3400/kbms_if.c
@@ -7,12 +7,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kbms_if.c   7.2 (Berkeley) %G%
+ *     @(#)kbms_if.c   7.3 (Berkeley) %G%

  */
 
 /* Keyboard Mouse Gate-array control routine */
 
  */
 
 /* Keyboard Mouse Gate-array control routine */
 

-#include <machine/fix_machine_type.h>

 #include <machine/adrsmap.h>
 
 #include "ms.h"
 #include <machine/adrsmap.h>
 
 #include "ms.h"


@@ -21,7 +20,7 @@
 #include <sys/param.h>
 #include <news3400/sio/scc.h>
 
 #include <sys/param.h>
 #include <news3400/sio/scc.h>
 

-#if defined(news1200) || defined(news3200)
+#if defined(news3200)

 #include <sys/time.h>
 #include <news3400/iop/mouse.h>
 #endif
 #include <sys/time.h>
 #include <news3400/iop/mouse.h>
 #endif


@@ -113,11 +112,6 @@ kbm_open(chan)
 #else
        *kbm->reset_port = (u_char)0;
        *kbm->intr_port = (u_char)1;
 #else
        *kbm->reset_port = (u_char)0;
        *kbm->intr_port = (u_char)1;

-#endif
-#ifdef news1200
-       *kbm->init1_port = kbm->init1;
-       *kbm->init2_port = kbm->init2;
-       *kbm->buzzf_port = kbm->buzzf;

 #endif
        kbd_flush();
 }
 #endif
        kbd_flush();
 }


@@ -201,19 +195,6 @@ kbm_write(chan, buf, count)
        register u_char *port = Kbm_port[chan].buzz_port;
        int c_save = count;
 
        register u_char *port = Kbm_port[chan].buzz_port;
        int c_save = count;
 

-#ifdef news1200
-       *port = count;
-#endif
-
-#ifdef news1700
-       if (buf == NULL)
-               while (--count >= 0)
-                       *port = 0xff;
-       else
-               while (--count >= 0)
-                       *port = *buf++;
-#endif
-

 #ifdef news3400
        *port = count / 3;
 #endif
 #ifdef news3400
        *port = count / 3;
 #endif