diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-26 17:39:43 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-26 17:39:43 +0000 |
| commit | 5aca8c3b2fbada188ff86781fba24685d346cef9 (patch) | |
| tree | d3cc0526e7c45b23dfddf42a123d4261f87a93b4 /hw/slavio_misc.c | |
| parent | db7b5426a4b424249b4aba3496bf14da69a6625b (diff) | |
| download | qemu-5aca8c3b2fbada188ff86781fba24685d346cef9.tar.gz | |
Split DMA controller in two
Fix register size related bugs
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2869 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/slavio_misc.c')
| -rw-r--r-- | hw/slavio_misc.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 1007238240..e8a4ea4d41 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -47,7 +47,7 @@ typedef struct MiscState { uint8_t diag, mctrl, sysctrl; } MiscState; -#define MISC_MAXADDR 1 +#define MISC_SIZE 1 static void slavio_misc_update_irq(void *opaque) { @@ -224,19 +224,25 @@ void *slavio_misc_init(target_phys_addr_t base, target_phys_addr_t power_base, slavio_misc_io_memory = cpu_register_io_memory(0, slavio_misc_mem_read, slavio_misc_mem_write, s); // Slavio control - cpu_register_physical_memory(base + 0x1800000, MISC_MAXADDR, slavio_misc_io_memory); + cpu_register_physical_memory(base + 0x1800000, MISC_SIZE, + slavio_misc_io_memory); // AUX 1 - cpu_register_physical_memory(base + 0x1900000, MISC_MAXADDR, slavio_misc_io_memory); + cpu_register_physical_memory(base + 0x1900000, MISC_SIZE, + slavio_misc_io_memory); // AUX 2 - cpu_register_physical_memory(base + 0x1910000, MISC_MAXADDR, slavio_misc_io_memory); + cpu_register_physical_memory(base + 0x1910000, MISC_SIZE, + slavio_misc_io_memory); // Diagnostics - cpu_register_physical_memory(base + 0x1a00000, MISC_MAXADDR, slavio_misc_io_memory); + cpu_register_physical_memory(base + 0x1a00000, MISC_SIZE, + slavio_misc_io_memory); // Modem control - cpu_register_physical_memory(base + 0x1b00000, MISC_MAXADDR, slavio_misc_io_memory); + cpu_register_physical_memory(base + 0x1b00000, MISC_SIZE, + slavio_misc_io_memory); // System control - cpu_register_physical_memory(base + 0x1f00000, MISC_MAXADDR, slavio_misc_io_memory); + cpu_register_physical_memory(base + 0x1f00000, MISC_SIZE, + slavio_misc_io_memory); // Power management - cpu_register_physical_memory(power_base, MISC_MAXADDR, slavio_misc_io_memory); + cpu_register_physical_memory(power_base, MISC_SIZE, slavio_misc_io_memory); s->irq = irq; |