diff options
author | kaashoek <kaashoek> | 2006-09-07 01:37:58 +0000 |
---|---|---|
committer | kaashoek <kaashoek> | 2006-09-07 01:37:58 +0000 |
commit | f70172129c94e4d53b56fc10a7d859679b581bd2 (patch) | |
tree | f5c95ac0b9eea765d36ab0cb0c53573e2dfa0f9d /main.c | |
parent | f9bc4452b5437570f1709430e9364cc3e323cf3a (diff) | |
download | xv6-labs-f70172129c94e4d53b56fc10a7d859679b581bd2.tar.gz xv6-labs-f70172129c94e4d53b56fc10a7d859679b581bd2.tar.bz2 xv6-labs-f70172129c94e4d53b56fc10a7d859679b581bd2.zip |
run without lapic and ioapic, if they are not present
if no lapic available, use 8253pit for clock
now xv6 runs both on qemu (uniprocessor) and bochs (uniprocessor and MP)
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -71,8 +71,11 @@ main0(void) // start other CPUs mp_startthem(); - // turn on timer and enable interrupts on the local APIC - lapic_timerinit(); + // turn on timer + if (ismp) lapic_timerinit(); + else pit8253_timerinit(); + + // enable interrupts on the local APIC lapic_enableintr(); // Enable interrupts on this processor. |