obio -> macobio, and cleanups

4 files changed, 243 insertions, 270 deletions

diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 261135170cb..a7c06b02b7b 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.37 2001/06/25 18:14:12 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.38 2001/06/25 19:15:42 deraadt Exp $
 #
 # PPC GENERIC config file
 #
@@ -30,9 +30,9 @@ config		bsd	swap generic
 mainbus0	at root
 cpu*		at mainbus0
 
-mpcpcibr*	at mainbus0	# MPC106 PCI Bridge.
+mpcpcibr*	at mainbus0			# MPC106 PCI Bridge.
 memc*		at mainbus0
-pchb*		at pci?		# host bridge identifiers
+pchb*		at pci?
 
 #### PCI Bus devices.
 
@@ -41,7 +41,6 @@ ppb*		at pci? dev ? function ?	# PCI-PCI bridges
 pci*		at ppb? bus ?
 
 siop*		at pci? dev ? function ?
-#ncr*		at pci? dev ? function ?
 fxp*		at pci? dev ? function ?
 de*		at pci? dev ? function ?
 #vme*		at pci? dev ? function ?
@@ -53,53 +52,49 @@ vgafb0		at pci? dev ? function ?	# PCI VGA graphics
 #bha*		at pci? dev ? function ?	# BusLogic 9xx SCSI
 #pcscp*		at pci? dev ? function ?	# AMD Am53c974 PCscsi-PCI SCSI
 #pciide*	at pci? dev ? function ?
-obio0		at pci? dev ? function ?
+macobio0	at pci? dev ? function ?
 gm*		at pci? dev ? function ?	# GMAC ethernet
 
-# 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
-brgphy* at mii? phy ?			# Broadcom 10/100/1000 PHYs 
-bmtphy* at mii? phy ?			# Broadcom 10/100 PHYs 
-ukphy*	at mii? phy ?			# generic unknown PHYs
-
-macintr0 at obio?			# old interrupt controller
-openpic0 at obio?			# openpic interrupt controller
-bm*	at obio?			# bmac ethernet
-#mc*	at obio?			# MACE ethernet
-#esp*	at obio? flags 0x00ff		# 53c9x SCSI
-#mesh*	at obio? flags 0xffff		# MESH SCSI
-#nvram*	at obio?			# nvram
-adb*	at obio?			# Apple Desktop Bus
-wi*	at obio?			# airport
-gpio*	at obio?			# GPIO, PMU interrupt router.
-gpio*	at gpio?			# GPIO, PMU interrupt router.
-aed*	at adb?				# ADB Event Device
-akbd*	at adb?				# ADB keyboard
-wskbd*		at akbd? console ?
-ams*	at adb?				# ADB mouse
-wsmouse* at ams?			
-abtn*	at adb?				# ADB button?
-#zsc*	at obio?
-#zstty*	at zsc? channel ?
-
-awacs*  at obio? 			# Apple audio device
-audio* at awacs?
+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 ?			# ICS1890 PHYs
+#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 Semi QS6612 PHYs
+sqphy*		at mii? phy ?			# Seeq 8022[013] PHYs
+#tlphy*		at mii? phy ?			# ThunderLAN PHYs
+#tqphy*		at mii? phy ?			# TDK Semiconductor PHYs
+brgphy*		at mii? phy ?			# Broadcom 10/100/1000 PHYs 
+bmtphy*		at mii? phy ?			# Broadcom 10/100 PHYs 
+ukphy*		at mii? phy ?			# generic unknown PHYs
+
+macintr0	at macobio?			# old interrupt controller
+openpic0	at macobio?			# openpic interrupt controller
+bm*		at macobio?			# BMAC ethernet
+#mc*		at macobio?			# MACE ethernet
+#esp*		at macobio? flags 0x00ff	# 53c9x SCSI
+#mesh*		at macobio? flags 0xffff	# MESH SCSI
+#nvram*		at macobio?			# nvram
+adb*		at macobio?			# Apple Desktop Bus
+wi*		at macobio?			# airport
+gpio*		at macobio?			# GPIO, PMU interrupt router.
+gpio*		at gpio?			# GPIO, PMU interrupt router.
+aed*		at adb?				# ADB Event Device
+akbd*		at adb?				# ADB keyboard
 
+wskbd*		at akbd? console ?
+ams*		at adb?				# ADB mouse
+wsmouse*	at ams?			
+abtn*		at adb?				# ADB button?
+#zsc*		at macobio?
+#zstty*		at zsc? channel ?
 
