From owner-p4-projects@FreeBSD.ORG Fri Feb 6 22:43:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 745FC1065672; Fri, 6 Feb 2009 22:43:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3288C106564A for ; Fri, 6 Feb 2009 22:43:16 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F79D8FC12 for ; Fri, 6 Feb 2009 22:43:16 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n16MhGZP037759 for ; Fri, 6 Feb 2009 22:43:16 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n16MhFrZ037757 for perforce@freebsd.org; Fri, 6 Feb 2009 22:43:15 GMT (envelope-from andrew@freebsd.org) Date: Fri, 6 Feb 2009 22:43:15 GMT Message-Id: <200902062243.n16MhFrZ037757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 157311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2009 22:43:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=157311 Change 157311 by andrew@andrew_bender on 2009/02/06 22:42:36 Rename the s3c2410 driver to s3c24x0 to reflect the new file name Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#2 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_mci.c#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_nand.c#3 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#2 (text+ko) ==== @@ -66,53 +66,53 @@ }; /* prototypes */ -static device_t s3c2410_add_child(device_t, int, const char *, int); +static device_t s3c24x0_add_child(device_t, int, const char *, int); -static int s3c2410_probe(device_t); -static int s3c2410_attach(device_t); -static void s3c2410_identify(driver_t *, device_t); -static int s3c2410_setup_intr(device_t, device_t, struct resource *, int, +static int s3c24x0_probe(device_t); +static int s3c24x0_attach(device_t); +static void s3c24x0_identify(driver_t *, device_t); +static int s3c24x0_setup_intr(device_t, device_t, struct resource *, int, driver_filter_t *, driver_intr_t *, void *, void **); -static int s3c2410_teardown_intr(device_t, device_t, struct resource *, +static int s3c24x0_teardown_intr(device_t, device_t, struct resource *, void *); -static struct resource *s3c2410_alloc_resource(device_t, device_t, int, int *, +static struct resource *s3c24x0_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); -static int s3c2410_activate_resource(device_t, device_t, int, int, +static int s3c24x0_activate_resource(device_t, device_t, int, int, struct resource *); -static int s3c2410_release_resource(device_t, device_t, int, int, +static int s3c24x0_release_resource(device_t, device_t, int, int, struct resource *); -static struct resource_list *s3c2410_get_resource_list(device_t, device_t); +static struct resource_list *s3c24x0_get_resource_list(device_t, device_t); static void s3c24x0_identify_cpu(device_t); -static device_method_t s3c2410_methods[] = { - DEVMETHOD(device_probe, s3c2410_probe), - DEVMETHOD(device_attach, s3c2410_attach), - DEVMETHOD(device_identify, s3c2410_identify), - DEVMETHOD(bus_setup_intr, s3c2410_setup_intr), - DEVMETHOD(bus_teardown_intr, s3c2410_teardown_intr), - DEVMETHOD(bus_alloc_resource, s3c2410_alloc_resource), - DEVMETHOD(bus_activate_resource, s3c2410_activate_resource), - DEVMETHOD(bus_release_resource, s3c2410_release_resource), - DEVMETHOD(bus_get_resource_list,s3c2410_get_resource_list), +static device_method_t s3c24x0_methods[] = { + DEVMETHOD(device_probe, s3c24x0_probe), + DEVMETHOD(device_attach, s3c24x0_attach), + DEVMETHOD(device_identify, s3c24x0_identify), + DEVMETHOD(bus_setup_intr, s3c24x0_setup_intr), + DEVMETHOD(bus_teardown_intr, s3c24x0_teardown_intr), + DEVMETHOD(bus_alloc_resource, s3c24x0_alloc_resource), + DEVMETHOD(bus_activate_resource, s3c24x0_activate_resource), + DEVMETHOD(bus_release_resource, s3c24x0_release_resource), + DEVMETHOD(bus_get_resource_list,s3c24x0_get_resource_list), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), {0, 0}, }; -static driver_t s3c2410_driver = { - "s3c2410", - s3c2410_methods, +static driver_t s3c24x0_driver = { + "s3c24x0", + s3c24x0_methods, sizeof(struct s3c24x0_softc), }; -static devclass_t s3c2410_devclass; +static devclass_t s3c24x0_devclass; -DRIVER_MODULE(s3c2410, nexus, s3c2410_driver, s3c2410_devclass, 0, 0); +DRIVER_MODULE(s3c24x0, nexus, s3c24x0_driver, s3c24x0_devclass, 0, 0); struct s3c2xx0_softc *s3c2xx0_softc = NULL; static device_t -s3c2410_add_child(device_t bus, int prio, const char *name, int unit) +s3c24x0_add_child(device_t bus, int prio, const char *name, int unit) { device_t child; struct s3c2xx0_ivar *ivar; @@ -134,7 +134,7 @@ } static int -s3c2410_setup_intr(device_t dev, device_t child, +s3c24x0_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { @@ -152,14 +152,14 @@ } static int -s3c2410_teardown_intr(device_t dev, device_t child, struct resource *res, +s3c24x0_teardown_intr(device_t dev, device_t child, struct resource *res, void *cookie) { return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } static struct resource * -s3c2410_alloc_resource(device_t bus, device_t child, int type, int *rid, +s3c24x0_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { struct resource_list_entry *rle; @@ -244,14 +244,14 @@ } static int -s3c2410_activate_resource(device_t bus, device_t child, int type, int rid, +s3c24x0_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { return (0); } static int -s3c2410_release_resource(device_t bus, device_t child, int type, int rid, +s3c24x0_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { struct s3c2xx0_ivar *ivar = device_get_ivars(child); @@ -272,7 +272,7 @@ } static struct resource_list * -s3c2410_get_resource_list(device_t dev, device_t child) +s3c24x0_get_resource_list(device_t dev, device_t child) { struct s3c2xx0_ivar *ivar; @@ -281,20 +281,20 @@ } void -s3c2410_identify(driver_t *driver, device_t parent) +s3c24x0_identify(driver_t *driver, device_t parent) { - BUS_ADD_CHILD(parent, 0, "s3c2410", 0); + BUS_ADD_CHILD(parent, 0, "s3c24x0", 0); } int -s3c2410_probe(device_t dev) +s3c24x0_probe(device_t dev) { return 0; } int -s3c2410_attach(device_t dev) +s3c24x0_attach(device_t dev) { struct s3c24x0_softc *sc = device_get_softc(dev); bus_space_tag_t iot; @@ -373,17 +373,17 @@ S3C2410_REG_BASE + S3C2410_REG_SIZE) != 0) panic("s3c2410_attach: failed to set up register rman"); - s3c2410_add_child(dev, 0, "nand", 0); - s3c2410_add_child(dev, 0, "timer", 0); + s3c24x0_add_child(dev, 0, "nand", 0); + s3c24x0_add_child(dev, 0, "timer", 0); /* Add the MMC/SD and set it's irq/registers */ - child = s3c2410_add_child(dev, 0, "s3c24x0_mci", 0); + child = s3c24x0_add_child(dev, 0, "s3c24x0_mci", 0); bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_SDI, 1); bus_set_resource(child, SYS_RES_IOPORT, 0, S3C2410_SDI_BASE, S3C2410_SDI_SIZE); /* Add the uart and set it's irq and registers */ - child = s3c2410_add_child(dev, 0, "uart", 0); + child = s3c24x0_add_child(dev, 0, "uart", 0); bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_UART0, 1); bus_set_resource(child, SYS_RES_IOPORT, 0, S3C2410_UART0_BASE, S3C2410_UART_BASE(1) - S3C2410_UART0_BASE); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_clk.c#4 (text+ko) ==== @@ -94,7 +94,7 @@ }; static devclass_t s3c24x0_timer_devclass; -DRIVER_MODULE(s3c24x0timer, s3c2410, s3c24x0_timer_driver, s3c24x0_timer_devclass, 0, 0); +DRIVER_MODULE(s3c24x0timer, s3c24x0, s3c24x0_timer_driver, s3c24x0_timer_devclass, 0, 0); #ifndef STATHZ #define STATHZ 64 ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_mci.c#4 (text+ko) ==== @@ -559,5 +559,5 @@ static devclass_t s3c24x0_mci_devclass; -DRIVER_MODULE(s3c24x0_mci, s3c2410, s3c24x0_mci_driver, s3c24x0_mci_devclass, 0, 0); +DRIVER_MODULE(s3c24x0_mci, s3c24x0, s3c24x0_mci_driver, s3c24x0_mci_devclass, 0, 0); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_nand.c#3 (text+ko) ==== @@ -497,4 +497,4 @@ return(0); } -DRIVER_MODULE(nand, s3c2410, nand_s3c2410_driver, nand_devclass, 0, 0); +DRIVER_MODULE(nand, s3c24x0, nand_s3c2410_driver, nand_devclass, 0, 0); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#4 (text+ko) ==== @@ -48,4 +48,4 @@ return (0); } -DRIVER_MODULE(uart, s3c2410, uart_s3c2410_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, s3c24x0, uart_s3c2410_driver, uart_devclass, 0, 0);