summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-09-03 15:10:33 +0000
committerkaashoek <kaashoek>2006-09-03 15:10:33 +0000
commit801affcd147606873b10db04c9fbf80dede969f6 (patch)
tree6c45b697bfca4ada39cff43c352b67b07599c19e
parent97a5bba6d25588706d2765097b4e940793f2fd9f (diff)
downloadxv6-labs-801affcd147606873b10db04c9fbf80dede969f6.tar.gz
xv6-labs-801affcd147606873b10db04c9fbf80dede969f6.tar.bz2
xv6-labs-801affcd147606873b10db04c9fbf80dede969f6.zip
centralize credits
-rw-r--r--README14
-rw-r--r--asm.h1
-rw-r--r--bootasm.S4
-rw-r--r--bootother.S1
-rw-r--r--elf.h1
-rw-r--r--lapic.c5
-rw-r--r--mmu.h1
-rw-r--r--mp.h3
8 files changed, 15 insertions, 15 deletions
diff --git a/README b/README
index beea549..2df6682 100644
--- 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 e02f050..b5fca66 100644
--- 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 dda415d..c2a3c3e 100644
--- 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 8f2b2ce..2bdfdb2 100644
--- 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 e53051d..dbc0a4f 100644
--- 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 3b7c629..d2d3674 100644
--- 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 8b30534..200594e 100644
--- 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 2117b1e..622b061 100644
--- 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 */