-#### SCSI attachment points
+awacs*		at macobio?			# Apple audio device
+audio*		at awacs?
 
 scsibus*	at siop?
-#scsibus*	at ncr?
 #scsibus*	at adv?
 #scsibus*	at ahc?
 #scsibus*	at bha?
@@ -107,45 +102,38 @@ scsibus*	at siop?
 #scsibus*	at mesh?
 #scsibus*	at pcscp?
 
-wdc*	at obio? flags 0x0
-#wd*	at pciide? channel ? drive ?
-#wd*	at wdc? channel ? drive ? flags 0x0000
-wd*	at wdc? drive ? flags 0x0000
-
-atapiscsi* at wdc? channel ? flags 0x0000
-
-# ATAPI<->SCSI
-scsibus* at atapiscsi?
+wdc*		at macobio? flags 0x0
+#wd*		at pciide? channel ? drive ?
+#wd*		at wdc? channel ? drive ? flags 0x0000
+wd*		at wdc? drive ? flags 0x0000
+atapiscsi*	at wdc? channel ? flags 0x0000
+scsibus*	at atapiscsi?
 
 # PCI USB Controllers
-ohci*	at pci? 	# Open Host Controller
+ohci*		at pci?				# Open Host Controller
 
 # USB bus support
-usb*	at ohci? flags 0x1
-uhub*	at usb?
-uhub*	at uhub? port ? configuration ? interface ?
-
-uhid*	at uhub? port ? configuration ?	# USB Generic HID devices
-ukbd*	at uhub? port ? configuration ?	# USB HID Keyboard devices
-ums*	at uhub? port ? configuration ?	# USB Mice
-wsmouse* at ums? mux 0
-ulpt*	at uhub? port ? configuration ?	# USB Printer
-uscanner*  at uhub? port ?		# USB Scanner driver
-usscanner* at uhub? port ?		# USB SCSI scanners, e.g., HP5300
-scsibus* at usscanner?
-#uyap*	at uhub? port ?			# Y@P firmware loader
-ugen*	at uhub? port ? configuration ? # USB Generic driver
-umass*	at uhub? port ? configuration ? # USB Mass Storage devices
-scsibus* at umass?
-kue*	at uhub? port ?			# Kawasaki KL5KUSB101B based Ethernet
-
-#### Workstation Console attachments
+usb*		at ohci? flags 0x1
+uhub*		at usb?
+uhub*		at uhub? port ? configuration ? interface ?
+
+uhid*		at uhub? port ? configuration ?	# USB Generic HID devices
+ukbd*		at uhub? port ? configuration ?	# USB HID Keyboard devices
+ums*		at uhub? port ? configuration ?	# USB Mice
+wsmouse*	at ums? mux 0
+ulpt*		at uhub? port ? configuration ?	# USB Printer
+uscanner*	at uhub? port ?			# USB Scanner driver
+usscanner*	at uhub? port ?			# USB SCSI scanners
+scsibus*	at usscanner?
+#uyap*		at uhub? port ?			# Y@P firmware loader
+ugen*		at uhub? port ? configuration ? # USB Generic driver
+umass*		at uhub? port ? configuration ? # USB Mass Storage devices
+scsibus*	at umass?
+kue*		at uhub? port ?			# Kawasaki KL5KUSB101B
 
 wsdisplay*	at vgafb?
 wskbd*		at ukbd? console ?
 
-#### SCSI Bus devices
- 
 sd*		at scsibus? target ? lun ?
 st*		at scsibus? target ? lun ?
 cd*		at scsibus? target ? lun ?
diff --git a/sys/arch/powerpc/conf/RAMDISK b/sys/arch/powerpc/conf/RAMDISK
index 9de9a0e1af0..91c47d83fdd 100644
--- a/sys/arch/powerpc/conf/RAMDISK
+++ b/sys/arch/powerpc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.22 2001/06/23 19:46:58 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.23 2001/06/25 19:15:43 deraadt Exp $
 #
 # PPC GENERIC config file
 #
@@ -62,45 +62,43 @@ vgafb0		at pci? dev ? function ?	# PCI VGA graphics
 #bha*		at pci? dev ? function ?	# BusLogic 9xx SCSI
 #pcscp*		at pci? dev ? function ?	# AMD Am53c974 PCscsi-PCI SCSI
 #pciide*	at pci? dev ? function ?
