[isr] add arg

Author: hchunhui

arch_x86/kernel/fpu.c

@@ -65,8 +65,10 @@ void fpu_switch(struct s_task *prev, struct s_task *next)
 		stts();
 }
 
-int do_fpu_fault(struct s_regs *pregs)
+int do_fpu_fault(struct s_regs *pregs, void *__)
 {
+	(void) __;
+
 	clts();
 
 	if(current != last_use) {
@@ -87,5 +89,5 @@ int do_fpu_fault(struct s_regs *pregs)
 
 void fpu_fault_init()
 {
-	isr_register(7, do_fpu_fault);
+	isr_register(7, do_fpu_fault, NULL);
 }

arch_x86/kernel/mm.c

@@ -254,13 +254,15 @@ static unsigned long la2pn(unsigned long la)
 	return ADDR2NO(*ppte);
 }
 
-int do_page_fault(struct s_regs *pregs)
+int do_page_fault(struct s_regs *pregs, void *__)
 {
 	unsigned long cr2;
 	struct s_task *ptask = current;
 	unsigned long err_code;
 	unsigned long phy_pg_no;
 
+	(void) __;
+
 	asm ("movl %%cr2, %%eax; movl %%eax, %0":"=m"(cr2)::"eax");
 
 	err_code = pregs->err_code;
@@ -537,7 +539,7 @@ void mm_init(unsigned int size)
 
 	memset(pte, 0, sizeof(unsigned long)*1024*1024);
 
-	isr_register(14, do_page_fault);
+	isr_register(14, do_page_fault, NULL);
 
 	for_each_kern_pde(i)
 	{

drv/input_kbd.c

@@ -5,6 +5,7 @@
 #include <os/arch_config.h>
 #include <os/type.h>
 #include <lib/klib.h>
+#include <lib/string.h>
 #include <os/isr.h>
 #include <os/io.h>
 #include <drv/i8042.h>
@@ -18,10 +19,6 @@
 #define CODE_BRK	0xf0
 #define CODE_EX0	0xe0
 #define CODE_EX1	0xe1
-int is_brk;
-int is_ex;
-int follow;
-int gcode;
 extern struct input_dev_desc kbd_desc;
 
 void kbd_thread()
@@ -46,48 +43,56 @@ void kbd_thread()
 	}
 }
 
-static int kbd_int()
+struct kb_int_state {
+	int is_brk;
+	int is_ex;
+	int follow;
+	int gcode;
+};
+
+static int kbd_int(struct s_regs *pregs, void *data)
 {
 	struct s_event event;
+	struct kb_int_state *s = data;
 	unsigned char code = inb(0x60);
 
 	switch(code)
 	{
 	case CODE_BRK:
-		is_brk = 1;
-		if(!is_ex)
-			gcode = 0;
+		s->is_brk = 1;
+		if(!s->is_ex)
+			s->gcode = 0;
 		break;
 	case CODE_EX0:
-		is_ex = 1;
-		follow = 1;
-		gcode = 0xe0;
+		s->is_ex = 1;
+		s->follow = 1;
+		s->gcode = 0xe0;
 		break;
 	case CODE_EX1:
-		is_ex = 2;
-		follow = 2;
-		gcode = 0;
+		s->is_ex = 2;
+		s->follow = 2;
+		s->gcode = 0;
 		break;
 	default:
-		if(!is_ex)
-			follow = 1;
-		gcode <<= 8;
-		gcode |= code;
-		follow--;
-		if(follow == 0)
+		if(!s->is_ex)
+			s->follow = 1;
+		s->gcode <<= 8;
+		s->gcode |= code;
+		s->follow--;
+		if(s->follow == 0)
 		{
 			event.ticks = timer_get_ticks();
 			event.type = 1;
-			event.code = gcode;
-			event.value = is_brk;
+			event.code = s->gcode;
+			event.value = s->is_brk;
 			input_dev_event(&kbd_desc, &event);
 			/*printk("ex=%d, brk=%d, gcode=%x\n",
 			       is_ex,
 			       is_brk,
 			       gcode);*/
-			is_ex = 0;
-			is_brk = 0;
-			gcode = 0;
+			s->is_ex = 0;
+			s->is_brk = 0;
+			s->gcode = 0;
 		}
 		break;
 	}
@@ -96,15 +101,19 @@ static int kbd_int()
 
 static int kbd_init()
 {
+	struct kb_int_state *s;
 	printk("kbd: up\n");
-	irq_register(IRQ_KB, kbd_int);
+	s = kmalloc(sizeof(struct kb_int_state));
+	memset(s, 0, sizeof(struct kb_int_state));
+	irq_register(IRQ_KB, kbd_int, s);
 	pic_enable_irq(IRQ_KB);
 	return 0;
 }
 
 static int kbd_exit()
 {
 	printk("kbd: down\n");
+	// TODO: free kb_int_state
 	return 0;
 }
 

drv/input_mouse.c

@@ -5,6 +5,7 @@
 #include <os/arch_config.h>
 #include <os/type.h>
 #include <lib/klib.h>
+#include <lib/string.h>
 #include <os/isr.h>
 #include <os/io.h>
 #include <drv/i8042.h>
@@ -39,61 +40,69 @@ void mouse_thread()
 	}
 }
 
