diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-18 12:49:58 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-18 12:49:58 -0500 |
| commit | 9defae4d6f7b30d844447549fadffea4eab5a0dd (patch) | |
| tree | 2c44f6fb193d9b3f7487714e7dfa3903bedb932d /kernel | |
| parent | 1d3537f33d793e2cabe53e72f0e0ead911fcc870 (diff) | |
| download | kappa-9defae4d6f7b30d844447549fadffea4eab5a0dd.zip kappa-9defae4d6f7b30d844447549fadffea4eab5a0dd.tar.gz kappa-9defae4d6f7b30d844447549fadffea4eab5a0dd.tar.bz2 kappa-9defae4d6f7b30d844447549fadffea4eab5a0dd.tar.xz | |
support keyboard io
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/main.c b/kernel/main.c index 0ddf4e7..4c768b7 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -12,7 +12,7 @@ #include "multiboot.h" #include "panic.h" #include "pcspkr.h" -#include "ps2.h" +#include "ps2kbd.h" #include "fpu.h" #include "timer.h" #include "tty.h" @@ -78,7 +78,7 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) /* initialize other drivers */ timer_init(HZ); - ps2_init(); + ps2kbd_init(); set_interrupt_handler(0, div0); set_interrupt_handler(0xd, gpf); @@ -225,7 +225,7 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) while(1) { - ps2_set_leds(PS2_NUM_LOCK); + ps2kbd_set_leds(PS2_NUM_LOCK); timer_delay(HZ/4); if(s < 0) putchar('\b'); @@ -234,7 +234,7 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) n+=s; if(n<=0 || n>=3) s=-s; - ps2_set_leds(PS2_CAPS_LOCK); + ps2kbd_set_leds(PS2_CAPS_LOCK); timer_delay(HZ/4); if(s < 0) putchar('\b'); @@ -243,7 +243,7 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) n+=s; if(n<=0 || n>=3) s=-s; - ps2_set_leds(PS2_SCROLL_LOCK); + ps2kbd_set_leds(PS2_SCROLL_LOCK); timer_delay(HZ/4); if(s < 0) putchar('\b'); @@ -252,7 +252,7 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) n+=s; if(n<=0 || n>=3) s=-s; - ps2_set_leds(PS2_CAPS_LOCK); + ps2kbd_set_leds(PS2_CAPS_LOCK); timer_delay(HZ/4); if(s < 0) putchar('\b'); |