From owner-p4-projects@FreeBSD.ORG Tue Mar 4 01:20:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1C801065672; Tue, 4 Mar 2008 01:20:18 +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 5FCCE106566B for ; Tue, 4 Mar 2008 01:20:18 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E0B68FC12 for ; Tue, 4 Mar 2008 01:20:18 +0000 (UTC) (envelope-from marcel@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 m241KI53027267 for ; Tue, 4 Mar 2008 01:20:18 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m241KH0Z027265 for perforce@freebsd.org; Tue, 4 Mar 2008 01:20:17 GMT (envelope-from marcel@freebsd.org) Date: Tue, 4 Mar 2008 01:20:17 GMT Message-Id: <200803040120.m241KH0Z027265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136774 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: Tue, 04 Mar 2008 01:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=136774 Change 136774 by marcel@marcel_xcllnt on 2008/03/04 01:19:27 Fix $FreeBSD$ fodder. Affected files ... .. //depot/projects/e500/sys/dev/ic/quicc.h#3 edit .. //depot/projects/e500/sys/dev/quicc/quicc_bfe.h#5 edit .. //depot/projects/e500/sys/dev/quicc/quicc_bfe_ocp.c#4 edit .. //depot/projects/e500/sys/dev/quicc/quicc_bus.h#3 edit .. //depot/projects/e500/sys/dev/quicc/quicc_core.c#6 edit .. //depot/projects/e500/sys/dev/scc/scc_bfe_quicc.c#4 edit .. //depot/projects/e500/sys/dev/scc/scc_dev_quicc.c#3 edit .. //depot/projects/e500/sys/dev/tsec/if_tsec.c#9 edit .. //depot/projects/e500/sys/dev/tsec/if_tsec.h#4 edit .. //depot/projects/e500/sys/dev/tsec/if_tsecreg.h#5 edit .. //depot/projects/e500/sys/dev/uart/uart_bus_ocp.c#3 edit .. //depot/projects/e500/sys/dev/uart/uart_dev_quicc.c#5 edit .. //depot/projects/e500/sys/powerpc/booke/clock.c#5 edit .. //depot/projects/e500/sys/powerpc/booke/copyinout.c#5 edit .. //depot/projects/e500/sys/powerpc/booke/interrupt.c#9 edit .. //depot/projects/e500/sys/powerpc/booke/locore.S#7 edit .. //depot/projects/e500/sys/powerpc/booke/machdep.c#14 edit .. //depot/projects/e500/sys/powerpc/booke/pmap.c#14 edit .. //depot/projects/e500/sys/powerpc/booke/support.S#4 edit .. //depot/projects/e500/sys/powerpc/booke/swtch.S#4 edit .. //depot/projects/e500/sys/powerpc/booke/trap.c#9 edit .. //depot/projects/e500/sys/powerpc/booke/trap_subr.S#8 edit .. //depot/projects/e500/sys/powerpc/booke/uio_machdep.c#5 edit .. //depot/projects/e500/sys/powerpc/booke/vm_machdep.c#6 edit .. //depot/projects/e500/sys/powerpc/conf/MPC85XX#6 edit .. //depot/projects/e500/sys/powerpc/include/ocpbus.h#3 edit .. //depot/projects/e500/sys/powerpc/include/tlb.h#5 edit .. //depot/projects/e500/sys/powerpc/include/trap_aim.h#3 edit .. //depot/projects/e500/sys/powerpc/include/trap_booke.h#4 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/nexus.c#4 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#9 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.h#6 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/opic.c#4 edit .. //depot/projects/e500/sys/powerpc/mpc85xx/pci_ocp.c#6 edit Differences ... ==== //depot/projects/e500/sys/dev/ic/quicc.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/ic/quicc.h,v 1.1 2008/03/03 18:20:16 raj Exp $ */ #ifndef _DEV_IC_QUICC_H_ ==== //depot/projects/e500/sys/dev/quicc/quicc_bfe.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/quicc/quicc_bfe.h,v 1.1 2008/03/03 18:20:16 raj Exp $ */ #ifndef _DEV_QUICC_BFE_H_ ==== //depot/projects/e500/sys/dev/quicc/quicc_bfe_ocp.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/quicc/quicc_bfe_ocp.c,v 1.1 2008/03/03 18:20:16 raj Exp $"); #include #include ==== //depot/projects/e500/sys/dev/quicc/quicc_bus.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/quicc/quicc_bus.h,v 1.1 2008/03/03 18:20:16 raj Exp $ */ #ifndef _DEV_QUICC_BUS_H_ ==== //depot/projects/e500/sys/dev/quicc/quicc_core.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/quicc/quicc_core.c,v 1.1 2008/03/03 18:20:16 raj Exp $"); #include #include ==== //depot/projects/e500/sys/dev/scc/scc_bfe_quicc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/scc/scc_bfe_quicc.c,v 1.1 2008/03/03 18:20:16 raj Exp $"); #define __RMAN_RESOURCE_VISIBLE ==== //depot/projects/e500/sys/dev/scc/scc_dev_quicc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/scc/scc_dev_quicc.c,v 1.1 2008/03/03 18:20:16 raj Exp $"); #define __RMAN_RESOURCE_VISIBLE ==== //depot/projects/e500/sys/dev/tsec/if_tsec.c#9 (text+ko) ==== @@ -30,6 +30,8 @@ /* * Freescale integrated Three-Speed Ethernet Controller (TSEC) driver. */ +#include +__FBSDID("$FreeBSD: src/sys/dev/tsec/if_tsec.c,v 1.1 2008/03/03 19:03:44 raj Exp $"); #include #include ==== //depot/projects/e500/sys/dev/tsec/if_tsec.h#4 (text+ko) ==== @@ -25,6 +25,8 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/tsec/if_tsec.h,v 1.1 2008/03/03 19:03:44 raj Exp $ */ #define TSEC_RX_NUM_DESC 256 ==== //depot/projects/e500/sys/dev/tsec/if_tsecreg.h#5 (text+ko) ==== @@ -25,6 +25,8 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/tsec/if_tsecreg.h,v 1.1 2008/03/03 19:03:44 raj Exp $ */ #define TSEC_REG_ID 0x000 /* Controller ID register #1. */ ==== //depot/projects/e500/sys/dev/uart/uart_bus_ocp.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_ocp.c,v 1.1 2008/03/03 17:16:59 raj Exp $"); #include #include ==== //depot/projects/e500/sys/dev/uart/uart_dev_quicc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_quicc.c,v 1.1 2008/03/03 18:20:17 raj Exp $"); #include #include ==== //depot/projects/e500/sys/powerpc/booke/clock.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.20 2005/02/04 01:41:38 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/clock.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include #include ==== //depot/projects/e500/sys/powerpc/booke/copyinout.c#5 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.11 2005/01/07 02:29:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/copyinout.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include #include ==== //depot/projects/e500/sys/powerpc/booke/interrupt.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include /* RCS ID & Copyright macro defns */ -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/interrupt.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include #include ==== //depot/projects/e500/sys/powerpc/booke/locore.S#7 (text+ko) ==== @@ -24,7 +24,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/powerpc/booke/locore.S,v 1.1 2008/03/03 17:17:00 raj Exp $ */ #include "assym.s" ==== //depot/projects/e500/sys/powerpc/booke/machdep.c#14 (text+ko) ==== @@ -81,7 +81,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.89.2.1 2005/08/08 07:02:12 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/machdep.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" ==== //depot/projects/e500/sys/powerpc/booke/pmap.c#14 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/pmap.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include #include ==== //depot/projects/e500/sys/powerpc/booke/support.S#4 (text+ko) ==== @@ -24,7 +24,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/powerpc/booke/support.S,v 1.1 2008/03/03 17:17:00 raj Exp $ */ #include "assym.s" @@ -39,7 +39,6 @@ #include .text - /* * void remap_ccsrbar(vm_offset_t old_ccsrbar_va, vm_offset_t new_ccsrbar_va, * vm_offset_t new_ccsrbar_pa) ==== //depot/projects/e500/sys/powerpc/booke/swtch.S#4 (text+ko) ==== @@ -1,6 +1,3 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/swtch.S,v 1.21 2005/01/07 02:29:20 imp Exp $ */ -/* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ - /*- * Copyright (C) 2001 Benno Rice * All rights reserved. @@ -24,7 +21,12 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * + * from: $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ + * from: $FreeBSD: src/sys/powerpc/booke/swtch.S,v 1.1 2008/03/03 17:17:00 raj Exp $ + * + * $FreeBSD: src/sys/powerpc/booke/swtch.S,v 1.1 2008/03/03 17:17:00 raj Exp $ + */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 TooLs GmbH. ==== //depot/projects/e500/sys/powerpc/booke/trap.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.54.2.1 2005/08/08 07:02:12 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/trap.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include "opt_fpu_emu.h" #include "opt_ktrace.h" ==== //depot/projects/e500/sys/powerpc/booke/trap_subr.S#8 (text+ko) ==== @@ -1,6 +1,3 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/trap_subr.S,v 1.14.2.1 2005/08/08 07:02:12 grehan Exp $ */ -/* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $ */ - /*- * Copyright (C) 2006 Semihalf, Marian Balakowicz * Copyright (C) 2006 Semihalf, Rafal Jaworowski @@ -28,8 +25,9 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/powerpc/booke/trap_subr.S,v 1.1 2008/03/03 17:17:00 raj Exp $ */ - /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 TooLs GmbH. @@ -59,6 +57,8 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * from: $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $ */ /* ==== //depot/projects/e500/sys/powerpc/booke/uio_machdep.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/uio_machdep.c,v 1.5 2005/01/07 02:29:20 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/booke/uio_machdep.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include #include ==== //depot/projects/e500/sys/powerpc/booke/vm_machdep.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.110 2005/07/10 23:31:10 davidxu Exp $ + * from: $FreeBSD: src/sys/powerpc/booke/vm_machdep.c,v 1.1 2008/03/03 17:17:00 raj Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -98,6 +98,9 @@ * rights to redistribute these changes. */ +#include +__FBSDID("$FreeBSD: src/sys/powerpc/booke/vm_machdep.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); + #include #include #include ==== //depot/projects/e500/sys/powerpc/conf/MPC85XX#6 (text+ko) ==== @@ -1,3 +1,9 @@ +# +# Custom kernel for Freescale MPC85XX development boards like the CDS etc. +# +# $FreeBSD: src/sys/powerpc/conf/MPC85XX,v 1.1 2008/03/03 20:40:19 raj Exp $ +# + cpu E500 ident MPC85XX ==== //depot/projects/e500/sys/powerpc/include/ocpbus.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/powerpc/include/ocpbus.h,v 1.1 2008/03/03 17:17:00 raj Exp $ */ #ifndef _MACHINE_OCPBUS_H_ ==== //depot/projects/e500/sys/powerpc/include/tlb.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/powerpc/include/tlb.h,v 1.1 2008/03/03 13:20:52 raj Exp $ */ #ifndef _MACHINE_TLB_H_ ==== //depot/projects/e500/sys/powerpc/include/trap_aim.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $ - * $FreeBSD: src/sys/powerpc/include/trap.h,v 1.4 2005/01/07 02:29:19 imp Exp $ + * $FreeBSD: src/sys/powerpc/include/trap_aim.h,v 1.1 2008/03/03 13:20:52 raj Exp $ */ #ifndef _POWERPC_TRAP_H_ ==== //depot/projects/e500/sys/powerpc/include/trap_booke.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/powerpc/include/trap_booke.h,v 1.1 2008/03/03 13:20:52 raj Exp $ */ #ifndef _POWERPC_TRAP_H_ ==== //depot/projects/e500/sys/powerpc/mpc85xx/nexus.c#4 (text+ko) ==== @@ -51,10 +51,11 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09 - * - * $FreeBSD: src/sys/powerpc/powerpc/nexus.c,v 1.12 2005/01/07 02:29:20 imp Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/powerpc/mpc85xx/nexus.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); + #include #include #include ==== //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#9 (text+ko) ==== @@ -24,9 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/psim/iobus.c,v 1.8 2005/01/07 02:29:21 imp Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/powerpc/mpc85xx/ocpbus.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); + #include #include #include ==== //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/powerpc/mpc85xx/ocpbus.h,v 1.1 2008/03/03 17:17:00 raj Exp $ */ #ifndef _MACHINE_OCP85XX_H_ ==== //depot/projects/e500/sys/powerpc/mpc85xx/opic.c#4 (text+ko) ==== @@ -24,9 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/psim/iobus.c,v 1.8 2005/01/07 02:29:21 imp Exp $ */ +#include +__FBSDID("$FreeBSD: src/sys/powerpc/mpc85xx/opic.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); + #include #include #include @@ -43,17 +45,11 @@ #include "pic_if.h" -static int openpic_ocpbus_probe(device_t); - -struct openpic_ocpbus_softc { - struct openpic_softc osc; - int sc_rrid; - struct resource *sc_memr; /* mem resource */ -}; - /* * OpenPIC attachment to ocpbus */ +static int openpic_ocpbus_probe(device_t); + static device_method_t openpic_ocpbus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, openpic_ocpbus_probe), @@ -63,6 +59,7 @@ DEVMETHOD(pic_dispatch, openpic_dispatch), DEVMETHOD(pic_enable, openpic_enable), DEVMETHOD(pic_eoi, openpic_eoi), + DEVMETHOD(pic_ipi, openpic_ipi), DEVMETHOD(pic_mask, openpic_mask), DEVMETHOD(pic_unmask, openpic_unmask), @@ -72,7 +69,7 @@ static driver_t openpic_ocpbus_driver = { "openpic", openpic_ocpbus_methods, - sizeof(struct openpic_ocpbus_softc) + sizeof(struct openpic_softc) }; DRIVER_MODULE(openpic, ocpbus, openpic_ocpbus_driver, openpic_devclass, 0, 0); ==== //depot/projects/e500/sys/powerpc/mpc85xx/pci_ocp.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/powerpc/mpc85xx/pci_ocp.c,v 1.1 2008/03/03 17:17:00 raj Exp $"); #include #include