2 files changed, 62 insertions, 62 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 305225dbe232..b61d27d8687e 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1286,7 +1286,7 @@ device		ar	1
 hint.ar.0.at="isa"
 hint.ar.0.port="0x300"
 hint.ar.0.irq="10"
-hint.ar.0.iomem="0xd0000"
+hint.ar.0.maddr="0xd0000"
 device		cs
 hint.cs.0.at="isa"
 hint.cs.0.port="0x300"
@@ -1299,7 +1299,7 @@ device		ed
 hint.ed.0.at="isa"
 hint.ed.0.port="0x280"
 hint.ed.0.irq="5"
-hint.ed.0.iomem="0xd8000"
+hint.ed.0.maddr="0xd8000"
 device		el	1
 hint.el.0.at="isa"
 hint.el.0.port="0x300"
@@ -1313,16 +1313,16 @@ device		ie	2
 hint.ie.0.at="isa"
 hint.ie.0.port="0x300"
 hint.ie.0.irq="5"
-hint.ie.0.iomem="0xd0000"
+hint.ie.0.maddr="0xd0000"
 hint.ie.1.at="isa"
 hint.ie.1.port="0x360"
 hint.ie.1.irq="7"
-hint.ie.1.iomem="0xd0000"
+hint.ie.1.maddr="0xd0000"
 device		le	1
 hint.le.0.at="isa"
 hint.le.0.port="0x300"
 hint.le.0.irq="5"
-hint.le.0.iomem="0xd0000"
+hint.le.0.maddr="0xd0000"
 device		lnc	1
 hint.lnc.0.at="isa"
 hint.lnc.0.port="0x280"
@@ -1337,7 +1337,7 @@ device		sr	1
 hint.sr.0.at="isa"
 hint.sr.0.port="0x300"
 hint.sr.0.irq="5"
-hint.sr.0.iomem="0xd0000"
+hint.sr.0.maddr="0xd0000"
 device		sn
 hint.sn.0.at="isa"
 hint.sn.0.port="0x300"
@@ -1537,15 +1537,15 @@ hint.pca.0.port="0x040"
 #  This is version 0.0.5alpha, unsupported by Stallion.
 #  The stl driver has a secondary IO port hard coded at 0x280.  You need
 #     to change src/i386/isa/stallion.c if you reconfigure this on the boards.
-#  The "flags" and "iosiz" settings on the stli driver depend on the board:
-#	EasyConnection 8/64 ISA:     flags 23         iosiz 0x1000
-#	EasyConnection 8/64 EISA:    flags 24         iosiz 0x10000
-#	EasyConnection 8/64 MCA:     flags 25         iosiz 0x1000
-#	ONboard ISA:                 flags 4          iosiz 0x10000
-#	ONboard EISA:                flags 7          iosiz 0x10000
-#	ONboard MCA:                 flags 3          iosiz 0x10000
-#	Brumby:                      flags 2          iosiz 0x4000
-#	Stallion:                    flags 1          iosiz 0x10000
+#  The "flags" and "msize" settings on the stli driver depend on the board:
+#	EasyConnection 8/64 ISA:     flags 23         msize 0x1000
+#	EasyConnection 8/64 EISA:    flags 24         msize 0x10000
+#	EasyConnection 8/64 MCA:     flags 25         msize 0x1000
+#	ONboard ISA:                 flags 4          msize 0x10000
+#	ONboard EISA:                flags 7          msize 0x10000
+#	ONboard MCA:                 flags 3          msize 0x10000
+#	Brumby:                      flags 2          msize 0x4000
+#	Stallion:                    flags 1          msize 0x10000
 
 device		mcd	1
 hint.mcd.0.at="isa"
@@ -1567,12 +1567,12 @@ hint.wt.0.drq="1"
 device		ctx	1
 hint.ctx.0.at="isa"
 hint.ctx.0.port="0x230"
-hint.ctx.0.iomem="0xd0000"
+hint.ctx.0.maddr="0xd0000"
 device		spigot	1
 hint.spigot.0.at="isa"
 hint.spigot.0.port="0xad6"
 hint.spigot.0.irq="15"
