make kernel includes standard

SCCS-vsn: sys/news3400/bm/bitmapif.c 7.2
SCCS-vsn: sys/news3400/bm/bmcons.c 7.3
SCCS-vsn: sys/news3400/bm/fnt.c 7.3
SCCS-vsn: sys/news3400/bm/fnt24.c 7.2
SCCS-vsn: sys/news3400/bm/kb_ctrl.c 7.2
SCCS-vsn: sys/news3400/bm/kb_encode.c 7.4
SCCS-vsn: sys/news3400/bm/keyconf.c 7.2
SCCS-vsn: sys/news3400/bm/keytbl.c 7.2
SCCS-vsn: sys/news3400/bm/vt100.c 7.3
SCCS-vsn: sys/news3400/bm/vt100.h 7.3
SCCS-vsn: sys/news3400/bm/vt100esc.c 7.4
SCCS-vsn: sys/news3400/bm/vt100if.c 7.2
SCCS-vsn: sys/news3400/fb/askrom.c 7.2
SCCS-vsn: sys/news3400/fb/fb_conf.c 7.2
SCCS-vsn: sys/news3400/fb/fb_mfbs.c 7.2
SCCS-vsn: sys/news3400/fb/fb_probe.c 7.2
SCCS-vsn: sys/news3400/fb/fb_start.c 7.3
SCCS-vsn: sys/news3400/fb/fbbm_253.c 7.2
SCCS-vsn: sys/news3400/fb/fbbm_lcdm.c 7.2
SCCS-vsn: sys/news3400/fb/fbdefs.h 7.3
SCCS-vsn: sys/news3400/hbdev/ms.c 7.3
SCCS-vsn: sys/news3400/hbdev/scsi_1185.c 7.3
SCCS-vsn: sys/news3400/if/if_en.c 7.6
SCCS-vsn: sys/news3400/if/if_lance.c 7.3
SCCS-vsn: sys/news3400/if/if_news.c 7.3
SCCS-vsn: sys/news3400/include/adrsmap.h 7.2
SCCS-vsn: sys/news3400/include/cpu.h 7.3
SCCS-vsn: sys/news3400/iodev/scsireg.h 7.2
SCCS-vsn: sys/news3400/iodev/scu.h 7.2
SCCS-vsn: sys/news3400/iodev/sdreg.h 7.2
SCCS-vsn: sys/news3400/iodev/psd.c 7.2
SCCS-vsn: sys/news3400/iodev/scsi.c 7.2
SCCS-vsn: sys/news3400/iodev/sd.c 7.3
SCCS-vsn: sys/news3400/iodev/sd_var.c 7.2
SCCS-vsn: sys/news3400/iodev/sddefs.c 7.2
SCCS-vsn: sys/news3400/iop/fbreg.h 7.2
SCCS-vsn: sys/news3400/iop/framebuf.h 7.2
SCCS-vsn: sys/news3400/iop/kbreg.h 7.2
SCCS-vsn: sys/news3400/iop/mouse.h 7.2
SCCS-vsn: sys/news3400/iop/fb.c 7.2
SCCS-vsn: sys/news3400/iop/fb_sub.c 7.2
SCCS-vsn: sys/news3400/iop/iop.c 7.2
SCCS-vsn: sys/news3400/iop/kb.c 7.2
SCCS-vsn: sys/news3400/iop/rs.c 7.3
SCCS-vsn: sys/news3400/sio/scc.c 7.2

diff --git a/usr/src/sys/news3400/bm/bitmapif.c b/usr/src/sys/news3400/bm/bitmapif.c
index 210dbba..de95f06 100644 (file)
--- a/usr/src/sys/news3400/bm/bitmapif.c
+++ b/usr/src/sys/news3400/bm/bitmapif.c
@@ -9,27 +9,27 @@
  *
  * from: $Hdr: bitmapif.c,v 4.300 91/06/09 06:14:40 root Rel41 $ SONY
  *
  *
  * from: $Hdr: bitmapif.c,v 4.300 91/06/09 06:14:40 root Rel41 $ SONY
  *

