Clean up lapic code.

One initialization function now, not three.
Use #defines instead of enums (consistent with other code, but sigh).

Still boots in Bochs in SMP mode.

1 files changed, 2 insertions, 2 deletions

diff --git a/defs.h b/defs.h
index b81ef31..8c4c665 100644
--- a/defs.h
+++ b/defs.h
@@ -69,12 +69,12 @@ void            kinit(void);
 
 // lapic.c
 int             cpu(void);
-extern uint*    lapicaddr;
+extern volatile uint*    lapic;
 void            lapic_disableintr(void);
 void            lapic_enableintr(void);
 void            lapic_eoi(void);
 void            lapic_init(int);
-void            lapic_startap(uchar, int);
+void            lapic_startap(uchar, uint);
 void            lapic_timerinit(void);
 void            lapic_timerintr(void);