From owner-svn-src-projects@FreeBSD.ORG Mon Nov 9 16:43:02 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 64C54106568B; Mon, 9 Nov 2009 16:43:02 +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 497D38FC12; Mon, 9 Nov 2009 16:43:02 +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 nA9Gh23t027252; Mon, 9 Nov 2009 16:43:02 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA9Gh2PN027250; Mon, 9 Nov 2009 16:43:02 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200911091643.nA9Gh2PN027250@svn.freebsd.org> From: Randall Stewart Date: Mon, 9 Nov 2009 16:43:02 +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: r199090 - projects/mips/sys/mips/rmi 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: Mon, 09 Nov 2009 16:43:02 -0000 Author: rrs Date: Mon Nov 9 16:43:02 2009 New Revision: 199090 URL: http://svn.freebsd.org/changeset/base/199090 Log: White space changes. Modified: projects/mips/sys/mips/rmi/iodi.c Modified: projects/mips/sys/mips/rmi/iodi.c ============================================================================== --- projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:42:08 2009 (r199089) +++ projects/mips/sys/mips/rmi/iodi.c Mon Nov 9 16:43:02 2009 (r199090) @@ -78,10 +78,10 @@ static struct resource * iodi_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); -static int +static int iodi_activate_resource(device_t, device_t, int, int, struct resource *); -static int +static int iodi_setup_intr(device_t, device_t, struct resource *, int, driver_filter_t *, driver_intr_t *, void *, void **); @@ -112,41 +112,43 @@ iodi_setup_intr(device_t dev, device_t c /* FIXME is this the right place to fiddle with PIC? */ if (strcmp(device_get_name(child), "uart") == 0) { /* FIXME uart 1? */ - if (rmi_spin_mutex_safe) - mtx_lock_spin(&xlr_pic_lock); + if (rmi_spin_mutex_safe) + mtx_lock_spin(&xlr_pic_lock); level = PIC_IRQ_IS_EDGE_TRIGGERED(PIC_IRT_UART_0_INDEX); xlr_write_reg(mmio, PIC_IRT_0_UART_0, 0x01); xlr_write_reg(mmio, PIC_IRT_1_UART_0, ((1 << 31) | (level << 30) | (1 << 6) | (PIC_UART_0_IRQ))); - if (rmi_spin_mutex_safe) - mtx_unlock_spin(&xlr_pic_lock); + if (rmi_spin_mutex_safe) + mtx_unlock_spin(&xlr_pic_lock); cpu_establish_hardintr("uart", NULL, (driver_intr_t *) intr, (void *)arg, PIC_UART_0_IRQ, flags, cookiep); } else if (strcmp(device_get_name(child), "rge") == 0) { int irq; + /* This is a hack to pass in the irq */ irq = (int)ires->__r_i; if (rmi_spin_mutex_safe) - mtx_lock_spin(&xlr_pic_lock); + mtx_lock_spin(&xlr_pic_lock); reg = xlr_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE); xlr_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31)); - if (rmi_spin_mutex_safe) - mtx_unlock_spin(&xlr_pic_lock); + if (rmi_spin_mutex_safe) + mtx_unlock_spin(&xlr_pic_lock); cpu_establish_hardintr("rge", NULL, (driver_intr_t *) intr, (void *)arg, irq, flags, cookiep); } else if (strcmp(device_get_name(child), "ehci") == 0) { - if (rmi_spin_mutex_safe) - mtx_lock_spin(&xlr_pic_lock); + if (rmi_spin_mutex_safe) + mtx_lock_spin(&xlr_pic_lock); reg = xlr_read_reg(mmio, PIC_IRT_1_BASE + PIC_USB_IRQ - PIC_IRQ_BASE); xlr_write_reg(mmio, PIC_IRT_1_BASE + PIC_USB_IRQ - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31)); - if (rmi_spin_mutex_safe) - mtx_unlock_spin(&xlr_pic_lock); + if (rmi_spin_mutex_safe) + mtx_unlock_spin(&xlr_pic_lock); cpu_establish_hardintr("ehci", NULL, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep); } - /* This causes a panic and looks recursive to me (RRS). - BUS_SETUP_INTR(device_get_parent(dev), - child, ires, flags, filt, intr, arg, cookiep); - */ + /* + * This causes a panic and looks recursive to me (RRS). + * BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, + * intr, arg, cookiep); + */ return (0); }