mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
changed static functions to standard naming convention
svn path=/trunk/; revision=68
This commit is contained in:
parent
0805f2913e
commit
1d9a6c728c
1 changed files with 12 additions and 8 deletions
|
@ -25,21 +25,25 @@ static KIRQL CurrentIrql = HIGH_LEVEL;
|
||||||
|
|
||||||
/* FUNCTIONS ****************************************************************/
|
/* FUNCTIONS ****************************************************************/
|
||||||
|
|
||||||
static unsigned int pic_get_current_mask(void)
|
static unsigned int HiGetCurrentPICMask(void)
|
||||||
{
|
{
|
||||||
unsigned int mask;
|
unsigned int mask;
|
||||||
|
|
||||||
mask = inb_p(0x21);
|
mask = inb_p(0x21);
|
||||||
mask = mask | (inb_p(0xa1)<<8);
|
mask = mask | (inb_p(0xa1)<<8);
|
||||||
|
|
||||||
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int pic_set_current_mask(unsigned int mask)
|
static unsigned int HiSetCurrentPICMask(unsigned int mask)
|
||||||
{
|
{
|
||||||
outb_p(0x21,mask & 0xff);
|
outb_p(0x21,mask & 0xff);
|
||||||
outb_p(0xa1,(mask >> 8) & 0xff);
|
outb_p(0xa1,(mask >> 8) & 0xff);
|
||||||
|
|
||||||
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void switch_irql(void)
|
static void HiSwitchIrql(void)
|
||||||
/*
|
/*
|
||||||
* FUNCTION: Switches to the current irql
|
* FUNCTION: Switches to the current irql
|
||||||
* NOTE: Must be called with interrupt disabled
|
* NOTE: Must be called with interrupt disabled
|
||||||
|
@ -49,7 +53,7 @@ static void switch_irql(void)
|
||||||
|
|
||||||
if (CurrentIrql == HIGH_LEVEL)
|
if (CurrentIrql == HIGH_LEVEL)
|
||||||
{
|
{
|
||||||
pic_set_current_mask(0xffff);
|
HiSetCurrentPICMask(0xffff);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (CurrentIrql > DISPATCH_LEVEL)
|
if (CurrentIrql > DISPATCH_LEVEL)
|
||||||
|
@ -61,14 +65,14 @@ static void switch_irql(void)
|
||||||
set_bit(NR_DEVICE_SPECIFIC_LEVELS - i,¤t_mask);
|
set_bit(NR_DEVICE_SPECIFIC_LEVELS - i,¤t_mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
pic_set_current_mask(current_mask);
|
HiSetCurrentPICMask(current_mask);
|
||||||
__asm__("sti\n\t");
|
__asm__("sti\n\t");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CurrentIrql <= DISPATCH_LEVEL)
|
if (CurrentIrql <= DISPATCH_LEVEL)
|
||||||
{
|
{
|
||||||
pic_set_current_mask(0);
|
HiSetCurrentPICMask(0);
|
||||||
__asm__("sti\n\t");
|
__asm__("sti\n\t");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -104,7 +108,7 @@ VOID KeLowerIrql(KIRQL NewIrql)
|
||||||
DPRINT("NewIrql %x CurrentIrql %x\n",NewIrql,CurrentIrql);
|
DPRINT("NewIrql %x CurrentIrql %x\n",NewIrql,CurrentIrql);
|
||||||
assert(NewIrql <= CurrentIrql);
|
assert(NewIrql <= CurrentIrql);
|
||||||
CurrentIrql = NewIrql;
|
CurrentIrql = NewIrql;
|
||||||
switch_irql();
|
HiSwitchIrql();
|
||||||
}
|
}
|
||||||
|
|
||||||
VOID KeRaiseIrql(KIRQL NewIrql, PKIRQL OldIrql)
|
VOID KeRaiseIrql(KIRQL NewIrql, PKIRQL OldIrql)
|
||||||
|
@ -133,7 +137,7 @@ VOID KeRaiseIrql(KIRQL NewIrql, PKIRQL OldIrql)
|
||||||
// *OldIrql = InterlockedExchange(&CurrentIrql,NewIrql);
|
// *OldIrql = InterlockedExchange(&CurrentIrql,NewIrql);
|
||||||
DPRINT("NewIrql %x OldIrql %x CurrentIrql %x\n",NewIrql,*OldIrql,
|
DPRINT("NewIrql %x OldIrql %x CurrentIrql %x\n",NewIrql,*OldIrql,
|
||||||
CurrentIrql);
|
CurrentIrql);
|
||||||
switch_irql();
|
HiSwitchIrql();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue