cleanup header and machine dependency.

SCCS-vsn: sys/news3400/fb/askrom.c 7.3
SCCS-vsn: sys/news3400/fb/fb_conf.c 7.3
SCCS-vsn: sys/news3400/fb/fb_mfbs.c 7.3
SCCS-vsn: sys/news3400/fb/fbdefs.h 7.4
SCCS-vsn: sys/news3400/fb/fb_probe.c 7.3
SCCS-vsn: sys/news3400/fb/fb_start.c 7.4
SCCS-vsn: sys/news3400/fb/fbbm_lcdm.c 7.3
SCCS-vsn: sys/news3400/fb/fbbm_253.c 7.4
SCCS-vsn: sys/news3400/hbdev/ms.c 7.4
SCCS-vsn: sys/news3400/hbdev/scsi_1185.c 7.4

diff --git a/usr/src/sys/news3400/fb/askrom.c b/usr/src/sys/news3400/fb/askrom.c
index 0960b48..34cbc07 100644 (file)
--- a/usr/src/sys/news3400/fb/askrom.c
+++ b/usr/src/sys/news3400/fb/askrom.c
@@ -9,11 +9,9 @@
  *
  * from: $Hdr: askrom.c,v 4.300 91/06/09 06:32:39 root Rel41 $ SONY
  *
  *
  * from: $Hdr: askrom.c,v 4.300 91/06/09 06:32:39 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

 #include "nwb514.h"
 #include "nwb251.h"
 #include "nwb256.h"
 #include "nwb514.h"
 #include "nwb251.h"
 #include "nwb256.h"

diff --git a/usr/src/sys/news3400/fb/fb_conf.c b/usr/src/sys/news3400/fb/fb_conf.c
index a6494c2..30f2539 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_conf.c
+++ b/usr/src/sys/news3400/fb/fb_conf.c
@@ -9,11 +9,9 @@
  *
  * from: $Hdr: fb_conf.c,v 4.300 91/06/09 06:32:46 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fb_conf.c,v 4.300 91/06/09 06:32:46 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

 #include "nwb512.h"
 #include "nwb514.h"
 #include "nwb518.h"
 #include "nwb512.h"
 #include "nwb514.h"
 #include "nwb518.h"

diff --git a/usr/src/sys/news3400/fb/fb_mfbs.c b/usr/src/sys/news3400/fb/fb_mfbs.c
index 85660da..65cd006 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_mfbs.c
+++ b/usr/src/sys/news3400/fb/fb_mfbs.c
@@ -9,11 +9,9 @@
  *
  * from: $Hdr: fb_mfbs.c,v 4.300 91/06/27 20:42:43 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fb_mfbs.c,v 4.300 91/06/27 20:42:43 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

 #include <sys/param.h>
 #include <news3400/iop/framebuf.h>
 #include <news3400/iop/fbreg.h>
 #include <sys/param.h>
 #include <news3400/iop/framebuf.h>
 #include <news3400/iop/fbreg.h>

diff --git a/usr/src/sys/news3400/fb/fb_probe.c b/usr/src/sys/news3400/fb/fb_probe.c
index af4d19e..346976f 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_probe.c
+++ b/usr/src/sys/news3400/fb/fb_probe.c
@@ -9,11 +9,9 @@
  *
  * from: $Hdr: fb_probe.c,v 4.300 91/06/09 06:32:57 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fb_probe.c,v 4.300 91/06/09 06:32:57 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #include "types.h"
 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #include "types.h"


@@ -43,36 +41,6 @@ int  nfbdev = 0;
 static int     cons_dev = -1;
 extern struct fbdevsw  fbdevsw[];
 
 static int     cons_dev = -1;
 extern struct fbdevsw  fbdevsw[];
 