-obio0		at pci? dev ? function ?
+macobio0	at pci? dev ? function ?
 gm*		at pci? dev ? function ?	# GMAC ethernet
 
 # 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
-brgphy* at mii? phy ?			# Broadcom 10/100/1000 PHYs 
-bmtphy* at mii? phy ?			# Broadcom 10/100 PHYs 
-ukphy*	at mii? phy ?			# generic unknown PHYs
-
-macintr0 at obio?			# old interrupt controller
-openpic0 at obio?			# openpic interrupt controller
-bm*	at obio?			# bmac ethernet
-#mc*	at obio?			# MACE ethernet
-#esp*	at obio? flags 0x00ff		# 53c9x SCSI
-#mesh*	at obio? flags 0xffff		# MESH SCSI
-#nvram*	at obio?			# nvram
-adb*	at obio?			# Apple Desktop Bus
-gpio*	at obio?			# GPIO, PMU interrupt router.
-gpio*	at gpio?			# GPIO, PMU interrupt router.
-aed*	at adb?				# ADB Event Device
-akbd*	at adb?				# ADB keyboard
+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
+brgphy*		at mii? phy ?		# Broadcom 10/100/1000 PHYs 
+bmtphy*		at mii? phy ?		# Broadcom 10/100 PHYs 
+ukphy*		at mii? phy ?		# generic unknown PHYs
+
+macintr0	at macobio?		# old interrupt controller
+openpic0	at macobio?		# openpic interrupt controller
+bm*		at macobio?		# bmac ethernet
+#mc*		at macobio?		# MACE ethernet
+#esp*		at macobio? flags 0x00ff# 53c9x SCSI
+#mesh*		at macobio? flags 0xffff# MESH SCSI
+#nvram*		at macobio?		# nvram
+adb*		at macobio?		# Apple Desktop Bus
+gpio*		at macobio?		# GPIO, PMU interrupt router.
+gpio*		at gpio?		# GPIO, PMU interrupt router.
+aed*		at adb?			# ADB Event Device
+akbd*		at adb?			# ADB keyboard
 wskbd*		at akbd? console ?
-#ams*	at adb?				# ADB mouse
-#wsmouse* at ams?			
-abtn*	at adb?				# ADB button?
-#zsc*	at obio?
-#zstty*	at zsc? channel ?
-
-#### SCSI attachment points
+#ams*		at adb?			# ADB mouse
+#wsmouse*	at ams?			
+abtn*		at adb?			# ADB button?
+#zsc*		at macobio?
+#zstty*		at zsc? channel ?
 
 scsibus*	at siop?
 #scsibus*	at ncr?
@@ -111,45 +109,37 @@ scsibus*	at siop?
 #scsibus*	at mesh?
 #scsibus*	at pcscp?
 
-wdc*	at obio? flags 0x0
-#wd*	at pciide? channel ? drive ?
-#wd*	at wdc? channel ? drive ? flags 0x0000
-wd*	at wdc? drive ? flags 0x0000
-
-atapiscsi* at wdc? channel ? flags 0x0000
-
-# ATAPI<->SCSI
-scsibus* at atapiscsi?
-
+wdc*		at macobio? flags 0x0
+#wd*		at pciide? channel ? drive ?
+#wd*		at wdc? channel ? drive ? flags 0x0000
+wd*		at wdc? drive ? flags 0x0000
+atapiscsi*	at wdc? channel ? flags 0x0000
+scsibus*	at atapiscsi?
 
 # PCI USB Controllers
-ohci*	at pci?				# Open Host Controller
+ohci*		at pci?			# Open Host Controller
 
 # USB bus support