-static int mouse_int()
+struct mouse_int_state {
+	int last_tick;
+	int xdiff;
+	int ydiff;
+	int count;
+	int xsgn;
+	int ysgn;
+	int lrb;
+};
+
+static int mouse_int(struct s_regs *pregs, void *state)
 {
+	struct mouse_int_state *s = state;
 	unsigned char data = inb(0x60);
-	static int last_tick;
-	static int xdiff;
-	static int ydiff;
-	static int count;
-	static int xsgn;
-	static int ysgn;
-	static int lrb;
 	struct s_event event;
 	int ticks = timer_get_ticks();
 
 	//trick:在真机上数据对不上号，用ticks计时，把过早数据丢弃
-	if(!last_tick) last_tick = ticks;
-	if(ticks - last_tick > 5)
-		count = 0;
-	switch (++count)
+	if(ticks - s->last_tick > 5)
+		s->count = 0;
+	switch (++s->count)
 	{
 		case 1:
-			lrb = data & 0x7;
-			xsgn = (data & 0x10) ? (~0xff) : 0;
-			ysgn = (data & 0x20) ? (~0xff) : 0;
+			s->lrb = data & 0x7;
+			s->xsgn = (data & 0x10) ? (~0xff) : 0;
+			s->ysgn = (data & 0x20) ? (~0xff) : 0;
 			break;
 		case 2:
-			xdiff = (xsgn | data);
+			s->xdiff = (s->xsgn | data);
 			break;
 		case 3:
-			ydiff = -(ysgn | data);
-			count = 0;
+			s->ydiff = -(s->ysgn | data);
+			s->count = 0;
 			/* printk("xdiff=%d, ydiff=%d\n", */
 			/*        xdiff, */
 			/*        ydiff); */
 			event.ticks = ticks;
 			event.type = 2;
-			event.code = lrb;
-			event.value = (xdiff<<16) | (ydiff&0xffff);
+			event.code = s->lrb;
+			event.value = (s->xdiff<<16) | (s->ydiff&0xffff);
 			input_dev_event(&mouse_desc, &event);
 			break;
 	}
-	last_tick = ticks;
+	s->last_tick = ticks;
 	return 0;
 }
 
 static int mouse_init()
 {
+	struct mouse_int_state *s;
 	printk("mouse: up\n");
-	irq_register(IRQ_MOUSE, mouse_int);
+	s = kmalloc(sizeof(struct mouse_int_state));
+	memset(s, 0, sizeof(struct mouse_int_state));
+	s->last_tick = timer_get_ticks();
+	irq_register(IRQ_MOUSE, mouse_int, s);
 	pic_enable_irq(IRQ_MOUSE);
 	return 0;
 }
 
 static int mouse_exit()
 {
 	printk("mouse: down\n");
+	// TODO: free mouse_int_state
 	return 0;
 }
 

drv/serial.c

@@ -87,8 +87,8 @@ static int serial_init()
 		serial_early_init();
 	for(i = 0; i < N; i++)
 		dev_simp_open(DEV_MAJOR_PIPE, 0, 0, &sdata[i].pin_data);
-	irq_register(IRQ_SERIAL1, do_serial1_int);
-	irq_register(IRQ_SERIAL2, do_serial1_int);
+	irq_register(IRQ_SERIAL1, do_serial1_int, NULL);
+	irq_register(IRQ_SERIAL2, do_serial1_int, NULL);
 	pic_enable_irq(IRQ_SERIAL1);
 	pic_enable_irq(IRQ_SERIAL2);
 	printk("serial: up\n");

include/os/isr.h

@@ -1,8 +1,8 @@
 #ifndef _ISR_H_
 #define _ISR_H_
 #include <os/regs.h>
-typedef int (*isr_func)(struct s_regs *pregs);
-int isr_register(int no, isr_func fn);
-int irq_register(int irq_no, isr_func fn);
+typedef int (*isr_func)(struct s_regs *pregs, void *data);
+int isr_register(int no, isr_func fn, void *data);
+int irq_register(int irq_no, isr_func fn, void *data);
 
 #endif /* _ISR_H_ */

kernel/isr.c

@@ -8,19 +8,21 @@
 struct isr_desc
 {
 	isr_func fn;
+	void *data;
 	struct isr_desc *next;
 };
 
 int isr_dummy();
 
 static struct isr_desc dummy_desc = {
 	.fn = isr_dummy,
+	.data = NULL,
 	.next = NULL
 };
 
 static struct isr_desc *isr_table[64];
 
-int isr_register(int no, isr_func fn)
+int isr_register(int no, isr_func fn, void *data)
 {
 	struct isr_desc *desc;
 	assert(no >= 0 && no < 64);
@@ -29,13 +31,14 @@ int isr_register(int no, isr_func fn)
 
 	desc->next = isr_table[no];
 	desc->fn = fn;
+	desc->data = data;
 	isr_table[no] = desc;
 	return 0;
 }
 
-int irq_register(int irq_no, isr_func fn)
+int irq_register(int irq_no, isr_func fn, void *data)
 {
-	return isr_register(IRQ_0 + irq_no, fn);
+	return isr_register(IRQ_0 + irq_no, fn, data);
 }
 
 void isr_init()
@@ -46,7 +49,7 @@ void isr_init()
 		isr_table[i] = &dummy_desc;
 }
 
-int isr_dummy(void)
+int isr_dummy()
 {
 	panic("unhandled int/exception.");
 	/* printk("vec_no: %d\n" */
@@ -72,5 +75,5 @@ asmlinkage void do_isr(int vec_no, struct s_regs *pregs)
 			break;
 		desc = desc->next;
 		}*/
-	desc->fn(pregs);
+	desc->fn(pregs, desc->data);
 }

kernel/timer.c

@@ -79,7 +79,7 @@ void timer_init()
 	dev_simp_open(DEV_MAJOR_PIT, 0, 0, &data);
 	dev_simp_ioctl(DEV_MAJOR_PIT, 0, data,
 		       TIMER_CMD_SETFREQ, (void *)HZ);
-	irq_register(IRQ_TIMER, do_timer_int);
+	irq_register(IRQ_TIMER, do_timer_int, NULL);
 	pic_enable_irq(IRQ_TIMER);
 }