Apply patch supplied by Jonathan Chen: use the correct arguments to

pci_enable_io(). We need to use SYS_RES_IOPORT/SYS_RES_MEMORY instead
of PCIM_CMD_PORTEN/PCIM_CMD_MEMEN.

19 files changed, 36 insertions, 36 deletions

diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 0ef88c3..ec18090 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -1776,8 +1776,8 @@ static int dc_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef DC_USEIOSPACE
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 1558004..54c998a 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -530,8 +530,8 @@ static int lge_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef LGE_USEIOSPACE
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 9d4a876..2bad1c6 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -833,8 +833,8 @@ static int nge_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef NGE_USEIOSPACE
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index e0d0149..ac7717e 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -699,8 +699,8 @@ static int sf_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SF_USEIOSPACE
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 6c9ec6a..9c842d5 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -1217,8 +1217,8 @@ static int sk_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SK_USEIOSPACE
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 3e95df4..bb55cba 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -1482,7 +1482,7 @@ static int ti_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 	if (!(command & PCIM_CMD_MEMEN)) {
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 9ed0266..f037294 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -672,8 +672,8 @@ static int vr_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef VR_USEIOSPACE
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 0ef88c3..ec18090 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -1776,8 +1776,8 @@ static int dc_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef DC_USEIOSPACE
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index a2dc467..1dd388b 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -534,8 +534,8 @@ static int pcn_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef PCN_USEIOSPACE
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 269f293..5b70c08 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -835,8 +835,8 @@ static int rl_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef RL_USEIOSPACE
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index e0d0149..ac7717e 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -699,8 +699,8 @@ static int sf_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SF_USEIOSPACE
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index c93fba3..f4d4ea8 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -756,8 +756,8 @@ static int sis_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SIS_USEIOSPACE
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 6c9ec6a..9c842d5 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -1217,8 +1217,8 @@ static int sk_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef SK_USEIOSPACE
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 50de250..2458c44 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -945,8 +945,8 @@ static int ste_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef STE_USEIOSPACE
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 3e95df4..bb55cba 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -1482,7 +1482,7 @@ static int ti_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 	if (!(command & PCIM_CMD_MEMEN)) {
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 727f8d1..de4f822 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1131,8 +1131,8 @@ static int tl_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef TL_USEIOSPACE
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 9ed0266..f037294 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -672,8 +672,8 @@ static int vr_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef VR_USEIOSPACE
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index a03951b..be60876 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -846,8 +846,8 @@ static int wb_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef WB_USEIOSPACE
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 92c92d9..06c4423 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -1305,8 +1305,8 @@ static int xl_attach(dev)
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
-	pci_enable_io(dev, PCIM_CMD_PORTEN);
-	pci_enable_io(dev, PCIM_CMD_MEMEN);
+	pci_enable_io(dev, SYS_RES_IOPORT);
+	pci_enable_io(dev, SYS_RES_MEMORY);
 	command = pci_read_config(dev, PCIR_COMMAND, 4);
 
 #ifdef XL_USEIOSPACE