-usb*	at ohci?	flags 0x1
-uhub*	at usb?
-uhub*  at uhub? port ? configuration ? interface ?
-
-uhid*	at uhub? port ? configuration ?	# USB Generic HID devices
-ukbd*	at uhub? port ? configuration ?	# USB HID Keyboard devices
-#ums*	at uhub? port ? configuration ?	# USB Mice
-#wsmouse* at ums? mux 0
-#ulpt*	at uhub? port ? configuration ?	# USB Printer
-#uscanner*  at uhub? port ?		# USB Scanner driver
-#usscanner* at uhub? port ?		# USB SCSI scanners, e.g., HP5300
-#scsibus* at usscanner?
-#uyap*	at uhub? port ?			# Y@P firmware loader
-#ugen*	at uhub? port ? configuration ? # USB Generic driver
-umass*	at uhub? port ? configuration ? # USB Mass Storage devices
-scsibus* at umass?
-
-#### Workstation Console attachments
+usb*		at ohci?	flags 0x1
+uhub*		at usb?
+uhub*		at uhub? port ? configuration ? interface ?
+
+uhid*		at uhub? port ? configuration ?	# USB Generic HID devices
+ukbd*		at uhub? port ? configuration ?	# USB HID Keyboard devices
+#ums*		at uhub? port ? configuration ?	# USB Mice
+#wsmouse*	at ums? mux 0
+#ulpt*		at uhub? port ? configuration ?	# USB Printer
+#uscanner*	at uhub? port ?			# USB Scanner driver
+#usscanner*	at uhub? port ?			# USB SCSI scanners
+#scsibus*	at usscanner?
+#uyap*		at uhub? port ?			# Y@P firmware loader
+#ugen*		at uhub? port ? configuration ? # USB Generic driver
+umass*		at uhub? port ? configuration ? # USB Mass Storage devices
+scsibus*	at umass?
 
 wsdisplay*	at vgafb?
 wskbd*		at ukbd? console ?
 
-#### SCSI Bus devices
- 
 sd*		at scsibus? target ? lun ?
 st*		at scsibus? target ? lun ?            
 cd*		at scsibus? target ? lun ?
@@ -162,10 +152,8 @@ pseudo-device	pty	64	# pseudo-terminals
 #pseudo-device	ccd	4	# concatenated disk devices
 #pseudo-device	ksyms	1	# kernel symbols device
 pseudo-device   bpfilter 1	# packet filter
-pseudo-device	rd	 1	# ram disk
+pseudo-device	rd	1	# ram disk
 
 # RAMDISK stuff
 option		MINIROOTSIZE=8192
 option		RAMDISK_HOOKS
-
-
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 6fb63e54976..81d08856847 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -13,12 +13,12 @@ file	arch/powerpc/powerpc/conf.c
 file	arch/powerpc/powerpc/copyinstr.c
 file	arch/powerpc/powerpc/copyoutstr.c
 file	arch/powerpc/powerpc/copystr.c
-file	arch/powerpc/powerpc/disksubr.c		disk
+file	arch/powerpc/powerpc/disksubr.c			disk
 file	arch/powerpc/powerpc/fpu.c
 file	arch/powerpc/powerpc/fubyte.c
 file	arch/powerpc/powerpc/fuswintr.c
 file	arch/powerpc/powerpc/in_cksum.c
-file	arch/powerpc/powerpc/ipkdb_glue.c	ipkdb
+file	arch/powerpc/powerpc/ipkdb_glue.c		ipkdb
 file	arch/powerpc/powerpc/machdep.c
 file	arch/powerpc/powerpc/wscons_machdep.c
 file	arch/powerpc/powerpc/mem.c
@@ -35,13 +35,12 @@ file	arch/powerpc/powerpc/trap.c
 file	arch/powerpc/powerpc/vm_machdep.c
 file	dev/cons.c
 file	dev/cninit.c
-file    arch/powerpc/powerpc/setjmp.S                   ddb
-file    arch/powerpc/powerpc/db_memrw.c                 ddb
-file    arch/powerpc/powerpc/db_disasm.c                ddb
-file    arch/powerpc/powerpc/db_interface.c             ddb
-file    arch/powerpc/powerpc/db_trace.c                 ddb
-
-file    arch/powerpc/powerpc/ofwreal.S
+file	arch/powerpc/powerpc/setjmp.S			ddb
+file	arch/powerpc/powerpc/db_memrw.c			ddb
+file	arch/powerpc/powerpc/db_disasm.c		ddb
+file	arch/powerpc/powerpc/db_interface.c		ddb
+file	arch/powerpc/powerpc/db_trace.c			ddb
+file	arch/powerpc/powerpc/ofwreal.S
 
 #
 # Media Indepedent Interface (mii)
@@ -60,14 +59,14 @@ file	arch/powerpc/mac/dbdma.c
 define	mainbus {}
 device	mainbus
 attach	mainbus at root
