From owner-svn-src-projects@FreeBSD.ORG Thu Oct 15 21:03:33 2009 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 3B35C106566B; Thu, 15 Oct 2009 21:03:33 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 286FE8FC14; Thu, 15 Oct 2009 21:03:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9FL3XJY084613; Thu, 15 Oct 2009 21:03:33 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9FL3WjW084602; Thu, 15 Oct 2009 21:03:32 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200910152103.n9FL3WjW084602@svn.freebsd.org> From: Randall Stewart Date: Thu, 15 Oct 2009 21:03:32 +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: r198154 - in projects/mips/sys: conf dev/rmi dev/rmi/sec dev/rmi/xlr mips/adm5120 mips/alchemy mips/atheros mips/idt mips/include mips/malta mips/octeon1 mips/rmi mips/sentry5 mips/sibyte 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: Thu, 15 Oct 2009 21:03:33 -0000 Author: rrs Date: Thu Oct 15 21:03:32 2009 New Revision: 198154 URL: http://svn.freebsd.org/changeset/base/198154 Log: Does 4 things: 1) Adds future RMI directories 2) Places intr_machdep.c in specfic files.arch pointing to the generic intr_machdep.c. This allows us to have an architecture dependant intr_machdep.c (which we will need for RMI) in the machine specific directory 3) removes intr_machdep.c from files.mips 4) Adds some TARGET_XLR_XLS ifdef's for the machine specific intra_machdep.h. We may need to look at finding a better place to put this. But first I want to get this thing compiling. Added: projects/mips/sys/dev/rmi/ projects/mips/sys/dev/rmi/sec/ projects/mips/sys/dev/rmi/xlr/ projects/mips/sys/mips/rmi/ Modified: projects/mips/sys/conf/files.mips projects/mips/sys/mips/adm5120/files.adm5120 projects/mips/sys/mips/alchemy/files.alchemy projects/mips/sys/mips/atheros/files.ar71xx projects/mips/sys/mips/idt/files.idt projects/mips/sys/mips/include/intr_machdep.h projects/mips/sys/mips/malta/files.malta projects/mips/sys/mips/octeon1/files.octeon1 projects/mips/sys/mips/sentry5/files.sentry5 projects/mips/sys/mips/sibyte/files.sibyte Modified: projects/mips/sys/conf/files.mips ============================================================================== --- projects/mips/sys/conf/files.mips Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/conf/files.mips Thu Oct 15 21:03:32 2009 (r198154) @@ -64,7 +64,6 @@ mips/mips/db_interface.c optional ddb mips/mips/db_trace.c optional ddb mips/mips/dump_machdep.c standard mips/mips/in_cksum.c optional inet -mips/mips/intr_machdep.c standard mips/mips/locore.S standard no-obj mips/mips/mem.c optional mem mips/mips/nexus.c standard Modified: projects/mips/sys/mips/adm5120/files.adm5120 ============================================================================== --- projects/mips/sys/mips/adm5120/files.adm5120 Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/adm5120/files.adm5120 Thu Oct 15 21:03:32 2009 (r198154) @@ -9,3 +9,4 @@ mips/adm5120/obio.c standard mips/adm5120/uart_bus_adm5120.c optional uart mips/adm5120/uart_cpu_adm5120.c optional uart mips/adm5120/uart_dev_adm5120.c optional uart +mips/mips/intr_machdep.c standard Modified: projects/mips/sys/mips/alchemy/files.alchemy ============================================================================== --- projects/mips/sys/mips/alchemy/files.alchemy Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/alchemy/files.alchemy Thu Oct 15 21:03:32 2009 (r198154) @@ -5,3 +5,4 @@ mips/alchemy/alchemy_machdep.c standard mips/alchemy/obio.c standard mips/alchemy/uart_bus_alchemy.c optional uart mips/alchemy/uart_cpu_alchemy.c optional uart +mips/mips/intr_machdep.c standard Modified: projects/mips/sys/mips/atheros/files.ar71xx ============================================================================== --- projects/mips/sys/mips/atheros/files.ar71xx Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/atheros/files.ar71xx Thu Oct 15 21:03:32 2009 (r198154) @@ -12,3 +12,4 @@ mips/atheros/if_arge.c optional arge mips/atheros/uart_bus_ar71xx.c optional uart mips/atheros/uart_cpu_ar71xx.c optional uart mips/atheros/ar71xx_bus_space_reversed.c standard +mips/mips/intr_machdep.c standard Modified: projects/mips/sys/mips/idt/files.idt ============================================================================== --- projects/mips/sys/mips/idt/files.idt Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/idt/files.idt Thu Oct 15 21:03:32 2009 (r198154) @@ -6,3 +6,4 @@ mips/idt/if_kr.c optional kr mips/idt/obio.c standard mips/idt/uart_cpu_rc32434.c optional uart mips/idt/uart_bus_rc32434.c optional uart +mips/mips/intr_machdep.c standard Modified: projects/mips/sys/mips/include/intr_machdep.h ============================================================================== --- projects/mips/sys/mips/include/intr_machdep.h Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/include/intr_machdep.h Thu Oct 15 21:03:32 2009 (r198154) @@ -29,8 +29,26 @@ #ifndef _MACHINE_INTR_MACHDEP_H_ #define _MACHINE_INTR_MACHDEP_H_ +#ifdef TARGET_XLR_XLS +/* + * XLR/XLS uses its own intr_machdep.c and has + * a different number of interupts. This probably + * should be placed somewhere else. + */ + +struct mips_intrhand { + struct intr_event *mih_event; + driver_intr_t *mih_disable; + volatile long *cntp; /* interrupt counter */ +}; + +extern struct mips_intrhand mips_intr_handlers[]; +#define XLR_MAX_INTR 64 + +#else #define NHARD_IRQS 6 #define NSOFT_IRQS 2 +#endif struct trapframe; @@ -40,4 +58,5 @@ void cpu_establish_softintr(const char * void *, int, int, void **); void cpu_intr(struct trapframe *); + #endif /* !_MACHINE_INTR_MACHDEP_H_ */ Modified: projects/mips/sys/mips/malta/files.malta ============================================================================== --- projects/mips/sys/mips/malta/files.malta Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/malta/files.malta Thu Oct 15 21:03:32 2009 (r198154) @@ -7,3 +7,4 @@ mips/malta/uart_bus_maltausart.c optiona dev/uart/uart_dev_ns8250.c optional uart mips/malta/malta_machdep.c standard mips/malta/yamon.c standard +mips/mips/intr_machdep.c standard Modified: projects/mips/sys/mips/octeon1/files.octeon1 ============================================================================== --- projects/mips/sys/mips/octeon1/files.octeon1 Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/octeon1/files.octeon1 Thu Oct 15 21:03:32 2009 (r198154) @@ -13,3 +13,4 @@ mips/octeon1/octeon_machdep.c standard mips/octeon1/uart_bus_octeonusart.c optional uart mips/octeon1/uart_cpu_octeonusart.c optional uart mips/octeon1/uart_dev_oct16550.c optional uart +mips/mips/intr_machdep.c standard Modified: projects/mips/sys/mips/sentry5/files.sentry5 ============================================================================== --- projects/mips/sys/mips/sentry5/files.sentry5 Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/sentry5/files.sentry5 Thu Oct 15 21:03:32 2009 (r198154) @@ -5,3 +5,4 @@ # which are believed to be devices we have drivers for # which just need to be tweaked for attachment to an SSB system bus. mips/sentry5/s5_machdep.c standard +mips/mips/intr_machdep.c standard Modified: projects/mips/sys/mips/sibyte/files.sibyte ============================================================================== --- projects/mips/sys/mips/sibyte/files.sibyte Thu Oct 15 20:15:29 2009 (r198153) +++ projects/mips/sys/mips/sibyte/files.sibyte Thu Oct 15 21:03:32 2009 (r198154) @@ -5,5 +5,5 @@ mips/sibyte/sb_zbbus.c standard mips/sibyte/sb_zbpci.c standard mips/sibyte/sb_scd.c standard mips/sibyte/ata_zbbus.c standard - +mips/mips/intr_machdep.c standard mips/sibyte/sb_asm.S standard