[src/trunk]: src/sys/arch/arm/imx rename imx31_bs_tag as imx_bs_tag to share ...

[bsh <bsh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f507aaa647d4
branches:  trunk
changeset: 758683:f507aaa647d4
user:      bsh <bsh%NetBSD.org@localhost>
date:      Sat Nov 13 05:00:31 2010 +0000

description:
rename imx31_bs_tag as imx_bs_tag to share it with imx51.

diffstat:

 sys/arch/arm/imx/imx31_ahb.c |   9 ++++-----
 sys/arch/arm/imx/imx31var.h  |   4 ++--
 sys/arch/arm/imx/imx_space.c |  40 ++++++++++++++++++++--------------------
 sys/arch/arm/imx/imxuart.c   |   4 ++--
 4 files changed, 28 insertions(+), 29 deletions(-)

diffs (191 lines):

diff -r 5461c692872c -r f507aaa647d4 sys/arch/arm/imx/imx31_ahb.c
--- a/sys/arch/arm/imx/imx31_ahb.c      Sat Nov 13 04:58:46 2010 +0000
+++ b/sys/arch/arm/imx/imx31_ahb.c      Sat Nov 13 05:00:31 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx31_ahb.c,v 1.3 2008/05/02 22:00:29 martin Exp $     */
+/*     $NetBSD: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $        */
 
 /*
  * Copyright (c) 2002, 2005  Genetec Corporation.  All rights reserved.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.3 2008/05/02 22:00:29 martin Exp $");
+__KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.4 2010/11/13 05:00:31 bsh Exp $");
 
 #include "locators.h"
 #include "avic.h"
@@ -152,13 +152,12 @@
 ahb_attach(device_t parent, device_t self, void *aux)
 {
        struct ahb_softc *sc = (struct ahb_softc *)self;
-       extern struct bus_space imx31_bs_tag;
        struct ahb_attach_args ahba;
 
        ahb_sc = sc;
-       sc->sc_memt = &imx31_bs_tag;
+       sc->sc_memt = &imx_bs_tag;
 #if NBUS_DMA_GENERIC > 0
-       sc->sc_dmat = &imx31_bus_dma_tag;
+       sc->sc_dmat = &imx_bus_dma_tag;
 #else
        sc->sc_dmat = 0;
 #endif
diff -r 5461c692872c -r f507aaa647d4 sys/arch/arm/imx/imx31var.h
--- a/sys/arch/arm/imx/imx31var.h       Sat Nov 13 04:58:46 2010 +0000
+++ b/sys/arch/arm/imx/imx31var.h       Sat Nov 13 05:00:31 2010 +0000
@@ -1,9 +1,9 @@
-/*     $NetBSD: imx31var.h,v 1.2 2008/04/27 18:58:44 matt Exp $        */
+/*     $NetBSD: imx31var.h,v 1.3 2010/11/13 05:00:31 bsh Exp $ */
 
 #ifndef _ARM_IMX_IMX31VAR_H
 #define _ARM_IMX_IMX31VAR_H
 
-extern struct bus_space imx31_bs_tag;
+extern struct bus_space imx_bs_tag;
 
 struct aips_attach_args {
        const char      *aipsa_name;
diff -r 5461c692872c -r f507aaa647d4 sys/arch/arm/imx/imx_space.c
--- a/sys/arch/arm/imx/imx_space.c      Sat Nov 13 04:58:46 2010 +0000
+++ b/sys/arch/arm/imx/imx_space.c      Sat Nov 13 05:00:31 2010 +0000
@@ -1,7 +1,7 @@
-/* $Id: imx_space.c,v 1.1 2010/11/13 04:51:01 bsh Exp $ */
+/* $Id: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp $ */
 
 /* derived from: */
-/*     $NetBSD: imx_space.c,v 1.1 2010/11/13 04:51:01 bsh Exp $ */
+/*     $NetBSD: imx_space.c,v 1.2 2010/11/13 05:00:31 bsh Exp $ */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -82,32 +82,32 @@
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 
-bs_protos(imx31);
+bs_protos(imx);
 bs_protos(generic);
 bs_protos(generic_armv4);
 bs_protos(bs_notimpl);
 
-struct bus_space imx31_bs_tag = {
+struct bus_space imx_bs_tag = {
        /* cookie */
        (void *) 0,
 
        /* mapping/unmapping */
-       imx31_bs_map,
-       imx31_bs_unmap,
-       imx31_bs_subregion,
+       imx_bs_map,
+       imx_bs_unmap,
+       imx_bs_subregion,
 
        /* allocation/deallocation */
-       imx31_bs_alloc, /* not implemented */
-       imx31_bs_free,          /* not implemented */
+       imx_bs_alloc,   /* not implemented */
+       imx_bs_free,            /* not implemented */
 
        /* get kernel virtual address */
-       imx31_bs_vaddr,
+       imx_bs_vaddr,
 
        /* mmap */
        bs_notimpl_bs_mmap,
 
        /* barrier */
-       imx31_bs_barrier,
+       imx_bs_barrier,
 
        /* read (single) */
        generic_bs_r_1,
@@ -165,7 +165,7 @@
 };
 
 int
-imx31_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
+imx_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
              int flag, bus_space_handle_t *bshp)
 {
        u_long startpa, endpa, pa;
@@ -208,7 +208,7 @@
 }
 
 void
-imx31_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
+imx_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
 {
        vaddr_t va;
        vsize_t sz;
@@ -228,7 +228,7 @@
 
 
 int
-imx31_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset,
+imx_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset,
     bus_size_t size, bus_space_handle_t *nbshp)
 {
 
@@ -237,7 +237,7 @@
 }
 
 void
-imx31_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset,
+imx_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset,
     bus_size_t len, int flags)
 {
 
@@ -245,7 +245,7 @@
 }
 
 void *
-imx31_bs_vaddr(void *t, bus_space_handle_t bsh)
+imx_bs_vaddr(void *t, bus_space_handle_t bsh)
 {
 
        return ((void *)bsh);
@@ -253,19 +253,19 @@
 
 
 int
-imx31_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
+imx_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
     bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
     bus_addr_t *bpap, bus_space_handle_t *bshp)
 {
 
-       panic("imx31_io_bs_alloc(): not implemented\n");
+       panic("imx_io_bs_alloc(): not implemented\n");
 }
 
 void    
-imx31_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
+imx_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
 {
 
-       panic("imx31_io_bs_free(): not implemented\n");
+       panic("imx_io_bs_free(): not implemented\n");
 }
 
 
diff -r 5461c692872c -r f507aaa647d4 sys/arch/arm/imx/imxuart.c
--- a/sys/arch/arm/imx/imxuart.c        Sat Nov 13 04:58:46 2010 +0000
+++ b/sys/arch/arm/imx/imxuart.c        Sat Nov 13 05:00:31 2010 +0000
@@ -1,4 +1,4 @@
-/* $Id: imxuart.c,v 1.3 2008/06/30 00:46:41 perry Exp $ */
+/* $Id: imxuart.c,v 1.4 2010/11/13 05:00:31 bsh Exp $ */
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/device.h>
@@ -26,7 +26,7 @@
 
 #define __TRACE        imxuart_puts(&imxuart_softc, __func__ )
 
-extern struct bus_space imx31_bs_tag;
+extern struct bus_space imx_bs_tag;
 
 imxuart_softc_t imxuart_softc = { { 0, }, };