-file	arch/powerpc/powerpc/mainbus.c	mainbus
+file	arch/powerpc/powerpc/mainbus.c			mainbus
 
 device	cpu
 attach	cpu at mainbus
 file	arch/powerpc/powerpc/cpu.c
 
 include "../../../dev/ofw/files.ofw"
-file	arch/powerpc/powerpc/opendev.c 
+file	arch/powerpc/powerpc/opendev.c
 major	{ ofdisk = 4 }
 
 
@@ -75,15 +74,15 @@ include "dev/pci/files.pci"
 
 device	mpcpcibr {} : pcibus
 attach	mpcpcibr at mainbus
-file	arch/powerpc/pci/mpcpcibus.c		mpcpcibr
-#file	arch/powerpc/pci/pci_addr_fixup.c	mpcpcibr
+file	arch/powerpc/pci/mpcpcibus.c			mpcpcibr
+#file	arch/powerpc/pci/pci_addr_fixup.c		mpcpcibr
 
 device	memc {}
 attach	memc at mainbus
-file	arch/powerpc/mac/uni_n.c	memc
+file	arch/powerpc/mac/uni_n.c			memc
 
-major   {rd = 17}
-major	{sd = 2}		# hey this was 0 but at slot 2 in bdevsw XXX
+major	{rd = 17}
+major	{sd = 2}
 major	{cd = 3}
 
 include "../../../scsi/files.scsi"
@@ -95,24 +94,22 @@ include "../../../scsi/files.scsi"
 include "dev/wscons/files.wscons"
 
 
-#device ofb: wsemuldisplaydev, wsrasteremulops
-device ofb
-attach ofb at pci
-file arch/powerpc/mac/ofb.c				ofb needs-flag
+#device	ofb: wsemuldisplaydev, wsrasteremulops
+device	ofb
+attach	ofb at pci
+file	arch/powerpc/mac/ofb.c				ofb needs-flag
 
 
 #
 # mac peripheral pieces.
 #
 
-#file arch/powerpc/pci/bandit.c			pci
-
-# PCI bus support
+#file	arch/powerpc/pci/bandit.c			pci
 
 #PCI-Host bridge chipsets
-device pchb
-attach pchb at pci
-file arch/powerpc/pci/pchb.c			pchb
+device	pchb
+attach	pchb at pci
+file	arch/powerpc/pci/pchb.c				pchb
 
 
 #
@@ -122,126 +119,126 @@ file arch/powerpc/pci/pchb.c			pchb
 include "../../../dev/atapiscsi/files.atapiscsi"
 include "../../../dev/ata/files.ata"
 
-# MAC periph 
+# MAC periph
 
-device obio {}
-attach obio at pci
-file arch/powerpc/pci/macobio.c			obio
+device	macobio {}
+attach	macobio at pci
+file	arch/powerpc/pci/macobio.c			macobio
 
-#device esp: scsi, ncr53c9x
-#attach esp at obio
-#file arch/powerpc/mac/esp.c			esp
+#device	esp: scsi, ncr53c9x
+#attach	esp at macobio
+#file	arch/powerpc/mac/esp.c				esp
 
-device mesh: scsi
-attach mesh at obio
-file arch/powerpc/mac/mesh.c			mesh
+device	mesh: scsi
+attach	mesh at macobio
+file	arch/powerpc/mac/mesh.c				mesh
 
-device mc: ifnet, ether
-attach mc at obio
-file arch/powerpc/mac/if_mc.c			mc
-file arch/powerpc/mac/am79c950.c		mc
+device	mc: ifnet, ether
+attach	mc at macobio
+file	arch/powerpc/mac/if_mc.c			mc
+file	arch/powerpc/mac/am79c950.c			mc
 
-device bm: ether, ifnet, ifmedia
-attach bm at obio
-file arch/powerpc/mac/if_bm.c			bm
+device	bm: ether, ifnet, ifmedia
+attach	bm at macobio
+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 needs-flag
+device	gm: ether, ifnet, ifmedia, mii
+attach	gm at pci
+file	arch/powerpc/mac/if_gm.c			gm needs-flag
 
-device macintr {}
-attach macintr at obio
-file	arch/powerpc/mac/macintr.c		macintr
+device	macintr {}
+attach	macintr at macobio
+file	arch/powerpc/mac/macintr.c			macintr
 
-device openpic {}
-attach openpic at obio
-file	arch/powerpc/mac/openpic.c		openpic
+device	openpic {}
+attach	openpic at macobio
+file	arch/powerpc/mac/openpic.c			openpic
 
