From owner-p4-projects@FreeBSD.ORG Sat Feb 23 22:44:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F096216A404; Sat, 23 Feb 2008 22:44:23 +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 B579716A403 for ; Sat, 23 Feb 2008 22:44:23 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA76B13C448 for ; Sat, 23 Feb 2008 22:44:23 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1NMiNSn045402 for ; Sat, 23 Feb 2008 22:44:23 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1NMiN6W045399 for perforce@freebsd.org; Sat, 23 Feb 2008 22:44:23 GMT (envelope-from raj@freebsd.org) Date: Sat, 23 Feb 2008 22:44:23 GMT Message-Id: <200802232244.m1NMiN6W045399@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 136045 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: Sat, 23 Feb 2008 22:44:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=136045 Change 136045 by raj@raj_mimi on 2008/02/23 22:43:26 Fix style issues in OCP, other easthetics. Affected files ... .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#5 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.h#2 edit Differences ... ==== //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#5 (text+ko) ==== @@ -80,29 +80,29 @@ * Bus interface definition */ static device_method_t ocpbus_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ocpbus_probe), - DEVMETHOD(device_attach, ocpbus_attach), - DEVMETHOD(device_shutdown, ocpbus_shutdown), + /* Device interface */ + DEVMETHOD(device_probe, ocpbus_probe), + DEVMETHOD(device_attach, ocpbus_attach), + DEVMETHOD(device_shutdown, ocpbus_shutdown), - /* Bus interface */ - DEVMETHOD(bus_print_child, ocpbus_print_child), - DEVMETHOD(bus_read_ivar, ocpbus_read_ivar), - DEVMETHOD(bus_setup_intr, ocpbus_setup_intr), - DEVMETHOD(bus_teardown_intr, ocpbus_teardown_intr), + /* Bus interface */ + DEVMETHOD(bus_print_child, ocpbus_print_child), + DEVMETHOD(bus_read_ivar, ocpbus_read_ivar), + DEVMETHOD(bus_setup_intr, ocpbus_setup_intr), + DEVMETHOD(bus_teardown_intr, ocpbus_teardown_intr), - DEVMETHOD(bus_get_resource, ocpbus_get_resource), - DEVMETHOD(bus_alloc_resource, ocpbus_alloc_resource), - DEVMETHOD(bus_release_resource, ocpbus_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_get_resource, ocpbus_get_resource), + DEVMETHOD(bus_alloc_resource, ocpbus_alloc_resource), + DEVMETHOD(bus_release_resource, ocpbus_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - { 0, 0 } + { 0, 0 } }; static driver_t ocpbus_driver = { - "ocpbus", - ocpbus_methods, + "ocpbus", + ocpbus_methods, sizeof(struct ocpbus_softc) }; @@ -206,8 +206,7 @@ static int ocpbus_probe (device_t dev) { - - device_set_desc(dev, "on-chip peripheral bus"); + device_set_desc(dev, "On-Chip Peripherals bus"); return (BUS_PROBE_DEFAULT); } @@ -245,12 +244,13 @@ sc->sc_irq.rm_end = end; sc->sc_irq.rm_type = RMAN_ARRAY; sc->sc_irq.rm_descr = "Interrupt request lines"; - if (rman_init(&sc->sc_irq) || rman_manage_region(&sc->sc_irq, start, end)) + if (rman_init(&sc->sc_irq) || + rman_manage_region(&sc->sc_irq, start, end)) panic("ocpbus_attach IRQ rman"); /* Set up I/O mem rman */ sc->sc_mem.rm_type = RMAN_ARRAY; - sc->sc_mem.rm_descr = "OCPBus Device Memory"; + sc->sc_mem.rm_descr = "OCPBus Device Memory"; error = rman_init(&sc->sc_mem); if (error) { device_printf(dev, "rman_init() failed. error = %d\n", error); @@ -284,10 +284,9 @@ static int ocpbus_shutdown(device_t dev) { - return(0); + return(0); } - struct ocp_resource { int sr_devtype; int sr_unit; @@ -300,11 +299,11 @@ const struct ocp_resource mpc8555_resources[] = { {OCPBUS_DEVTYPE_PIC, 0, SYS_RES_MEMORY, 0, OCPE500_OPENPIC_OFF, OCPE500_OPENPIC_SIZE}, - + {OCPBUS_DEVTYPE_QUICC, 0, SYS_RES_MEMORY, 0, OCPE500_QUICC_OFF, OCPE500_QUICC_SIZE}, {OCPBUS_DEVTYPE_QUICC, 0, SYS_RES_IRQ, 0, PIC_IRQ_INT(30), 1}, - + {OCPBUS_DEVTYPE_TSEC, 0, SYS_RES_MEMORY, 0, OCPE500_TSEC0_OFF, OCPE500_TSEC_SIZE}, {OCPBUS_DEVTYPE_TSEC, 0, SYS_RES_IRQ, 0, PIC_IRQ_INT(13), 1}, @@ -325,14 +324,14 @@ {OCPBUS_DEVTYPE_TSEC, 3, SYS_RES_IRQ, 0, PIC_IRQ_INT(21), 1}, {OCPBUS_DEVTYPE_TSEC, 3, SYS_RES_IRQ, 1, PIC_IRQ_INT(22), 1}, {OCPBUS_DEVTYPE_TSEC, 3, SYS_RES_IRQ, 2, PIC_IRQ_INT(23), 1}, - + {OCPBUS_DEVTYPE_UART, 0, SYS_RES_MEMORY, 0, OCPE500_UART0_OFF, OCPE500_UART_SIZE}, {OCPBUS_DEVTYPE_UART, 0, SYS_RES_IRQ, 0, PIC_IRQ_INT(26), 1}, {OCPBUS_DEVTYPE_UART, 1, SYS_RES_MEMORY, 0, OCPE500_UART1_OFF, OCPE500_UART_SIZE}, {OCPBUS_DEVTYPE_UART, 1, SYS_RES_IRQ, 0, PIC_IRQ_INT(26), 1}, - + {OCPBUS_DEVTYPE_PCIB, 0, SYS_RES_MEMORY, 0, OCPE500_PCI0_OFF, OCPE500_PCI_SIZE}, {OCPBUS_DEVTYPE_PCIB, 0, SYS_RES_MEMORY, 1, 0, OCPE500_TGTIF_PCI0}, @@ -343,18 +342,18 @@ {OCPBUS_DEVTYPE_PCIB, 1, SYS_RES_IOPORT, 1, 0, OCPE500_TGTIF_PCI1}, {OCPBUS_DEVTYPE_PCIB, 2, SYS_RES_MEMORY, 0, OCPE500_PCI2_OFF, OCPE500_PCI_SIZE}, - {OCPBUS_DEVTYPE_PCIB, 2, SYS_RES_MEMORY, 1, 0, OCPE500_TGTIF_PCI2}, - {OCPBUS_DEVTYPE_PCIB, 2, SYS_RES_IOPORT, 1, 0, OCPE500_TGTIF_PCI2}, - + {OCPBUS_DEVTYPE_PCIB, 2, SYS_RES_MEMORY, 1, 0, OCPE500_TGTIF_PCI2}, + {OCPBUS_DEVTYPE_PCIB, 2, SYS_RES_IOPORT, 1, 0, OCPE500_TGTIF_PCI2}, + {OCPBUS_DEVTYPE_LBC, 0, SYS_RES_MEMORY, 0, OCPE500_LBC_OFF, OCPE500_LBC_SIZE}, {OCPBUS_DEVTYPE_LBC, 0, SYS_RES_MEMORY, 1, 0, OCPE500_TGTIF_LBC}, {OCPBUS_DEVTYPE_I2C, 0, SYS_RES_MEMORY, 0, OCPE500_I2C0_OFF, - OCPE500_I2C_SIZE}, + OCPE500_I2C_SIZE}, {OCPBUS_DEVTYPE_I2C, 0, SYS_RES_IRQ, 0, PIC_IRQ_INT(27), 1}, {OCPBUS_DEVTYPE_I2C, 1, SYS_RES_MEMORY, 0, OCPE500_I2C1_OFF, - OCPE500_I2C_SIZE}, + OCPE500_I2C_SIZE}, {OCPBUS_DEVTYPE_I2C, 1, SYS_RES_IRQ, 0, PIC_IRQ_INT(27), 1}, {0} @@ -456,7 +455,7 @@ rman_set_bustag(rv, &bs_be_tag); rman_set_bushandle(rv, rman_get_start(rv)); - return (rv); + return (rv); } static int @@ -542,7 +541,6 @@ ocpbus_release_resource(device_t dev, device_t child, int type, int rid, struct resource *res) { - return (rman_release_resource(res)); } @@ -550,7 +548,7 @@ ocpbus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, driver_filter_t *filter, driver_intr_t *ihand, void *arg, void **cookiep) { - int error; + int error; if (res == NULL) panic("ocpbus_setup_intr: NULL irq resource!"); ==== //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #ifndef _MACHINE_OCPE500_H_ #define _MACHINE_OCPE500_H_ - + /* * Local access registers. */