Sat Apr 24 09:46:22 2010 UTC ()
Support 64-bit imask for powerpc/pic.


(kiyohara)
diff -r1.17 -r1.18 src/sys/arch/powerpc/include/ibm4xx/ibm4xx_intr.h
cvs diff -r1.17 -r1.18 src/sys/arch/powerpc/include/ibm4xx/Attic/ibm4xx_intr.h (expand / switch to unified diff)

--- src/sys/arch/powerpc/include/ibm4xx/Attic/ibm4xx_intr.h 2010/03/18 13:47:04 1.17
+++ src/sys/arch/powerpc/include/ibm4xx/Attic/ibm4xx_intr.h 2010/04/24 09:46:22 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ibm4xx_intr.h,v 1.17 2010/03/18 13:47:04 kiyohara Exp $ */ 1/* $NetBSD: ibm4xx_intr.h,v 1.18 2010/04/24 09:46:22 kiyohara Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Charles M. Hannum. 8 * by Charles M. Hannum.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -54,27 +54,28 @@ @@ -54,27 +54,28 @@
54 54
55#define CLKF_BASEPRI(frame) ((frame)->pri == 0) 55#define CLKF_BASEPRI(frame) ((frame)->pri == 0)
56 56
57void *intr_establish(int, int, int, int (*)(void *), void *); 57void *intr_establish(int, int, int, int (*)(void *), void *);
58void intr_disestablish(void *); 58void intr_disestablish(void *);
59void intr_init(void); 59void intr_init(void);
60int uic_add(u_int, int); 60int uic_add(u_int, int);
61void ext_intr(void); /* for machdep */ 61void ext_intr(void); /* for machdep */
62int splraise(int); 62int splraise(int);
63int spllower(int); 63int spllower(int);
64void splx(int); 64void splx(int);
65void softintr(int); 65void softintr(int);
66 66
67extern volatile u_int imask[NIPL]; 67typedef u_int imask_t;
 68extern volatile imask_t imask[NIPL];
68extern const int mask_clock; /* for clock.c */ 69extern const int mask_clock; /* for clock.c */
69extern const int mask_statclock; /* for clock.c */ 70extern const int mask_statclock; /* for clock.c */
70 71
71#define spllowersoftclock() spllower(imask[IPL_SOFTCLOCK]) 72#define spllowersoftclock() spllower(imask[IPL_SOFTCLOCK])
72 73
73typedef int ipl_t; 74typedef int ipl_t;
74typedef struct { 75typedef struct {
75 ipl_t _ipl; 76 ipl_t _ipl;
76} ipl_cookie_t; 77} ipl_cookie_t;
77 78
78static inline ipl_cookie_t 79static inline ipl_cookie_t
79makeiplcookie(ipl_t ipl) 80makeiplcookie(ipl_t ipl)
80{ 81{