xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 7abf49d2f22af633f2fb3546f9f9fd818cef25df
parent 801affcd147606873b10db04c9fbf80dede969f6
Author: kaashoek <kaashoek>
Date:   Sun,  3 Sep 2006 15:39:29 +0000

remove duplication
don't use the same name for two different pieces of code

Diffstat:
Masm.h | 4++--
Mbootasm.S | 6+++---
Mbootother.S | 6+++---
Mconsole.c | 1+
Mide.c | 1+
Mpicirq.c | 1+
Mtraps.h | 2++
Mx86.h | 9---------
8 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/asm.h b/asm.h @@ -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) diff --git a/bootasm.S b/bootasm.S @@ -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 @@ -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 diff --git a/console.c b/console.c @@ -1,5 +1,6 @@ #include "types.h" #include "x86.h" +#include "traps.h" #include "defs.h" #include "spinlock.h" #include "dev.h" diff --git a/ide.c b/ide.c @@ -8,6 +8,7 @@ #include "proc.h" #include "defs.h" #include "x86.h" +#include "traps.h" #include "spinlock.h" #define IDE_BSY 0x80 diff --git a/picirq.c b/picirq.c @@ -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 diff --git a/traps.h b/traps.h @@ -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 diff --git a/x86.h b/x86.h @@ -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