-device zsc {channel = -1}
-attach zsc at obio
-file arch/powerpc/mac/zs.c			zsc needs-flag
-file dev/ic/z8530sc.c				zsc
+device	zsc {channel = -1}
+attach	zsc at macobio
+file	arch/powerpc/mac/zs.c				zsc needs-flag
+file	dev/ic/z8530sc.c				zsc
 
-device zstty: tty
-attach zstty at zsc
-file dev/ic/z8530tty.c                 zstty needs-flag
+device	zstty: tty
+attach	zstty at zsc
+file	dev/ic/z8530tty.c				zstty needs-flag
 
-device adb {}
-attach adb at obio
-file arch/powerpc/mac/adb.c                      adb needs-flag
-file arch/powerpc/mac/adb_direct.c               adb
-file arch/powerpc/mac/pm_direct.c                adb
+device	adb {}
+attach	adb at macobio
+file	arch/powerpc/mac/adb.c				adb needs-flag
+file	arch/powerpc/mac/adb_direct.c			adb
+file	arch/powerpc/mac/pm_direct.c			adb
 
-device aed
-attach aed at adb
-file arch/powerpc/mac/aed.c                      aed needs-flag
+device	aed
+attach	aed at adb
+file	arch/powerpc/mac/aed.c				aed needs-flag
 
 #??
-#define wskbddev	{[console = -1]}
+#define wskbddev {[console = -1]}
 #define wsmousedev {}
 #??
 
-device akbd: wskbddev
-attach akbd at adb
-file arch/powerpc/mac/akbd.c                     akbd needs-flag
+device	akbd: wskbddev
+attach	akbd at adb
+file	arch/powerpc/mac/akbd.c				akbd needs-flag
 
-device ams: wsmousedev
-attach ams at adb
-file arch/powerpc/mac/ams.c                      ams
+device	ams: wsmousedev
+attach	ams at adb
+file	arch/powerpc/mac/ams.c				ams
 
-device abtn
-attach abtn at adb
-file arch/powerpc/mac/abtn.c			abtn
+device	abtn
+attach	abtn at adb
+file	arch/powerpc/mac/abtn.c				abtn
 
-device awacs: audio, auconv, mulaw
-attach awacs at obio
-file arch/powerpc/mac/awacs.c			awacs
+device	awacs: audio, auconv, mulaw
+attach	awacs at macobio
+file	arch/powerpc/mac/awacs.c			awacs
 
-device nvram
-attach nvram at obio
-file arch/powerpc/mac/nvram.c			nvram needs-flag
+device	nvram
+attach	nvram at macobio
+file	arch/powerpc/mac/nvram.c			nvram needs-flag
 
-device gpio {}
-attach gpio at obio with gpio_obio
-attach gpio at gpio with gpio_gpio
-file arch/powerpc/mac/gpio.c			gpio
+device	gpio {}
+attach	gpio at macobio with gpio_obio
+attach	gpio at gpio with gpio_gpio
+file	arch/powerpc/mac/gpio.c				gpio
 
-attach wdc at obio with wdc_obio
-file arch/powerpc/mac/wdc_obio.c		wdc_obio
+attach	wdc at macobio with wdc_obio
+file	arch/powerpc/mac/wdc_obio.c			wdc_obio
 
-attach wi at obio with wi_obio
-file	arch/powerpc/mac/if_wi_obio.c		wi_obio
+attach	wi at macobio with wi_obio
+file	arch/powerpc/mac/if_wi_obio.c			wi_obio
 
-define grfdev {}
+define	grfdev {}
 
-device grfati: grfdev
-attach grfati at pci
-file arch/powerpc/mac/grf_ati.c                  grfati needs-flag
+device	grfati: grfdev
+attach	grfati at pci
+file	arch/powerpc/mac/grf_ati.c			grfati needs-flag
 
-device grf {}
-attach grf at grfdev
-file arch/powerpc/mac/grf.c                      grf needs-flag
-file arch/powerpc/mac/grf_subr.c                 grf
+device	grf {}
+attach	grf at grfdev
+file	arch/powerpc/mac/grf.c				grf needs-flag
+file	arch/powerpc/mac/grf_subr.c			grf
 
-device ite: tty
-attach ite at grf
-file arch/powerpc/mac/ite.c                      ite needs-flag
+device	ite: tty
+attach	ite at grf
+file	arch/powerpc/mac/ite.c				ite needs-flag
 
 
 # VGA framebuffer
