diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-01-31 01:43:05 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-01-31 01:43:05 +0100 |
| commit | 2f9d3f1ce47d7601a9d200d1bedfa07bfec278df (patch) | |
| tree | 16d3a26eaf984fce927acce9c6efb4d7a5d65628 | |
| parent | a3f387eb2ac58c2751345bb7a06dfa5b30c79f04 (diff) | |
Drop kbd device on xen
* i386/Makefrag.am (libkernel_a_SOURCES): Move i386/i386at/kd_event.[ch] and
i386/i386at/kd_queue.[ch] to [PLATFORM_at].
* i386/i386at/conf.c (dev_name_list): Move kbd device to [!MACH_HYP].
| -rw-r--r-- | i386/Makefrag.am | 8 | ||||
| -rw-r--r-- | i386/i386at/conf.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/i386/Makefrag.am b/i386/Makefrag.am index 8cb78240..e59c5b77 100644 --- a/i386/Makefrag.am +++ b/i386/Makefrag.am @@ -23,10 +23,6 @@ libkernel_a_SOURCES += \ i386/i386at/conf.c \ i386/i386at/cons_conf.c \ i386/i386at/idt.h \ - i386/i386at/kd_event.c \ - i386/i386at/kd_event.h \ - i386/i386at/kd_queue.c \ - i386/i386at/kd_queue.h \ i386/i386at/model_dep.c \ i386/include/mach/sa/stdarg.h @@ -45,6 +41,10 @@ libkernel_a_SOURCES += \ i386/i386at/interrupt.S \ i386/i386at/kd.c \ i386/i386at/kd.h \ + i386/i386at/kd_event.c \ + i386/i386at/kd_event.h \ + i386/i386at/kd_queue.c \ + i386/i386at/kd_queue.h \ i386/i386at/kd_mouse.c \ i386/i386at/kd_mouse.h \ i386/i386at/kdasm.S \ diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c index d51b5ee2..83c8dbfc 100644 --- a/i386/i386at/conf.c +++ b/i386/i386at/conf.c @@ -123,14 +123,12 @@ struct dev_ops dev_name_list[] = nodev, mousegetstat, nulldev, nomap, nodev, nulldev, nulldev, 0, nodev }, -#endif /* MACH_HYP */ { kbdname, kbdopen, kbdclose, kbdread, nodev, kbdgetstat, kbdsetstat, nomap, nodev, nulldev, nulldev, 0, nodev }, -#ifndef MACH_HYP { memname, nulldev, nulldev, nodev, nodev, nodev, nodev, memmmap, nodev, nulldev, nulldev, 0, |