diff options
author | kaashoek <kaashoek> | 2006-09-03 15:39:29 +0000 |
---|---|---|
committer | kaashoek <kaashoek> | 2006-09-03 15:39:29 +0000 |
commit | 7abf49d2f22af633f2fb3546f9f9fd818cef25df (patch) | |
tree | e2c8e235d2d00240a9910e26ee527ae3dee6de0f | |
parent | 801affcd147606873b10db04c9fbf80dede969f6 (diff) | |
download | xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.tar.gz xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.tar.bz2 xv6-labs-7abf49d2f22af633f2fb3546f9f9fd818cef25df.zip |
remove duplication
don't use the same name for two different pieces of code
-rw-r--r-- | asm.h | 4 | ||||
-rw-r--r-- | bootasm.S | 6 | ||||
-rw-r--r-- | bootother.S | 6 | ||||
-rw-r--r-- | console.c | 1 | ||||
-rw-r--r-- | ide.c | 1 | ||||
-rw-r--r-- | picirq.c | 1 | ||||
-rw-r--r-- | traps.h | 2 | ||||
-rw-r--r-- | x86.h | 9 |
8 files changed, 13 insertions, 17 deletions
@@ -2,10 +2,10 @@ // macros to create x86 segments from assembler // -#define SEG_NULL \ +#define SEG_NULLASM \ .word 0, 0; \ .byte 0, 0, 0, 0 -#define SEG(type,base,lim) \ +#define SEG_ASM(type,base,lim) \ .word (((lim) >> 12) & 0xffff), ((base) & 0xffff); \ .byte (((base) >> 16) & 0xff), (0x90 | (type)), \ (0xC0 | (((lim) >> 28) & 0xf)), (((base) >> 24) & 0xff) @@ -87,9 +87,9 @@ spin: jmp spin # ..but in case it does, spin .p2align 2 # force 4 byte alignment gdt: - SEG_NULL # null seg - SEG(STA_X|STA_R, 0x0, 0xffffffff) # code seg - SEG(STA_W, 0x0, 0xffffffff) # data seg + SEG_NULLASM # null seg + SEG_ASM(STA_X|STA_R, 0x0, 0xffffffff) # code seg + SEG_ASM(STA_W, 0x0, 0xffffffff) # data seg gdtdesc: .word 0x17 # sizeof(gdt) - 1 diff --git a/bootother.S b/bootother.S index 2bdfdb2..99e4713 100644 --- a/bootother.S +++ b/bootother.S @@ -70,9 +70,9 @@ protcseg: .p2align 2 # force 4 byte alignment gdt: - SEG_NULL # null seg - SEG(STA_X|STA_R, 0x0, 0xffffffff) # code seg - SEG(STA_W, 0x0, 0xffffffff) # data seg + SEG_NULLASM # null seg + SEG_ASM(STA_X|STA_R, 0x0, 0xffffffff) # code seg + SEG_ASM(STA_W, 0x0, 0xffffffff) # data seg gdtdesc: .word 0x17 # sizeof(gdt) - 1 @@ -1,5 +1,6 @@ #include "types.h" #include "x86.h" +#include "traps.h" #include "defs.h" #include "spinlock.h" #include "dev.h" @@ -8,6 +8,7 @@ #include "proc.h" #include "defs.h" #include "x86.h" +#include "traps.h" #include "spinlock.h" #define IDE_BSY 0x80 @@ -2,6 +2,7 @@ #include "types.h" #include "x86.h" +#include "traps.h" #include "defs.h" // I/O Addresses of the two 8259A programmable interrupt controllers @@ -27,6 +27,8 @@ #define IRQ_OFFSET 32 // IRQ 0 corresponds to int IRQ_OFFSET +#define IRQ_KBD 1 +#define IRQ_IDE 14 #define IRQ_TIMER 18 #define IRQ_ERROR 19 #define IRQ_SPURIOUS 31 @@ -151,12 +151,3 @@ struct trapframe { ushort ss; ushort padding4; }; - -#define MAX_IRQS 16 // Number of IRQs - -#define IRQ_OFFSET 32 // IRQ 0 corresponds to int IRQ_OFFSET - -#define IRQ_KBD 1 -#define IRQ_IDE 14 -#define IRQ_ERROR 19 -#define IRQ_SPURIOUS 31 |