From c601785091d72dc95b13a40c09e4fd6a3ccc3197 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 6 Oct 2011 16:34:39 +0200 Subject: jazz_led: convert to memory API Signed-off-by: Avi Kivity --- hw/mips_jazz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/mips_jazz.c') diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 14beea2d64..6e657ddd4e 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -287,7 +287,7 @@ static void mips_jazz_init(MemoryRegion *address_space, sysbus_mmio_map(sysbus, 0, 0x80009000); /* LED indicator */ - jazz_led_init(0x8000f000); + jazz_led_init(address_space, 0x8000f000); } static -- cgit v1.2.3 From 63858cd99244aeb819f92a6f8f9a23a5719c4824 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 6 Oct 2011 16:44:26 +0200 Subject: parallel: convert to memory API Signed-off-by: Avi Kivity --- hw/mips_jazz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/mips_jazz.c') diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 6e657ddd4e..f6e331652b 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -274,7 +274,8 @@ static void mips_jazz_init(MemoryRegion *address_space, /* Parallel port */ if (parallel_hds[0]) - parallel_mm_init(0x80008000, 0, rc4030[0], parallel_hds[0]); + parallel_mm_init(address_space, 0x80008000, 0, rc4030[0], + parallel_hds[0]); /* Sound card */ /* FIXME: missing Jazz sound at 0x8000c000, rc4030[2] */ -- cgit v1.2.3 From 3054434d61fa6345cff8c4976b2a1480160f4e96 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 6 Nov 2011 19:30:48 +0200 Subject: rc4030: convert to memory API Signed-off-by: Avi Kivity --- hw/mips_jazz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/mips_jazz.c') diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index f6e331652b..e1db841bf5 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -177,7 +177,8 @@ static void mips_jazz_init(MemoryRegion *address_space, cpu_mips_clock_init(env); /* Chipset */ - rc4030_opaque = rc4030_init(env->irq[6], env->irq[3], &rc4030, &dmas); + rc4030_opaque = rc4030_init(env->irq[6], env->irq[3], &rc4030, &dmas, + address_space); memory_region_init_io(dma_dummy, &dma_dummy_ops, NULL, "dummy_dma", 0x1000); memory_region_add_subregion(address_space, 0x8000d000, dma_dummy); -- cgit v1.2.3 From 024e5bb664bda54b393e405f425f10fa9d3fbd1a Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 9 Nov 2011 18:22:37 +0200 Subject: dp8393x: convert to memory API Fixes address space leak on hotunplug. Signed-off-by: Avi Kivity --- hw/mips_jazz.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/mips_jazz.c') diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index e1db841bf5..358de599b0 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -227,7 +227,7 @@ static void mips_jazz_init(MemoryRegion *address_space, if (!nd->model) nd->model = g_strdup("dp83932"); if (strcmp(nd->model, "dp83932") == 0) { - dp83932_init(nd, 0x80001000, 2, rc4030[4], + dp83932_init(nd, 0x80001000, 2, get_system_memory(), rc4030[4], rc4030_opaque, rc4030_dma_memory_rw); break; } else if (strcmp(nd->model, "?") == 0) { -- cgit v1.2.3