Module Name: src Committed By: matt Date: Tue Feb 4 18:51:16 UTC 2014
Modified Files: src/sys/arch/arm/at91: at91intr.h src/sys/arch/arm/footbridge: footbridge_intr.h src/sys/arch/arm/include/arm32: psl.h src/sys/arch/arm/ixp12x0: ixp12x0_intr.h src/sys/arch/arm/omap: omap_intr.c omap_intr.h src/sys/arch/arm/xscale: becc_intr.h i80321_intr.h pxa2x0_intr.h src/sys/arch/evbarm/include: intr.h src/sys/arch/hpcarm/include: intr.h Log Message: _setsoftintr is long dead. reap any leftovers from arm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91intr.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/footbridge/footbridge_intr.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/include/arm32/psl.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ixp12x0/ixp12x0_intr.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap_intr.c \ src/sys/arch/arm/omap/omap_intr.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/becc_intr.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/i80321_intr.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/pxa2x0_intr.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/include/intr.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/include/intr.h 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/at91/at91intr.h diff -u src/sys/arch/arm/at91/at91intr.h:1.3 src/sys/arch/arm/at91/at91intr.h:1.4 --- src/sys/arch/arm/at91/at91intr.h:1.3 Fri Oct 23 06:53:13 2009 +++ src/sys/arch/arm/at91/at91intr.h Tue Feb 4 18:51:16 2014 @@ -1,5 +1,5 @@ -/* $Id: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ -/* $NetBSD: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ +/* $Id: at91intr.h,v 1.4 2014/02/04 18:51:16 matt Exp $ */ +/* $NetBSD: at91intr.h,v 1.4 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy. @@ -41,7 +41,6 @@ int _splraise(int); int _spllower(int); void splx(int); -void _setsoftintr(int); #endif /* ! _LOCORE */ Index: src/sys/arch/arm/footbridge/footbridge_intr.h diff -u src/sys/arch/arm/footbridge/footbridge_intr.h:1.15 src/sys/arch/arm/footbridge/footbridge_intr.h:1.16 --- src/sys/arch/arm/footbridge/footbridge_intr.h:1.15 Sun Jun 10 13:15:24 2012 +++ src/sys/arch/arm/footbridge/footbridge_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: footbridge_intr.h,v 1.15 2012/06/10 13:15:24 skrll Exp $ */ +/* $NetBSD: footbridge_intr.h,v 1.16 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -141,14 +141,12 @@ footbridge_spllower(int ipl) #define splx(newspl) footbridge_splx(newspl) #define _spllower(ipl) footbridge_spllower(ipl) #define _splraise(ipl) footbridge_splraise(ipl) -void _setsoftintr(int); #else int _splraise(int); int _spllower(int); void splx(int); -void _setsoftintr(int); #endif /* ! ARM_SPL_NOINLINE */ Index: src/sys/arch/arm/include/arm32/psl.h diff -u src/sys/arch/arm/include/arm32/psl.h:1.19 src/sys/arch/arm/include/arm32/psl.h:1.20 --- src/sys/arch/arm/include/arm32/psl.h:1.19 Fri Jul 27 05:36:09 2012 +++ src/sys/arch/arm/include/arm32/psl.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.19 2012/07/27 05:36:09 matt Exp $ */ +/* $NetBSD: psl.h,v 1.20 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -70,10 +70,6 @@ int raisespl (int); int lowerspl (int); void splx (int); -#ifdef __HAVE_FAST_SOFTINTS -void _setsoftintr (int si); -#endif - typedef uint8_t ipl_t; typedef struct { uint8_t _ipl; Index: src/sys/arch/arm/ixp12x0/ixp12x0_intr.h diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.h:1.2 src/sys/arch/arm/ixp12x0/ixp12x0_intr.h:1.3 --- src/sys/arch/arm/ixp12x0/ixp12x0_intr.h:1.2 Tue Jan 8 02:07:51 2008 +++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp12x0_intr.h,v 1.2 2008/01/08 02:07:51 matt Exp $ */ +/* $NetBSD: ixp12x0_intr.h,v 1.3 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -45,9 +45,6 @@ int _splraise(int); int _spllower(int); void splx(int); -#ifdef __HAVE_FAST_SOFTINTS -void _setsoftintr(int); -#endif #endif /* ! _LOCORE */ Index: src/sys/arch/arm/omap/omap_intr.c diff -u src/sys/arch/arm/omap/omap_intr.c:1.9 src/sys/arch/arm/omap/omap_intr.c:1.10 --- src/sys/arch/arm/omap/omap_intr.c:1.9 Fri Jul 1 20:30:21 2011 +++ src/sys/arch/arm/omap/omap_intr.c Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: omap_intr.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $ */ +/* $NetBSD: omap_intr.c,v 1.10 2014/02/04 18:51:16 matt Exp $ */ /* * Based on arch/arm/xscale/pxa2x0_intr.c @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: omap_intr.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: omap_intr.c,v 1.10 2014/02/04 18:51:16 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -428,16 +428,6 @@ _spllower(int ipl) return omap_spllower(ipl); } -#ifdef __HAVE_FAST_SOFTINTS -#undef _setsoftintr -void -_setsoftintr(int si) -{ - - return omap_setsoftintr(si); -} -#endif - void * omap_intr_establish(int irqno, int level, const char *name, int (*func)(void *), void *cookie) Index: src/sys/arch/arm/omap/omap_intr.h diff -u src/sys/arch/arm/omap/omap_intr.h:1.9 src/sys/arch/arm/omap/omap_intr.h:1.10 --- src/sys/arch/arm/omap/omap_intr.h:1.9 Sun Aug 18 15:58:19 2013 +++ src/sys/arch/arm/omap/omap_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: omap_intr.h,v 1.9 2013/08/18 15:58:19 matt Exp $ */ +/* $NetBSD: omap_intr.h,v 1.10 2014/02/04 18:51:16 matt Exp $ */ /* * Redistribution and use in source and binary forms, with or without @@ -168,9 +168,6 @@ omap_spllower(int ipl) int _splraise(int); int _spllower(int); void splx(int); -#ifdef __HAVE_FAST_SOFTINTS -void _setsoftintr(int); -#endif #if !defined(EVBARM_SPL_NOINLINE) #define splx(new) omap_splx(new) Index: src/sys/arch/arm/xscale/becc_intr.h diff -u src/sys/arch/arm/xscale/becc_intr.h:1.4 src/sys/arch/arm/xscale/becc_intr.h:1.5 --- src/sys/arch/arm/xscale/becc_intr.h:1.4 Sun Apr 27 18:58:45 2008 +++ src/sys/arch/arm/xscale/becc_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: becc_intr.h,v 1.4 2008/04/27 18:58:45 matt Exp $ */ +/* $NetBSD: becc_intr.h,v 1.5 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -104,20 +104,6 @@ becc_spllower(int ipl) return (old); } -#ifdef __HAVE_FAST_SOFTINTS -static inline void __attribute__((__unused__)) -becc_setsoftintr(int si) -{ - extern volatile uint32_t becc_sipending; - - becc_sipending |= (1 << si); - BECC_CSR_WRITE(BECC_ICSR, (1U << ICU_SOFT)); -} -#endif /* __PROG32 */ - -int becc_softint(void *arg); -#endif - #if !defined(EVBARM_SPL_NOINLINE) #define _splraise(ipl) becc_splraise(ipl) Index: src/sys/arch/arm/xscale/i80321_intr.h diff -u src/sys/arch/arm/xscale/i80321_intr.h:1.10 src/sys/arch/arm/xscale/i80321_intr.h:1.11 --- src/sys/arch/arm/xscale/i80321_intr.h:1.10 Sun Apr 27 18:58:45 2008 +++ src/sys/arch/arm/xscale/i80321_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i80321_intr.h,v 1.10 2008/04/27 18:58:45 matt Exp $ */ +/* $NetBSD: i80321_intr.h,v 1.11 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2001, 2002, 2006 Wasabi Systems, Inc. @@ -119,14 +119,12 @@ i80321_spllower(int ipl) #define splx(new) i80321_splx(new) #define _spllower(ipl) i80321_spllower(ipl) #define _splraise(ipl) i80321_splraise(ipl) -void _setsoftintr(int); #else int _splraise(int); int _spllower(int); void splx(int); -void _setsoftintr(int); #endif /* ! EVBARM_SPL_NOINLINE */ Index: src/sys/arch/arm/xscale/pxa2x0_intr.h diff -u src/sys/arch/arm/xscale/pxa2x0_intr.h:1.13 src/sys/arch/arm/xscale/pxa2x0_intr.h:1.14 --- src/sys/arch/arm/xscale/pxa2x0_intr.h:1.13 Sun Jul 29 00:07:10 2012 +++ src/sys/arch/arm/xscale/pxa2x0_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: pxa2x0_intr.h,v 1.13 2012/07/29 00:07:10 matt Exp $ */ +/* $NetBSD: pxa2x0_intr.h,v 1.14 2014/02/04 18:51:16 matt Exp $ */ /* Derived from i80321_intr.h */ @@ -134,14 +134,12 @@ find_first_bit(uint32_t bits) int _splraise(int); int _spllower(int); void splx(int); -void _setsoftintr(int); #if !defined(EVBARM_SPL_NOINLINE) #define splx(new) pxa2x0_splx(new) #define _spllower(ipl) pxa2x0_spllower(ipl) #define _splraise(ipl) pxa2x0_splraise(ipl) -#define _setsoftintr(si) pxa2x0_setsoftintr(si) #endif /* !EVBARM_SPL_NOINTR */ Index: src/sys/arch/evbarm/include/intr.h diff -u src/sys/arch/evbarm/include/intr.h:1.24 src/sys/arch/evbarm/include/intr.h:1.25 --- src/sys/arch/evbarm/include/intr.h:1.24 Thu Nov 8 08:19:50 2012 +++ src/sys/arch/evbarm/include/intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.24 2012/11/08 08:19:50 skrll Exp $ */ +/* $NetBSD: intr.h,v 1.25 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2001, 2003 Wasabi Systems, Inc. @@ -74,9 +74,6 @@ int _splraise(int); int _spllower(int); void splx(int); -#ifdef __HAVE_FAST_SOFTINTS -void _setsoftintr(int); -#endif #else /* _LKM */ Index: src/sys/arch/hpcarm/include/intr.h diff -u src/sys/arch/hpcarm/include/intr.h:1.18 src/sys/arch/hpcarm/include/intr.h:1.19 --- src/sys/arch/hpcarm/include/intr.h:1.18 Sat Jul 28 23:12:52 2012 +++ src/sys/arch/hpcarm/include/intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.18 2012/07/28 23:12:52 matt Exp $ */ +/* $NetBSD: intr.h,v 1.19 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -77,7 +77,6 @@ int _splraise(int); int _spllower(int); void splx(int); -void _setsoftintr(int); #else /* _LKM */