summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2008-05-25 00:36:11 +0000
committerBrad Smith <brad@cvs.openbsd.org>2008-05-25 00:36:11 +0000
commit163468b84e83c0627b5cde7234fe1cae9beaedef (patch)
tree35e6b17b3519cbe60d906327c8db22af03902e1f /sys/dev
parentcefc6ef9d0fb741eb7ce2e1b6220b48fe6523ce8 (diff)
Remove redundant enabling of memory space and bus master which
pci_mapreg_map() deals with. ok jakemsr@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/bktr/bktr_os.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 9e16d0b3ee6..7a48c82ce4b 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_os.c,v 1.28 2007/11/26 09:28:34 martynas Exp $ */
+/* $OpenBSD: bktr_os.c,v 1.29 2008/05/25 00:36:10 brad Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
/*
@@ -172,14 +172,13 @@ bktr_attach(struct device *parent, struct device *self, void *aux)
unit = bktr->bktr_dev.dv_unit;
bktr->dmat = pa->pa_dmat;
- /* Enabled Bus Master
+ /* Enable Back-to-Back
XXX: check if all old DMA is stopped first (e.g. after warm
boot) */
fun = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
DPR((" fun=%b", fun, PCI_COMMAND_STATUS_BITS));
pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
- fun | PCI_COMMAND_MEM_ENABLE | PCI_COMMAND_MASTER_ENABLE |
- PCI_COMMAND_BACKTOBACK_ENABLE);
+ fun | PCI_COMMAND_BACKTOBACK_ENABLE);
/*
* map memory