From owner-svn-src-projects@FreeBSD.ORG Sun Apr 15 01:40:22 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB6FB1065670; Sun, 15 Apr 2012 01:40:22 +0000 (UTC) (envelope-from dmarion@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6AB28FC08; Sun, 15 Apr 2012 01:40:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3F1eMnq058943; Sun, 15 Apr 2012 01:40:22 GMT (envelope-from dmarion@svn.freebsd.org) Received: (from dmarion@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3F1eMmc058940; Sun, 15 Apr 2012 01:40:22 GMT (envelope-from dmarion@svn.freebsd.org) Message-Id: <201204150140.q3F1eMmc058940@svn.freebsd.org> From: Damjan Marion Date: Sun, 15 Apr 2012 01:40:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234305 - in projects/armv6/sys/arm/ti: . usb X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Apr 2012 01:40:22 -0000 Author: dmarion Date: Sun Apr 15 01:40:22 2012 New Revision: 234305 URL: http://svn.freebsd.org/changeset/base/234305 Log: TI code cleanup. Deleted: projects/armv6/sys/arm/ti/omap.c Modified: projects/armv6/sys/arm/ti/tivar.h projects/armv6/sys/arm/ti/usb/omap_ehci.c Modified: projects/armv6/sys/arm/ti/tivar.h ============================================================================== --- projects/armv6/sys/arm/ti/tivar.h Sun Apr 15 00:04:23 2012 (r234304) +++ projects/armv6/sys/arm/ti/tivar.h Sun Apr 15 01:40:22 2012 (r234305) @@ -33,124 +33,7 @@ #ifndef _TIVAR_H_ #define _TIVAR_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include - - -/* - * Random collection of functions and definitions ... needs cleanup - * - * - * - */ - - -extern struct bus_space omap_bs_tag; /* board-dependent reset function implementation */ extern void (*ti_cpu_reset)(void); -unsigned int -omap_sdram_size(void); - -void -omap_mask_all_intr(void); - -void -omap_post_filter_intr(void *arg); - -int -omap_setup_intr(device_t dev, device_t child, - struct resource *res, int flags, driver_filter_t *filt, - driver_intr_t *intr, void *arg, void **cookiep); - -int -omap_teardown_intr(device_t dev, device_t child, struct resource *res, - void *cookie); - - - -/** - * OMAP Device IDs - * - * These values are typically read out of the ID_CODE register, located at - * physical address 0x4A00 2204 on most OMAP devices - */ -#define OMAP_CPUID_OMAP3530 0x0C00 -#define OMAP_CPUID_OMAP3525 0x4C00 -#define OMAP_CPUID_OMAP3515 0x1C00 -#define OMAP_CPUID_OMAP3503 0x5C00 - -#define OMAP_CPUID_OMAP4430_ES1_2 0xB852 -#define OMAP_CPUID_OMAP4430 0xB95C - -/** - * struct omap_softc - * - * - * - */ -extern uint32_t omap3_chip_id; - -static inline int -omap_cpu_is(uint32_t cpu) -{ - return ((omap3_chip_id & 0xffff) == cpu); -} - -/** - * struct omap_softc - * - * - * - */ -struct omap_softc { - device_t sc_dev; - bus_space_tag_t sc_iotag; - bus_space_handle_t sc_ioh; - - struct rman sc_irq_rman; - struct rman sc_mem_rman; - bus_dma_tag_t sc_dmat; -}; - -struct omap_mem_range { - bus_addr_t base; - bus_size_t size; -}; - -/** - * struct omap_cpu_dev - * - * Structure used to define all the SoC devices, it allows for two memory - * address ranges and 4 IRQ's per device. - * - */ -struct omap_cpu_dev { - const char *name; - int unit; - - struct omap_mem_range mem[16]; - int irqs[16]; -}; - -struct omap_ivar { - struct resource_list resources; -}; - -#endif /* _OMAP3VAR_H_ */ +#endif /* _TIVAR_H_ */ Modified: projects/armv6/sys/arm/ti/usb/omap_ehci.c ============================================================================== --- projects/armv6/sys/arm/ti/usb/omap_ehci.c Sun Apr 15 00:04:23 2012 (r234304) +++ projects/armv6/sys/arm/ti/usb/omap_ehci.c Sun Apr 15 01:40:22 2012 (r234305) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include