Sun Mar 15 19:47:22 2009 UTC ()
Pull up following revision(s) (requested by christos in ticket #458):
	sys/arch/evbarm/ifpga/ifpga_intr.h: revision 1.9
Another port which needs <arm/cpu.h> added as in include due to
the new kern_ssp.c.


(snj)
diff -r1.8 -r1.8.10.1 src/sys/arch/evbarm/ifpga/ifpga_intr.h
cvs diff -r1.8 -r1.8.10.1 src/sys/arch/evbarm/ifpga/ifpga_intr.h (expand / switch to unified diff)

--- src/sys/arch/evbarm/ifpga/ifpga_intr.h 2008/04/27 18:58:46 1.8
+++ src/sys/arch/evbarm/ifpga/ifpga_intr.h 2009/03/15 19:47:22 1.8.10.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ifpga_intr.h,v 1.8 2008/04/27 18:58:46 matt Exp $ */ 1/* $NetBSD: ifpga_intr.h,v 1.8.10.1 2009/03/15 19:47:22 snj Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001, 2002 Wasabi Systems, Inc. 4 * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc. 7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -32,26 +32,27 @@ @@ -32,26 +32,27 @@
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 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 34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE. 35 * POSSIBILITY OF SUCH DAMAGE.
36 */ 36 */
37 37
38#ifndef _IFPGA_INTR_H_ 38#ifndef _IFPGA_INTR_H_
39#define _IFPGA_INTR_H_ 39#define _IFPGA_INTR_H_
40 40
41#define ARM_IRQ_HANDLER _C_LABEL(ifpga_intr_dispatch) 41#define ARM_IRQ_HANDLER _C_LABEL(ifpga_intr_dispatch)
42 42
43#ifndef _LOCORE 43#ifndef _LOCORE
44 44
 45#include <arm/cpu.h>
45#include <arm/armreg.h> 46#include <arm/armreg.h>
46#include <arm/cpufunc.h> 47#include <arm/cpufunc.h>
47 48
48#include <evbarm/ifpga/ifpgareg.h> 49#include <evbarm/ifpga/ifpgareg.h>
49#include <evbarm/ifpga/ifpgavar.h> 50#include <evbarm/ifpga/ifpgavar.h>
50 51
51static inline void __attribute__((__unused__)) 52static inline void __attribute__((__unused__))
52ifpga_set_intrmask(void) 53ifpga_set_intrmask(void)
53{ 54{
54 extern volatile uint32_t intr_enabled; 55 extern volatile uint32_t intr_enabled;
55 extern struct ifpga_softc *ifpga_sc; 56 extern struct ifpga_softc *ifpga_sc;
56 uint32_t mask = intr_enabled; 57 uint32_t mask = intr_enabled;
57 58