Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Use "ibm4xx" instead of "galaxy"; galaxy was an ear...
details: https://anonhg.NetBSD.org/src/rev/5ac30072f1e4
branches: trunk
changeset: 535268:5ac30072f1e4
user: simonb <simonb%NetBSD.org@localhost>
date: Tue Aug 13 05:43:24 2002 +0000
description:
Use "ibm4xx" instead of "galaxy"; galaxy was an early code name for the
405GP.
diffstat:
sys/arch/powerpc/ibm4xx/dev/if_emac.c | 4 +-
sys/arch/powerpc/ibm4xx/dev/opb.c | 8 ++--
sys/arch/powerpc/ibm4xx/dev/plb.c | 12 +++---
sys/arch/powerpc/include/ibm4xx/ibm405gp.h | 6 +-
sys/arch/walnut/dev/ibm405gp.c | 8 ++--
sys/arch/walnut/dev/pbus.c | 10 +++---
sys/arch/walnut/dev/pckbc_pbus.c | 4 +-
sys/arch/walnut/include/bus.h | 46 +++++++++++++++---------------
sys/arch/walnut/include/intr.h | 9 ++---
sys/arch/walnut/pci/pchb.c | 14 ++++----
sys/arch/walnut/pci/pci_machdep.c | 10 +++---
sys/arch/walnut/walnut/bus_dma.c | 12 +++---
sys/arch/walnut/walnut/consinit.c | 6 +-
13 files changed, 74 insertions(+), 75 deletions(-)
diffs (truncated from 516 to 300 lines):
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/powerpc/ibm4xx/dev/if_emac.c
--- a/sys/arch/powerpc/ibm4xx/dev/if_emac.c Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/if_emac.c Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_emac.c,v 1.7 2002/08/13 05:25:39 simonb Exp $ */
+/* $NetBSD: if_emac.c,v 1.8 2002/08/13 05:43:24 simonb Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -297,7 +297,7 @@
bus_dma_segment_t seg;
int error, i, nseg;
- sc->sc_st = galaxy_make_bus_space_tag(0, 0);
+ sc->sc_st = ibm4xx_make_bus_space_tag(0, 0);
sc->sc_sh = oaa->opb_addr;
sc->sc_dmat = oaa->opb_dmat;
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/powerpc/ibm4xx/dev/opb.c
--- a/sys/arch/powerpc/ibm4xx/dev/opb.c Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/opb.c Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: opb.c,v 1.3 2002/08/13 04:57:49 simonb Exp $ */
+/* $NetBSD: opb.c,v 1.4 2002/08/13 05:43:25 simonb Exp $ */
/*
* Copyright 2001,2002 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
#include <sys/extent.h>
#include <sys/malloc.h>
-#define _GALAXY_BUS_DMA_PRIVATE
+#define _IBM4XX_BUS_DMA_PRIVATE
#include <machine/walnut.h>
#include <powerpc/spr.h>
@@ -153,8 +153,8 @@
oaa.opb_name = opb_devs[i].name;
oaa.opb_addr = opb_devs[i].addr;
oaa.opb_irq = opb_devs[i].irq;
- oaa.opb_bt = galaxy_make_bus_space_tag(0, 0);
- oaa.opb_dmat = &galaxy_default_bus_dma_tag;
+ oaa.opb_bt = ibm4xx_make_bus_space_tag(0, 0);
+ oaa.opb_dmat = &ibm4xx_default_bus_dma_tag;
(void) config_found_sm(self, &oaa, opb_print, opb_submatch);
}
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/powerpc/ibm4xx/dev/plb.c
--- a/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/powerpc/ibm4xx/dev/plb.c Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plb.c,v 1.1 2002/08/12 02:06:20 simonb Exp $ */
+/* $NetBSD: plb.c,v 1.2 2002/08/13 05:43:25 simonb Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -73,7 +73,7 @@
#include <sys/extent.h>
#include <sys/malloc.h>
-#define _GALAXY_BUS_DMA_PRIVATE
+#define _IBM4XX_BUS_DMA_PRIVATE
#include <powerpc/ibm4xx/dev/plbvar.h>
#include <powerpc/ibm4xx/ibm405gp.h>
@@ -128,16 +128,16 @@
for (i = 0; plb_devs[i].plb_name != NULL; i++) {
paa.plb_name = plb_devs[i].plb_name;
- paa.plb_bt = galaxy_make_bus_space_tag(0, 0);
- paa.plb_dmat = &galaxy_default_bus_dma_tag;
+ paa.plb_bt = ibm4xx_make_bus_space_tag(0, 0);
+ paa.plb_dmat = &ibm4xx_default_bus_dma_tag;
(void) config_found_sm(self, &paa, plb_print, plb_submatch);
}
while (local_plb_devs && local_plb_devs->plb_name != NULL) {
paa.plb_name = local_plb_devs->plb_name;
- paa.plb_bt = galaxy_make_bus_space_tag(0, 0);
- paa.plb_dmat = &galaxy_default_bus_dma_tag;
+ paa.plb_bt = ibm4xx_make_bus_space_tag(0, 0);
+ paa.plb_dmat = &ibm4xx_default_bus_dma_tag;
(void) config_found_sm(self, &paa, plb_print, plb_submatch);
local_plb_devs++;
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/powerpc/include/ibm4xx/ibm405gp.h
--- a/sys/arch/powerpc/include/ibm4xx/ibm405gp.h Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/powerpc/include/ibm4xx/ibm405gp.h Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm405gp.h,v 1.7 2002/08/13 04:57:49 simonb Exp $ */
+/* $NetBSD: ibm405gp.h,v 1.8 2002/08/13 05:43:25 simonb Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -88,7 +88,7 @@
#define IBM405GP_BOOT_ROM_END 0xffffffff
#ifndef _LOCORE
-void galaxy_show_pci_map(void);
-void galaxy_setup_pci(void);
+void ibm4xx_show_pci_map(void);
+void ibm4xx_setup_pci(void);
#endif /* _LOCORE */
#endif /* _IBM4XX_IBM405GP_H_ */
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/walnut/dev/ibm405gp.c
--- a/sys/arch/walnut/dev/ibm405gp.c Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/walnut/dev/ibm405gp.c Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm405gp.c,v 1.5 2002/08/13 05:25:40 simonb Exp $ */
+/* $NetBSD: ibm405gp.c,v 1.6 2002/08/13 05:43:25 simonb Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
#include <powerpc/ibm4xx/ibm405gp.h>
#include <powerpc/ibm4xx/dev/pcicreg.h>
-static bus_space_tag_t pcicfg_iot = galaxy_make_bus_space_tag(0, 0);
+static bus_space_tag_t pcicfg_iot = ibm4xx_make_bus_space_tag(0, 0);
static bus_space_handle_t pcicfg_ioh = 0;
#define PCI0_MEM_BASE 0x80000000
@@ -62,7 +62,7 @@
* Setup proper Local<->PCI mapping
* PCI memory window: 256M @ PCI0MEMBASE with direct memory translation
*/
-void galaxy_setup_pci(void)
+void ibm4xx_setup_pci(void)
{
pcitag_t tag;
@@ -94,7 +94,7 @@
pci_conf_write(0, tag, PCIC_PTM2BAR, 0);
}
-void galaxy_show_pci_map(void)
+void ibm4xx_show_pci_map(void)
{
paddr_t la, lm, pl, ph;
pcitag_t tag;
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/walnut/dev/pbus.c
--- a/sys/arch/walnut/dev/pbus.c Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/walnut/dev/pbus.c Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pbus.c,v 1.1 2002/08/12 02:06:22 simonb Exp $ */
+/* $NetBSD: pbus.c,v 1.2 2002/08/13 05:43:25 simonb Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -74,7 +74,7 @@
#include <sys/extent.h>
#include <sys/malloc.h>
-#define _GALAXY_BUS_DMA_PRIVATE
+#define _IBM4XX_BUS_DMA_PRIVATE
#include <arch/walnut/dev/pbusvar.h>
#include <machine/bus.h>
#include <machine/walnut.h>
@@ -141,7 +141,7 @@
int i;
#if NPCKBC > 0
bus_space_handle_t ioh_fpga;
- bus_space_tag_t iot_fpga = galaxy_make_bus_space_tag(0, 0);
+ bus_space_tag_t iot_fpga = ibm4xx_make_bus_space_tag(0, 0);
uint8_t fpga_reg;
#endif
@@ -151,8 +151,8 @@
pba.pb_name = pbus_devs[i].name;
pba.pb_addr = pbus_devs[i].addr;
pba.pb_irq = pbus_devs[i].irq;
- pba.pb_bt = galaxy_make_bus_space_tag(0, 0);
- pba.pb_dmat = &galaxy_default_bus_dma_tag;
+ pba.pb_bt = ibm4xx_make_bus_space_tag(0, 0);
+ pba.pb_dmat = &ibm4xx_default_bus_dma_tag;
(void) config_found_sm(self, &pba, pbus_print, pbus_submatch);
}
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/walnut/dev/pckbc_pbus.c
--- a/sys/arch/walnut/dev/pckbc_pbus.c Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/walnut/dev/pckbc_pbus.c Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_pbus.c,v 1.1 2002/08/12 02:06:22 simonb Exp $ */
+/* $NetBSD: pckbc_pbus.c,v 1.2 2002/08/13 05:43:25 simonb Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -92,7 +92,7 @@
struct pbus_attach_args *paa = aux;
struct pckbc_internal *t;
bus_space_handle_t ioh_d, ioh_c;
- bus_space_tag_t iot = galaxy_make_bus_space_tag(0, 0);
+ bus_space_tag_t iot = ibm4xx_make_bus_space_tag(0, 0);
u_long addr = paa->pb_addr;
/*
diff -r 6cc212830754 -r 5ac30072f1e4 sys/arch/walnut/include/bus.h
--- a/sys/arch/walnut/include/bus.h Tue Aug 13 05:42:27 2002 +0000
+++ b/sys/arch/walnut/include/bus.h Tue Aug 13 05:43:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.3 2001/10/18 22:25:31 eeh Exp $ */
+/* $NetBSD: bus.h,v 1.4 2002/08/13 05:43:26 simonb Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -68,24 +68,24 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _GALAXY_BUS_H_
-#define _GALAXY_BUS_H_
+#ifndef _WALNUT_BUS_H_
+#define _WALNUT_BUS_H_
#include <machine/pio.h>
/*
- * Values for the galaxy bus space tag, not to be used directly by MI code.
+ * Values for the ibm4xx bus space tag, not to be used directly by MI code.
*/
#define __BUS_SPACE_HAS_STREAM_METHODS
-#define GALAXY_BUS_ADDR_MASK 0xfffff000
-#define GALAXY_BUS_STRIDE_MASK 0x0000000f
+#define IBM4XX_BUS_ADDR_MASK 0xfffff000
+#define IBM4XX_BUS_STRIDE_MASK 0x0000000f
-#define galaxy_make_bus_space_tag(addr, stride) \
- (((addr) & GALAXY_BUS_ADDR_MASK) | (stride))
+#define ibm4xx_make_bus_space_tag(addr, stride) \
+ (((addr) & IBM4XX_BUS_ADDR_MASK) | (stride))
/* Mw may need to use tag as an offset to convert between bus-side and local addresses */
-#define __BA(t, h, o) ((void *)((h) + ((o) << ((t) & GALAXY_BUS_STRIDE_MASK))))
+#define __BA(t, h, o) ((void *)((h) + ((o) << ((t) & IBM4XX_BUS_STRIDE_MASK))))
/*
@@ -172,8 +172,8 @@
int flags;
bus_space_handle_t *bshp;
{
- paddr_t base = t & GALAXY_BUS_ADDR_MASK;
- int stride = t & GALAXY_BUS_STRIDE_MASK;
+ paddr_t base = t & IBM4XX_BUS_ADDR_MASK;
+ int stride = t & IBM4XX_BUS_STRIDE_MASK;
*bshp = (bus_space_handle_t)
mapiodev(base + addr, size << stride);
return 0;
@@ -187,7 +187,7 @@
int prot;
int flags;
{
- paddr_t base = t & GALAXY_BUS_ADDR_MASK;
+ paddr_t base = t & IBM4XX_BUS_ADDR_MASK;
return (base+addr+offset);
}
@@ -835,7 +835,7 @@
* bus_space_handle_t bsh, bus_size_t offset,
* bus_size_t len, int flags);
*
- * Note: the galaxy does not currently require barriers, but we must
+ * Note: the ibm4xx does not currently require barriers, but we must
* provide the flags to MI code.
*/
@@ -877,8 +877,8 @@
#define BUS_DMASYNC_PREWRITE 0x04 /* pre-write synchronization */
#define BUS_DMASYNC_POSTWRITE 0x08 /* post-write synchronization */
-typedef struct galaxy_bus_dma_tag *bus_dma_tag_t;
-typedef struct galaxy_bus_dmamap *bus_dmamap_t;
+typedef struct ibm4xx_bus_dma_tag *bus_dma_tag_t;
+typedef struct ibm4xx_bus_dmamap *bus_dmamap_t;
/*
* bus_dma_segment_t
@@ -886,11 +886,11 @@
* Describes a single contiguous DMA transaction. Values
* are suitable for programming into DMA registers.
*/
-struct galaxy_bus_dma_segment {
+struct ibm4xx_bus_dma_segment {
bus_addr_t ds_addr; /* DMA address */
bus_size_t ds_len; /* length of transfer */
};
-typedef struct galaxy_bus_dma_segment bus_dma_segment_t;
+typedef struct ibm4xx_bus_dma_segment bus_dma_segment_t;
/*
* bus_dma_tag_t
@@ -899,7 +899,7 @@
* DMA for a given bus.
*/
-struct galaxy_bus_dma_tag {
+struct ibm4xx_bus_dma_tag {
/*
Home |
Main Index |
Thread Index |
Old Index