summaryrefslogtreecommitdiff
path: root/lapic.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-09-08 15:07:45 +0000
committerkaashoek <kaashoek>2006-09-08 15:07:45 +0000
commit5c596bb3a7b3e08760ac5c033680c9957e4e2842 (patch)
tree29dc342b35dcf1905168141d26ef532d37577072 /lapic.c
parent5cb7877e0f1dd09a513859f018d3981a9c9d17ad (diff)
downloadxv6-labs-5c596bb3a7b3e08760ac5c033680c9957e4e2842.tar.gz
xv6-labs-5c596bb3a7b3e08760ac5c033680c9957e4e2842.tar.bz2
xv6-labs-5c596bb3a7b3e08760ac5c033680c9957e4e2842.zip
consistency.
Diffstat (limited to 'lapic.c')
-rw-r--r--lapic.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/lapic.c b/lapic.c
index 7777929..612bf3b 100644
--- a/lapic.c
+++ b/lapic.c
@@ -105,13 +105,14 @@ lapic_write(int r, int data)
void
lapic_timerinit(void)
{
- if (lapicaddr) {
- lapic_write(LAPIC_TDCR, LAPIC_X1);
- lapic_write(LAPIC_TIMER, LAPIC_CLKIN | LAPIC_PERIODIC |
- (IRQ_OFFSET + IRQ_TIMER));
- lapic_write(LAPIC_TCCR, 10000000);
- lapic_write(LAPIC_TICR, 10000000);
- }
+ if (!lapicaddr)
+ return;
+
+ lapic_write(LAPIC_TDCR, LAPIC_X1);
+ lapic_write(LAPIC_TIMER, LAPIC_CLKIN | LAPIC_PERIODIC |
+ (IRQ_OFFSET + IRQ_TIMER));
+ lapic_write(LAPIC_TCCR, 10000000);
+ lapic_write(LAPIC_TICR, 10000000);
}
void
@@ -126,7 +127,7 @@ lapic_init(int c)
{
uint r, lvt;
- if (lapicaddr == 0)
+ if (!lapicaddr)
return;
lapic_write(LAPIC_DFR, 0xFFFFFFFF); // Set dst format register