summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-02-06 19:26:40 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-02-06 19:26:40 +0000
commitecd8b4221a6fae4080caf694f331b00d82af8d3c (patch)
treebc54d22de01284c574bdc298ea75b279805fa627 /sys
parent8e3adbbaa38abe0d284701a8bfc9f61020f785ba (diff)
Rename pcs_bus* to pci_swiz_bus* to reduce confusion and match NetBSD.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/pci/apecs_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/apecs_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/apecs_lca_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/apecs_lca_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/cia.c4
-rw-r--r--sys/arch/alpha/pci/cia_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/cia_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/lca_bus_io.c4
-rw-r--r--sys/arch/alpha/pci/lca_bus_mem.c4
-rw-r--r--sys/arch/alpha/pci/pci_eb164.c5
-rw-r--r--sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c (renamed from sys/arch/alpha/pci/pcs_bus_io_common.c)2
-rw-r--r--sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c (renamed from sys/arch/alpha/pci/pcs_bus_mem_common.c)2
12 files changed, 23 insertions, 22 deletions
diff --git a/sys/arch/alpha/pci/apecs_bus_io.c b/sys/arch/alpha/pci/apecs_bus_io.c
index 021ef966966..aaa6580181f 100644
--- a/sys/arch/alpha/pci/apecs_bus_io.c
+++ b/sys/arch/alpha/pci/apecs_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_bus_io.c,v 1.2 1997/11/10 15:53:11 niklas Exp $ */
+/* $OpenBSD: apecs_bus_io.c,v 1.3 2001/02/06 19:26:38 art Exp $ */
/* $NetBSD: apecs_bus_io.c,v 1.1 1996/11/25 03:42:09 cgd Exp $ */
/*
@@ -61,4 +61,4 @@
#define CHIP_IO_W2_SYS_START(v) (APECS_PCI_SIO + (0x00040000UL << 5))
#define CHIP_IO_W2_SYS_END(v) (APECS_PCI_SIO + (0x01000000UL << 5) - 1)
-#include "pcs_bus_io_common.c"
+#include "pci_swiz_bus_io_chipdep.c"
diff --git a/sys/arch/alpha/pci/apecs_bus_mem.c b/sys/arch/alpha/pci/apecs_bus_mem.c
index 6d1df177d46..327ac0cb368 100644
--- a/sys/arch/alpha/pci/apecs_bus_mem.c
+++ b/sys/arch/alpha/pci/apecs_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_bus_mem.c,v 1.2 1997/11/10 15:53:11 niklas Exp $ */
+/* $OpenBSD: apecs_bus_mem.c,v 1.3 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: apecs_bus_mem.c,v 1.1 1996/11/25 03:42:11 cgd Exp $ */
/*
@@ -71,4 +71,4 @@
#define CHIP_S_MEM_W2_SYS_END(v) \
(APECS_PCI_SPARSE + (0x08000000UL << 5) - 1)
-#include "pcs_bus_mem_common.c"
+#include "pci_swiz_bus_mem_chipdep.c"
diff --git a/sys/arch/alpha/pci/apecs_lca_bus_io.c b/sys/arch/alpha/pci/apecs_lca_bus_io.c
index e388db74be7..1aecc2f25c7 100644
--- a/sys/arch/alpha/pci/apecs_lca_bus_io.c
+++ b/sys/arch/alpha/pci/apecs_lca_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_lca_bus_io.c,v 1.5 1996/12/08 00:20:32 niklas Exp $ */
+/* $OpenBSD: apecs_lca_bus_io.c,v 1.6 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: apecs_lca_bus_io.c,v 1.4 1996/08/27 16:29:23 cgd Exp $ */
/*
@@ -59,4 +59,4 @@
#define CHIP_IO_W2_BASE(v) APECS_PCI_SIO
#define CHIP_IO_W2_MASK(v) 0x00ffffff
-#include "pcs_bus_io_common.c"
+#include "pci_swiz_bus_io_chipdep.c"
diff --git a/sys/arch/alpha/pci/apecs_lca_bus_mem.c b/sys/arch/alpha/pci/apecs_lca_bus_mem.c
index 47c1dac1706..e1c22d167f5 100644
--- a/sys/arch/alpha/pci/apecs_lca_bus_mem.c
+++ b/sys/arch/alpha/pci/apecs_lca_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_lca_bus_mem.c,v 1.5 1996/12/08 00:20:33 niklas Exp $ */
+/* $OpenBSD: apecs_lca_bus_mem.c,v 1.6 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: apecs_lca_bus_mem.c,v 1.5 1996/08/27 16:29:24 cgd Exp $ */
/*
@@ -65,4 +65,4 @@
#define CHIP_S_MEM_W2_BASE(v) APECS_PCI_SPARSE
#define CHIP_S_MEM_W2_MASK(v) 0x07ffffff
-#include "pcs_bus_mem_common.c"
+#include "pci_swiz_bus_mem_chipdep.c"
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index a7a09dbac38..0fe7ffd10d2 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia.c,v 1.10 2000/11/08 20:59:24 ericj Exp $ */
+/* $OpenBSD: cia.c,v 1.11 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */
/*-
@@ -140,7 +140,7 @@ struct cia_config cia_configuration;
#endif
#ifndef CIA_PYXIS_FORCE_BWX
-#define CIA_PYXIS_FORCE_BWX 0
+#define CIA_PYXIS_FORCE_BWX 1
#endif
int cia_pci_use_bwx = CIA_PCI_USE_BWX;
diff --git a/sys/arch/alpha/pci/cia_bus_io.c b/sys/arch/alpha/pci/cia_bus_io.c
index ea36a7382bf..35ba8b56cb3 100644
--- a/sys/arch/alpha/pci/cia_bus_io.c
+++ b/sys/arch/alpha/pci/cia_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_bus_io.c,v 1.6 1997/01/24 19:57:37 niklas Exp $ */
+/* $OpenBSD: cia_bus_io.c,v 1.7 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: cia_bus_io.c,v 1.6 1996/11/25 03:46:07 cgd Exp $ */
/*
@@ -65,4 +65,4 @@
#define CHIP_IO_W2_SYS_END(v) \
(CIA_PCI_SIO2 + ((HAE_IO_REG2_MASK + 1) << 5) - 1)
-#include "pcs_bus_io_common.c"
+#include "pci_swiz_bus_io_chipdep.c"
diff --git a/sys/arch/alpha/pci/cia_bus_mem.c b/sys/arch/alpha/pci/cia_bus_mem.c
index 38b5956e659..d652974df3f 100644
--- a/sys/arch/alpha/pci/cia_bus_mem.c
+++ b/sys/arch/alpha/pci/cia_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_bus_mem.c,v 1.6 1997/01/24 19:57:38 niklas Exp $ */
+/* $OpenBSD: cia_bus_mem.c,v 1.7 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: cia_bus_mem.c,v 1.7 1996/11/25 03:46:09 cgd Exp $ */
/*
@@ -82,4 +82,4 @@
#define CHIP_S_MEM_W3_SYS_END(v) \
(CIA_PCI_SMEM3 + ((HAE_MEM_REG3_MASK + 1) << 5) - 1)
-#include "pcs_bus_mem_common.c"
+#include "pci_swiz_bus_mem_chipdep.c"
diff --git a/sys/arch/alpha/pci/lca_bus_io.c b/sys/arch/alpha/pci/lca_bus_io.c
index 5350726231b..3d01c9c3c1d 100644
--- a/sys/arch/alpha/pci/lca_bus_io.c
+++ b/sys/arch/alpha/pci/lca_bus_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca_bus_io.c,v 1.2 1997/11/10 15:53:12 niklas Exp $ */
+/* $OpenBSD: lca_bus_io.c,v 1.3 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: lca_bus_io.c,v 1.1 1996/11/25 03:42:14 cgd Exp $ */
/*
@@ -51,4 +51,4 @@
#define CHIP_IO_W1_SYS_START(v) LCA_PCI_SIO
#define CHIP_IO_W1_SYS_END(v) (LCA_PCI_SIO + ((0x00ffffffUL + 1) << 5) - 1)
-#include "pcs_bus_io_common.c"
+#include "pci_swiz_bus_io_chipdep.c"
diff --git a/sys/arch/alpha/pci/lca_bus_mem.c b/sys/arch/alpha/pci/lca_bus_mem.c
index f9fa0254d0f..6bf0e859c40 100644
--- a/sys/arch/alpha/pci/lca_bus_mem.c
+++ b/sys/arch/alpha/pci/lca_bus_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lca_bus_mem.c,v 1.2 1997/11/10 15:53:12 niklas Exp $ */
+/* $OpenBSD: lca_bus_mem.c,v 1.3 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: lca_bus_mem.c,v 1.1 1996/11/25 03:42:15 cgd Exp $ */
/*
@@ -71,4 +71,4 @@
#define CHIP_S_MEM_W2_SYS_END(v) \
(LCA_PCI_SPARSE + (0x08000000UL << 5) - 1)
-#include "pcs_bus_mem_common.c"
+#include "pci_swiz_bus_mem_chipdep.c"
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index f151856d887..00fdf604289 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.4 2000/11/11 19:36:34 ericj Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.5 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
/*-
@@ -211,7 +211,8 @@ dec_eb164_intr_map(ccv, bustag, buspin, line, ihp)
if (device == 8) {
if (function == 0)
panic("dec_eb164_intr_map: SIO device");
- return (1);
+ if (function == 1 || function == 2)
+ return (1);
}
} else {
if (device == 8)
diff --git a/sys/arch/alpha/pci/pcs_bus_io_common.c b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
index 1ab25324fcf..2839feb60ab 100644
--- a/sys/arch/alpha/pci/pcs_bus_io_common.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcs_bus_io_common.c,v 1.9 2000/06/16 21:47:09 provos Exp $ */
+/* $OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.1 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $ */
/*
diff --git a/sys/arch/alpha/pci/pcs_bus_mem_common.c b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
index 8105285795b..b7cbbe20149 100644
--- a/sys/arch/alpha/pci/pcs_bus_mem_common.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcs_bus_mem_common.c,v 1.9 2000/06/16 21:47:10 provos Exp $ */
+/* $OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.1 2001/02/06 19:26:39 art Exp $ */
/* $NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $ */
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 18:06:58 +0000