remove opt_smp.h from this well-included file, minor style police
This commit is contained in:
parent
6b19c20ba5
commit
ecf8148761
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=26263
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)icu.h 5.6 (Berkeley) 5/9/91
|
||||
* $Id: icu.h,v 1.11 1997/04/26 11:45:53 peter Exp $
|
||||
* $Id: icu.h,v 1.12 1997/04/27 21:18:58 fsmp Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -47,8 +47,6 @@
|
||||
|
||||
#ifndef LOCORE
|
||||
|
||||
#include "opt_smp.h" /* so we dont have to change EVERY file including icu.h */
|
||||
|
||||
/*
|
||||
* Interrupt "level" mechanism variables, masks, and macros
|
||||
*/
|
||||
@ -66,29 +64,29 @@ void write_io_apic_mask24 __P((int, u_int32_t)); /* i386/i386/mpapic.c */
|
||||
#endif /* MULTIPLE_IOAPICS */
|
||||
|
||||
static __inline u_int32_t
|
||||
INTRGET( void )
|
||||
INTRGET(void)
|
||||
{
|
||||
return (imen & 0x00ffffff); /* return our global copy */
|
||||
}
|
||||
|
||||
static __inline void
|
||||
INTRSET( unsigned s )
|
||||
INTRSET(unsigned s)
|
||||
{
|
||||
write_io_apic_mask24( 0, s );
|
||||
write_io_apic_mask24(0, s);
|
||||
imen = s;
|
||||
}
|
||||
|
||||
static __inline void
|
||||
INTREN( unsigned s )
|
||||
INTREN(unsigned s)
|
||||
{
|
||||
write_io_apic_mask24( 0, imen & ~s );
|
||||
write_io_apic_mask24(0, imen & ~s);
|
||||
imen &= ~s;
|
||||
}
|
||||
|
||||
static __inline void
|
||||
INTRDIS( unsigned s )
|
||||
INTRDIS(unsigned s)
|
||||
{
|
||||
write_io_apic_mask24( 0, imen | s );
|
||||
write_io_apic_mask24(0, imen | s);
|
||||
imen |= s;
|
||||
}
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)icu.h 5.6 (Berkeley) 5/9/91
|
||||
* $Id: icu.h,v 1.11 1997/04/26 11:45:53 peter Exp $
|
||||
* $Id: icu.h,v 1.12 1997/04/27 21:18:58 fsmp Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -47,8 +47,6 @@
|
||||
|
||||
#ifndef LOCORE
|
||||
|
||||
#include "opt_smp.h" /* so we dont have to change EVERY file including icu.h */
|
||||
|
||||
/*
|
||||
* Interrupt "level" mechanism variables, masks, and macros
|
||||
*/
|
||||
@ -66,29 +64,29 @@ void write_io_apic_mask24 __P((int, u_int32_t)); /* i386/i386/mpapic.c */
|
||||
#endif /* MULTIPLE_IOAPICS */
|
||||
|
||||
static __inline u_int32_t
|
||||
INTRGET( void )
|
||||
INTRGET(void)
|
||||
{
|
||||
return (imen & 0x00ffffff); /* return our global copy */
|
||||
}
|
||||
|
||||
static __inline void
|
||||
INTRSET( unsigned s )
|
||||
INTRSET(unsigned s)
|
||||
{
|
||||
write_io_apic_mask24( 0, s );
|
||||
write_io_apic_mask24(0, s);
|
||||
imen = s;
|
||||
}
|
||||
|
||||
static __inline void
|
||||
INTREN( unsigned s )
|
||||
INTREN(unsigned s)
|
||||
{
|
||||
write_io_apic_mask24( 0, imen & ~s );
|
||||
write_io_apic_mask24(0, imen & ~s);
|
||||
imen &= ~s;
|
||||
}
|
||||
|
||||
static __inline void
|
||||
INTRDIS( unsigned s )
|
||||
INTRDIS(unsigned s)
|
||||
{
|
||||
write_io_apic_mask24( 0, imen | s );
|
||||
write_io_apic_mask24(0, imen | s);
|
||||
imen |= s;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user