Deleted Added
sdiff udiff text old ( 164426 ) new ( 186352 )
full compact
ixp425_intr.h (164426) ixp425_intr.h (186352)
1/* $NetBSD: ixp425_intr.h,v 1.6 2005/12/24 20:06:52 perry Exp $ */
2
3/*
4 * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
5 * All rights reserved.
6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 *

--- 20 unchanged lines hidden (view full) ---

29 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 *
1/* $NetBSD: ixp425_intr.h,v 1.6 2005/12/24 20:06:52 perry Exp $ */
2
3/*
4 * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
5 * All rights reserved.
6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 *

--- 20 unchanged lines hidden (view full) ---

29 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 *
37 * $FreeBSD: head/sys/arm/xscale/ixp425/ixp425_intr.h 164426 2006-11-19 23:55:23Z sam $
37 * $FreeBSD: head/sys/arm/xscale/ixp425/ixp425_intr.h 186352 2008-12-20 03:26:09Z sam $
38 *
39 */
40
41#ifndef _IXP425_INTR_H_
42#define _IXP425_INTR_H_
43
44#define ARM_IRQ_HANDLER _C_LABEL(ixp425_intr_dispatch)
45

--- 18 unchanged lines hidden (view full) ---

64}
65
66static __inline void
67ixp425_set_intrsteer(void)
68{
69 IXPREG(IXP425_INT_SELECT) = intr_steer & IXP425_INT_HWMASK;
70}
71
38 *
39 */
40
41#ifndef _IXP425_INTR_H_
42#define _IXP425_INTR_H_
43
44#define ARM_IRQ_HANDLER _C_LABEL(ixp425_intr_dispatch)
45

--- 18 unchanged lines hidden (view full) ---

64}
65
66static __inline void
67ixp425_set_intrsteer(void)
68{
69 IXPREG(IXP425_INT_SELECT) = intr_steer & IXP425_INT_HWMASK;
70}
71
72#define INT_SWMASK \
73 ((1U << IXP425_INT_bit31) | (1U << IXP425_INT_bit30) | \
74 (1U << IXP425_INT_bit14) | (1U << IXP425_INT_bit11))
72extern __volatile uint32_t intr_enabled2;
73extern uint32_t intr_steer2;
75
74
76#if 0
77static __inline void __attribute__((__unused__))
75static __inline void __attribute__((__unused__))
78ixp425_splx(int new)
76ixp435_set_intrmask(void)
79{
77{
80 extern __volatile uint32_t intr_enabled;
81 extern __volatile int current_spl_level;
82 extern __volatile int ixp425_ipending;
83 extern void ixp425_do_pending(void);
84 int oldirqstate, hwpend;
85
86 /* Don't let the compiler re-order this code with preceding code */
87 __insn_barrier();
88
89 current_spl_level = new;
90
91 hwpend = (ixp425_ipending & IXP425_INT_HWMASK) & ~new;
92 if (hwpend != 0) {
93 oldirqstate = disable_interrupts(I32_bit);
94 intr_enabled |= hwpend;
95 ixp425_set_intrmask();
96 restore_interrupts(oldirqstate);
97 }
98
99 if ((ixp425_ipending & INT_SWMASK) & ~new)
100 ixp425_do_pending();
78 IXPREG(IXP435_INT_ENABLE2) = intr_enabled2 & IXP435_INT_HWMASK;
101}
102
79}
80
103static __inline int __attribute__((__unused__))
104ixp425_splraise(int ipl)
81static __inline void
82ixp435_set_intrsteer(void)
105{
83{
106 extern __volatile int current_spl_level;
107 extern int ixp425_imask[];
108 int old;
109
110 old = current_spl_level;
111 current_spl_level |= ixp425_imask[ipl];
112
113 /* Don't let the compiler re-order this code with subsequent code */
114 __insn_barrier();
115
116 return (old);
84 IXPREG(IXP435_INT_SELECT2) = intr_steer2 & IXP435_INT_HWMASK;
117}
118
85}
86
119static __inline int __attribute__((__unused__))
120ixp425_spllower(int ipl)
121{
122 extern __volatile int current_spl_level;
123 extern int ixp425_imask[];
124 int old = current_spl_level;
125
126 ixp425_splx(ixp425_imask[ipl]);
127 return(old);
128}
129
130#endif
131#if !defined(EVBARM_SPL_NOINLINE)
132
133#define splx(new) ixp425_splx(new)
134#define _spllower(ipl) ixp425_spllower(ipl)
135#define _splraise(ipl) ixp425_splraise(ipl)
136void _setsoftintr(int);
137
138#else
139
140int _splraise(int);
141int _spllower(int);
142void splx(int);
143void _setsoftintr(int);
144
145#endif /* ! EVBARM_SPL_NOINLINE */
146
147#endif /* _LOCORE */
148
149#endif /* _IXP425_INTR_H_ */
87#endif /* _LOCORE */
88
89#endif /* _IXP425_INTR_H_ */