-device        vgafb: wsemuldisplaydev, wsrasteremulops
-file  arch/powerpc/pci/vgafb.c          	vgafb & vgafb_pci
+device	vgafb: wsemuldisplaydev, wsrasteremulops
+file	arch/powerpc/pci/vgafb.c			vgafb & vgafb_pci
 
 # Generic VGA Framebuffer version
-attach  vgafb at pci with vgafb_pci
-file    arch/powerpc/pci/vgafb_pci.c             vgafb_pci       needs-flag
+attach	vgafb at pci with vgafb_pci
+file	arch/powerpc/pci/vgafb_pci.c			vgafb_pci needs-flag
 
 
 #
 # CARDBUS
 #
 include	"dev/cardbus/files.cardbus"
-#file	arch/powerpc/powerpc/rbus_machdep.c	cardbus
+#file	arch/powerpc/powerpc/rbus_machdep.c		cardbus
 
 #
 # Machine-independent PCMCIA drivers
diff --git a/sys/arch/powerpc/pci/macobio.c b/sys/arch/powerpc/pci/macobio.c
index 55cee804210..87c38f74b31 100644
--- a/sys/arch/powerpc/pci/macobio.c
+++ b/sys/arch/powerpc/pci/macobio.c
@@ -45,26 +45,26 @@
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 
-static void obio_attach __P((struct device *, struct device *, void *));
-static int obio_match __P((struct device *, void *, void *));
-static int obio_print __P((void *, const char *));
+static void macobio_attach __P((struct device *, struct device *, void *));
+static int macobio_match __P((struct device *, void *, void *));
+static int macobio_print __P((void *, const char *));
 
-struct obio_softc {
+struct macobio_softc {
 	struct device sc_dev;
 	int sc_node;
 	struct ppc_bus_space sc_membus_space;
 };
-struct cfdriver obio_cd = {
+struct cfdriver macobio_cd = {
 	NULL, "macobio", DV_DULL,
 };
 
 
-struct cfattach obio_ca = {
-	sizeof(struct obio_softc), obio_match, obio_attach
+struct cfattach macobio_ca = {
+	sizeof(struct macobio_softc), macobio_match, macobio_attach
 };
 
 int
-obio_match(parent, cf, aux)
+macobio_match(parent, cf, aux)
 	struct device *parent;
 	void *cf;
 	void *aux;
@@ -92,11 +92,11 @@ u_int32_t *heathrow_FCR = NULL;
  * Attach all the sub-devices we can find
  */
 void
-obio_attach(parent, self, aux)
+macobio_attach(parent, self, aux)
 	struct device *parent, *self;
 	void *aux;
 {
-	struct obio_softc *sc = (struct obio_softc *)self;
+	struct macobio_softc *sc = (struct macobio_softc *)self;
 	struct pci_attach_args *pa = aux;
 	struct confargs ca;
 	int node, child, namelen;
@@ -138,7 +138,7 @@ obio_attach(parent, self, aux)
 
 		break;
 	default:
-		printf(": unknown obio controller\n");
+		printf(": unknown macobio controller\n");
 		return;
 	}
 	sc->sc_node = node;
@@ -171,7 +171,7 @@ obio_attach(parent, self, aux)
 		ca.ca_reg = 0;
 		ca.ca_intr = 0;
 
-		config_found(self, &ca, obio_print);
+		config_found(self, &ca, macobio_print);
 	}
 
 	for (child = OF_child(node); child; child = OF_peer(child)) {
@@ -195,21 +195,21 @@ obio_attach(parent, self, aux)
 		ca.ca_reg = reg;
 		ca.ca_intr = intr;
 
-		config_found(self, &ca, obio_print);
+		config_found(self, &ca, macobio_print);
 	}
 }
 
 int
-obio_print(aux, obio)
+macobio_print(aux, macobio)
 	void *aux;
-	const char *obio;
+	const char *macobio;
 {
 	struct confargs *ca = aux;
 
 #if 0
 /* no reason to clutter the screen with unneccessary printfs */
-	if (obio)
-		printf("%s at %s", ca->ca_name, obio);
+	if (macobio)
+		printf("%s at %s", ca->ca_name, macobio);
 
 	if (ca->ca_nreg > 0)
 		printf(" offset 0x%x", ca->ca_reg[0]);