From owner-svn-src-head@FreeBSD.ORG Wed Jan 21 05:05:11 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E70906A8; Wed, 21 Jan 2015 05:05:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D31EF3CF; Wed, 21 Jan 2015 05:05:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0L55B3c065373; Wed, 21 Jan 2015 05:05:11 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0L558XE065355; Wed, 21 Jan 2015 05:05:08 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201501210505.t0L558XE065355@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Wed, 21 Jan 2015 05:05:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277477 - in head/sys/arm/xscale: i80321 i8134x X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2015 05:05:12 -0000 Author: ian Date: Wed Jan 21 05:05:07 2015 New Revision: 277477 URL: https://svnweb.freebsd.org/changeset/base/277477 Log: Use the base arm bus_space instead of an identical local copy. Deleted: head/sys/arm/xscale/i80321/obio_space.c Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c head/sys/arm/xscale/i80321/files.ep80219 head/sys/arm/xscale/i80321/files.i80219 head/sys/arm/xscale/i80321/files.i80321 head/sys/arm/xscale/i80321/files.iq31244 head/sys/arm/xscale/i80321/iq31244_machdep.c head/sys/arm/xscale/i80321/obio.c head/sys/arm/xscale/i80321/obiovar.h head/sys/arm/xscale/i80321/uart_cpu_i80321.c head/sys/arm/xscale/i8134x/crb_machdep.c head/sys/arm/xscale/i8134x/files.i81342 head/sys/arm/xscale/i8134x/obio.c head/sys/arm/xscale/i8134x/obiovar.h head/sys/arm/xscale/i8134x/uart_cpu_i81342.c Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c ============================================================================== --- head/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/ep80219_machdep.c Wed Jan 21 05:05:07 2015 (r277477) @@ -312,7 +312,7 @@ initarm(struct arm_boot_params *abp) * registers. */ i80321_calibrate_delay(); - i80321_sdram_bounds(&obio_bs_tag, IQ80321_80321_VBASE + VERDE_MCU_BASE, + i80321_sdram_bounds(obio_bs_tag, IQ80321_80321_VBASE + VERDE_MCU_BASE, &memstart, &memsize); physmem = memsize / PAGE_SIZE; cninit(); Modified: head/sys/arm/xscale/i80321/files.ep80219 ============================================================================== --- head/sys/arm/xscale/i80321/files.ep80219 Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/files.ep80219 Wed Jan 21 05:05:07 2015 (r277477) @@ -6,7 +6,6 @@ arm/xscale/i80321/iq80321.c standard arm/xscale/i80321/ep80219_machdep.c standard arm/xscale/i80321/obio.c standard -arm/xscale/i80321/obio_space.c standard arm/xscale/i80321/uart_cpu_i80321.c optional uart arm/xscale/i80321/uart_bus_i80321.c optional uart dev/uart/uart_dev_ns8250.c optional uart Modified: head/sys/arm/xscale/i80321/files.i80219 ============================================================================== --- head/sys/arm/xscale/i80321/files.i80219 Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/files.i80219 Wed Jan 21 05:05:07 2015 (r277477) @@ -2,6 +2,7 @@ # # IOP Specific # +arm/arm/bus_space_base.c standard arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/xscale/i80321/i80321.c standard Modified: head/sys/arm/xscale/i80321/files.i80321 ============================================================================== --- head/sys/arm/xscale/i80321/files.i80321 Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/files.i80321 Wed Jan 21 05:05:07 2015 (r277477) @@ -1,4 +1,5 @@ #$FreeBSD$ +arm/arm/bus_space_base.c standard arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/xscale/i80321/i80321.c standard Modified: head/sys/arm/xscale/i80321/files.iq31244 ============================================================================== --- head/sys/arm/xscale/i80321/files.iq31244 Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/files.iq31244 Wed Jan 21 05:05:07 2015 (r277477) @@ -3,7 +3,6 @@ arm/xscale/i80321/iq80321.c standard arm/xscale/i80321/iq31244_machdep.c standard arm/xscale/i80321/iq31244_7seg.c optional iq31244_7seg arm/xscale/i80321/obio.c standard -arm/xscale/i80321/obio_space.c standard arm/xscale/i80321/uart_cpu_i80321.c optional uart arm/xscale/i80321/uart_bus_i80321.c optional uart dev/uart/uart_dev_ns8250.c optional uart Modified: head/sys/arm/xscale/i80321/iq31244_machdep.c ============================================================================== --- head/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/iq31244_machdep.c Wed Jan 21 05:05:07 2015 (r277477) @@ -313,7 +313,7 @@ initarm(struct arm_boot_params *abp) * registers. */ i80321_calibrate_delay(); - i80321_sdram_bounds(&obio_bs_tag, IQ80321_80321_VBASE + VERDE_MCU_BASE, + i80321_sdram_bounds(obio_bs_tag, IQ80321_80321_VBASE + VERDE_MCU_BASE, &memstart, &memsize); physmem = memsize / PAGE_SIZE; cninit(); Modified: head/sys/arm/xscale/i80321/obio.c ============================================================================== --- head/sys/arm/xscale/i80321/obio.c Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/obio.c Wed Jan 21 05:05:07 2015 (r277477) @@ -58,6 +58,8 @@ __FBSDID("$FreeBSD$"); #include #include +bus_space_tag_t obio_bs_tag; + int obio_probe(device_t); int obio_attach(device_t); @@ -72,7 +74,8 @@ obio_attach(device_t dev) { struct obio_softc *sc = device_get_softc(dev); - sc->oba_st = &obio_bs_tag; + obio_bs_tag = arm_base_bs_tag; + sc->oba_st = obio_bs_tag; sc->oba_addr = IQ80321_OBIO_BASE; sc->oba_size = IQ80321_OBIO_SIZE; sc->oba_rman.rm_type = RMAN_ARRAY; Modified: head/sys/arm/xscale/i80321/obiovar.h ============================================================================== --- head/sys/arm/xscale/i80321/obiovar.h Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/obiovar.h Wed Jan 21 05:05:07 2015 (r277477) @@ -53,6 +53,6 @@ struct obio_softc { struct rman oba_irq_rman; }; -extern struct bus_space obio_bs_tag; +extern bus_space_tag_t obio_bs_tag; #endif /* _IQ80321_OBIOVAR_H_ */ Modified: head/sys/arm/xscale/i80321/uart_cpu_i80321.c ============================================================================== --- head/sys/arm/xscale/i80321/uart_cpu_i80321.c Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i80321/uart_cpu_i80321.c Wed Jan 21 05:05:07 2015 (r277477) @@ -53,14 +53,14 @@ uart_cpu_getdev(int devtype, struct uart { di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; - di->bas.bst = &obio_bs_tag; + di->bas.bst = obio_bs_tag; di->bas.regshft = 0; di->bas.rclk = 0; di->baudrate = 115200; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; - uart_bus_space_io = &obio_bs_tag; + uart_bus_space_io = obio_bs_tag; uart_bus_space_mem = NULL; di->bas.bsh = 0xfe800000; return (0); Modified: head/sys/arm/xscale/i8134x/crb_machdep.c ============================================================================== --- head/sys/arm/xscale/i8134x/crb_machdep.c Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i8134x/crb_machdep.c Wed Jan 21 05:05:07 2015 (r277477) @@ -293,7 +293,7 @@ initarm(struct arm_boot_params *abp) cpu_setup(""); i80321_calibrate_delay(); - i81342_sdram_bounds(&obio_bs_tag, IOP34X_VADDR, &memstart, &memsize); + i81342_sdram_bounds(obio_bs_tag, IOP34X_VADDR, &memstart, &memsize); physmem = memsize / PAGE_SIZE; cninit(); /* Set stack for exception handlers */ Modified: head/sys/arm/xscale/i8134x/files.i81342 ============================================================================== --- head/sys/arm/xscale/i8134x/files.i81342 Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i8134x/files.i81342 Wed Jan 21 05:05:07 2015 (r277477) @@ -1,4 +1,5 @@ # $FreeBSD$ +arm/arm/bus_space_base.c standard arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/cpufunc_asm_xscale_c3.S standard @@ -9,7 +10,6 @@ arm/xscale/i8134x/i81342_mcu.c standard arm/xscale/i8134x/i81342_pci.c optional pci arm/xscale/i8134x/i81342_space.c standard arm/xscale/i8134x/obio.c standard -arm/xscale/i8134x/obio_space.c standard arm/xscale/i8134x/uart_bus_i81342.c optional uart arm/xscale/i8134x/uart_cpu_i81342.c optional uart dev/uart/uart_dev_ns8250.c optional uart Modified: head/sys/arm/xscale/i8134x/obio.c ============================================================================== --- head/sys/arm/xscale/i8134x/obio.c Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i8134x/obio.c Wed Jan 21 05:05:07 2015 (r277477) @@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$"); #include #include +bus_space_tag_t obio_bs_tag; static int obio_probe(device_t dev) @@ -68,7 +69,8 @@ obio_attach(device_t dev) { struct obio_softc *sc = device_get_softc(dev); - sc->oba_st = &obio_bs_tag; + obio_bs_tag = arm_base_bs_tag; + sc->oba_st = obio_bs_tag; sc->oba_rman.rm_type = RMAN_ARRAY; sc->oba_rman.rm_descr = "OBIO I/O"; if (rman_init(&sc->oba_rman) != 0 || Modified: head/sys/arm/xscale/i8134x/obiovar.h ============================================================================== --- head/sys/arm/xscale/i8134x/obiovar.h Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i8134x/obiovar.h Wed Jan 21 05:05:07 2015 (r277477) @@ -50,6 +50,6 @@ struct obio_softc { struct rman oba_irq_rman; }; -extern struct bus_space obio_bs_tag; +extern bus_space_tag_t obio_bs_tag; #endif /* _IQ80321_OBIOVAR_H_ */ Modified: head/sys/arm/xscale/i8134x/uart_cpu_i81342.c ============================================================================== --- head/sys/arm/xscale/i8134x/uart_cpu_i81342.c Wed Jan 21 04:28:19 2015 (r277476) +++ head/sys/arm/xscale/i8134x/uart_cpu_i81342.c Wed Jan 21 05:05:07 2015 (r277477) @@ -54,14 +54,14 @@ uart_cpu_getdev(int devtype, struct uart di->ops = uart_getops(&uart_ns8250_class); di->bas.chan = 0; - di->bas.bst = &obio_bs_tag; + di->bas.bst = obio_bs_tag; di->bas.regshft = 2; di->bas.rclk = 33334000; di->baudrate = 115200; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; - uart_bus_space_io = &obio_bs_tag; + uart_bus_space_io = obio_bs_tag; uart_bus_space_mem = NULL; di->bas.bsh = IOP34X_UART0_VADDR; return (0);