Index: sys/pci/if_dc.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_dc.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sys/pci/if_dc.c	2001/06/20 19:48:34	1.52
+++ sys/pci/if_dc.c	2001/07/09 17:58:36	1.53
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_dc.c,v 1.52 2001/06/20 19:48:34 bmilekic Exp $
+ * $FreeBSD: src/sys/pci/if_dc.c,v 1.53 2001/07/09 17:58:36 wpaul Exp $
  */
 
 /*
@@ -133,7 +133,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_dc.c,v 1.52 2001/06/20 19:48:34 bmilekic Exp $";
+  "$FreeBSD: src/sys/pci/if_dc.c,v 1.53 2001/07/09 17:58:36 wpaul Exp $";
 #endif
 
 /*
@@ -1776,8 +1776,8 @@
 	 * 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
Index: sys/pci/if_pcn.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_pcn.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sys/pci/if_pcn.c	2001/06/05 20:51:17	1.21
+++ sys/pci/if_pcn.c	2001/07/09 17:58:36	1.22
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_pcn.c,v 1.21 2001/06/05 20:51:17 wpaul Exp $
+ * $FreeBSD: src/sys/pci/if_pcn.c,v 1.22 2001/07/09 17:58:36 wpaul Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_pcn.c,v 1.21 2001/06/05 20:51:17 wpaul Exp $";
+  "$FreeBSD: src/sys/pci/if_pcn.c,v 1.22 2001/07/09 17:58:36 wpaul Exp $";
 #endif
 
 /*
@@ -534,8 +534,8 @@
 	 * 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
Index: sys/pci/if_rl.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_rl.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sys/pci/if_rl.c	2001/06/20 19:48:35	1.59
+++ sys/pci/if_rl.c	2001/07/09 17:58:36	1.60
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_rl.c,v 1.59 2001/06/20 19:48:35 bmilekic Exp $
+ * $FreeBSD: src/sys/pci/if_rl.c,v 1.60 2001/07/09 17:58:36 wpaul Exp $
  */
 
 /*
@@ -133,7 +133,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_rl.c,v 1.59 2001/06/20 19:48:35 bmilekic Exp $";
+  "$FreeBSD: src/sys/pci/if_rl.c,v 1.60 2001/07/09 17:58:36 wpaul Exp $";
 #endif
 
 /*
@@ -835,8 +835,8 @@
 	 * 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
Index: sys/pci/if_sf.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_sf.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sys/pci/if_sf.c	2001/06/20 19:48:35	1.35
+++ sys/pci/if_sf.c	2001/07/09 17:58:37	1.36
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_sf.c,v 1.35 2001/06/20 19:48:35 bmilekic Exp $
+ * $FreeBSD: src/sys/pci/if_sf.c,v 1.36 2001/07/09 17:58:37 wpaul Exp $
  */
 
 /*
@@ -121,7 +121,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_sf.c,v 1.35 2001/06/20 19:48:35 bmilekic Exp $";
+  "$FreeBSD: src/sys/pci/if_sf.c,v 1.36 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 static struct sf_type sf_devs[] = {
@@ -699,8 +699,8 @@
 	 * 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
Index: sys/pci/if_sis.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_sis.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sys/pci/if_sis.c	2001/06/20 19:48:35	1.33
+++ sys/pci/if_sis.c	2001/07/09 17:58:37	1.34
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_sis.c,v 1.33 2001/06/20 19:48:35 bmilekic Exp $
+ * $FreeBSD: src/sys/pci/if_sis.c,v 1.34 2001/07/09 17:58:37 wpaul Exp $
  */
 
 /*
@@ -99,7 +99,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_sis.c,v 1.33 2001/06/20 19:48:35 bmilekic Exp $";
+  "$FreeBSD: src/sys/pci/if_sis.c,v 1.34 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 /*
@@ -756,8 +756,8 @@
 	 * 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
Index: sys/pci/if_sk.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_sk.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sys/pci/if_sk.c	2001/06/20 19:48:35	1.43
+++ sys/pci/if_sk.c	2001/07/09 17:58:37	1.44
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_sk.c,v 1.43 2001/06/20 19:48:35 bmilekic Exp $
+ * $FreeBSD: src/sys/pci/if_sk.c,v 1.44 2001/07/09 17:58:37 wpaul Exp $
  */
 
 /*
@@ -113,7 +113,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_sk.c,v 1.43 2001/06/20 19:48:35 bmilekic Exp $";
+  "$FreeBSD: src/sys/pci/if_sk.c,v 1.44 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 static struct sk_type sk_devs[] = {
@@ -1217,8 +1217,8 @@
 	 * 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
Index: sys/pci/if_ste.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_ste.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sys/pci/if_ste.c	2001/02/21 20:54:21	1.26
+++ sys/pci/if_ste.c	2001/07/09 17:58:37	1.27
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_ste.c,v 1.26 2001/02/21 20:54:21 wpaul Exp $
+ * $FreeBSD: src/sys/pci/if_ste.c,v 1.27 2001/07/09 17:58:37 wpaul Exp $
  */
 
 #include <sys/param.h>
@@ -74,7 +74,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_ste.c,v 1.26 2001/02/21 20:54:21 wpaul Exp $";
+  "$FreeBSD: src/sys/pci/if_ste.c,v 1.27 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 /*
@@ -945,8 +945,8 @@
 	 * 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
