mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
PS2 mouse and keyboard separation (Paul Brook)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1658 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
+3
-3
@@ -298,13 +298,13 @@ VL_OBJS+= usb.o usb-uhci.o usb-linux.o usb-hid.o
|
|||||||
|
|
||||||
ifeq ($(TARGET_BASE_ARCH), i386)
|
ifeq ($(TARGET_BASE_ARCH), i386)
|
||||||
# Hardware support
|
# Hardware support
|
||||||
VL_OBJS+= ide.o ne2000.o pckbd.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
|
VL_OBJS+= ide.o ne2000.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
|
||||||
VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o
|
VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o
|
||||||
VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o
|
VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o
|
||||||
DEFINES += -DHAS_AUDIO
|
DEFINES += -DHAS_AUDIO
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_BASE_ARCH), ppc)
|
ifeq ($(TARGET_BASE_ARCH), ppc)
|
||||||
VL_OBJS+= ppc.o ide.o ne2000.o pckbd.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
|
VL_OBJS+= ppc.o ide.o ne2000.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
|
||||||
VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o
|
VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o
|
||||||
VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o mixeng.o
|
VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o mixeng.o
|
||||||
DEFINES += -DHAS_AUDIO
|
DEFINES += -DHAS_AUDIO
|
||||||
@@ -315,7 +315,7 @@ VL_OBJS+= mips_r4k.o dma.o vga.o serial.o ne2000.o i8254.o i8259.o
|
|||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_BASE_ARCH), sparc)
|
ifeq ($(TARGET_BASE_ARCH), sparc)
|
||||||
ifeq ($(TARGET_ARCH), sparc64)
|
ifeq ($(TARGET_ARCH), sparc64)
|
||||||
VL_OBJS+= sun4u.o ide.o ne2000.o pckbd.o vga.o
|
VL_OBJS+= sun4u.o ide.o ne2000.o pckbd.o ps2.o vga.o
|
||||||
VL_OBJS+= fdc.o mc146818rtc.o serial.o m48t59.o
|
VL_OBJS+= fdc.o mc146818rtc.o serial.o m48t59.o
|
||||||
VL_OBJS+= cirrus_vga.o parallel.o
|
VL_OBJS+= cirrus_vga.o parallel.o
|
||||||
VL_OBJS+= magic-load.o
|
VL_OBJS+= magic-load.o
|
||||||
|
|||||||
+40
-378
File diff suppressed because it is too large
Load Diff
@@ -928,6 +928,14 @@ void do_usb_add(const char *devname);
|
|||||||
void do_usb_del(const char *devname);
|
void do_usb_del(const char *devname);
|
||||||
void usb_info(void);
|
void usb_info(void);
|
||||||
|
|
||||||
|
/* ps2.c */
|
||||||
|
void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);
|
||||||
|
void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);
|
||||||
|
void ps2_write_mouse(void *, int val);
|
||||||
|
void ps2_write_keyboard(void *, int val);
|
||||||
|
uint32_t ps2_read_data(void *);
|
||||||
|
void ps2_queue(void *, int b);
|
||||||
|
|
||||||
#endif /* defined(QEMU_TOOL) */
|
#endif /* defined(QEMU_TOOL) */
|
||||||
|
|
||||||
/* monitor.c */
|
/* monitor.c */
|
||||||
|
|||||||
Reference in New Issue
Block a user