diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 21:26:55 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-04-10 21:26:55 +0000 |
| commit | 68238a9e90708740200e652631ee1356dd55147d (patch) | |
| tree | ec40170ed3aa80c84da08d1d65c77cfe41532ad5 /hw/mips_jazz.c | |
| parent | c2c5104b226f7fdcfa8e9bb9d62bd934c09da5f0 (diff) | |
| download | qemu-68238a9e90708740200e652631ee1356dd55147d.tar.gz | |
Clean up rc4030 init function
At the moment, rc4030 init function is returning some function pointers.
Mark them non-static and define them in header file instead.
Export also a function to read/write DMA memory, it will be required by
the netcard.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7072 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_jazz.c')
| -rw-r--r-- | hw/mips_jazz.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 39b42fda0c..2931b4753c 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -133,7 +133,7 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, CPUState *env; qemu_irq *rc4030, *i8259; rc4030_dma *dmas; - rc4030_dma_function dma_read, dma_write; + void* rc4030_opaque; void *scsi_hba; int hd; int s_rtc, s_dma_dummy; @@ -185,8 +185,7 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, cpu_mips_clock_init(env); /* Chipset */ - rc4030 = rc4030_init(env->irq[6], env->irq[3], - &dmas, &dma_read, &dma_write); + rc4030_opaque = rc4030_init(env->irq[6], env->irq[3], &rc4030, &dmas); s_dma_dummy = cpu_register_io_memory(0, dma_dummy_read, dma_dummy_write, NULL); cpu_register_physical_memory(0x8000d000, 0x00001000, s_dma_dummy); @@ -217,7 +216,7 @@ void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size, /* SCSI adapter */ scsi_hba = esp_init(0x80002000, 0, - dma_read, dma_write, dmas[0], + rc4030_dma_read, rc4030_dma_write, dmas[0], rc4030[5], &esp_reset); for (n = 0; n < ESP_MAX_DEVS; n++) { hd = drive_get_index(IF_SCSI, 0, n); |