-hint.spigot.0.iomem="0xee000"
+hint.spigot.0.maddr="0xee000"
 device		apm
 hint.apm.0.flags="0x20"
 device		gp
@@ -1589,17 +1589,17 @@ device		cy	1
 options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 hint.cy.0.at="isa"
 hint.cy.0.irq="10"
-hint.cy.0.iomem="0xd4000"
-hint.cy.0.iosiz="0x2000"
+hint.cy.0.maddr="0xd4000"
+hint.cy.0.msize="0x2000"
 device		dgb	1
 options 	NDGBPORTS=16		# Defaults to 16*NDGB
 hint.dgb.0.at="isa"
 hint.dgb.0.port="0x220"
-hint.dgb.0.iomem="0xfc000"
+hint.dgb.0.maddr="0xfc000"
 device		dgm	1
 hint.dgm.0.at="isa"
 hint.dgm.0.port="0x104"
-hint.dgm.0.iomem="0xd0000"
+hint.dgm.0.maddr="0xd0000"
 device		labpc	1
 hint.labpc.0.at="isa"
 hint.labpc.0.port="0x260"
@@ -1619,7 +1619,7 @@ hint.tw.0.irq="11"
 device		si
 options 	SI_DEBUG
 hint.si.0.at="isa"
-hint.si.0.iomem="0xd0000"
+hint.si.0.maddr="0xd0000"
 hint.si.0.irq="12"
 device		asc	1
 hint.asc.0.at="isa"
@@ -1633,9 +1633,9 @@ hint.stl.0.irq="10"
 device		stli
 hint.stli.0.at="isa"
 hint.stli.0.port="0x2a0"
-hint.stli.0.iomem="0xcc000"
+hint.stli.0.maddr="0xcc000"
 hint.stli.0.flags="23"
-hint.stli.0.iosiz="0x1000"
+hint.stli.0.msize="0x1000"
 # You are unlikely to have the hardware for loran <phk@FreeBSD.org>
 device		loran
 hint.loran.0.at="isa"
@@ -2085,7 +2085,7 @@ device		isic		# core driver support
 # Teles S0/8 or Niccy 1008
 options 	TEL_S0_8
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0xd0000"
+hint.isic.0.maddr="0xd0000"
 hint.isic.0.irq="5"
 hint.isic.0.flags="1"
 #
@@ -2093,42 +2093,42 @@ hint.isic.0.flags="1"
 options 	TEL_S0_16
 hint.isic.0.at="isa"
 hint.isic.0.port="0xd80"
-hint.isic.0.iomem="0xd0000"
+hint.isic.0.maddr="0xd0000"
 hint.isic.0.irq="5"
 hint.isic.0.flags="2"
 #
 # Teles S0/16.3
 options 	TEL_S0_16_3
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0xd80"
+hint.isic.0.maddr="0xd80"
 hint.isic.0.irq="5"
 hint.isic.0.flags="3"
 #
 # AVM A1 or AVM Fritz!Card
 options 	AVM_A1
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0x340"
+hint.isic.0.maddr="0x340"
 hint.isic.0.irq="5"
 hint.isic.0.flags="4"
 #
 # USRobotics Sportster ISDN TA intern (not supported yet!)
 #options 	USR_STI
 #hint.isic.0.at="isa"
-#hint.isic.0.iomem="0x268"
+#hint.isic.0.maddr="0x268"
 #hint.isic.0.irq="5"
 #hint.isic.0.flags="7"
 #
 # ITK ix1 Micro ( < V.3, non-PnP version ) (not supported yet!)
 #options 	ITKIX1
 #hint.isic.0.at="isa"
-#hint.isic.0.iomem="0x398"
+#hint.isic.0.maddr="0x398"
 #hint.isic.0.irq="10"
 #hint.isic.0.flags="18"
 #
 # ELSA PCC-16
 options 	ELSA_PCC16
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0x360"
+hint.isic.0.maddr="0x360"
 hint.isic.0.irq="10"
 hint.isic.0.flags="20"
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 305225dbe232..b61d27d8687e 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1286,7 +1286,7 @@ device		ar	1
 hint.ar.0.at="isa"
 hint.ar.0.port="0x300"
 hint.ar.0.irq="10"
