Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Expand the bcm2835_intr_establish inline.
details: https://anonhg.NetBSD.org/src/rev/4282fad3b71b
branches: trunk
changeset: 339580:4282fad3b71b
user: skrll <skrll%NetBSD.org@localhost>
date: Wed Jul 29 10:47:58 2015 +0000
description:
Expand the bcm2835_intr_establish inline.
No functional change.
diffstat:
sys/arch/arm/broadcom/bcm2835_dmac.c | 8 ++++----
sys/arch/arm/broadcom/bcm2835_dwctwo.c | 6 +++---
sys/arch/arm/broadcom/bcm2835_emmc.c | 6 +++---
sys/arch/arm/broadcom/bcm2835_intr.h | 9 +--------
sys/arch/arm/broadcom/bcm2835_mbox.c | 6 +++---
sys/arch/arm/broadcom/bcm2835_plcom.c | 6 +++---
sys/arch/arm/broadcom/bcm2835_spi.c | 6 +++---
sys/arch/arm/broadcom/bcm2835_tmr.c | 6 +++---
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c | 6 +++---
9 files changed, 26 insertions(+), 33 deletions(-)
diffs (241 lines):
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_dmac.c
--- a/sys/arch/arm/broadcom/bcm2835_dmac.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_dmac.c Wed Jul 29 10:47:58 2015 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
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);
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_dwctwo.c
--- a/sys/arch/arm/broadcom/bcm2835_dwctwo.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_dwctwo.c Wed Jul 29 10:47:58 2015 +0000
@@ -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 @@
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) {
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_emmc.c
--- a/sys/arch/arm/broadcom/bcm2835_emmc.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_emmc.c Wed Jul 29 10:47:58 2015 +0000
@@ -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 @@
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) {
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_intr.h
--- a/sys/arch/arm/broadcom/bcm2835_intr.h Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_intr.h Wed Jul 29 10:47:58 2015 +0000
@@ -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 @@
#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 */
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_mbox.c
--- a/sys/arch/arm/broadcom/bcm2835_mbox.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_mbox.c Wed Jul 29 10:47:58 2015 +0000
@@ -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 @@
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");
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_plcom.c
--- a/sys/arch/arm/broadcom/bcm2835_plcom.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_plcom.c Wed Jul 29 10:47:58 2015 +0000
@@ -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 @@
}
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));
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_spi.c
--- a/sys/arch/arm/broadcom/bcm2835_spi.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_spi.c Wed Jul 29 10:47:58 2015 +0000
@@ -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 @@
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");
diff -r f825e94319cc -r 4282fad3b71b sys/arch/arm/broadcom/bcm2835_tmr.c
--- a/sys/arch/arm/broadcom/bcm2835_tmr.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/arch/arm/broadcom/bcm2835_tmr.c Wed Jul 29 10:47:58 2015 +0000
@@ -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 @@
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__);
diff -r f825e94319cc -r 4282fad3b71b sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c
--- a/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c Wed Jul 29 08:52:22 2015 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c Wed Jul 29 10:47:58 2015 +0000
@@ -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_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",
Home |
Main Index |
Thread Index |
Old Index