Module Name: src Committed By: skrll Date: Wed Jul 29 10:47:58 UTC 2015
Modified Files: src/sys/arch/arm/broadcom: bcm2835_dmac.c bcm2835_dwctwo.c bcm2835_emmc.c bcm2835_intr.h bcm2835_mbox.c bcm2835_plcom.c bcm2835_spi.c bcm2835_tmr.c src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_kmod_netbsd.c Log Message: Expand the bcm2835_intr_establish inline. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/broadcom/bcm2835_dmac.c \ src/sys/arch/arm/broadcom/bcm2835_mbox.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c \ src/sys/arch/arm/broadcom/bcm2835_intr.h \ src/sys/arch/arm/broadcom/bcm2835_spi.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/broadcom/bcm2835_emmc.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_plcom.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm2835_tmr.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/broadcom/bcm2835_dmac.c diff -u src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.9 src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.10 --- src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.9 Sun Sep 14 14:29:57 2014 +++ src/sys/arch/arm/broadcom/bcm2835_dmac.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_dmac.c,v 1.9 2014/09/14 14:29:57 jmcneill Exp $ */ +/* $NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.9 2014/09/14 14:29:57 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.10 2015/07/29 10:47:58 skrll Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -213,8 +213,8 @@ bcm_dmac_alloc(enum bcm_dmac_type type, return NULL; KASSERT(ch->ch_ih == NULL); - ch->ch_ih = bcm2835_intr_establish(BCM2835_INT_DMA0 + ch->ch_index, - ipl, bcm_dmac_intr, ch); + ch->ch_ih = intr_establish(BCM2835_INT_DMA0 + ch->ch_index, + IST_LEVEL, ipl, bcm_dmac_intr, ch); if (ch->ch_ih == NULL) { aprint_error_dev(sc->sc_dev, "failed to establish interrupt for DMA%d\n", ch->ch_index); Index: src/sys/arch/arm/broadcom/bcm2835_mbox.c diff -u src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.9 src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.10 --- src/sys/arch/arm/broadcom/bcm2835_mbox.c:1.9 Wed Oct 15 06:57:27 2014 +++ src/sys/arch/arm/broadcom/bcm2835_mbox.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_mbox.c,v 1.9 2014/10/15 06:57:27 skrll Exp $ */ +/* $NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.9 2014/10/15 06:57:27 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox.c,v 1.10 2015/07/29 10:47:58 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -107,7 +107,7 @@ bcmmbox_attach(device_t parent, device_t return; } - sc->sc_intrh = bcm2835_intr_establish(aaa->aaa_intr, IPL_VM, + sc->sc_intrh = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_VM, bcmmbox_intr, sc); if (sc->sc_intrh == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n"); Index: src/sys/arch/arm/broadcom/bcm2835_dwctwo.c diff -u src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.2 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.3 --- src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.2 Tue Sep 2 14:55:56 2014 +++ src/sys/arch/arm/broadcom/bcm2835_dwctwo.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $ */ +/* $NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.2 2014/09/02 14:55:56 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.3 2015/07/29 10:47:58 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -130,7 +130,7 @@ bcmdwc2_attach(device_t parent, device_t aprint_naive(": USB controller\n"); aprint_normal(": USB controller\n"); - sc->sc_ih = bcm2835_intr_establish(aaa->aaa_intr, IPL_SCHED, + sc->sc_ih = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_SCHED, dwc2_intr, &sc->sc_dwc2); if (sc->sc_ih == NULL) { Index: src/sys/arch/arm/broadcom/bcm2835_intr.h diff -u src/sys/arch/arm/broadcom/bcm2835_intr.h:1.2 src/sys/arch/arm/broadcom/bcm2835_intr.h:1.3 --- src/sys/arch/arm/broadcom/bcm2835_intr.h:1.2 Sun Apr 12 17:32:39 2015 +++ src/sys/arch/arm/broadcom/bcm2835_intr.h Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_intr.h,v 1.2 2015/04/12 17:32:39 skrll Exp $ */ +/* $NetBSD: bcm2835_intr.h,v 1.3 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -43,13 +43,6 @@ void bcm2835_irq_handler(void *); #include <arm/pic/picvar.h> -static __inline void * -bcm2835_intr_establish(int irq, int ipl, int (*func)(void *), void *arg) -{ - - return intr_establish(irq, ipl, IST_LEVEL, func, arg); -} - void bcm2836mp_intr_init(struct cpu_info *); #endif /* _LOCORE */ Index: src/sys/arch/arm/broadcom/bcm2835_spi.c diff -u src/sys/arch/arm/broadcom/bcm2835_spi.c:1.2 src/sys/arch/arm/broadcom/bcm2835_spi.c:1.3 --- src/sys/arch/arm/broadcom/bcm2835_spi.c:1.2 Tue Oct 7 06:44:38 2014 +++ src/sys/arch/arm/broadcom/bcm2835_spi.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_spi.c,v 1.2 2014/10/07 06:44:38 skrll Exp $ */ +/* $NetBSD: bcm2835_spi.c,v 1.3 2015/07/29 10:47:58 skrll Exp $ */ /* * Copyright (c) 2012 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.2 2014/10/07 06:44:38 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.3 2015/07/29 10:47:58 skrll Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -109,7 +109,7 @@ bcmspi_attach(device_t parent, device_t for (u_int pin = 7; pin <= 11; pin++) bcm2835gpio_function_select(pin, BCM2835_GPIO_ALT0); - sc->sc_intrh = bcm2835_intr_establish(aaa->aaa_intr, IPL_VM, + sc->sc_intrh = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_VM, bcmspi_intr, sc); if (sc->sc_intrh == NULL) { aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n"); Index: src/sys/arch/arm/broadcom/bcm2835_emmc.c diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.21 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.22 --- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.21 Mon Dec 15 08:17:15 2014 +++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_emmc.c,v 1.21 2014/12/15 08:17:15 mlelstv Exp $ */ +/* $NetBSD: bcm2835_emmc.c,v 1.22 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.21 2014/12/15 08:17:15 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.22 2015/07/29 10:47:58 skrll Exp $"); #include "bcmdmac.h" @@ -143,7 +143,7 @@ bcmemmc_attach(device_t parent, device_t aprint_naive(": SDHC controller\n"); aprint_normal(": SDHC controller\n"); - sc->sc_ih = bcm2835_intr_establish(aaa->aaa_intr, IPL_SDMMC, sdhc_intr, + sc->sc_ih = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_SDMMC, sdhc_intr, &sc->sc); if (sc->sc_ih == NULL) { Index: src/sys/arch/arm/broadcom/bcm2835_plcom.c diff -u src/sys/arch/arm/broadcom/bcm2835_plcom.c:1.1 src/sys/arch/arm/broadcom/bcm2835_plcom.c:1.2 --- src/sys/arch/arm/broadcom/bcm2835_plcom.c:1.1 Thu Jul 26 06:21:57 2012 +++ src/sys/arch/arm/broadcom/bcm2835_plcom.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_plcom.c,v 1.1 2012/07/26 06:21:57 skrll Exp $ */ +/* $NetBSD: bcm2835_plcom.c,v 1.2 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ /* Interface to plcom (PL011) serial driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_plcom.c,v 1.1 2012/07/26 06:21:57 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_plcom.c,v 1.2 2015/07/29 10:47:58 skrll Exp $"); #include <sys/types.h> #include <sys/device.h> @@ -91,7 +91,7 @@ bcm2835_plcom_attach(device_t parent, de } plcom_attach_subr(sc); - ih = bcm2835_intr_establish(aaa->aaa_intr, IPL_SERIAL, plcomintr, sc); + ih = intr_establish(aaa->aaa_intr, IST_LEVEL, IPL_SERIAL, plcomintr, sc); if (ih == NULL) panic("%s: cannot install interrupt handler", device_xname(sc->sc_dev)); Index: src/sys/arch/arm/broadcom/bcm2835_tmr.c diff -u src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.5 src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.6 --- src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.5 Wed Dec 17 06:54:48 2014 +++ src/sys/arch/arm/broadcom/bcm2835_tmr.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_tmr.c,v 1.5 2014/12/17 06:54:48 skrll Exp $ */ +/* $NetBSD: bcm2835_tmr.c,v 1.6 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.5 2014/12/17 06:54:48 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.6 2015/07/29 10:47:58 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -143,7 +143,7 @@ cpu_initclocks(void) stcl += counts_per_hz; bus_space_write_4(sc->sc_iot, sc->sc_ioh, BCM2835_STIMER_C3, stcl); - clock_ih = bcm2835_intr_establish(BCM2835_INT_TIMER3, IPL_CLOCK, + clock_ih = intr_establish(BCM2835_INT_TIMER3, IST_LEVEL, IPL_CLOCK, clockhandler, NULL); if (clock_ih == NULL) panic("%s: unable to register timer interrupt", __func__); Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.3 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.4 --- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c:1.3 Tue Sep 2 09:55:48 2014 +++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c Wed Jul 29 10:47:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vchiq_kmod_netbsd.c,v 1.3 2014/09/02 09:55:48 jmcneill Exp $ */ +/* $NetBSD: vchiq_kmod_netbsd.c,v 1.4 2015/07/29 10:47:58 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.3 2014/09/02 09:55:48 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vchiq_kmod_netbsd.c,v 1.4 2015/07/29 10:47:58 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -117,7 +117,7 @@ vchiq_defer(device_t self) vchiq_core_initialize(); - sc->sc_ih = bcm2835_intr_establish(sc->sc_intr, IPL_SCHED, + sc->sc_ih = intr_establish(sc->sc_intr, IST_LEVEL, IPL_SCHED, vchiq_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "failed to establish interrupt %d\n",