-hint.ar.0.iomem="0xd0000"
+hint.ar.0.maddr="0xd0000"
 device		cs
 hint.cs.0.at="isa"
 hint.cs.0.port="0x300"
@@ -1299,7 +1299,7 @@ device		ed
 hint.ed.0.at="isa"
 hint.ed.0.port="0x280"
 hint.ed.0.irq="5"
-hint.ed.0.iomem="0xd8000"
+hint.ed.0.maddr="0xd8000"
 device		el	1
 hint.el.0.at="isa"
 hint.el.0.port="0x300"
@@ -1313,16 +1313,16 @@ device		ie	2
 hint.ie.0.at="isa"
 hint.ie.0.port="0x300"
 hint.ie.0.irq="5"
-hint.ie.0.iomem="0xd0000"
+hint.ie.0.maddr="0xd0000"
 hint.ie.1.at="isa"
 hint.ie.1.port="0x360"
 hint.ie.1.irq="7"
-hint.ie.1.iomem="0xd0000"
+hint.ie.1.maddr="0xd0000"
 device		le	1
 hint.le.0.at="isa"
 hint.le.0.port="0x300"
 hint.le.0.irq="5"
-hint.le.0.iomem="0xd0000"
+hint.le.0.maddr="0xd0000"
 device		lnc	1
 hint.lnc.0.at="isa"
 hint.lnc.0.port="0x280"
@@ -1337,7 +1337,7 @@ device		sr	1
 hint.sr.0.at="isa"
 hint.sr.0.port="0x300"
 hint.sr.0.irq="5"
-hint.sr.0.iomem="0xd0000"
+hint.sr.0.maddr="0xd0000"
 device		sn
 hint.sn.0.at="isa"
 hint.sn.0.port="0x300"
@@ -1537,15 +1537,15 @@ hint.pca.0.port="0x040"
 #  This is version 0.0.5alpha, unsupported by Stallion.
 #  The stl driver has a secondary IO port hard coded at 0x280.  You need
 #     to change src/i386/isa/stallion.c if you reconfigure this on the boards.
-#  The "flags" and "iosiz" settings on the stli driver depend on the board:
-#	EasyConnection 8/64 ISA:     flags 23         iosiz 0x1000
-#	EasyConnection 8/64 EISA:    flags 24         iosiz 0x10000
-#	EasyConnection 8/64 MCA:     flags 25         iosiz 0x1000
-#	ONboard ISA:                 flags 4          iosiz 0x10000
-#	ONboard EISA:                flags 7          iosiz 0x10000
-#	ONboard MCA:                 flags 3          iosiz 0x10000
-#	Brumby:                      flags 2          iosiz 0x4000
-#	Stallion:                    flags 1          iosiz 0x10000
+#  The "flags" and "msize" settings on the stli driver depend on the board:
+#	EasyConnection 8/64 ISA:     flags 23         msize 0x1000
+#	EasyConnection 8/64 EISA:    flags 24         msize 0x10000
+#	EasyConnection 8/64 MCA:     flags 25         msize 0x1000
+#	ONboard ISA:                 flags 4          msize 0x10000
+#	ONboard EISA:                flags 7          msize 0x10000
+#	ONboard MCA:                 flags 3          msize 0x10000
+#	Brumby:                      flags 2          msize 0x4000
+#	Stallion:                    flags 1          msize 0x10000
 
 device		mcd	1
 hint.mcd.0.at="isa"
@@ -1567,12 +1567,12 @@ hint.wt.0.drq="1"
 device		ctx	1
 hint.ctx.0.at="isa"
 hint.ctx.0.port="0x230"
-hint.ctx.0.iomem="0xd0000"
+hint.ctx.0.maddr="0xd0000"
 device		spigot	1
 hint.spigot.0.at="isa"
 hint.spigot.0.port="0xad6"
 hint.spigot.0.irq="15"
