formatting nits

diff --git a/ioapic.c b/ioapic.c
index 34592b887f51cea8e92420d4d58a20af08a56f1f..aae49b5b1568eac5c334cf0eb9b5e93f877c4c97 100644 (file)
--- a/ioapic.c
+++ b/ioapic.c
@@ -37,7 +37,7 @@ ioapic_init(void)
   uchar id;
   int i;
 
-  if (!ismp)
+  if(!ismp)
     return;
 
   io = (struct ioapic*) IO_APIC_BASE;
@@ -71,7 +71,7 @@ ioapic_enable (int irq, int cpunum)
   uint l, h;
   struct ioapic *io;
   
-  if (!ismp)
+  if(!ismp)
     return;
 
   io = (struct ioapic*) IO_APIC_BASE;

diff --git a/lapic.c b/lapic.c
index 612bf3bc4d7c7407e3667410b66bd2fba8385dc0..7634358ca0300ae20b614eab639a77a1239abc91 100644 (file)
--- a/lapic.c
+++ b/lapic.c
@@ -105,7 +105,7 @@ lapic_write(int r, int data)
 void
 lapic_timerinit(void)
 {
-  if (!lapicaddr) 
+  if(!lapicaddr) 
     return;
 
   lapic_write(LAPIC_TDCR, LAPIC_X1);
@@ -118,7 +118,7 @@ lapic_timerinit(void)
 void
 lapic_timerintr(void)
 {
-  if (lapicaddr) 
+  if(lapicaddr) 
     lapic_write(LAPIC_EOI, 0);
 }
 
@@ -127,7 +127,7 @@ lapic_init(int c)
 {
   uint r, lvt;
 
-  if (!lapicaddr) 
+  if(!lapicaddr) 
     return;
 
   lapic_write(LAPIC_DFR, 0xFFFFFFFF);    // Set dst format register
@@ -162,21 +162,21 @@ lapic_init(int c)
 void
 lapic_enableintr(void)
 {
-  if (lapicaddr)
+  if(lapicaddr)
     lapic_write(LAPIC_TPR, 0);
 }
 
 void
 lapic_disableintr(void)
 {
-  if (lapicaddr)
+  if(lapicaddr)
     lapic_write(LAPIC_TPR, 0xFF);
 }
 
 void
 lapic_eoi(void)
 {
-  if (lapicaddr)
+  if(lapicaddr)
     lapic_write(LAPIC_EOI, 0);
 }
 
@@ -184,7 +184,7 @@ int
 cpu(void)
 {
   int x;
-  if (lapicaddr) 
+  if(lapicaddr) 
     x = (lapic_read(LAPIC_ID)>>24) & 0xFF;
   else 
     x = 0;

diff --git a/main.c b/main.c
index cfab55f6cfebd70ab59c9034d574542408da7fb0..add0f926acec7ee4186902c9887edab9906425f9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -74,8 +74,10 @@ main0(void)
   mp_startthem();
 
   // turn on timer
-  if (ismp) lapic_timerinit();
-  else pit8253_timerinit();
+  if(ismp)
+    lapic_timerinit();
+  else
+    pit8253_timerinit();
 
   // enable interrupts on the local APIC
   lapic_enableintr();
@@ -126,7 +128,8 @@ process0()
   p0->cwd = iget(rootdev, 1);
   iunlock(p0->cwd);
 
-  // dummy user memory to make copyproc() happy
+  // dummy user memory to make copyproc() happy.
+  // must be big enough to hold the init binary.
   p0->sz = PAGE;
   p0->mem = kalloc(p0->sz);
 

diff --git a/mp.c b/mp.c
index c34982d9849464f896a7caa2f5850c208244aa8f..3430d6c2ebe5ef1a41fa2453f39866e2dd6a1b1d 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -191,7 +191,8 @@ mp_init(void)
 int
 mp_bcpu(void)
 {
-  if (ismp) return bcpu-cpus;
+  if(ismp)
+    return bcpu-cpus;
   else return 0;
 }