summaryrefslogtreecommitdiff
path: root/picirq.c
diff options
context:
space:
mode:
authorrsc <rsc>2009-03-08 22:07:13 +0000
committerrsc <rsc>2009-03-08 22:07:13 +0000
commit2157576107d6e81c643e14e134b60b8ae519c256 (patch)
tree88ff770d321b4b2ef1ef1fcc0e17508ede6001bf /picirq.c
parentb7f653dc49dd4af29a3b7bdd66cd712bea166623 (diff)
downloadxv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.gz
xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.bz2
xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.zip
be consistent: no underscores in function names
Diffstat (limited to 'picirq.c')
-rw-r--r--picirq.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/picirq.c b/picirq.c
index 1cc9953..be505a0 100644
--- a/picirq.c
+++ b/picirq.c
@@ -15,7 +15,7 @@
static ushort irqmask = 0xFFFF & ~(1<<IRQ_SLAVE);
static void
-pic_setmask(ushort mask)
+picsetmask(ushort mask)
{
irqmask = mask;
outb(IO_PIC1+1, mask);
@@ -23,14 +23,14 @@ pic_setmask(ushort mask)
}
void
-pic_enable(int irq)
+picenable(int irq)
{
- pic_setmask(irqmask & ~(1<<irq));
+ picsetmask(irqmask & ~(1<<irq));
}
// Initialize the 8259A interrupt controllers.
void
-pic_init(void)
+picinit(void)
{
// mask all interrupts
outb(IO_PIC1+1, 0xFF);
@@ -80,5 +80,5 @@ pic_init(void)
outb(IO_PIC2, 0x0a); // OCW3
if(irqmask != 0xFFFF)
- pic_setmask(irqmask);
+ picsetmask(irqmask);
}