From 3993ee01e4f167394f4c1c1fdd77cfe15a2646e1 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Wed, 24 Mar 1999 01:07:59 +0000
Subject: [PATCH] Don't enable I/O or memory access here!  These bits in the
 PCI CSR are set up by the firmware, and indicate which mapping types the
 system supports.

---
 sys/dev/pci/if_vr.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index abd28f1ed27b..962885db4e16 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vr.c,v 1.18 1999/02/12 00:36:48 thorpej Exp $	*/
+/*	$NetBSD: if_vr.c,v 1.19 1999/03/24 01:07:59 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -146,8 +146,6 @@
 
 #define	VR_USEIOSPACE
 
-#define	ETHER_CRC_LEN	4	/* XXX Should be in a common header. */
-
 /*
  * Various supported device vendors/types and their names.
  */
@@ -1573,16 +1571,14 @@ vr_attach(parent, self, aux)
 		}
 	}
 
+	/* Make sure bus mastering is enabled. */
+	command = PCI_CONF_READ(PCI_COMMAND_STATUS_REG);
+	command |= PCI_COMMAND_MASTER_ENABLE;
+	PCI_CONF_WRITE(PCI_COMMAND_STATUS_REG, command);
+
 	/*
 	 * Map control/status registers.
 	 */
-	command = PCI_CONF_READ(PCI_COMMAND_STATUS_REG);
-	command |= (PCI_COMMAND_IO_ENABLE |
-		    PCI_COMMAND_MEM_ENABLE |
-		    PCI_COMMAND_MASTER_ENABLE);
-	PCI_CONF_WRITE(PCI_COMMAND_STATUS_REG, command);
-	command = PCI_CONF_READ(PCI_COMMAND_STATUS_REG);
-
 	{
 		bus_space_tag_t iot, memt;
 		bus_space_handle_t ioh, memh;