sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

PPC: Fix via-cuda memory registration 

Commit 23c5e4ca (convert to memory API) broke the VIA Cuda emulation layer
by not registering the IO structs.

This patch registers them properly and thus makes -M g3beige and -M mac99
work again.

Tested-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2011-09-08 18:51:17 +02:00
parent 7a880d9352
commit ea0a7eb460
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/cuda.c
View File

@ -634,16 +634,20 @@ static uint32_t cuda_readl (void *opaque, target_phys_addr_t addr)
return 0; return 0;
} }
static CPUWriteMemoryFunc * const cuda_write[] = { static MemoryRegionOps cuda_ops = {
&cuda_writeb, .old_mmio = {
&cuda_writew, .write = {
&cuda_writel, cuda_writeb,
}; cuda_writew,
cuda_writel,
static CPUReadMemoryFunc * const cuda_read[] = { },
&cuda_readb, .read = {
&cuda_readw, cuda_readb,
&cuda_readl, cuda_readw,
cuda_readl,
},
},
.endianness = DEVICE_NATIVE_ENDIAN,
}; };
static bool cuda_timer_exist(void *opaque, int version_id) static bool cuda_timer_exist(void *opaque, int version_id)
@ -740,8 +744,8 @@ void cuda_init (MemoryRegion **cuda_mem, qemu_irq irq)
s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET; s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET;
s->adb_poll_timer = qemu_new_timer_ns(vm_clock, cuda_adb_poll, s); s->adb_poll_timer = qemu_new_timer_ns(vm_clock, cuda_adb_poll, s);
cpu_register_io_memory(cuda_read, cuda_write, s, memory_region_init_io(&s->mem, &cuda_ops, s, "cuda", 0x2000);
DEVICE_NATIVE_ENDIAN);
*cuda_mem = &s->mem; *cuda_mem = &s->mem;
vmstate_register(NULL, -1, &vmstate_cuda, s); vmstate_register(NULL, -1, &vmstate_cuda, s);
qemu_register_reset(cuda_reset, s); qemu_register_reset(cuda_reset, s);