Index: sys/pci/if_ti.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_ti.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sys/pci/if_ti.c	2001/05/23 19:25:14	1.49
+++ sys/pci/if_ti.c	2001/07/09 17:58:37	1.50
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_ti.c,v 1.49 2001/05/23 19:25:14 phk Exp $
+ * $FreeBSD: src/sys/pci/if_ti.c,v 1.50 2001/07/09 17:58:37 wpaul Exp $
  */
 
 /*
@@ -125,7 +125,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_ti.c,v 1.49 2001/05/23 19:25:14 phk Exp $";
+  "$FreeBSD: src/sys/pci/if_ti.c,v 1.50 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 /*
@@ -1482,7 +1482,7 @@
 	 * 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)) {
Index: sys/pci/if_tl.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_tl.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- sys/pci/if_tl.c	2001/02/21 20:54:22	1.65
+++ sys/pci/if_tl.c	2001/07/09 17:58:37	1.66
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_tl.c,v 1.65 2001/02/21 20:54:22 wpaul Exp $
+ * $FreeBSD: src/sys/pci/if_tl.c,v 1.66 2001/07/09 17:58:37 wpaul Exp $
  */
 
 /*
@@ -225,7 +225,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_tl.c,v 1.65 2001/02/21 20:54:22 wpaul Exp $";
+  "$FreeBSD: src/sys/pci/if_tl.c,v 1.66 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 /*
@@ -1131,8 +1131,8 @@
 	 * 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
Index: sys/pci/if_vr.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_vr.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sys/pci/if_vr.c	2001/06/20 19:48:35	1.44
+++ sys/pci/if_vr.c	2001/07/09 17:58:37	1.45
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_vr.c,v 1.44 2001/06/20 19:48:35 bmilekic Exp $
+ * $FreeBSD: src/sys/pci/if_vr.c,v 1.45 2001/07/09 17:58:37 wpaul Exp $
  */
 
 /*
@@ -101,7 +101,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_vr.c,v 1.44 2001/06/20 19:48:35 bmilekic Exp $";
+  "$FreeBSD: src/sys/pci/if_vr.c,v 1.45 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 /*
@@ -672,8 +672,8 @@
 	 * 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
Index: sys/pci/if_wb.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_wb.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sys/pci/if_wb.c	2001/06/20 19:48:35	1.42
+++ sys/pci/if_wb.c	2001/07/09 17:58:37	1.43
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_wb.c,v 1.42 2001/06/20 19:48:35 bmilekic Exp $
+ * $FreeBSD: src/sys/pci/if_wb.c,v 1.43 2001/07/09 17:58:37 wpaul Exp $
  */
 
 /*
@@ -128,7 +128,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_wb.c,v 1.42 2001/06/20 19:48:35 bmilekic Exp $";
+  "$FreeBSD: src/sys/pci/if_wb.c,v 1.43 2001/07/09 17:58:37 wpaul Exp $";
 #endif
 
 /*
@@ -846,8 +846,8 @@
 	 * 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
Index: sys/pci/if_xl.c
===================================================================
RCS file: /export/ncvs/src/sys/pci/if_xl.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- sys/pci/if_xl.c	2001/06/01 00:34:50	1.94
+++ sys/pci/if_xl.c	2001/07/09 17:58:38	1.95
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_xl.c,v 1.94 2001/06/01 00:34:50 wpaul Exp $
+ * $FreeBSD: src/sys/pci/if_xl.c,v 1.95 2001/07/09 17:58:38 wpaul Exp $
  */
 
 /*
@@ -150,7 +150,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_xl.c,v 1.94 2001/06/01 00:34:50 wpaul Exp $";
+  "$FreeBSD: src/sys/pci/if_xl.c,v 1.95 2001/07/09 17:58:38 wpaul Exp $";
 #endif
 
 /*
@@ -1305,8 +1305,8 @@
 	 * 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
Index: sys/dev/lge/if_lge.c
===================================================================
RCS file: /export/ncvs/src/sys/dev/lge/if_lge.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sys/dev/lge/if_lge.c	2001/06/20 19:47:55	1.6
+++ sys/dev/lge/if_lge.c	2001/07/09 17:58:42	1.7
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.6 2001/06/20 19:47:55 bmilekic Exp $
+ * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.7 2001/07/09 17:58:42 wpaul Exp $
  */
 
 /*
@@ -114,7 +114,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.6 2001/06/20 19:47:55 bmilekic Exp $";
+  "$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.7 2001/07/09 17:58:42 wpaul Exp $";
 #endif
 
 /*
@@ -530,8 +530,8 @@
 	 * 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
Index: sys/dev/nge/if_nge.c
===================================================================
RCS file: /export/ncvs/src/sys/dev/nge/if_nge.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sys/dev/nge/if_nge.c	2001/07/08 16:24:01	1.15
+++ sys/dev/nge/if_nge.c	2001/07/09 17:58:41	1.16
@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.15 2001/07/08 16:24:01 wpaul Exp $
+ * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.16 2001/07/09 17:58:41 wpaul Exp $
  */
 
 /*
@@ -137,7 +137,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.15 2001/07/08 16:24:01 wpaul Exp $";
+  "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.16 2001/07/09 17:58:41 wpaul Exp $";
 #endif
 
 #define NGE_CSUM_FEATURES	(CSUM_IP | CSUM_TCP | CSUM_UDP)
@@ -833,8 +833,8 @@
 	 * 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