Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Don't enable I/O or memory access here! These b...



details:   https://anonhg.NetBSD.org/src/rev/bbd6f2a4d7c3
branches:  trunk
changeset: 467383:bbd6f2a4d7c3
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Mar 24 01:07:59 1999 +0000

description:
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.

diffstat:

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

diffs (40 lines):

diff -r d7c64072ff87 -r bbd6f2a4d7c3 sys/dev/pci/if_vr.c
--- a/sys/dev/pci/if_vr.c       Wed Mar 24 01:05:15 1999 +0000
+++ b/sys/dev/pci/if_vr.c       Wed Mar 24 01:07:59 1999 +0000
@@ -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 @@
                }
        }
 
+       /* 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;



Home | Main Index | Thread Index | Old Index