[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv4 13/14] unicore32-softmmu: Add ps2 support
From: |
Guan Xuetao |
Subject: |
[Qemu-devel] [PATCHv4 13/14] unicore32-softmmu: Add ps2 support |
Date: |
Fri, 13 Jul 2012 19:07:48 +0800 |
This patch adds ps2/keyboard support, and enables CONFIG_PCKBD.
Signed-off-by: Guan Xuetao <address@hidden>
---
default-configs/unicore32-softmmu.mak | 1 +
hw/puv3.c | 5 +++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/default-configs/unicore32-softmmu.mak
b/default-configs/unicore32-softmmu.mak
index 4d4fbfc..de38577 100644
--- a/default-configs/unicore32-softmmu.mak
+++ b/default-configs/unicore32-softmmu.mak
@@ -1,3 +1,4 @@
# Default configuration for unicore32-softmmu
CONFIG_PUV3=y
CONFIG_PTIMER=y
+CONFIG_PCKBD=y
diff --git a/hw/puv3.c b/hw/puv3.c
index 9acfc5a..271df97 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -38,6 +38,7 @@ static void puv3_soc_init(CPUUniCore32State *env)
{
qemu_irq *cpu_intc, irqs[PUV3_IRQS_NR];
DeviceState *dev;
+ MemoryRegion *i8042 = g_new(MemoryRegion, 1);
int i;
/* Initialize interrupt controller */
@@ -57,6 +58,10 @@ static void puv3_soc_init(CPUUniCore32State *env)
irqs[PUV3_IRQS_GPIOLOW4], irqs[PUV3_IRQS_GPIOLOW5],
irqs[PUV3_IRQS_GPIOLOW6], irqs[PUV3_IRQS_GPIOLOW7],
irqs[PUV3_IRQS_GPIOHIGH], NULL);
+
+ /* Keyboard (i8042), mouse disabled for nographic */
+ i8042_mm_init(irqs[PUV3_IRQS_PS2_KBD], NULL, i8042, PUV3_REGS_OFFSET, 4);
+ memory_region_add_subregion(get_system_memory(), PUV3_PS2_BASE, i8042);
}
static void puv3_board_init(CPUUniCore32State *env, ram_addr_t ram_size)
--
1.7.0.4
- [Qemu-devel] [PATCHv4 00/14] unicore32: Add unicore32-softmmu support, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 04/14] target-unicore32: Drop UC32_CPUID macros, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 01/14] unicore32-softmmu: Add unicore32-softmmu build support, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 03/14] unicore32-softmmu: Make UniCore32 cpuid & exceptions correct and runable, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 02/14] unicore32-softmmu: Add coprocessor 0(sysctrl) and 1(ocd) instruction support, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 07/14] unicore32-softmmu: Add puv3 soc/board support, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 14/14] unicore32-softmmu: Add maintainer information for UniCore32 machine, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 05/14] unicore32-softmmu: Implement softmmu specific functions, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 13/14] unicore32-softmmu: Add ps2 support,
Guan Xuetao <=
- [Qemu-devel] [PATCHv4 09/14] unicore32-softmmu: Add puv3 ostimer support, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 10/14] unicore32-softmmu: Add puv3 gpio support, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 06/14] unicore32-softmmu: Make sure that kernel can access user space, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 12/14] unicore32-softmmu: Add puv3 dma support, Guan Xuetao, 2012/07/13
- [Qemu-devel] [PATCHv4 08/14] unicore32-softmmu: Add puv3 interrupt support, Guan Xuetao, 2012/07/13