-#if defined(news1700)
-struct autodev autodev[] = {
-       -1, (char *)0xf0600000, (char *)0xf0610000,
-       -1, (char *)0xf0620000, (char *)0xf0630000,
-       -1, (char *)0xf0640000, (char *)0xf0650000,
-       -1, (char *)0xf0660000, (char *)0xf0670000,
-       -1, (char *)0xf0680000, (char *)0xf0690000,
-       -1, (char *)0xf06a0000, (char *)0xf06b0000,
-       -1, (char *)0xf06c0000, (char *)0xf06d0000,
-       -1, (char *)0xf06e0000, (char *)0xf06f0000,
-};
-
-#define AUTOSEL        1
-#endif /* defined(news1700) */
-
-#ifdef news1800
-struct autodev autodev[] = {
-       -1, (char *)0x20600000, (char *)0x20610000,
-       -1, (char *)0x20620000, (char *)0x20630000,
-       -1, (char *)0x20640000, (char *)0x20650000,
-       -1, (char *)0x20660000, (char *)0x20670000,
-       -1, (char *)0x20680000, (char *)0x20690000,
-       -1, (char *)0x206a0000, (char *)0x206b0000,
-       -1, (char *)0x206c0000, (char *)0x206d0000,
-       -1, (char *)0x206e0000, (char *)0x206f0000,
-};
-
-#define AUTOSEL        1
-#endif /* news1800 */
-

 #ifdef news3400
 struct autodev autodev[] = {
        -1, (char *)0xb8600000, (char *)0xb8610000,
 #ifdef news3400
 struct autodev autodev[] = {
        -1, (char *)0xb8600000, (char *)0xb8610000,

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

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

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

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

diff --git a/usr/src/sys/news3400/fb/fbbm_253.c b/usr/src/sys/news3400/fb/fbbm_253.c
index aaa0bdc..97ab0e5 100644 (file)
--- a/usr/src/sys/news3400/fb/fbbm_253.c
+++ b/usr/src/sys/news3400/fb/fbbm_253.c
@@ -9,15 +9,13 @@
  *
  * from: $Hdr: fbbm_253.c,v 4.300 91/06/09 06:33:12 root Rel41 $ SONY;
  *
  *
  * from: $Hdr: fbbm_253.c,v 4.300 91/06/09 06:33:12 root Rel41 $ SONY;
  *

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

  */
 
 /*
  * NWB-253 frame buffer driver
  */
 
  */
 
 /*
  * NWB-253 frame buffer driver
  */
 

-#include <machine/fix_machine_type.h>
-

 #include "nwb253.h"
 
 #if NNWB253 > 0
 #include "nwb253.h"
 
 #if NNWB253 > 0

diff --git a/usr/src/sys/news3400/fb/fbbm_lcdm.c b/usr/src/sys/news3400/fb/fbbm_lcdm.c
index ff9eebf..dfbf3aa 100644 (file)
--- a/usr/src/sys/news3400/fb/fbbm_lcdm.c
+++ b/usr/src/sys/news3400/fb/fbbm_lcdm.c
@@ -9,23 +9,16 @@
  *
  * from: $Hdr: fbbm_lcdm.c,v 4.300 91/06/09 06:33:38 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fbbm_lcdm.c,v 4.300 91/06/09 06:33:38 root Rel41 $ SONY
  *

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

  */
 
 /*
  * LCD frame buffer driver
  */
 
  */
 
 /*
  * LCD frame buffer driver
  */
 

-#include <machine/fix_machine_type.h>
-

 #include "lfbm.h"
 
 #if NLFBM > 0
 #include "lfbm.h"
 
 #if NLFBM > 0

-#ifdef mips
-#ifndef news3200
-#define news3200 1
-#endif /* !news3200 */
-#endif /* mips */

 
 #include <sys/param.h>
 #include <news3400/iop/framebuf.h>
 
 #include <sys/param.h>
 #include <news3400/iop/framebuf.h>


@@ -45,15 +38,6 @@ extern unsigned int mfbrmask32[];
 
 #define NOP    for (j = 0; j < 40; j++)
        
 
 #define NOP    for (j = 0; j < 40; j++)
        

-#ifdef news1200
-#define LCD_CRTC       (unsigned char *)(0xe1480000)
-#define LCD_PORT       (unsigned char *)(0xe1500002)
-#define DIMMER_PORT    (unsigned char *)(0xe190000f)
-#define KROM_START     (char *)(0xe2000000)
-#define        VRAM_START      (unsigned long *)(0xe4000000)
-#define VRAM_WIDTH     (1120/32)
-#endif
-

 #ifdef news3200
 #define LCD_PORT       (volatile unsigned long *)(0xb0000000)
 #define DIMMER_PORT    (volatile unsigned long *)(0xb0100000)
 #ifdef news3200
 #define LCD_PORT       (volatile unsigned long *)(0xb0000000)
 #define DIMMER_PORT    (volatile unsigned long *)(0xb0100000)


@@ -63,63 +47,6 @@ extern unsigned int mfbrmask32[];
 #define VRAM_WIDTH     (1120/32)
 #endif
 
 #define VRAM_WIDTH     (1120/32)
 #endif
 

-#ifdef news1200
-static caddr_t
-fblfbm_Krom_addr(fb, c, sr)
-       struct fbdev *fb;
-       register int c;
-       lRectangle *sr;
-{
-       register caddr_t tmp;
-
-       if ((c >= 0x20) && (c <= 0x7e)) {
-               /*
-                * ASCII char
-                */
-               c -= ' ';
-               c = ((c & 0x1f) | ((c & 0xe0) << 2)) << 7;
-               tmp =  (caddr_t)(c + fb->Krom_base + (sr->extent.y > 16 ? 0 : 96));
-       } else if ((c >= 0xa1) && (c <= 0xdf)) {
-               /*
-                * KANA char
-                */
-               if (sr->extent.y > 16)
-                       tmp =  (caddr_t)ext_fnt24_addr[c + 64];
-               else
-                       tmp =  (caddr_t)ext_fnt_addr[c + 64];
-       } else if ((c >= 0x2020) && (c <= 0x7e7e)) {
-               /*
-                * KANJI char
-                */
-               switch (c & 0x7000) {
-               case 0x2000:
-                       c = ((c & 0x1f) | ((c & 0x60) << 5) | ((c & 0x700) >> 1)) << 7;
-                       break;
-               case 0x3000:
-               case 0x4000:
-                       c = ((c & 0x7f) | ((c & 0xf00) >> 1) | ((c & 0x4000) >> 3)) << 7;
-                       break;
-               case 0x5000:
-               case 0x6000:
-                       c = ((c & 0x7f) | ((c & 0xf00) >> 1) | ((c & 0x2000) >> 2)
-                               | 0x1000) << 7;
-                       break;
-               case 0x7000:
-                       c = ((c & 0x1f) | ((c & 0x60) << 5) | ((c & 0x700) >> 1)
-                               | 0x1000) << 7;
-                       break;
-               }
-               tmp =  (caddr_t)(c + fb->Krom_base + (sr->extent.y > 16 ? 0 : 96));
-       } else {
-               /*
-                * UNKNOWN char
-                */
-               tmp =  (caddr_t)zero;
-       }
-       return (tmp);
-}
-#endif /* news1200 */
-

 #ifdef news3200
 static caddr_t
 fblfbm_Krom_addr(fb, c, sr)
 #ifdef news3200
 static caddr_t
 fblfbm_Krom_addr(fb, c, sr)


@@ -200,15 +127,6 @@ fblfbm_set_dimmer(fb, dim)
        int s;
 
        fb->status_flag = dim ? 0xf1: 0xf0;
        int s;
 
        fb->status_flag = dim ? 0xf1: 0xf0;

-#ifdef news1200
-       val_1185_ioptr = fb->status_flag;
-       if (scsi_stat.ipc >= 0) {
-               pend_1185_ioptr = 1;
-       } else {
-               pend_1185_ioptr = 0;
-               *DIMMER_PORT = val_1185_ioptr;
-       }
-#endif

 #ifdef news3200
        *DIMMER_PORT = fb->status_flag;
 #endif
 #ifdef news3200
        *DIMMER_PORT = fb->status_flag;
 #endif


@@ -236,9 +154,6 @@ fblfbm_get_page(fb, off)
        off_t off;
 {
        if (off < 1120/8 * 930) {               /* X/8 * Y */
        off_t off;
 {
        if (off < 1120/8 * 930) {               /* X/8 * Y */

-#ifdef news1200
-               return (((unsigned int)VRAM_START + off) >> PGSHIFT);
-#endif

 #ifdef news3200
                return (((unsigned int)0x10200000 + off) >> PGSHIFT);
 #endif
 #ifdef news3200
                return (((unsigned int)0x10200000 + off) >> PGSHIFT);
 #endif


@@ -250,14 +165,6 @@ int
 fblfbm_probe(unit)
        int unit;
 {
 fblfbm_probe(unit)
        int unit;
 {

-#ifdef news1200
-       if (unit < NLFBM) {
-               if (badaddr(VRAM_START, 1))
-                       return 0;
-               else
-                       return FB_LCDM;
-       }
-#endif /* news1200 */

 #ifdef news3200
        if (unit < NLFBM) {
                if (badaddr(0xbff50000, 1))
 #ifdef news3200
        if (unit < NLFBM) {
                if (badaddr(0xbff50000, 1))

diff --git a/usr/src/sys/news3400/fb/fbdefs.h b/usr/src/sys/news3400/fb/fbdefs.h
index bc85c46..a0a8691 100644 (file)
--- a/usr/src/sys/news3400/fb/fbdefs.h
+++ b/usr/src/sys/news3400/fb/fbdefs.h
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: fbdefs.h,v 4.300 91/06/09 06:33:54 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fbdefs.h,v 4.300 91/06/09 06:33:54 root Rel41 $ SONY
  *

- *     @(#)fbdefs.h    7.3 (Berkeley) %G%
+ *     @(#)fbdefs.h    7.4 (Berkeley) %G%

  */
 
 #ifndef mips
  */
 
 #ifndef mips


@@ -17,28 +17,21 @@
 #endif
 
 #ifdef CPU_SINGLE
 #endif
 
 #ifdef CPU_SINGLE

-#if defined(news1700)
-#undef splbitmap
-#endif
-#if defined(news700)
-#define splbitmap      spl4
-#endif /* news700 */
+

 #if defined(news3400) || defined(news3700)
 #define splbitmap      spl3
 #if defined(news3400) || defined(news3700)
 #define splbitmap      spl3

-#endif /* news3400 || news3700 */
+#endif

 #define        FB_LOCK         lock_bitmap()
 #define FB_UNLOCK      unlock_bitmap()
 #define        FB_LOCK         lock_bitmap()
 #define FB_UNLOCK      unlock_bitmap()

+

 #else /* CPU_SINGLE */
 #else /* CPU_SINGLE */

+

 #undef PRE_EMPT
 #define PRE_EMPT
 #undef PRE_EMPT
 #define PRE_EMPT

-#ifdef IPC_MRX

 #define FB_LOCK
 #define FB_UNLOCK
 #include <news3400/fb/fbsem.h> /* semaphore name */
 #define FB_LOCK
 #define FB_UNLOCK
 #include <news3400/fb/fbsem.h> /* semaphore name */

-#else /* IPC_MRX */
-#define FB_LOCK                wait(bitmap_use)
-#define FB_UNLOCK      signal(bitmap_use)
-#endif /* IPC_MRX */
+

 #endif /* CPU_SINGLE */
 
 #if defined(news3400) || defined(news3700)
 #endif /* CPU_SINGLE */
 
 #if defined(news3400) || defined(news3700)

diff --git a/usr/src/sys/news3400/hbdev/ms.c b/usr/src/sys/news3400/hbdev/ms.c
index 3394b3f..e06534a 100644 (file)
--- a/usr/src/sys/news3400/hbdev/ms.c
+++ b/usr/src/sys/news3400/hbdev/ms.c
@@ -9,11 +9,9 @@
  *
  * from: $Hdr: ms.c,v 4.300 91/06/09 06:22:04 root Rel41 $ SONY
  *
  *
  * from: $Hdr: ms.c,v 4.300 91/06/09 06:22:04 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

 #include "ms.h"
 #if NMS > 0
 /*
 #include "ms.h"
 #if NMS > 0
 /*


@@ -41,7 +39,7 @@
 
 #ifndef mips
 #define volatile
 
 #ifndef mips
 #define volatile

-#endif /* mips */
+#endif

 
 struct ms_stat  ms_stat[NMS];
 
 
 struct ms_stat  ms_stat[NMS];
 


@@ -52,19 +50,13 @@ struct hb_driver   msdriver = {
        msprobe, 0, msattach, 0, 0, "ms", msinfo, "mc", 0, 0
 };
 
        msprobe, 0, msattach, 0, 0, "ms", msinfo, "mc", 0, 0
 };
 

-#ifndef news700

 extern int tty00_is_console;
 extern int tty00_is_console;

-#endif

 
 #ifdef news3400
 #define        splms           spl4
 
 #ifdef news3400
 #define        splms           spl4

-#else /* news3400 */
-#ifdef news700
-#define        splms           spl4
-#else /* news700 */
+#else

 #define        splms           spl5
 #define        splms           spl5

-#endif /* news700 */
-#endif /* news3400 */
+#endif

 
 /*ARGSUSED*/
 msprobe(ii)
 
 /*ARGSUSED*/
 msprobe(ii)


@@ -109,7 +101,7 @@ msq_read(unit)
        int unit;
 {
        register volatile struct ms_queue *q = ms_stat[unit].mss_queue;
        int unit;
 {
        register volatile struct ms_queue *q = ms_stat[unit].mss_queue;

-       register volatile struct ms_event *data;
+       register struct ms_event *data;

 
        while (q->mq_head != q->mq_tail && q->mq_queue[q->mq_head].mse_inval)
                q->mq_head = ++q->mq_head % MS_MAXREPORT;
 
        while (q->mq_head != q->mq_tail && q->mq_queue[q->mq_head].mse_inval)
                q->mq_head = ++q->mq_head % MS_MAXREPORT;


@@ -127,7 +119,7 @@ msq_write(unit)
        int unit;
 {
        register volatile struct ms_queue *q = ms_stat[unit].mss_queue;
        int unit;
 {
        register volatile struct ms_queue *q = ms_stat[unit].mss_queue;

-       register volatile struct ms_event *data = q->mq_queue + q->mq_tail;
+       register struct ms_event *data = q->mq_queue + q->mq_tail;

        register int new;
 
        /* if queue is full, newest data is gone away */
        register int new;
 
        /* if queue is full, newest data is gone away */


@@ -196,13 +188,9 @@ msopen(dev, flag)
                        ms->mss_pgrp = curproc->p_pid;
                curproc->p_pgrp->pg_id = ms->mss_pgrp;
        }
                        ms->mss_pgrp = curproc->p_pid;
                curproc->p_pgrp->pg_id = ms->mss_pgrp;
        }

-#ifdef news700
-       scc_open(SCC_MOUSE);
-#else

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

-#endif

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


@@ -234,11 +222,9 @@ msclose(dev, flag)
 
        free(ms->mss_queue, M_DEVBUF);
        ms->mss_pgrp = 0;
 
        free(ms->mss_queue, M_DEVBUF);
        ms->mss_pgrp = 0;

-#ifndef news700

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

-#endif /* news700 */

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

diff --git a/usr/src/sys/news3400/hbdev/scsi_1185.c b/usr/src/sys/news3400/hbdev/scsi_1185.c
index 9f90200..1b5591d 100644 (file)
--- a/usr/src/sys/news3400/hbdev/scsi_1185.c
+++ b/usr/src/sys/news3400/hbdev/scsi_1185.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: scsi_1185.c,v 4.300 91/06/09 06:22:20 root Rel41 $ SONY
  *
  *
  * from: $Hdr: scsi_1185.c,v 4.300 91/06/09 06:22:20 root Rel41 $ SONY
  *

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

  */
 
 /*
  */
 
 /*


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

-#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>


@@ -75,7 +73,6 @@
 
 #define APAD_ALWAYS_ON
 
 
 #define APAD_ALWAYS_ON
 

-#define        LOOP_BREAK

 # define       CHECK_LOOP_CNT  60
 # define       RSL_LOOP_CNT    60
 
 # define       CHECK_LOOP_CNT  60
 # define       RSL_LOOP_CNT    60
 


@@ -163,11 +160,6 @@ static char ScsiSoftError[] = "SCSI soft error";
 
 static int pad_start;
 
 
 static int pad_start;
 

-#ifdef news1200
-VOLATILE int pend_1185_ioptr;
-VOLATILE int val_1185_ioptr;
-#endif
-

 #if defined(mips) && defined(CPU_SINGLE)
 #define dma_reset(x) { \
        int s = splscsi(); \
 #if defined(mips) && defined(CPU_SINGLE)
 #define dma_reset(x) { \
        int s = splscsi(); \


@@ -186,10 +178,8 @@ WAIT_STATR_BITCLR(bitmask)
        do {
                dummy = sc_statr;
                DMAC_WAIT0;
        do {
                dummy = sc_statr;
                DMAC_WAIT0;

-#ifdef LOOP_BREAK

                if (iloop++ > CHECK_LOOP_CNT)
                        return (-1);
                if (iloop++ > CHECK_LOOP_CNT)
                        return (-1);

-#endif

        } while (dummy & bitmask);
        return (0);
 }
        } while (dummy & bitmask);
        return (0);
 }


@@ -204,10 +194,8 @@ WAIT_STATR_BITSET(bitmask)
        do {
                dummy = sc_statr;
                DMAC_WAIT0;
        do {
                dummy = sc_statr;
                DMAC_WAIT0;

-#ifdef LOOP_BREAK

                if (iloop++ > CHECK_LOOP_CNT)
                        return (-1);
                if (iloop++ > CHECK_LOOP_CNT)
                        return (-1);

-#endif

        } while ((dummy & bitmask) == 0);
        return (0);
 }
        } while ((dummy & bitmask) == 0);
        return (0);
 }


@@ -426,11 +414,6 @@ scintr()
        register VOLATILE int dummy;
        int s_int1, s_int2;
 
        register VOLATILE int dummy;
        int s_int1, s_int2;
 

-#ifdef news1200
-       if ((intr_st & INTR_SCSIDMA) == 0)
-               return (0);
-#endif
-

 scintr_loop:
 
 #if defined(CHECK_MRQ) && defined(news3400)
 scintr_loop:
 
 #if defined(CHECK_MRQ) && defined(news3400)


@@ -685,12 +668,6 @@ scsi_hardreset()
        if (dmac_map_init == 0) {
                dmac_map_init++;
                for (i = 0; i < NDMACMAP; i++) {
        if (dmac_map_init == 0) {
                dmac_map_init++;
                for (i = 0; i < NDMACMAP; i++) {

-# ifdef news1200
-                       dmac_tag = i;
-                       DMAC_WAIT;
-                       dmac_mapent = 0;
-                       DMAC_WAIT;
-# endif

 # if defined(mips) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)i;
 # if defined(mips) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)i;


@@ -721,12 +698,6 @@ scsi_chipreset()
 
        s = splscsi();
 
 
        s = splscsi();
 

-#ifdef news1200
-       DMAC_WAIT0;
-       dmac_ctl = DC_CTL_RST;                  /* reset DMAC */
-       DMAC_WAIT0;
-#endif
-

 #if defined(mips) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
        dmac_cwid = 4;                          /* initialize DMAC SCSI chan */
 #if defined(mips) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
        dmac_cwid = 4;                          /* initialize DMAC SCSI chan */


@@ -811,19 +782,12 @@ scsi_softreset()
                        if ((cs->sc->sc_istatus & INST_EP) == 0)
                                cs->sc->sc_istatus = (INST_EP|INST_HE);
                        cs->sc = NULL;
                        if ((cs->sc->sc_istatus & INST_EP) == 0)
                                cs->sc->sc_istatus = (INST_EP|INST_HE);
                        cs->sc = NULL;

-#ifdef mc68030
-                       dcia();
-#endif

 #ifdef mips
                        scdp = &sc_data[cs->chan_num];
                        MachFlushDCache(scdp->scd_scaddr, sizeof(struct scsi));
 
                        if (MACH_IS_USPACE(scdp->scd_vaddr)) {
 #ifdef mips
                        scdp = &sc_data[cs->chan_num];
                        MachFlushDCache(scdp->scd_scaddr, sizeof(struct scsi));
 
                        if (MACH_IS_USPACE(scdp->scd_vaddr)) {

-#ifdef never_happen /* KU:XXX */
-                               clean_kudcache(scdp->scd_procp, scdp->scd_vaddr,                                                scdp->scd_count, FLUSH_DCACHE);
-#else

                                panic("scsi_softreset: user address is not supported");
                                panic("scsi_softreset: user address is not supported");

-#endif

                        } else if (MACH_IS_CACHED(scdp->scd_vaddr)) {
                            MachFlushDCache(scdp->scd_vaddr, scdp->scd_count);
                        } else if (MACH_IS_MAPPED(scdp->scd_vaddr)) {
                        } else if (MACH_IS_CACHED(scdp->scd_vaddr)) {
                            MachFlushDCache(scdp->scd_vaddr, scdp->scd_count);
                        } else if (MACH_IS_MAPPED(scdp->scd_vaddr)) {


@@ -909,12 +873,10 @@ sc_resel()
                /*
                 * Max 6 usec wait
                 */
                /*
                 * Max 6 usec wait
                 */

-# ifdef LOOP_BREAK

                if (iloop++ > RSL_LOOP_CNT) {
                        sel_stat[chan] = SEL_RSL_WAIT;
                        return;
                }
                if (iloop++ > RSL_LOOP_CNT) {
                        sel_stat[chan] = SEL_RSL_WAIT;
                        return;
                }

-# endif

                GET_INTR(&int_stat1, &int_stat2);
        }
        int_stat2 &= ~R3_FNC;
                GET_INTR(&int_stat1, &int_stat2);
        }
        int_stat2 &= ~R3_FNC;


@@ -947,17 +909,6 @@ sc_discon()
        extern struct sc_data sc_data[];
        register struct sc_data *scdp;
 #endif
        extern struct sc_data sc_data[];
        register struct sc_data *scdp;
 #endif

-#ifdef news1200
-       extern VOLATILE int pend_1185_ioptr;
-       extern VOLATILE int val_1185_ioptr;
-#endif
-
-#ifdef news1200
-       if (pend_1185_ioptr) {
-               sc_ioptr = (u_char)val_1185_ioptr;
-               pend_1185_ioptr = 0;
-       }
-#endif

 
        /*
         * Signal reflection on BSY is occured.
 
        /*
         * Signal reflection on BSY is occured.


@@ -1011,20 +962,12 @@ sc_discon()
                if (perr_flag[cs->chan_num] > 0)
                        cs->sc->sc_istatus |= INST_EP|INST_PRE;
                cs->sc = NULL;
                if (perr_flag[cs->chan_num] > 0)
                        cs->sc->sc_istatus |= INST_EP|INST_PRE;
                cs->sc = NULL;

-#ifdef mc68030
-               dcia();
-#endif

 #ifdef mips
                scdp = &sc_data[cs->chan_num];
                MachFlushDCache(scdp->scd_scaddr, sizeof(struct scsi));
 
                if (MACH_IS_USPACE(scdp->scd_vaddr)) {
 #ifdef mips
                scdp = &sc_data[cs->chan_num];
                MachFlushDCache(scdp->scd_scaddr, sizeof(struct scsi));
 
                if (MACH_IS_USPACE(scdp->scd_vaddr)) {

-#ifdef never_happen /* KU:XXX */
-                       clean_kudcache(scdp->scd_procp, scdp->scd_vaddr,
-                                       scdp->scd_count, FLUSH_DCACHE);
-#else

                        panic("sc_discon: user address is not supported");
                        panic("sc_discon: user address is not supported");

-#endif

                } else if (MACH_IS_CACHED(scdp->scd_vaddr)) {
                        MachFlushDCache(scdp->scd_vaddr, scdp->scd_count);
                } else if (MACH_IS_MAPPED(scdp->scd_vaddr)) {
                } else if (MACH_IS_CACHED(scdp->scd_vaddr)) {
                        MachFlushDCache(scdp->scd_vaddr, scdp->scd_count);
                } else if (MACH_IS_MAPPED(scdp->scd_vaddr)) {


@@ -1248,9 +1191,6 @@ sc_min(cs)
        register struct scsi *sc;
        register struct scsi_stat *ss;
        register VOLATILE int dummy;
        register struct scsi *sc;
        register struct scsi_stat *ss;
        register VOLATILE int dummy;

-#ifdef DISP_EXTMES
-       u_char mes;
-#endif

 
        sc = cs->sc;
        ss = &scsi_stat;
 
        sc = cs->sc;
        ss = &scsi_stat;


@@ -1303,9 +1243,6 @@ sc_min(cs)
        DMAC_WAIT0;
 
        if (min_cnt[cs->chan_num] == 0) {
        DMAC_WAIT0;
 
        if (min_cnt[cs->chan_num] == 0) {

-#ifdef DISP_EXTMES
-               mes = sc->sc_message;
-#endif

                sc->sc_message = sc->sc_identify;
                if (dummy == MSG_EXTND) {
                        /* Extended Message */
                sc->sc_message = sc->sc_identify;
                if (dummy == MSG_EXTND) {
                        /* Extended Message */


@@ -1313,9 +1250,6 @@ sc_min(cs)
                        min_point[cs->chan_num] = sc->sc_param;
                        bzero((caddr_t)sc->sc_param, 8);
                        *min_point[cs->chan_num]++ = dummy;
                        min_point[cs->chan_num] = sc->sc_param;
                        bzero((caddr_t)sc->sc_param, 8);
                        *min_point[cs->chan_num]++ = dummy;

-#ifdef DISP_EXTMES
-                       printf("Extmes: 0x1 ");
-#endif

                } else {
                        switch ((dummy & MSG_IDENT)? MSG_IDENT : dummy) {
 
                } else {
                        switch ((dummy & MSG_IDENT)? MSG_IDENT : dummy) {
 


@@ -1324,9 +1258,6 @@ sc_min(cs)
                                break;
 
                        case MSG_MREJ:
                                break;
 
                        case MSG_MREJ:

-#ifdef DISP_EXTMES
-                               printf("MREJ:%x\n", mes);
-#endif

 #ifndef NOT_SUPPORT_SYNCTR
                                if (mout_flag[cs->chan_num] == MOUT_SYNC_TR)
                                        sync_tr[cs->chan_num] = 0;
 #ifndef NOT_SUPPORT_SYNCTR
                                if (mout_flag[cs->chan_num] == MOUT_SYNC_TR)
                                        sync_tr[cs->chan_num] = 0;


@@ -1372,17 +1303,11 @@ sc_min(cs)
                }
        } else {
                *min_point[cs->chan_num]++ = dummy;
                }
        } else {
                *min_point[cs->chan_num]++ = dummy;

-#ifdef DISP_EXTMES
-               printf("0x%x ", dummy);
-#endif

                if (min_cnt[cs->chan_num] == GET_MIN_COUNT)
                        min_cnt[cs->chan_num] = dummy;
                else
                        min_cnt[cs->chan_num]--;
                if (min_cnt[cs->chan_num] <= 0) {
                if (min_cnt[cs->chan_num] == GET_MIN_COUNT)
                        min_cnt[cs->chan_num] = dummy;
                else
                        min_cnt[cs->chan_num]--;
                if (min_cnt[cs->chan_num] <= 0) {

-#ifdef DISP_EXTMES
-                       printf("\n");
-#endif

 #ifdef ABORT_SYNCTR_MES_FROM_TARGET
                        if ((sc->sc_param[2] == 0x01)
                            && (mout_flag[cs->chan_num] == MOUT_SYNC_TR)) {
 #ifdef ABORT_SYNCTR_MES_FROM_TARGET
                        if ((sc->sc_param[2] == 0x01)
                            && (mout_flag[cs->chan_num] == MOUT_SYNC_TR)) {


@@ -1403,25 +1328,8 @@ sc_min(cs)
                                        sync_tr[cs->chan_num] = 0;
                                else
                                        sync_tr[cs->chan_num] = i | sc->sc_param[4];
                                        sync_tr[cs->chan_num] = 0;
                                else
                                        sync_tr[cs->chan_num] = i | sc->sc_param[4];

-# ifdef DISP_EXTMES
-                               printf("sc_syncr=0x%x\n", sync_tr[cs->chan_num]);
-# endif

 #endif /* !NOT_SUPPORT_SYNCTR */
                        } else {
 #endif /* !NOT_SUPPORT_SYNCTR */
                        } else {

-#ifdef DISP_EXTMES
-                               register u_char *p;
-                               register int cnt;
-                               register int i;
-
-                               p = sc->sc_param;
-                               cnt = p[1];
-                               
-                               printf("Extmes: 0x%x 0x%x ", *p, cnt);
-                               p += 2;
-                               for (i = 0; i < cnt; i++)
-                                       printf("0x%x ", *p++);
-                               printf(":ATN\n");
-#endif

                                sc->sc_message = MSG_MREJ;
                                SET_CMD(SCMD_AST_ATN);  /* assert ATN */
                        }
                                sc->sc_message = MSG_MREJ;
                                SET_CMD(SCMD_AST_ATN);  /* assert ATN */
                        }


@@ -1470,9 +1378,6 @@ sc_mout(cs)
                        sc_datr = sc->sc_identify;
                        DMAC_WAIT0;
                        for (iloop = 1; iloop < cnt; iloop++) {
                        sc_datr = sc->sc_identify;
                        DMAC_WAIT0;
                        for (iloop = 1; iloop < cnt; iloop++) {

-#ifdef DISP_EXTMES
-                               printf("0x%x ", *mp);
-#endif

                                sc_datr = *mp++;
                                DMAC_WAIT;
                        }
                                sc_datr = *mp++;
                                DMAC_WAIT;
                        }


@@ -1511,9 +1416,6 @@ sc_mout(cs)
                                return;
                        }
 
                                return;
                        }
 

-#ifdef DISP_EXTMES
-                       printf("0x%x\n", *mp);
-#endif

                        SET_CMD(SCMD_TR_INFO);
                        sc_datr = *mp++;
                        DMAC_WAIT0;
                        SET_CMD(SCMD_TR_INFO);
                        sc_datr = *mp++;
                        DMAC_WAIT0;


@@ -1530,10 +1432,8 @@ sc_mout(cs)
                        do {
                                dummy = sc_cmonr;
                                DMAC_WAIT0;
                        do {
                                dummy = sc_cmonr;
                                DMAC_WAIT0;

-#ifdef LOOP_BREAK

                                if (iloop++ > CHECK_LOOP_CNT)
                                        break;
                                if (iloop++ > CHECK_LOOP_CNT)
                                        break;

-#endif

                        } while ((dummy & R4_MREQ) == 0);
                        SET_CMD(SCMD_TR_INFO);
                        sc_datr = sc->sc_identify;
                        } while ((dummy & R4_MREQ) == 0);
                        SET_CMD(SCMD_TR_INFO);
                        sc_datr = sc->sc_identify;


@@ -1560,9 +1460,6 @@ sc_mout(cs)
                SET_CMD(SCMD_TR_INFO);
                sc_datr = sc->sc_message;
                DMAC_WAIT0;
                SET_CMD(SCMD_TR_INFO);
                sc_datr = sc->sc_message;
                DMAC_WAIT0;

-#ifdef DISP_EXTMES
-               printf("sc_mout:0x%x ", sc->sc_message);
-#endif

        }
 }
 
        }
 }
 


@@ -1596,10 +1493,8 @@ sc_sin(cs)
        int_stat2 &= ~R3_FNC;
        iloop = 0;
        do {
        int_stat2 &= ~R3_FNC;
        iloop = 0;
        do {

-# ifdef LOOP_BREAK

                if (iloop++ > CHECK_LOOP_CNT)
                        break;
                if (iloop++ > CHECK_LOOP_CNT)
                        break;

-# endif

                GET_INTR(&int_stat1, &int_stat2);       /* clear interrupt */
        } while ((int_stat2 & R3_FNC) == 0);
        int_stat2 &= ~R3_FNC;
                GET_INTR(&int_stat1, &int_stat2);       /* clear interrupt */
        } while ((int_stat2 & R3_FNC) == 0);
        int_stat2 &= ~R3_FNC;


@@ -1625,14 +1520,6 @@ sc_dio(cs)
        sc = cs->sc;
        ss = &scsi_stat;
 
        sc = cs->sc;
        ss = &scsi_stat;
 

-#ifdef news1200
-       DMAC_WAIT;
-       dmac_ctl = DC_CTL_RST;                  /* reset DMAC */
-       DMAC_WAIT;
-       dmac_ctl = OFF;                         /* clear dmac_ctl */
-       DMAC_WAIT;
-#endif
-

        sc_intok2 = Rb_FNC|Rb_DCNT|Rb_SRST|Rb_PHC|Rb_SPE;
        DMAC_WAIT0;
 
        sc_intok2 = Rb_FNC|Rb_DCNT|Rb_SRST|Rb_PHC|Rb_SPE;
        DMAC_WAIT0;
 


@@ -1672,18 +1559,6 @@ sc_dio(cs)
        SET_CMD(SCMD_TR_INFO|R0_DMA|R0_TRBE);
 #endif
 
        SET_CMD(SCMD_TR_INFO|R0_DMA|R0_TRBE);
 #endif
 

-#if defined(news1200)
-       SET_CMD(SCMD_TR_INFO|R0_DMA|R0_TRBE);
-#endif
-
-#ifdef news1200
-       DMAC_WAIT;
-       dmac_tcnt = cs->act_trcnt;      
-       DMAC_WAIT;
-       dmac_ofs = cs->act_offset & PGOFSET;
-       DMAC_WAIT;
-#endif
-

 #if defined(mips) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
        dmac_ctrcl = (u_char)(cs->act_trcnt & 0xff);
 #if defined(mips) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
        dmac_ctrcl = (u_char)(cs->act_trcnt & 0xff);


@@ -1702,12 +1577,6 @@ sc_dio(cs)
                for (i = cs->act_tag; i < pages; i++) {
                        if ((pfn = sc->sc_map->mp_addr[i]) == 0)
                                panic("SCSI:sc_dma() zero entry");
                for (i = cs->act_tag; i < pages; i++) {
                        if ((pfn = sc->sc_map->mp_addr[i]) == 0)
                                panic("SCSI:sc_dma() zero entry");

-#ifdef news1200
-                       dmac_tag = tag++;
-                       DMAC_WAIT;
-                       dmac_mapent = pfn;
-                       DMAC_WAIT;
-#endif

 #if defined(mips) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)tag++;
 #if defined(mips) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)tag++;


@@ -1728,12 +1597,6 @@ sc_dio(cs)
                pfn = (u_int)vtophys(cs->act_point) >> PGSHIFT;
                pages = (cs->act_trcnt >> PGSHIFT) + 2;
                for (i = 0; i < pages; i++) {
                pfn = (u_int)vtophys(cs->act_point) >> PGSHIFT;
                pages = (cs->act_trcnt >> PGSHIFT) + 2;
                for (i = 0; i < pages; i++) {

-#ifdef news1200
-                       dmac_tag = tag++;
-                       DMAC_WAIT;
-                       dmac_mapent = pfn + i;
-                       DMAC_WAIT;
-#endif

 #if defined(mips) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)tag++;
 #if defined(mips) && defined(CPU_SINGLE)
                        dmac_gsel = CH_SCSI;
                        dmac_ctag = (u_char)tag++;


@@ -1741,10 +1604,6 @@ sc_dio(cs)
 #endif
                }
        }
 #endif
                }
        }

-#ifdef news1200
-       dmac_tag = 0;
-       DMAC_WAIT;
-#endif

 
 #if defined(mips) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;
 
 #if defined(mips) && defined(CPU_SINGLE)
        dmac_gsel = CH_SCSI;


@@ -1753,12 +1612,6 @@ sc_dio(cs)
 
        if (phase == DAT_IN) {
                ss->dma_stat = SC_DMAC_RD;
 
        if (phase == DAT_IN) {
                ss->dma_stat = SC_DMAC_RD;

-#ifdef news1200
-               dmac_ctl = DC_CTL_MOD;          /* I/O->mem */
-               DMAC_WAIT;
-               dmac_ctl = (DC_CTL_MOD|DC_CTL_ENB);
-               DMAC_WAIT;
-#endif

 #if defined(mips) && defined(CPU_SINGLE)
                /*
                 * auto pad flag is always on
 #if defined(mips) && defined(CPU_SINGLE)
                /*
                 * auto pad flag is always on


@@ -1772,12 +1625,6 @@ sc_dio(cs)
        }
        else if (phase == DAT_OUT) {
                ss->dma_stat = SC_DMAC_WR;
        }
        else if (phase == DAT_OUT) {
                ss->dma_stat = SC_DMAC_WR;

-#ifdef news1200
-               dmac_ctl = 0;
-               DMAC_WAIT;
-               dmac_ctl = DC_CTL_ENB;
-               DMAC_WAIT;
-#endif

 #if defined(mips) && defined(CPU_SINGLE)
                dmac_gsel = CH_SCSI;
                dmac_cctl = DM_APAD;
 #if defined(mips) && defined(CPU_SINGLE)
                dmac_gsel = CH_SCSI;
                dmac_cctl = DM_APAD;


@@ -1911,26 +1758,6 @@ adjust_transfer(cs)
                pad_start = 0;
                remain_cnt = 0;
        } else {
                pad_start = 0;
                remain_cnt = 0;
        } else {

-# ifdef news1200
-               if (ss->dma_stat == SC_DMAC_RD) {
-                       /*
-                        * DMA DATA IN
-                        */
-                       DMAC_WAIT;
-                       remain_cnt = dmac_tcnt;
-                       DMAC_WAIT;
-               } else {
-                       /*
-                        * DMA DATA OUT
-                        */
-                       remain_cnt = GET_CNT();
-                       remain_cnt -= pad_cnt[cs->chan_num];
-                       /*
-                        * adjust counter in the FIFO
-                        */
-                       remain_cnt += sc_ffstr & R5_FIFOREM;
-               }
-# endif

 # if defined(mips) && defined(CPU_SINGLE)
                remain_cnt = GET_CNT();
                remain_cnt -= pad_cnt[cs->chan_num];
 # if defined(mips) && defined(CPU_SINGLE)
                remain_cnt = GET_CNT();
                remain_cnt -= pad_cnt[cs->chan_num];