diff options
author | rsc <rsc> | 2009-03-08 22:07:13 +0000 |
---|---|---|
committer | rsc <rsc> | 2009-03-08 22:07:13 +0000 |
commit | 2157576107d6e81c643e14e134b60b8ae519c256 (patch) | |
tree | 88ff770d321b4b2ef1ef1fcc0e17508ede6001bf /main.c | |
parent | b7f653dc49dd4af29a3b7bdd66cd712bea166623 (diff) | |
download | xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.gz xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.bz2 xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.zip |
be consistent: no underscores in function names
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -12,22 +12,22 @@ static void mpmain(void) __attribute__((noreturn)); int main(void) { - mp_init(); // collect info about this machine - lapic_init(mp_bcpu()); + mpinit(); // collect info about this machine + lapicinit(mpbcpu()); cprintf("\ncpu%d: starting xv6\n\n", cpu()); pinit(); // process table binit(); // buffer cache - pic_init(); // interrupt controller - ioapic_init(); // another interrupt controller + picinit(); // interrupt controller + ioapicinit(); // another interrupt controller kinit(); // physical memory allocator tvinit(); // trap vectors fileinit(); // file table iinit(); // inode cache - console_init(); // I/O devices & their interrupts - ide_init(); // disk + consoleinit(); // I/O devices & their interrupts + ideinit(); // disk if(!ismp) - timer_init(); // uniprocessor timer + timerinit(); // uniprocessor timer userinit(); // first user process bootothers(); // start other processors @@ -42,8 +42,8 @@ mpmain(void) { cprintf("cpu%d: mpmain\n", cpu()); idtinit(); - if(cpu() != mp_bcpu()) - lapic_init(cpu()); + if(cpu() != mpbcpu()) + lapicinit(cpu()); setupsegs(0); xchg(&cpus[cpu()].booted, 1); @@ -71,7 +71,7 @@ bootothers(void) stack = kalloc(KSTACKSIZE); *(void**)(code-4) = stack + KSTACKSIZE; *(void**)(code-8) = mpmain; - lapic_startap(c->apicid, (uint)code); + lapicstartap(c->apicid, (uint)code); // Wait for cpu to get through bootstrap. while(c->booted == 0) |