update.

diff --git a/sys/arch/wgrisc/conf/GENERIC b/sys/arch/wgrisc/conf/GENERIC
index 387282f..16d585c 100644 (file)
--- a/sys/arch/wgrisc/conf/GENERIC
+++ b/sys/arch/wgrisc/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.1.1.1 1997/02/06 16:02:45 pefo Exp $
+#      $OpenBSD: GENERIC,v 1.2 1997/02/20 11:50:45 pefo Exp $
 #
 #      Generic configuration file for Willowglen RISC-PC 9100
 #
@@ -46,14 +46,14 @@ options     NFSCLIENT       # Sun NFS-compatible filesystem (client)
 
 
 # Networking options
-#options       GATEWAY         # IP packet forwarding
+options        GATEWAY         # IP packet forwarding
 options        INET            # Internet protocols
 #options        NS              # XNS
 #options        IPX             # IPX+SPX
 #options       ISO,TPIP        # OSI networking
 #options       EON             # OSI tunneling over IP
 #options       CCITT,LLC,HDLC  # X.25
-#options       IPFILTER        # IP packet filter for security
+options        IPFILTER        # IP packet filter for security
 
 #options       TCP_COMPAT_42   # compatibility with 4.2BSD TCP/IP
 #options       MULTICAST       # Multicast support

diff --git a/sys/arch/wgrisc/include/bus.h b/sys/arch/wgrisc/include/bus.h
index 64f484f..eaf2d84 100644 (file)
--- a/sys/arch/wgrisc/include/bus.h
+++ b/sys/arch/wgrisc/include/bus.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bus.h,v 1.2 1997/02/16 22:31:25 pefo Exp $    */
+/*     $OpenBSD: bus.h,v 1.3 1997/02/20 11:50:46 pefo Exp $    */
 
 /*
  * Copyright (c) 1996 Niklas Hallqvist.  All rights reserved.
@@ -61,11 +61,6 @@ static __inline CAT3(u_int,m,_t)                                           \
 CAT(bus_space_read_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,          \
      bus_addr_t ba)                                                          \
 {                                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
        return *(volatile CAT3(u_int,m,_t) *)(bsh + ba);                      \
 }
 
@@ -75,18 +70,17 @@ bus_space_read(4,32)
 
 #define        bus_space_read_8        !!! bus_space_read_8 unimplemented !!!
 
-#define bus_space_read_multi(n, m)                                           \
-static __inline void                                                         \
-CAT(bus_space_read_multi_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,     \
-    bus_addr_t ba, CAT3(u_int,m,_t) *buf, bus_size_t cnt)                    \
-{                                                                            \
-       while (cnt--)                                                         \
-               *buf++ = CAT(bus_space_read_,n)(bst, bsh, ba);                \
-}
+#define bus_space_read_multi_1(t, h, o, a, c) do {                           \
+               insb((h) + (o), (a), (c));                                    \
+       } while(0)
 
-bus_space_read_multi(1,8)
-bus_space_read_multi(2,16)
-bus_space_read_multi(4,32)
+#define bus_space_read_multi_2(t, h, o, a, c) do {                           \
+               insw((h) + (o), (a), (c));                                    \
+       } while(0)
+
+#define bus_space_read_multi_4(t, h, o, a, c) do {                           \
+               insl((h) + (o), (a), (c));                                    \
+       } while(0)
 
 #define        bus_space_read_multi_8  !!! bus_space_read_multi_8 not implemented !!!
 
@@ -95,13 +89,6 @@ static __inline void                                                       \
 CAT(bus_space_write_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,         \
      bus_addr_t ba, CAT3(u_int,m,_t) x)                                              \
 {                                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
-       wbflush();                                                            \
        *(volatile CAT3(u_int,m,_t) *)(bsh + ba) = x;                         \
 }
 
@@ -111,18 +98,18 @@ bus_space_write(4,32)
 
 #define        bus_space_write_8       !!! bus_space_write_8 unimplemented !!!
 
-#define bus_space_write_multi(n, m)                                          \
-static __inline void                                                         \
-CAT(bus_space_write_multi_,n)(bus_space_tag_t bst, bus_space_handle_t bsh,    \
-    bus_addr_t ba, const CAT3(u_int,m,_t) *buf, bus_size_t cnt)                      \
-{                                                                            \
-       while (cnt--)                                                         \
-               CAT(bus_space_write_,n)(bst, bsh, ba, *buf++);                \
-}
 
-bus_space_write_multi(1,8)
-bus_space_write_multi(2,16)
-bus_space_write_multi(4,32)
+#define bus_space_write_multi_1(t, h, o, a, c) do {                          \
+               outsb((h) + (o), (a), (c));                                   \
+       } while(0)
+
+#define bus_space_write_multi_2(t, h, o, a, c) do {                          \
+               outsw((h) + (o), (a), (c));                                   \
+       } while(0)
+
+#define bus_space_write_multi_4(t, h, o, a, c) do {                          \
+               outsl((h) + (o), (a), (c));                                   \
+       } while(0)
 
 #define        bus_space_write_multi_8 !!! bus_space_write_multi_8 not implemented !!!