Add pchb PCi Host Bridge dummy device to print devices nicely, instead of

"not configured"

diff --git a/sys/arch/powerpc/conf/GENERICMAC b/sys/arch/powerpc/conf/GENERICMAC
index dff7211..505dd0d 100644 (file)
--- a/sys/arch/powerpc/conf/GENERICMAC
+++ b/sys/arch/powerpc/conf/GENERICMAC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERICMAC,v 1.7 2000/03/25 15:26:26 rahnds Exp $
+#      $OpenBSD: GENERICMAC,v 1.8 2000/03/31 04:44:39 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -29,6 +29,7 @@ cpu*          at mainbus0
 
 ofroot*                at mainbus0
 mpcpcibr*      at mainbus0     # MPC106 PCI Bridge.
+pchb*          at pci?         # host bridge identifiers
 #isabr*                at pci?         # ISA dev bridge.
 #isabr*                at mainbus0     # ISA dev bridge.
 

diff --git a/sys/arch/powerpc/conf/RAMDISKMAC b/sys/arch/powerpc/conf/RAMDISKMAC
index 8515b0f..01e4e9e 100644 (file)
--- a/sys/arch/powerpc/conf/RAMDISKMAC
+++ b/sys/arch/powerpc/conf/RAMDISKMAC
@@ -1,4 +1,4 @@
-#      $OpenBSD: RAMDISKMAC,v 1.7 2000/03/25 15:26:26 rahnds Exp $
+#      $OpenBSD: RAMDISKMAC,v 1.8 2000/03/31 04:44:39 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -45,6 +45,7 @@ cpu*          at mainbus0
 
 ofroot*                at mainbus0
 mpcpcibr*      at mainbus0     # MPC106 PCI Bridge.
+pchb*          at pci?         # host bridge identifiers
 #isabr*                at pci?         # ISA dev bridge.
 #isabr*                at mainbus0     # ISA dev bridge.
 

diff --git a/sys/arch/powerpc/conf/USBMAC b/sys/arch/powerpc/conf/USBMAC
index ab6207e..0960791 100644 (file)
--- a/sys/arch/powerpc/conf/USBMAC
+++ b/sys/arch/powerpc/conf/USBMAC
@@ -1,4 +1,4 @@
-#      $OpenBSD: USBMAC,v 1.1 2000/03/20 07:15:00 rahnds Exp $
+#      $OpenBSD: USBMAC,v 1.2 2000/03/31 04:44:39 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -29,6 +29,7 @@ cpu*          at mainbus0
 
 ofroot*                at mainbus0
 mpcpcibr*      at mainbus0     # MPC106 PCI Bridge.
+pchb*          at pci?         # host bridge identifiers
 #isabr*                at pci?         # ISA dev bridge.
 #isabr*                at mainbus0     # ISA dev bridge.
 
@@ -53,8 +54,22 @@ de*          at pci? dev ? function ?
 #pciide*               at pci? dev ? function ?
 #macofcons0 at pci? dev ? function ?    # OpenFirmware console (for debugging)
 obio0   at pci? dev ? function ?
+gm*     at pci? dev ? function ?                       # gmac ethernet  G4 
+
+# how many of these are needed?
+exphy*  at mii? phy ?                   # 3Com internal PHYs
+inphy*  at mii? phy ?                   # Intel 82555 PHYs
+iophy*  at mii? phy ?                   # Intel 82553 PHYs
+icsphy* at mii? phy ?                   # Integrated Circuit Systems ICS1890
+#lxtphy* at mii? phy ?                   # Level One LXT-970 PHYs
+nsphy*  at mii? phy ?                   # NS83840 PHYs
+#nsphyter* at mii? phy ?                 # NS83843 PHYs
+#qsphy*  at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
+sqphy*  at mii? phy ?                   # Seeq 80220/80221/80223 PHYs
+#tlphy*  at mii? phy ?                   # ThunderLAN PHYs
+#tqphy*  at mii? phy ?                   # TDK Semiconductor PHYs
+ukphy*  at mii? phy ?                   # generic unknown PHYs
 
-#nsphy*  at mii? phy ?                   # NS83840 PHYs   
 
 macintr0 at obio?                        # old interrupt controller
 openpic0 at obio?                        # openpic interrupt controller
@@ -87,7 +102,6 @@ wdc*    at obio? flags 0x0
 wd*     at wdc? drive ? flags 0x0000
 
 atapiscsi* at wdc? channel ? flags 0x0000
-#atapibus* at wdc? 
 
 # ATAPI<->SCSI
 scsibus* at atapiscsi?
@@ -106,8 +120,6 @@ uhid*  at uhub? port ? configuration ? interface ?
 # USB Generic driver
 ugen*  at uhub? port ? configuration ? interface ?
 
-
-
 #### ISA Bus devices.
 
 #isa*          at isabr?

diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 8c00c51..f0de7fc 100644 (file)
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -163,7 +163,7 @@ file arch/powerpc/mac/if_bm.c                       bm
 
 device gm: ether, ifnet, ifmedia, mii
 attach gm at pci
-file arch/powerpc/mac/if_gm.c                  gm
+file arch/powerpc/mac/if_gm.c                  gm needs-flag
 
 device macintr {}
 attach macintr at obio