From 6dc5b7376371974f7dcb9af130897eee8863fab8 Mon Sep 17 00:00:00 2001 From: Evgeny Voevodin Date: Thu, 26 Jul 2012 10:25:12 +0400 Subject: [PATCH] tizen/src/hw/maru_arm_soc.c: Fix misleading definitions' names. Signed-off-by: Evgeny Voevodin --- tizen/src/hw/maru_arm_soc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tizen/src/hw/maru_arm_soc.c b/tizen/src/hw/maru_arm_soc.c index 1c3c9e7..b229365 100644 --- a/tizen/src/hw/maru_arm_soc.c +++ b/tizen/src/hw/maru_arm_soc.c @@ -129,10 +129,9 @@ /* I2S */ #define EXYNOS4210_I2S0_BASE_ADDR 0x03830000 -/* VirtIO BLK */ -#define EXYNOS4210_VIRTIO_BLK_BASE_ADDR 0x10AD0000 -/* VirtIO NET */ -#define EXYNOS4210_VIRTIO_NET_BASE_ADDR 0x10AC0000 +/* VirtIO MMIO */ +#define EXYNOS4210_VIRTIO_MMIO0_BASE_ADDR 0x10AD0000 +#define EXYNOS4210_VIRTIO_MMIO1_BASE_ADDR 0x10AC0000 /* pl050 ps/2 interface */ #define EXYNOS4210_PL050_BASE_ADDR 0x12E30000 @@ -429,9 +428,12 @@ Exynos4210State *maru_arm_soc_init(MemoryRegion *system_mem, EXYNOS4210_I2S0_BASE_ADDR, s->irqs.ext_gic_irq[97]); - sysbus_create_simple(VIRTIO_MMIO_TRANSPORT, EXYNOS4210_VIRTIO_BLK_BASE_ADDR, + sysbus_create_simple(VIRTIO_MMIO_TRANSPORT, + EXYNOS4210_VIRTIO_MMIO0_BASE_ADDR, s->irq_table[exynos4210_get_irq(37, 3)]); - sysbus_create_simple(VIRTIO_MMIO_TRANSPORT, EXYNOS4210_VIRTIO_NET_BASE_ADDR, + + sysbus_create_simple(VIRTIO_MMIO_TRANSPORT, + EXYNOS4210_VIRTIO_MMIO1_BASE_ADDR, s->irq_table[exynos4210_get_irq(37, 2)]); /* PL050 PS/2 if keyboard */ -- 2.7.4