- *     @(#)bitmapif.c  7.1 (Berkeley) %G%
+ *     @(#)bitmapif.c  7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef IPC_MRX
 
 #ifdef IPC_MRX

-#include "../../h/param.h"
-#include "../../h/types.h"
-#include "../../iop/framebuf.h"
-#include "../../iop/fbreg.h"
+#include <sys/param.h>
+#include <sys/types.h>
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/fbreg.h>

 #else
 #else

-#include "param.h"
-#include "types.h"
-#include "../iop/framebuf.h"
-#include "../iop/fbreg.h"
+#include <sys/param.h>
+#include <sys/types.h>
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/fbreg.h>

 #endif
 
 #endif
 

-#include "../fb/fbdefs.h"
+#include <news3400/fb/fbdefs.h>

 
 

-#include "../bm/vt100.h"
-#include "../bm/bitmapif.h"
+#include <news3400/bm/vt100.h>
+#include <news3400/bm/bitmapif.h>

 
 extern int bm_todo;
 extern int tmode;
 
 extern int bm_todo;
 extern int tmode;


@@ -56,7 +56,7 @@ extern int bitmap_use;
 #endif
 
 #ifdef CPU_SINGLE
 #endif
 
 #ifdef CPU_SINGLE

-#include "../include/cpu.h"
+#include <machine/cpu.h>

 #define PRE_EMPT       need_resched()
 #else
 #define        PRE_EMPT
 #define PRE_EMPT       need_resched()
 #else
 #define        PRE_EMPT

diff --git a/usr/src/sys/news3400/bm/bmcons.c b/usr/src/sys/news3400/bm/bmcons.c
index cc1f222..331c63f 100644 (file)
--- a/usr/src/sys/news3400/bm/bmcons.c
+++ b/usr/src/sys/news3400/bm/bmcons.c
@@ -9,28 +9,28 @@
  *
  * from: $Hdr: cons.c,v 4.300 91/06/09 06:34:41 root Rel41 $ SONY
  *
  *
  * from: $Hdr: cons.c,v 4.300 91/06/09 06:34:41 root Rel41 $ SONY
  *

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

  */
 
 /*
  * console driver
  */
  */
 
 /*
  * console driver
  */

-#include "../include/fix_machine_type.h"
-#include "param.h"
-#include "../include/pte.h"
-#include "conf.h"
-#include "proc.h"
-#include "user.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "map.h"
-#include "buf.h"
-#include "clist.h"
-#include "file.h"
-#include "bm.h"
-
-#include "../hbdev/rsreg.h"
-#include "../sio/sccparam.h"
+#include <machine/fix_machine_type.h>
+#include <sys/param.h>
+#include <machine/pte.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <sys/clist.h>
+#include <sys/file.h>
+#include <sys/bm.h>
+
+#include <news3400/hbdev/rsreg.h>
+#include <news3400/sio/sccparam.h>

 
 #define        CN_RXE          RXE
 #define        CN_TXE          TXE
 
 #define        CN_RXE          RXE
 #define        CN_TXE          TXE


@@ -499,9 +499,9 @@ cncint()
  *     cn_set_param()
  */
 #ifdef IPC_MRX
  *     cn_set_param()
  */
 #ifdef IPC_MRX

-#include "../newsipc/newsipc.h"
-#include "../mrx/h/cio.h"
-#include "../mrx/h/console.h"
+#include <news3400/newsipc/newsipc.h>
+#include <news3400/mrx/h/cio.h>
+#include <news3400/mrx/h/console.h>

 
 #ifdef mips
 #define ipc_phys(x)    K0_TT0(x)
 
 #ifdef mips
 #define ipc_phys(x)    K0_TT0(x)


@@ -683,9 +683,9 @@ cnfont(port)
 #endif /* IPC_MRX */
 
 #ifdef CPU_SINGLE
 #endif /* IPC_MRX */
 
 #ifdef CPU_SINGLE

-#include "../hbdev/rsreg.h"
-#include "../iop/framebuf.h"
-#include "../fb/fbdefs.h"
+#include <news3400/hbdev/rsreg.h>
+#include <news3400/iop/framebuf.h>
+#include <news3400/fb/fbdefs.h>

 
 int lastcount;
 int start_dimmer = 1;
 
 int lastcount;
 int start_dimmer = 1;

diff --git a/usr/src/sys/news3400/bm/fnt.c b/usr/src/sys/news3400/bm/fnt.c
index edb643f..a33dcc7 100644 (file)
--- a/usr/src/sys/news3400/bm/fnt.c
+++ b/usr/src/sys/news3400/bm/fnt.c
@@ -9,17 +9,17 @@
  *
  * from: $Hdr: fnt.c,v 4.300 91/06/09 06:14:43 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fnt.c,v 4.300 91/06/09 06:14:43 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include "machine/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef CPU_SINGLE
 # define ipc_phys(x)   (x)
 #else /* CPU_SINGLE */
 
 #ifdef CPU_SINGLE
 # define ipc_phys(x)   (x)
 #else /* CPU_SINGLE */

-# include "param.h"
+# include <sys/param.h>

 # ifdef IPC_MRX
 # ifdef IPC_MRX

-#  include "../ipc/newsipc.h"
+#  include <news3400/ipc/newsipc.h>

 #  ifdef mips
 #   define ipc_phys(x) K0_TT0(x)
 #  else /* mips */
 #  ifdef mips
 #   define ipc_phys(x) K0_TT0(x)
 #  else /* mips */

diff --git a/usr/src/sys/news3400/bm/fnt24.c b/usr/src/sys/news3400/bm/fnt24.c
index be96010..91d9033 100644 (file)
--- a/usr/src/sys/news3400/bm/fnt24.c
+++ b/usr/src/sys/news3400/bm/fnt24.c
@@ -9,17 +9,17 @@
  *
  * from: $Hdr: fnt24.c,v 4.300 91/06/09 06:14:46 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fnt24.c,v 4.300 91/06/09 06:14:46 root Rel41 $ SONY
  *

- *     @(#)fnt24.c     7.1 (Berkeley) %G%
+ *     @(#)fnt24.c     7.2 (Berkeley) %G%

  */
 
  */
 

-#include "machine/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef CPU_SINGLE
 # define ipc_phys(x)   (x)
 #else /* CPU_SINGLE */
 
 #ifdef CPU_SINGLE
 # define ipc_phys(x)   (x)
 #else /* CPU_SINGLE */

-# include "../h/param.h"
+# include <sys/param.h>

 # ifdef IPC_MRX
 # ifdef IPC_MRX

-#  include "../newsipc/newsipc.h"
+#  include <news3400/newsipc/newsipc.h>

 #  ifdef mips
 #   define ipc_phys(x) K0_TT0(x)
 #  else /* mips */
 #  ifdef mips
 #   define ipc_phys(x) K0_TT0(x)
 #  else /* mips */

diff --git a/usr/src/sys/news3400/bm/kb_ctrl.c b/usr/src/sys/news3400/bm/kb_ctrl.c
index ef04c4e..e91e8ae 100644 (file)
--- a/usr/src/sys/news3400/bm/kb_ctrl.c
+++ b/usr/src/sys/news3400/bm/kb_ctrl.c
@@ -9,26 +9,26 @@
  *
  * from: $Hdr: kb_ctrl.c,v 4.300 91/06/09 06:14:49 root Rel41 $ SONY
  *
  *
  * from: $Hdr: kb_ctrl.c,v 4.300 91/06/09 06:14:49 root Rel41 $ SONY
  *

- *     @(#)kb_ctrl.c   7.1 (Berkeley) %G%
+ *     @(#)kb_ctrl.c   7.2 (Berkeley) %G%

  */
 
 /*
  *     Keyboard driver
  */
 
  */
 
 /*
  *     Keyboard driver
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef IPC_MRX
 
 #ifdef IPC_MRX

-#include "../../h/ioctl.h"
-#include "../../iop/keyboard.h"
-#include "../../iop/kbreg.h"
+#include <sys/ioctl.h>
+#include <news3400/iop/keyboard.h>
+#include <news3400/iop/kbreg.h>

 #else
 #else

-#include "ioctl.h"
-#include "param.h"
-#include "systm.h"
-#include "types.h"
-#include "../iop/keyboard.h"
-#include "../iop/kbreg.h"
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/types.h>
+#include <news3400/iop/keyboard.h>
+#include <news3400/iop/kbreg.h>

 #endif
 
 extern int tmode;
 #endif
 
 extern int tmode;


@@ -51,12 +51,12 @@ Key_table *key_table_addr = default_table;
 
 #ifdef CPU_SINGLE
 #include "ms.h"
 
 #ifdef CPU_SINGLE
 #include "ms.h"

-#include "clist.h"     
-#include "ttydev.h"
-#include "tty.h"
-#include "../sio/scc.h"
-#include "time.h"
-#include "../iop/mouse.h"
+#include <sys/clist.h> 
+#include <sys/ttydev.h>
+#include <sys/tty.h>
+#include <news3400/sio/scc.h>
+#include <sys/time.h>
+#include <news3400/iop/mouse.h>

 
 extern int cnrint();
 
 
 extern int cnrint();
 

diff --git a/usr/src/sys/news3400/bm/kb_encode.c b/usr/src/sys/news3400/bm/kb_encode.c
index 0847211..a28a665 100644 (file)
--- a/usr/src/sys/news3400/bm/kb_encode.c
+++ b/usr/src/sys/news3400/bm/kb_encode.c
@@ -9,27 +9,27 @@
  *
  * from: $Hdr: kb_encode.c,v 4.300 91/06/09 06:14:51 root Rel41 $ SONY
  *
  *
  * from: $Hdr: kb_encode.c,v 4.300 91/06/09 06:14:51 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef IPC_MRX
 
 #ifdef IPC_MRX

-#include "../../h/param.h"
-#include "../../h/systm.h"
-#include "../../h/types.h"
-#include "../../h/ioctl.h"
-#include "../../iop/keyboard.h"
-#include "../../iop/kbreg.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <news3400/iop/keyboard.h>
+#include <news3400/iop/kbreg.h>

 #else
 #else

-#include "param.h"
-#include "systm.h"
-#include "types.h"
-#include "ioctl.h"
-#include "../iop/keyboard.h"
-#include "../iop/kbreg.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <news3400/iop/keyboard.h>
+#include <news3400/iop/kbreg.h>

 #endif
 #endif

-#include "malloc.h"
+#include <sys/malloc.h>

 
 extern int tmode;
 extern int country;
 
 extern int tmode;
 extern int country;

diff --git a/usr/src/sys/news3400/bm/keyconf.c b/usr/src/sys/news3400/bm/keyconf.c
index 53613a6..7f88efd 100644 (file)
--- a/usr/src/sys/news3400/bm/keyconf.c
+++ b/usr/src/sys/news3400/bm/keyconf.c
@@ -9,15 +9,15 @@
  *
  * from: $Hdr: keyconf.c,v 4.300 91/06/09 06:14:53 root Rel41 $ SONY
  *
  *
  * from: $Hdr: keyconf.c,v 4.300 91/06/09 06:14:53 root Rel41 $ SONY
  *

- *     @(#)keyconf.c   7.1 (Berkeley) %G%
+ *     @(#)keyconf.c   7.2 (Berkeley) %G%

  */
 
 #ifdef CPU_DOUBLE
  */
 
 #ifdef CPU_DOUBLE

-#include "../../iop/keyboard.h"
-#include "../../iop/kbreg.h"
+#include <news3400/iop/keyboard.h>
+#include <news3400/iop/kbreg.h>

 #else
 #else

-#include "../iop/keyboard.h"
-#include "../iop/kbreg.h"
+#include <news3400/iop/keyboard.h>
+#include <news3400/iop/kbreg.h>

 #endif
 
 #ifndef NULL
 #endif
 
 #ifndef NULL

diff --git a/usr/src/sys/news3400/bm/keytbl.c b/usr/src/sys/news3400/bm/keytbl.c
index bb50782..4891666 100644 (file)
--- a/usr/src/sys/news3400/bm/keytbl.c
+++ b/usr/src/sys/news3400/bm/keytbl.c
@@ -9,12 +9,12 @@
  *
  * from: $Hdr: keytbl.c,v 4.300 91/06/09 06:14:54 root Rel41 $ SONY
  *
  *
  * from: $Hdr: keytbl.c,v 4.300 91/06/09 06:14:54 root Rel41 $ SONY
  *

- *     @(#)keytbl.c    7.1 (Berkeley) %G%
+ *     @(#)keytbl.c    7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include "../iop/keyboard.h"
+#include <news3400/iop/keyboard.h>

 
 #define        NULL    (char *)0
 
 
 #define        NULL    (char *)0
 

diff --git a/usr/src/sys/news3400/bm/vt100.c b/usr/src/sys/news3400/bm/vt100.c
index 75bcae7..d8bbce1 100644 (file)
--- a/usr/src/sys/news3400/bm/vt100.c
+++ b/usr/src/sys/news3400/bm/vt100.c
@@ -9,20 +9,20 @@
  *
  * from: $Hdr: vt100.c,v 4.300 91/06/09 06:14:56 root Rel41 $ SONY
  *
  *
  * from: $Hdr: vt100.c,v 4.300 91/06/09 06:14:56 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include "types.h"
-#include "param.h"
-#include "systm.h"
-#include "../iop/framebuf.h"
-#include "../iop/kbreg.h"
-#include "../iop/keyboard.h"
-#include "../fb/fbdefs.h"
-#include "../bm/vt100.h"
-#include "../bm/bitmapif.h"
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/kbreg.h>
+#include <news3400/iop/keyboard.h>
+#include <news3400/fb/fbdefs.h>
+#include <news3400/bm/vt100.h>
+#include <news3400/bm/bitmapif.h>

 
 #ifdef IPC_MRX
 #include "config.h"
 
 #ifdef IPC_MRX
 #include "config.h"


@@ -40,7 +40,7 @@
 #endif
 
 #ifdef CPU_SINGLE
 #endif
 
 #ifdef CPU_SINGLE

-#include "../sio/scc.h"
+#include <nes3400/sio/scc.h>

 #endif
 
 extern Key_string key_str;
 #endif
 
 extern Key_string key_str;

diff --git a/usr/src/sys/news3400/bm/vt100.h b/usr/src/sys/news3400/bm/vt100.h
index e59d1ed..643d366 100644 (file)
--- a/usr/src/sys/news3400/bm/vt100.h
+++ b/usr/src/sys/news3400/bm/vt100.h
@@ -9,16 +9,16 @@
  *
  * from: $Hdr: vt100.h,v 4.300 91/06/09 06:14:58 root Rel41 $ SONY
  *
  *
  * from: $Hdr: vt100.h,v 4.300 91/06/09 06:14:58 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 /*
  *  vt100 emulator header
  */
 
 
 /*
  *  vt100 emulator header
  */
 

-#include "../bm/vt100esc.h"
+#include <news3400/bm/vt100esc.h>

 
 /*
  *  terminal mode
 
 /*
  *  terminal mode

diff --git a/usr/src/sys/news3400/bm/vt100esc.c b/usr/src/sys/news3400/bm/vt100esc.c
index e2f5107..a4ee643 100644 (file)
--- a/usr/src/sys/news3400/bm/vt100esc.c
+++ b/usr/src/sys/news3400/bm/vt100esc.c
@@ -9,40 +9,40 @@
  *
  * from: $Hdr: vt100esc.c,v 4.300 91/06/09 06:14:59 root Rel41 $ SONY
  *
  *
  * from: $Hdr: vt100esc.c,v 4.300 91/06/09 06:14:59 root Rel41 $ SONY
  *

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

  */
 
 /*
  *  vt100 escape sequence handler
  */
 
  */
 
 /*
  *  vt100 escape sequence handler
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef IPC_MRX
 #include "../../h/param.h"
 #include "../../h/systm.h"
 #include "../../iop/framebuf.h"
 #else
 
 #ifdef IPC_MRX
 #include "../../h/param.h"
 #include "../../h/systm.h"
 #include "../../iop/framebuf.h"
 #else

-#include "param.h"
-#include "systm.h"
-#include "../iop/framebuf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <news3400/iop/framebuf.h>

 #endif
 
 #endif
 

-#include "../bm/vt100.h"
-#include "../bm/bitmapif.h"
+#include <news3400/bm/vt100.h>
+#include <news3400/bm/bitmapif.h>

 
 

-#include "../fb/fbdefs.h"
+#include <news3400/fb/fbdefs.h>

 
 #ifdef IPC_MRX
 #include "../../iop/kbreg.h"
 #include "../../iop/keyboard.h"
 #else
 
 #ifdef IPC_MRX
 #include "../../iop/kbreg.h"
 #include "../../iop/keyboard.h"
 #else

-#include "../iop/kbreg.h"
-#include "../iop/keyboard.h"
+#include <news3400/iop/kbreg.h>
+#include <news3400/iop/keyboard.h>

 #endif
 
 #if CPU_SINGLE
 #endif
 
 #if CPU_SINGLE

-#include "../sio/scc.h"
+#include <news3400/sio/scc.h>

 #endif
 
 #ifdef IPC_MRX
 #endif
 
 #ifdef IPC_MRX

diff --git a/usr/src/sys/news3400/bm/vt100if.c b/usr/src/sys/news3400/bm/vt100if.c
index e57acac..82eb093 100644 (file)
--- a/usr/src/sys/news3400/bm/vt100if.c
+++ b/usr/src/sys/news3400/bm/vt100if.c
@@ -9,25 +9,25 @@
  *
  * from: $Hdr: vt100if.c,v 4.300 91/06/09 06:15:02 root Rel41 $ SONY
  *
  *
  * from: $Hdr: vt100if.c,v 4.300 91/06/09 06:15:02 root Rel41 $ SONY
  *

- *     @(#)vt100if.c   7.1 (Berkeley) %G%
+ *     @(#)vt100if.c   7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef IPC_MRX
 #include "types.h"
 #include "ioctl.h"
 #else /* IPC_MRX */
 
 #ifdef IPC_MRX
 #include "types.h"
 #include "ioctl.h"
 #else /* IPC_MRX */

-#include "types.h"
+#include <sys/types.h>

 #ifdef CPU_SINGLE
 #ifdef CPU_SINGLE

-#include "param.h"
+#include <sys/param.h>

 #endif /* CPU_SINGLE */
 #endif /* CPU_SINGLE */

-#include "ioctl.h"
+#include <sys/ioctl.h>

 #endif /* IPC_MRX */
 
 #if CPU_SINGLE
 #endif /* IPC_MRX */
 
 #if CPU_SINGLE

-#include "../sio/scc.h"
-#include "../sio/sccparam.h"
+#include <news3400/sio/scc.h>
+#include <news3400/sio/sccparam.h>

 #endif /* CPU_SINGLE */
 
 #ifdef IPC_MRX
 #endif /* CPU_SINGLE */
 
 #ifdef IPC_MRX


@@ -55,11 +55,11 @@ extern int bitmap_use;
 extern int *gcpu_semadr;
 #endif /* IPC_3CPU */
 #else /* IPC_MRX */
 extern int *gcpu_semadr;
 #endif /* IPC_3CPU */
 #else /* IPC_MRX */

-#include "../iop/keyboard.h"
+#include <news3400/iop/keyboard.h>

 #endif /* IPC_MRX */
 
 #ifdef CPU_SINGLE
 #endif /* IPC_MRX */
 
 #ifdef CPU_SINGLE

-#include "../include/cpu.h"
+#include <machine/cpu.h>

 #define PRE_EMPT       need_resched()
 #endif
 
 #define PRE_EMPT       need_resched()
 #endif
 

diff --git a/usr/src/sys/news3400/fb/askrom.c b/usr/src/sys/news3400/fb/askrom.c
index 45ff774..0960b48 100644 (file)
--- a/usr/src/sys/news3400/fb/askrom.c
+++ b/usr/src/sys/news3400/fb/askrom.c
@@ -9,10 +9,10 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)askrom.c    7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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


@@ -26,15 +26,14 @@
 #include "../../iop/fbreg.h"
 #else
 #include <sys/types.h>
 #include "../../iop/fbreg.h"
 #else
 #include <sys/types.h>

-#include "../h/types.h"
-#include "../h/param.h"
-#include "../iop/framebuf.h"
-#include "../iop/fbreg.h"
+#include <sys/param.h>
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/fbreg.h>

 #endif
 
 #endif
 

-#include "../fb/fbdefs.h"
+#include <news3400/fb/fbdefs.h>

 
 

-#include "../fb/qpdm.h"
+#include <news3400/fb/qpdm.h>

 
 extern short zero[];
 
 
 extern short zero[];
 

diff --git a/usr/src/sys/news3400/fb/fb_conf.c b/usr/src/sys/news3400/fb/fb_conf.c
index 7fa8b68..a6494c2 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_conf.c
+++ b/usr/src/sys/news3400/fb/fb_conf.c
@@ -9,10 +9,10 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)fb_conf.c   7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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


@@ -37,10 +37,10 @@
 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #else
 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #else

-#include "../iop/framebuf.h"
+#include <news3400/iop/framebuf.h>

 #endif
 
 #endif
 

-#include "../fb/fbdefs.h"
+#include <news3400/fb/fbdefs.h>

 
 #define NFBDEV \
        NNWB225 + NNWB512 + NNWB518 + NPFBM + NPFBC + NNWB514 + NNWB251 + \
 
 #define NFBDEV \
        NNWB225 + NNWB512 + NNWB518 + NPFBM + NPFBC + NNWB514 + NNWB251 + \

diff --git a/usr/src/sys/news3400/fb/fb_mfbs.c b/usr/src/sys/news3400/fb/fb_mfbs.c
index cbd7ed3..85660da 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_mfbs.c
+++ b/usr/src/sys/news3400/fb/fb_mfbs.c
@@ -9,15 +9,15 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)fb_mfbs.c   7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include "param.h"
-#include "../iop/framebuf.h"
-#include "../iop/fbreg.h"
-#include "../fb/fbdefs.h"
+#include <sys/param.h>
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/fbreg.h>
+#include <news3400/fb/fbdefs.h>

 
 u_short mfbstarttab16[16] =
     {
 
 u_short mfbstarttab16[16] =
     {

diff --git a/usr/src/sys/news3400/fb/fb_probe.c b/usr/src/sys/news3400/fb/fb_probe.c
index 7ee8ce4..af4d19e 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_probe.c
+++ b/usr/src/sys/news3400/fb/fb_probe.c
@@ -9,10 +9,10 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)fb_probe.c  7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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


@@ -20,12 +20,12 @@
 #include "exec.h"
 #include "romsw.h"
 #else
 #include "exec.h"
 #include "romsw.h"
 #else

-#include "../iop/framebuf.h"
-#include "types.h"
-#include "exec.h"
+#include <news3400/iop/framebuf.h>
+#include <sys/types.h>
+#include <sys/exec.h>

 #endif
 
 #endif
 

-#include "../fb/fbdefs.h"
+#include <news3400/fb/fbdefs.h>

 
 #ifdef CPU_SINGLE
 #define SW_CONSOLE     0x07
 
 #ifdef CPU_SINGLE
 #define SW_CONSOLE     0x07

diff --git a/usr/src/sys/news3400/fb/fb_start.c b/usr/src/sys/news3400/fb/fb_start.c
index 6dce344..8d5b0fe 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_start.c
+++ b/usr/src/sys/news3400/fb/fb_start.c
@@ -9,27 +9,27 @@
  *
  * 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.2 (Berkeley) %G%
+ *     @(#)fb_start.c  7.3 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include "param.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/systm.h>

 
 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #include "../../iop/fbreg.h"
 #include "page.h"
 #else
 
 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #include "../../iop/fbreg.h"
 #include "page.h"
 #else

-#include "../iop/framebuf.h"
-#include "../iop/fbreg.h"
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/fbreg.h>

 #endif
 
 #endif
 

-#include "../fb/fbdefs.h"
+#include <news3400/fb/fbdefs.h>

 
 #ifdef CPU_SINGLE
 
 #ifdef CPU_SINGLE

-#include "../include/cpu.h"
+#include <machine/cpu.h>

 extern struct tty cons;
 extern int cnstart();
 #define PRE_EMPT       need_resched()
 extern struct tty cons;
 extern int cnstart();
 #define PRE_EMPT       need_resched()

diff --git a/usr/src/sys/news3400/fb/fbbm_253.c b/usr/src/sys/news3400/fb/fbbm_253.c
index a88d63f..d7a3cef 100644 (file)
--- a/usr/src/sys/news3400/fb/fbbm_253.c
+++ b/usr/src/sys/news3400/fb/fbbm_253.c
@@ -9,23 +9,23 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)fbbm_253.c  7.2 (Berkeley) %G%

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

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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

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

 
 

-#include "../fb/fbdefs.h"
+#include <news3400/fb/fbdefs.h>

 
 extern int error();
 extern int nofunc();
 
 extern int error();
 extern int nofunc();

diff --git a/usr/src/sys/news3400/fb/fbbm_lcdm.c b/usr/src/sys/news3400/fb/fbbm_lcdm.c
index 00c7475..ff9eebf 100644 (file)
--- a/usr/src/sys/news3400/fb/fbbm_lcdm.c
+++ b/usr/src/sys/news3400/fb/fbbm_lcdm.c
@@ -9,14 +9,14 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)fbbm_lcdm.c 7.2 (Berkeley) %G%

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

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #include "lfbm.h"
 
 
 #include "lfbm.h"
 


@@ -27,18 +27,11 @@
 #endif /* !news3200 */
 #endif /* mips */
 
 #endif /* !news3200 */
 #endif /* mips */
 

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

 
 

-#include "../fb/fbdefs.h"
-
-#ifdef news1200
-#include "../hbdev/scsic.h"
-extern int pend_1185_ioptr;
-extern int val_1185_ioptr;
-extern struct scsi_stat scsi_stat;
-#endif /* news1200 */
+#include <news3400/fb/fbdefs.h>

 
 extern int nofunc();
 extern int error();
 
 extern int nofunc();
 extern int error();

diff --git a/usr/src/sys/news3400/fb/fbdefs.h b/usr/src/sys/news3400/fb/fbdefs.h
index 8c17acc..bc85c46 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.2 (Berkeley) %G%
+ *     @(#)fbdefs.h    7.3 (Berkeley) %G%

  */
 
 #ifndef mips
  */
 
 #ifndef mips


@@ -34,7 +34,7 @@
 #ifdef IPC_MRX
 #define FB_LOCK
 #define FB_UNLOCK
 #ifdef IPC_MRX
 #define FB_LOCK
 #define FB_UNLOCK

-#include "../fb/fbsem.h" /* semaphore name */
+#include <news3400/fb/fbsem.h> /* semaphore name */

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

diff --git a/usr/src/sys/news3400/hbdev/ms.c b/usr/src/sys/news3400/hbdev/ms.c
index f52a43e..3394b3f 100644 (file)
--- a/usr/src/sys/news3400/hbdev/ms.c
+++ b/usr/src/sys/news3400/hbdev/ms.c
@@ -9,35 +9,35 @@
  *
  * 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.2 (Berkeley) %G%
+ *     @(#)ms.c        7.3 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include    "ms.h"
+#include "ms.h"

 #if NMS > 0
 /*
  * mouse 
  */
 
 #if NMS > 0
 /*
  * mouse 
  */
 

-#include "types.h"
-#include "../include/cpu.h"
-#include "../include/pte.h"
-#include "param.h"
-#include "proc.h"
-#include "user.h"
-#include "buf.h"
-#include "malloc.h"
-#include "systm.h"
-#include "uio.h"
-#include "kernel.h"
-#include "file.h"
-
-#include "../iop/mouse.h"
-#include "../iop/msreg.h"
-
-#include "../sio/scc.h"
-#include "../hbdev/hbvar.h"
+#include <sys/types.h>
+#include <machine/cpu.h>
+#include <machine/pte.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+
+#include <news3400/iop/mouse.h>
+#include <news3400/iop/msreg.h>
+
+#include <news3400/sio/scc.h>
+#include <news3400/hbdev/hbvar.h>

 
 #ifndef mips
 #define volatile
 
 #ifndef mips
 #define volatile

diff --git a/usr/src/sys/news3400/hbdev/scsi_1185.c b/usr/src/sys/news3400/hbdev/scsi_1185.c
index 59de22f..9f90200 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.2 (Berkeley) %G%
+ *     @(#)scsi_1185.c 7.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -31,42 +31,35 @@
  *
  */
 
  *
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

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

 
 

-#include "param.h"
-#include "systm.h"
-#include "map.h"
-#include "buf.h"
-#include "vm/vm.h"
-#include "proc.h"
-#include "user.h"
-#include "conf.h"
-#include "dkstat.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <vm/vm.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/conf.h>
+#include <sys/dkstat.h>
+#include <sys/kernel.h>

 
 

-#include "../hbdev/hbvar.h"
-#include "../hbdev/screg_1185.h"
-#include "../hbdev/scsic.h"
-
-#ifdef news1200
-# include "../hbdev/dmac_0266.h"
-# ifndef NDMACMAP
-# define NDMACMAP      NVSCSIREG
-# endif
-#endif
+#include <news3400/hbdev/hbvar.h>
+#include <news3400/hbdev/screg_1185.h>
+#include <news3400/hbdev/scsic.h>

 
 #ifdef news3400
 
 #ifdef news3400

-# include "../hbdev/dmac_0448.h"
+# include <news3400/hbdev/dmac_0448.h>

 # ifndef NDMACMAP
 # define NDMACMAP      144
 # endif
 #endif
 
 # ifndef NDMACMAP
 # define NDMACMAP      144
 # endif
 #endif
 

-#include "../iodev/scsireg.h"
+#include <news3400/iodev/scsireg.h>

 
 #ifdef mips
 #define        VOLATILE        volatile
 
 #ifdef mips
 #define        VOLATILE        volatile

diff --git a/usr/src/sys/news3400/if/if_en.c b/usr/src/sys/news3400/if/if_en.c
index c57fafc..4fcaeb1 100644 (file)
--- a/usr/src/sys/news3400/if/if_en.c
+++ b/usr/src/sys/news3400/if/if_en.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: if_en.c,v 4.300 91/06/09 06:25:54 root Rel41 $ SONY
  *
  *
  * from: $Hdr: if_en.c,v 4.300 91/06/09 06:25:54 root Rel41 $ SONY
  *

- *     @(#)if_en.c     7.5 (Berkeley) %G%
+ *     @(#)if_en.c     7.6 (Berkeley) %G%

  */
 
 #include "en.h"
  */
 
 #include "en.h"


@@ -21,45 +21,45 @@
 /*
  * Interlan Ethernet Communications Controller interface
  */
 /*
  * Interlan Ethernet Communications Controller interface
  */

-#include "types.h"
-#include "../include/fix_machine_type.h"
-#include "../include/pte.h"
-
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "buf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "time.h"
-#include "cdefs.h"
-
-#include "net/if.h"
-#include "net/netisr.h"
-#include "net/route.h"
+#include <sys/types.h>
+#include <machine/fix_machine_type.h>
+#include <machine/pte.h>
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/buf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include <sys/cdefs.h>
+
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/route.h>

 
 #ifdef INET
 
 #ifdef INET

-#include "netinet/in.h"
-#include "netinet/in_systm.h"
-#include "netinet/in_var.h"
-#include "netinet/ip.h"
-#include "netinet/if_ether.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/if_ether.h>

 #endif
 
 #endif
 

-#include "../if/if_news.h"
-#include "../if/if_en.h"
+#include <news3400/if/if_news.h>
+#include <news3400/if/if_en.h>

 
 #ifdef CPU_SINGLE
 
 #ifdef CPU_SINGLE

-#include "../hbdev/hbvar.h"
+#include <news3400/hbdev/hbvar.h>

 #define        iop_device      hb_device
 #define        iop_driver      hb_driver
 #define        ii_unit         hi_unit
 #define        ii_intr         hi_intr
 #define        ii_alive        hi_alive
 #else
 #define        iop_device      hb_device
 #define        iop_driver      hb_driver
 #define        ii_unit         hi_unit
 #define        ii_intr         hi_intr
 #define        ii_alive        hi_alive
 #else

-#include "../iop/iopvar.h"
+#include <news3400/iop/iopvar.h>

 #endif
 
 int    enprobe(), enattach(), enrint(), enxint();
 #endif
 
 int    enprobe(), enattach(), enrint(), enxint();


@@ -87,7 +87,7 @@ extern struct ifnet loif;
 struct en_softc en_softc[NEN];
 
 #if NBPFILTER > 0
 struct en_softc en_softc[NEN];
 
 #if NBPFILTER > 0

-#include "../net/bpf.h"
+#include <net/bpf.h>

 #endif
 
 enprobe(ii)
 #endif
 
 enprobe(ii)


@@ -453,7 +453,7 @@ ensetaddr(physaddr, unit)
  *     en_prom_mode()
  */
 #ifdef CPU_SINGLE
  *     en_prom_mode()
  */
 #ifdef CPU_SINGLE

-#include "../include/cpu.h"
+#include <machine/cpu.h>

 
 en_probe(hi)
        struct hb_device *hi;
 
 en_probe(hi)
        struct hb_device *hi;

diff --git a/usr/src/sys/news3400/if/if_lance.c b/usr/src/sys/news3400/if/if_lance.c
index 4a97e2d..89de636 100644 (file)
--- a/usr/src/sys/news3400/if/if_lance.c
+++ b/usr/src/sys/news3400/if/if_lance.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: if_lance.c,v 4.300 91/06/09 06:25:58 root Rel41 $ SONY
  *
  *
  * from: $Hdr: if_lance.c,v 4.300 91/06/09 06:25:58 root Rel41 $ SONY
  *

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

  */
 
 /*
  */
 
 /*


@@ -24,13 +24,13 @@
 
 #if NEN > 0
 
 
 #if NEN > 0
 

-#include "../include/fix_machine_type.h"
-#include "../include/adrsmap.h"
+#include <machine/fix_machine_type.h>
+#include <machine/adrsmap.h>

 
 

-#include "param.h"
+#include <sys/param.h>

 
 

-#include "../if/lancereg.h"
-#include "../if/if_lance.h"
+#include <news3400/if/lancereg.h>
+#include <news3400/if/if_lance.h>

 
 #ifdef mips
 #define        VOLATILE        volatile
 
 #ifdef mips
 #define        VOLATILE        volatile

diff --git a/usr/src/sys/news3400/if/if_news.c b/usr/src/sys/news3400/if/if_news.c
index 09f43e7..f8c3ccb 100644 (file)
--- a/usr/src/sys/news3400/if/if_news.c
+++ b/usr/src/sys/news3400/if/if_news.c
@@ -9,25 +9,25 @@
  *
  * from: $Hdr: if_news.c,v 4.300 91/06/09 06:26:01 root Rel41 $ SONY
  *
  *
  * from: $Hdr: if_news.c,v 4.300 91/06/09 06:26:01 root Rel41 $ SONY
  *

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

  */
 
  */
 

-#include "types.h"
-#include "../include/fix_machine_type.h"
-#include "../include/pte.h"
+#include <sys/types.h"
+#include <machine/fix_machine_type.h>
+#include <machine/pte.h>

 
 

-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "map.h"
-#include "buf.h"
-#include "socket.h"
-#include "proc.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <sys/socket.h>
+#include <sys/proc.h>
+#include <sys/user.h>

 
 

-#include "../net/if.h"
-#include "../if/if_news.h"
-#include "../include/cpu.h"
+#include <news3400/net/if.h>
+#include <news3400/if/if_news.h>
+#include <machine/cpu.h>

 
 #if MCLBYTES == CLBYTES && defined(CPU_DOUBLE)
 #define        USE_CLUSTER
 
 #if MCLBYTES == CLBYTES && defined(CPU_DOUBLE)
 #define        USE_CLUSTER

diff --git a/usr/src/sys/news3400/include/adrsmap.h b/usr/src/sys/news3400/include/adrsmap.h
index 2ac9775..4f79dc6 100644 (file)
--- a/usr/src/sys/news3400/include/adrsmap.h
+++ b/usr/src/sys/news3400/include/adrsmap.h
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: adrsmap.h,v 4.300 91/06/09 06:34:29 root Rel41 $ SONY
  *
  *
  * from: $Hdr: adrsmap.h,v 4.300 91/06/09 06:34:29 root Rel41 $ SONY
  *

- *     @(#)adrsmap.h   7.1 (Berkeley) %G%
+ *     @(#)adrsmap.h   7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -21,7 +21,7 @@
 #ifndef __ADRSMAP__
 #define        __ADRSMAP__     1
 
 #ifndef __ADRSMAP__
 #define        __ADRSMAP__     1
 

-#include "machine/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 #ifdef news3400
 /*----------------------------------------------------------------------
 
 #ifdef news3400
 /*----------------------------------------------------------------------

diff --git a/usr/src/sys/news3400/include/cpu.h b/usr/src/sys/news3400/include/cpu.h
index 6523903..169e3f7 100644 (file)
--- a/usr/src/sys/news3400/include/cpu.h
+++ b/usr/src/sys/news3400/include/cpu.h
@@ -8,13 +8,13 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

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

  */
 
 #ifndef _CPU_H_
 #define _CPU_H_
 
  */
 
 #ifndef _CPU_H_
 #define _CPU_H_
 

-#include "machConst.h"
+#include <machine/machConst.h>

 
 /*
  * Exported definitions unique to pmax/mips cpu support.
 
 /*
  * Exported definitions unique to pmax/mips cpu support.

diff --git a/usr/src/sys/news3400/iodev/psd.c b/usr/src/sys/news3400/iodev/psd.c
index 5aabf8d..d76096b 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.1 (Berkeley) %G%
+ *     @(#)psd.c       7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -24,24 +24,22 @@
  *
  */
 
  *
  */
 

-#include "../include/fix_machine_type.h"
-
-#include "param.h"
-#include "buf.h"
-#include "proc.h"
-#include "user.h"
-#include "dkstat.h"
-#include "uio.h"
-#include "kernel.h"
-#include "ioctl.h"
-#ifdef BSD4_3
-#include "syslog.h"
-#endif
+#include <machine/fix_machine_type.h>
+
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/dkstat.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/syslog.h>

 
 

-#include "vm/vm.h"
+#include <vm/vm.h>

 
 #ifdef mips
 
 #ifdef mips

-#include "../include/cpu.h"
+#include <machine/cpu.h>

 #endif
 
 #ifdef IPC_MRX
 #endif
 
 #ifdef IPC_MRX


@@ -50,14 +48,14 @@
 #endif
 
 #ifdef CPU_SINGLE
 #endif
 
 #ifdef CPU_SINGLE

-#include "../hbdev/hbvar.h"
-#include "../hbdev/scsic.h"
+#include <news3400/hbdev/hbvar.h>
+#include <news3400/hbdev/scsic.h>

 #endif
 
 #endif
 

-#include "../iodev/scsireg.h"
-#include "../iodev/scu.h"
+#include <news3400/iodev/scsireg.h>
+#include <news3400/iodev/scu.h>

 
 

-#include "../iodev/ioptohb.h"
+#include <news3400/iodev/ioptohb.h>

 
 
 #define        PROBE_MAXRETRY  100
 
 
 #define        PROBE_MAXRETRY  100

diff --git a/usr/src/sys/news3400/iodev/scsi.c b/usr/src/sys/news3400/iodev/scsi.c
index 23a2db3..c411156 100644 (file)
--- a/usr/src/sys/news3400/iodev/scsi.c
+++ b/usr/src/sys/news3400/iodev/scsi.c
@@ -9,29 +9,29 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)scsi.c      7.2 (Berkeley) %G%

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

-#include "../include/fix_machine_type.h"
-#include "../include/param.h"
+#include <machine/fix_machine_type.h>
+#include <machine/param.h>

 
 

-#include "param.h"
-#include "buf.h"
-#include "proc.h"
-#include "user.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/user.h>

 
 

-# include "../include/cpu.h"
+# include <machine/cpu.h>

 
 

-#include "../hbdev/hbvar.h"
-#include "../hbdev/scsic.h"
-#include "../hbdev/screg_1185.h"
+#include <news3400/hbdev/hbvar.h>
+#include <news3400/hbdev/scsic.h>
+#include <news3400/hbdev/screg_1185.h>

 
 

-#include "../iodev/scsireg.h"
-#include "../iodev/ioptohb.h"
+#include <news3400/iodev/scsireg.h>
+#include <news3400/iodev/ioptohb.h>

 
 #define DEBUG_LOSSBSY_HUNG
 
 
 #define DEBUG_LOSSBSY_HUNG
 

diff --git a/usr/src/sys/news3400/iodev/scsireg.h b/usr/src/sys/news3400/iodev/scsireg.h
index 5c066c1..7b6032b 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.1 (Berkeley) %G%
+ *     @(#)scsireg.h   7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -19,12 +19,7 @@
 #ifndef __SCSIREG__
 #define __SCSIREG__ 1
 
 #ifndef __SCSIREG__
 #define __SCSIREG__ 1
 

-#ifdef KERNEL
-#include "../include/fix_machine_type.h"
-#else
-#include "machine/fix_machine_type.h"
-#endif
-
+#include <machine/fix_machine_type.h>

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

diff --git a/usr/src/sys/news3400/iodev/scu.h b/usr/src/sys/news3400/iodev/scu.h
index e3dc437..b5762ac 100644 (file)
--- a/usr/src/sys/news3400/iodev/scu.h
+++ b/usr/src/sys/news3400/iodev/scu.h
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: scu.h,v 4.300 91/07/02 16:38:38 root Rel41 $ SONY
  *
  *
  * from: $Hdr: scu.h,v 4.300 91/07/02 16:38:38 root Rel41 $ SONY
  *

- *     @(#)scu.h       7.1 (Berkeley) %G%
+ *     @(#)scu.h       7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -19,11 +19,7 @@
 #ifndef __SCU__
 #define __SCU__ 1
 
 #ifndef __SCU__
 #define __SCU__ 1
 

-#ifdef KERNEL
-#include "ioctl.h"
-#else

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#endif

 
 #define        RAWSCSI_USE_PIO         0
 #define        RAWSCSI_USE_DMA         1
 
 #define        RAWSCSI_USE_PIO         0
 #define        RAWSCSI_USE_DMA         1

diff --git a/usr/src/sys/news3400/iodev/sd.c b/usr/src/sys/news3400/iodev/sd.c
index 2199392..6c3c914 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.2 (Berkeley) %G%
+ *     @(#)sd.c        7.3 (Berkeley) %G%

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


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

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include "param.h"
-#include "buf.h"
-#include "proc.h"
-#include "user.h"
-#include "dkstat.h"
-#include "uio.h"
-#include "kernel.h"
-#include "reboot.h"
-#include "ioctl.h"
-#include "systm.h"
-#include "mtio.h"
-#include "stat.h"
-#include "disklabel.h"
-#include "vm/vm.h"
-#include "syslog.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/dkstat.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/reboot.h>
+#include <sys/ioctl.h>
+#include <sys/systm.h>
+#include <sys/mtio.h>
+#include <sys/stat.h>
+#include <sys/disklabel.h>
+#include <vm/vm.h>
+#include <sys/syslog.h>

 
 

-#include "../ufs/ffs/fs.h"
+#include <ufs/ffs/fs.h>

 
 

-# include "../include/cpu.h"
+# include <machine/cpu.h>

 
 #ifdef IPC_MRX
 # include "../iop/iopvar.h"
 
 #ifdef IPC_MRX
 # include "../iop/iopvar.h"


@@ -48,16 +48,16 @@
 #endif
 
 #ifdef CPU_SINGLE
 #endif
 
 #ifdef CPU_SINGLE

-# include "../hbdev/hbvar.h"
-# include "../iodev/ioptohb.h"
+# include <news3400/hbdev/hbvar.h>
+# include <news3400/iodev/ioptohb.h>

 #endif
 
 #endif
 

-#include "../iodev/scsireg.h"
-#include "../iodev/scu.h"
-#include "../iodev/dkio.h"
-#include "../iodev/sdreg.h"
+#include <news3400/iodev/scsireg.h>
+#include <news3400/iodev/scu.h>
+#include <news3400/iodev/dkio.h>
+#include <news3400/iodev/sdreg.h>

 /* #ifdef DISKINFO KU:XXX */
 /* #ifdef DISKINFO KU:XXX */

-#include "../iodev/diskinfo.h"
+#include <news3400/iodev/diskinfo.h>

 /* #endif /* DISKINFO */
 
 #define        sce_sdecode     sce_hdecode
 /* #endif /* DISKINFO */
 
 #define        sce_sdecode     sce_hdecode

diff --git a/usr/src/sys/news3400/iodev/sd_var.c b/usr/src/sys/news3400/iodev/sd_var.c
index 2a1f4be..cfdb7c0 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.1 (Berkeley) %G%
+ *     @(#)sd_var.c    7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -23,22 +23,14 @@
 #include "sd.h"
 #if NSD > 0
 
 #include "sd.h"
 #if NSD > 0
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include "param.h"
-#include "buf.h"
-#include "disklabel.h"
+#include <sys/param.h>
+#include <sys/buf.h>
+#include <sys/disklabel.h>

 
 

-#if defined(news800) || defined(news1800)
-# include "../iop/iopvar.h"
-#endif
-
-#if defined(news1700)
-# include "../hbdev/hbvar.h"
-#endif
-
-#include "../iodev/scsireg.h"
-#include "../iodev/sdreg.h"
+#include <news3400/iodev/scsireg.h>
+#include <news3400/iodev/sdreg.h>

 
 struct iop/**/_ctlr *sdminfo[NSDC];
 struct iop/**/_device *sddinfo[NSD];
 
 struct iop/**/_ctlr *sdminfo[NSDC];
 struct iop/**/_device *sddinfo[NSD];

diff --git a/usr/src/sys/news3400/iodev/sddefs.c b/usr/src/sys/news3400/iodev/sddefs.c
index f97e0c4..2b5d8dd 100644 (file)
--- a/usr/src/sys/news3400/iodev/sddefs.c
+++ b/usr/src/sys/news3400/iodev/sddefs.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: sddefs.c,v 4.300 91/06/09 06:38:25 root Rel41 $ SONY
  *
  *
  * from: $Hdr: sddefs.c,v 4.300 91/06/09 06:38:25 root Rel41 $ SONY
  *

- *     @(#)sddefs.c    7.1 (Berkeley) %G%
+ *     @(#)sddefs.c    7.2 (Berkeley) %G%

  */
 
 #include "sd.h"
  */
 
 #include "sd.h"


@@ -22,17 +22,10 @@
  * SD device configuration file
  */
 
  * SD device configuration file
  */
 

-#ifdef KERNEL
-#include "param.h"
-#include "../iodev/sdreg.h"
-#include "../iodev/scsireg.h"
-#include "../iodev/scu.h"
-#else
-#include "/sys/h/param.h"
-#include "/sys/iodev/sdreg.h"
-#include "/sys/iodev/scsireg.h"
-#include "/sys/iodev/scu.h"
-#endif
+#include <sys/param.h>
+#include <news3400/iodev/sdreg.h>
+#include <news3400/iodev/scsireg.h>
+#include <news3400/iodev/scu.h>

 
 char   revs_all[] = "????";
 
 
 char   revs_all[] = "????";
 

diff --git a/usr/src/sys/news3400/iodev/sdreg.h b/usr/src/sys/news3400/iodev/sdreg.h
index 480a33a..5d817dc 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.1 (Berkeley) %G%
+ *     @(#)sdreg.h     7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -22,11 +22,7 @@
 #ifndef __SDREG__
 #define __SDREG__ 1
 
 #ifndef __SDREG__
 #define __SDREG__ 1
 

-#ifdef KERNEL
-#include "../include/fix_machine_type.h"
-#else
-#include "machine/fix_machine_type.h"
-#endif
+#include <machine/fix_machine_type.h>

 
 #define        MAXSLAVE        8
 #define        PNUM            8
 
 #define        MAXSLAVE        8
 #define        PNUM            8

diff --git a/usr/src/sys/news3400/iop/fb.c b/usr/src/sys/news3400/iop/fb.c
index 5e015d0..8b28a10 100644 (file)
--- a/usr/src/sys/news3400/iop/fb.c
+++ b/usr/src/sys/news3400/iop/fb.c
@@ -9,10 +9,10 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)fb.c        7.2 (Berkeley) %G%

  */
 
  */
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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


@@ -20,26 +20,26 @@
  * Frame buffer driver
  */
 
  * Frame buffer driver
  */
 

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

 
 

-#include "param.h"
-#include "proc.h"
-#include "user.h"
-#include "buf.h"
-#include "vm/vm.h"
-#include "systm.h"
-#include "map.h"
-#include "uio.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <vm/vm.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>

 
 

-#include "../iop/framebuf.h"
-#include "../iop/fbreg.h"
-#include "../iodev/ioptohb.h"
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/fbreg.h>
+#include <news3400/iodev/ioptohb.h>

 
 #ifdef CPU_SINGLE
 
 #ifdef CPU_SINGLE

-#include "../hbdev/hbvar.h"
+#include <news3400/hbdev/hbvar.h>

 
 #define ipc_phys(x)    (caddr_t)((int)(x))
 #define ipc_log(x)     (caddr_t)((int)(x) | 0x80000000)
 
 #define ipc_phys(x)    (caddr_t)((int)(x))
 #define ipc_log(x)     (caddr_t)((int)(x) | 0x80000000)


@@ -49,7 +49,7 @@
 
 extern rop_xint();
 #else /* CPU_SINGLE */
 
 extern rop_xint();
 #else /* CPU_SINGLE */

-#include "../iop/iopvar.h"
+#include <news3400/iop/iopvar.h>

 
 #ifdef IPC_MRX
 #include "../ipc/newsipc.h"
 
 #ifdef IPC_MRX
 #include "../ipc/newsipc.h"

diff --git a/usr/src/sys/news3400/iop/fb_sub.c b/usr/src/sys/news3400/iop/fb_sub.c
index f8c5e33..7e16803 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.1 (Berkeley) %G%
+ *     @(#)fb_sub.c    7.2 (Berkeley) %G%

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


@@ -18,25 +18,25 @@
  * Frame buffer driver
  */
 
  * Frame buffer driver
  */
 

-#include "../include/fix_machine_type.h"
-
-#include "types.h"
-#include "../include/pte.h"
-#include "../include/cpu.h"
-#include "../include/param.h"
-
-#include "param.h"
-#include "proc.h"
-#include "user.h"
-#include "buf.h"
-#include "vm/vm.h"
-#include "systm.h"
-#include "map.h"
-#include "uio.h"
-#include "kernel.h"
-
-#include "../iop/framebuf.h"
-#include "../iop/fbreg.h"
+#include <machine/fix_machine_type.h>
+
+#include <sys/types.h>
+#include <machine/pte.h>
+#include <machine/cpu.h>
+#include <machine/param.h>
+
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/buf.h>
+#include <vm/vm.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+
+#include <news3400/iop/framebuf.h>
+#include <news3400/iop/fbreg.h>

 #ifdef CPU_DOUBLE
 #ifdef IPC_MRX
 #include "../ipc/newsipc.h"
 #ifdef CPU_DOUBLE
 #ifdef IPC_MRX
 #include "../ipc/newsipc.h"

diff --git a/usr/src/sys/news3400/iop/fbreg.h b/usr/src/sys/news3400/iop/fbreg.h
index d776d23..cd8ff6c 100644 (file)
--- a/usr/src/sys/news3400/iop/fbreg.h
+++ b/usr/src/sys/news3400/iop/fbreg.h
@@ -9,12 +9,12 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)fbreg.h     7.2 (Berkeley) %G%

  */
 
 #ifdef KERNEL
 
  */
 
 #ifdef KERNEL
 

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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

diff --git a/usr/src/sys/news3400/iop/framebuf.h b/usr/src/sys/news3400/iop/framebuf.h
index baf8b16..e12e2bf 100644 (file)
--- a/usr/src/sys/news3400/iop/framebuf.h
+++ b/usr/src/sys/news3400/iop/framebuf.h
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: framebuf.h,v 4.300 91/06/09 06:42:21 root Rel41 $ SONY
  *
  *
  * from: $Hdr: framebuf.h,v 4.300 91/06/09 06:42:21 root Rel41 $ SONY
  *

- *     @(#)framebuf.h  7.1 (Berkeley) %G%
+ *     @(#)framebuf.h  7.2 (Berkeley) %G%

  */
 
 #ifndef __FRAMEBUF__
  */
 
 #ifndef __FRAMEBUF__


@@ -616,11 +616,7 @@ typedef struct {
 /*
  * FB IOCTL
  */
 /*
  * FB IOCTL
  */

-#ifdef KERNEL
-#include "ioctl.h"
-#else /* KERNEL */

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#endif /* KERNEL */

 
 #define FBIOCSETSCR            _IOW('F', 0, int)
 #define FBIOCGETSCR            _IOR('F', 1, int)
 
 #define FBIOCSETSCR            _IOW('F', 0, int)
 #define FBIOCGETSCR            _IOR('F', 1, int)

diff --git a/usr/src/sys/news3400/iop/iop.c b/usr/src/sys/news3400/iop/iop.c
index fbdd088..fe74544 100644 (file)
--- a/usr/src/sys/news3400/iop/iop.c
+++ b/usr/src/sys/news3400/iop/iop.c
@@ -9,41 +9,41 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)iop.c       7.2 (Berkeley) %G%

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

-#include "../include/fix_machine_type.h"
-#include "../include/machConst.h"
+#include <machine/fix_machine_type.h>
+#include <machine/machConst.h>

 
 

-#include "param.h"
-#include "systm.h"
-#include "map.h"
-#include "buf.h"
-#include "proc.h"
-#include "user.h"
-#include "conf.h"
-#include "dkstat.h"
-#include "kernel.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/conf.h>
+#include <sys/dkstat.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>

 
 

-#include "../include/pte.h"
-#include "../include/cpu.h"
+#include <machine/pte.h>
+#include <machine/cpu.h>

 
 #ifndef news700
 
 
 #ifndef news700
 

-#include "../iodev/scsireg.h"
+#include <news3400/iodev/scsireg.h>

 
 #ifdef CPU_DOUBLE
 #include "../iop/iopvar.h"
 #endif
 
 #ifdef CPU_SINGLE
 
 #ifdef CPU_DOUBLE
 #include "../iop/iopvar.h"
 #endif
 
 #ifdef CPU_SINGLE

-#include "../hbdev/hbvar.h"
-#include "../hbdev/scsic.h"
+#include <news3400/hbdev/hbvar.h>
+#include <news3400/hbdev/scsic.h>

 struct scsi_stat scsi_stat;
 #endif
 
 struct scsi_stat scsi_stat;
 #endif
 

diff --git a/usr/src/sys/news3400/iop/kb.c b/usr/src/sys/news3400/iop/kb.c
index 06523d5..835ae70 100644 (file)
--- a/usr/src/sys/news3400/iop/kb.c
+++ b/usr/src/sys/news3400/iop/kb.c
@@ -9,32 +9,32 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)kb.c        7.2 (Berkeley) %G%

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

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

 
 

-#include "param.h"
-#include "proc.h"
-#include "user.h"
-#include "ioctl.h"
-#include "buf.h"
-#include "systm.h"
-#include "map.h"
-#include "uio.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/ioctl.h>
+#include <sys/buf.h>
+#include <sys/systm.h>
+#include <sys/map.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>

 
 

-#include "../iop/keyboard.h"
-#include "../iop/kbreg.h"
+#include <news3400/iop/keyboard.h>
+#include <news3400/iop/kbreg.h>

 
 #ifdef CPU_SINGLE
 
 #ifdef CPU_SINGLE

-#include "tty.h"
-#include "clist.h"
-#include "../sio/scc.h"
-#include "../hbdev/hbvar.h"
+#include <sys/tty.h>
+#include <sys/clist.h>
+#include <news3400/sio/scc.h>
+#include <news3400/hbdev/hbvar.h>

 #define        iop_device      hb_device
 #define        ii_alive        hi_alive
 #else
 #define        iop_device      hb_device
 #define        ii_alive        hi_alive
 #else

diff --git a/usr/src/sys/news3400/iop/kbreg.h b/usr/src/sys/news3400/iop/kbreg.h
index d2112a4..27f6c2f 100644 (file)
--- a/usr/src/sys/news3400/iop/kbreg.h
+++ b/usr/src/sys/news3400/iop/kbreg.h
@@ -9,13 +9,13 @@
  *
  * 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.1 (Berkeley) %G%
+ *     @(#)kbreg.h     7.2 (Berkeley) %G%

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

-#include "machine/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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

diff --git a/usr/src/sys/news3400/iop/mouse.h b/usr/src/sys/news3400/iop/mouse.h
index 8a7efa6..df519c7 100644 (file)
--- a/usr/src/sys/news3400/iop/mouse.h
+++ b/usr/src/sys/news3400/iop/mouse.h
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: mouse.h,v 4.300 91/06/09 06:42:56 root Rel41 $ SONY
  *
  *
  * from: $Hdr: mouse.h,v 4.300 91/06/09 06:42:56 root Rel41 $ SONY
  *

- *     @(#)mouse.h     7.1 (Berkeley) %G%
+ *     @(#)mouse.h     7.2 (Berkeley) %G%

  */
 
 #ifndef __MOUSE__
  */
 
 #ifndef __MOUSE__


@@ -213,11 +213,7 @@ struct ms_param {
  * Mouse I/O contol commands
  */
 
  * Mouse I/O contol commands
  */
 

-#ifdef KERNEL
-#include "ioctl.h"
-#else

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#endif

 
 #define        MSIOCGETEM      _IOR('M', 0, int)       /* get current event mask */
 #define        MSIOCSETEM      _IOW('M', 1, int)       /* set event mask */
 
 #define        MSIOCGETEM      _IOR('M', 0, int)       /* get current event mask */
 #define        MSIOCSETEM      _IOW('M', 1, int)       /* set event mask */

diff --git a/usr/src/sys/news3400/iop/rs.c b/usr/src/sys/news3400/iop/rs.c
index b7b0210..4da9495 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.2 (Berkeley) %G%
+ *     @(#)rs.c        7.3 (Berkeley) %G%

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


@@ -20,29 +20,29 @@
  * RS driver
  *
  */
  * RS driver
  *
  */

-#include "../include/fix_machine_type.h"
+#include <machine/fix_machine_type.h>

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

-#include "param.h"
-#include "conf.h"
-#include "proc.h"
-#include "user.h"
-#include "kernel.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "buf.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>

 
 #ifdef CPU_SINGLE
 
 #ifdef CPU_SINGLE

-#include "../hbdev/hbvar.h"
+#include <news3400/hbdev/hbvar.h>

 #else
 #include "../iop/iopvar.h"
 #endif
 
 #else
 #include "../iop/iopvar.h"
 #endif
 

-#include "../iop/rsreg.h"
-#include "../sio/sccparam.h"
+#include <news3400/iop/rsreg.h>
+#include <news3400/sio/sccparam.h>

 
 #define        RS_RXE  RXE
 #define        RS_TXE  TXE
 
 #define        RS_RXE  RXE
 #define        RS_TXE  TXE


@@ -817,9 +817,9 @@ rsflowctl(unit, block)
  *     rs_set_param()
  */
 #ifdef CPU_SINGLE
  *     rs_set_param()
  */
 #ifdef CPU_SINGLE

-#include "../hbdev/hbvar.h"
-#include "../hbdev/rsreg.h"
-#include "../sio/scc.h"
+#include <news3400/hbdev/hbvar.h>
+#include <news3400/hbdev/rsreg.h>
+#include <news3400/sio/scc.h>

 
 int    rslastcount[NRS*4];
 int    scc_unit[] = { 0, 1, -1, -1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
 int    rslastcount[NRS*4];
 int    scc_unit[] = { 0, 1, -1, -1, 2, 3, 4, 5, 6, 7, 8, 9 };

diff --git a/usr/src/sys/news3400/sio/scc.c b/usr/src/sys/news3400/sio/scc.c
index 2ee01f7..cfbaa9d 100644 (file)
--- a/usr/src/sys/news3400/sio/scc.c
+++ b/usr/src/sys/news3400/sio/scc.c
@@ -9,7 +9,7 @@
  *
  * from: $Hdr: scc.c,v 4.300 91/06/09 06:44:53 root Rel41 $ SONY
  *
  *
  * from: $Hdr: scc.c,v 4.300 91/06/09 06:44:53 root Rel41 $ SONY
  *

- *     @(#)scc.c       7.1 (Berkeley) %G%
+ *     @(#)scc.c       7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -23,25 +23,20 @@
  * Work Station Division, all rights RESERVED.
  */
 
  * Work Station Division, all rights RESERVED.
  */
 

-#include "../include/fix_machine_type.h"
-#include "../include/adrsmap.h"
+#include <machine/fix_machine_type.h>
+#include <machine/adrsmap.h>

 
 

-#ifdef news700
-#include "ms.h"
-#include "bm.h"
-#else

 #include "rs.h"
 #include "rs.h"

-#endif

 
 

-#include "param.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/malloc.h>

 
 

-#include "sccparam.h"
-#include "sccreg.h"
-#include "scc.h"
-#include "scc.conf"
+#include <news3400/sio/sccparam.h>
+#include <news3400/sio/sccreg.h>
+#include <news3400/sio/scc.h>
+#include <news3400/sio/scc.conf>

 
 #define        PROBE_DATA      0x55
 
 
 #define        PROBE_DATA      0x55