centralize credits

diff --git a/README b/README
index beea549394cc49f14600f0656a05b757a1667816..2df66828c976b098b6b1701318dc5e470d6a9862 100644 (file)
--- a/README
+++ b/README
@@ -10,3 +10,17 @@ Communications; ISBN: 1-57398-013-7; 1st edition (June 14, 2000). See
 also http://pdos.csail.mit.edu/6.828/2006/v6.html, which provides
 pointers to on-line resources for v6.
 
+Code was used from the following sources:
+    JOS (asm.h, elf.h, mmu.h, bootasm.S, ide.c, and others)
+    Plan 9 (bootother.S, mp.h, mp.c, ioapic.h, lapic.c)
+    FreeBSD (ioapic.c)
+
+The following people made contributions:
+    Russ Cox (context switching, locking)
+    Cliff Frey (MP)
+    Xiao Yu (MP)
+
+If you spot errors or have suggestions for improvement, please send
+email to Frans Kaashoek and Robert Morris
+({kaashoek,rtm}@csail.mit.edu).  This version is the very first one,
+so don't be surprised if there are errors or the code is unclear.

diff --git a/asm.h b/asm.h
index e02f0504e7a103dda37cba53cc38ffccab7f9ab9..b5fca66b9d84e7621fa5ebae166fbb09c9e6d444 100644 (file)
--- a/asm.h
+++ b/asm.h
@@ -1,6 +1,5 @@
 //
 // macros to create x86 segments from assembler
-// from JOS
 //
 
 #define SEG_NULL                                               \

diff --git a/bootasm.S b/bootasm.S
index dda415d15580bcb57976798d9ab2afb0d49815d0..c2a3c3e3ffac9c7da7d1c0efb098309223e26d34 100644 (file)
--- a/bootasm.S
+++ b/bootasm.S
@@ -1,7 +1,3 @@
-#
-# from JOS
-#
-        
 #include "asm.h"
        
 .set PROT_MODE_CSEG,0x8                # code segment selector

diff --git a/bootother.S b/bootother.S
index 8f2b2cedf189d0c416554d96a4531d29df105107..2bdfdb26817354f885431cd5a98f176de4b09f3e 100644 (file)
--- a/bootother.S
+++ b/bootother.S
@@ -14,7 +14,6 @@
  * mp.c puts the correct %esp in start-4, and the place to jump
  * to in start-8.
  *     
- * Credit: Cliff Frey and Plan 9
  */
 
 .set PROT_MODE_CSEG,0x8                # code segment selector

diff --git a/elf.h b/elf.h
index e53051d6ee03798ea8dec51343f1fafc6e23e543..dbc0a4f89041c197946a85d191bcf96e9fd4dbe1 100644 (file)
--- a/elf.h
+++ b/elf.h
@@ -1,6 +1,5 @@
 //
 // format of an ELF executable file
-// from JOS
 //
 
 #define ELF_MAGIC 0x464C457FU  /* "\x7FELF" in little endian */

diff --git a/lapic.c b/lapic.c
index 3b7c629d02bda663da7891bc8f6f36fb84e2f249..d2d367490a673d62873dc1d9337cdbcd48a82a86 100644 (file)
--- a/lapic.c
+++ b/lapic.c
@@ -7,11 +7,6 @@
 #include "mmu.h"
 #include "proc.h"
 
-
-/* 
- * Credit: Plan 9 sources, Intel MP spec, and Cliff Frey
- */
-
 enum {                                 /* Local APIC registers */
   LAPIC_ID  = 0x0020,  /* ID */
   LAPIC_VER = 0x0030,  /* Version */

diff --git a/mmu.h b/mmu.h
index 8b30534f06a1220b24c7f268a2220696f479f6b4..200594ea3055b9327ff3888abd5d39e40c68b7b5 100644 (file)
--- a/mmu.h
+++ b/mmu.h
@@ -1,6 +1,5 @@
 /*
  * This file contains definitions for the x86 memory management unit (MMU).
- * from JOS.
  */
 
 // Eflags register

diff --git a/mp.h b/mp.h
index 2117b1ebaf6e086c26af4c89bc5d525e117ab0fd..622b06156db4222ce7b1cd694ea15146c3d72679 100644 (file)
--- a/mp.h
+++ b/mp.h
@@ -1,7 +1,6 @@
 /*
- * MultiProcessor Specification Version 1.[14].
+ * See MultiProcessor Specification Version 1.[14].
  *
- * Credit: Plan 9 sources
  */
 
 struct mp {                    /* floating pointer */