-hint.spigot.0.iomem="0xee000"
+hint.spigot.0.maddr="0xee000"
 device		apm
 hint.apm.0.flags="0x20"
 device		gp
@@ -1589,17 +1589,17 @@ device		cy	1
 options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 hint.cy.0.at="isa"
 hint.cy.0.irq="10"
-hint.cy.0.iomem="0xd4000"
-hint.cy.0.iosiz="0x2000"
+hint.cy.0.maddr="0xd4000"
+hint.cy.0.msize="0x2000"
 device		dgb	1
 options 	NDGBPORTS=16		# Defaults to 16*NDGB
 hint.dgb.0.at="isa"
 hint.dgb.0.port="0x220"
-hint.dgb.0.iomem="0xfc000"
+hint.dgb.0.maddr="0xfc000"
 device		dgm	1
 hint.dgm.0.at="isa"
 hint.dgm.0.port="0x104"
-hint.dgm.0.iomem="0xd0000"
+hint.dgm.0.maddr="0xd0000"
 device		labpc	1
 hint.labpc.0.at="isa"
 hint.labpc.0.port="0x260"
@@ -1619,7 +1619,7 @@ hint.tw.0.irq="11"
 device		si
 options 	SI_DEBUG
 hint.si.0.at="isa"
-hint.si.0.iomem="0xd0000"
+hint.si.0.maddr="0xd0000"
 hint.si.0.irq="12"
 device		asc	1
 hint.asc.0.at="isa"
@@ -1633,9 +1633,9 @@ hint.stl.0.irq="10"
 device		stli
 hint.stli.0.at="isa"
 hint.stli.0.port="0x2a0"
-hint.stli.0.iomem="0xcc000"
+hint.stli.0.maddr="0xcc000"
 hint.stli.0.flags="23"
-hint.stli.0.iosiz="0x1000"
+hint.stli.0.msize="0x1000"
 # You are unlikely to have the hardware for loran <phk@FreeBSD.org>
 device		loran
 hint.loran.0.at="isa"
@@ -2085,7 +2085,7 @@ device		isic		# core driver support
 # Teles S0/8 or Niccy 1008
 options 	TEL_S0_8
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0xd0000"
+hint.isic.0.maddr="0xd0000"
 hint.isic.0.irq="5"
 hint.isic.0.flags="1"
 #
@@ -2093,42 +2093,42 @@ hint.isic.0.flags="1"
 options 	TEL_S0_16
 hint.isic.0.at="isa"
 hint.isic.0.port="0xd80"
-hint.isic.0.iomem="0xd0000"
+hint.isic.0.maddr="0xd0000"
 hint.isic.0.irq="5"
 hint.isic.0.flags="2"
 #
 # Teles S0/16.3
 options 	TEL_S0_16_3
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0xd80"
+hint.isic.0.maddr="0xd80"
 hint.isic.0.irq="5"
 hint.isic.0.flags="3"
 #
 # AVM A1 or AVM Fritz!Card
 options 	AVM_A1
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0x340"
+hint.isic.0.maddr="0x340"
 hint.isic.0.irq="5"
 hint.isic.0.flags="4"
 #
 # USRobotics Sportster ISDN TA intern (not supported yet!)
 #options 	USR_STI
 #hint.isic.0.at="isa"
-#hint.isic.0.iomem="0x268"
+#hint.isic.0.maddr="0x268"
 #hint.isic.0.irq="5"
 #hint.isic.0.flags="7"
 #
 # ITK ix1 Micro ( < V.3, non-PnP version ) (not supported yet!)
 #options 	ITKIX1
 #hint.isic.0.at="isa"
-#hint.isic.0.iomem="0x398"
+#hint.isic.0.maddr="0x398"
 #hint.isic.0.irq="10"
 #hint.isic.0.flags="18"
 #
 # ELSA PCC-16
 options 	ELSA_PCC16
 hint.isic.0.at="isa"
-hint.isic.0.iomem="0x360"
+hint.isic.0.maddr="0x360"
 hint.isic.0.irq="10"
 hint.isic.0.flags="20"
 #