Revision 68238a9e hw/mips_jazz.c

b/hw/mips_jazz.c
133 133
    CPUState *env;
134 134
    qemu_irq *rc4030, *i8259;
135 135
    rc4030_dma *dmas;
136
    rc4030_dma_function dma_read, dma_write;
136
    void* rc4030_opaque;
137 137
    void *scsi_hba;
138 138
    int hd;
139 139
    int s_rtc, s_dma_dummy;
......
185 185
    cpu_mips_clock_init(env);
186 186

  
187 187
    /* Chipset */
188
    rc4030 = rc4030_init(env->irq[6], env->irq[3],
189
                         &dmas, &dma_read, &dma_write);
188
    rc4030_opaque = rc4030_init(env->irq[6], env->irq[3], &rc4030, &dmas);
190 189
    s_dma_dummy = cpu_register_io_memory(0, dma_dummy_read, dma_dummy_write, NULL);
191 190
    cpu_register_physical_memory(0x8000d000, 0x00001000, s_dma_dummy);
192 191

  
......
217 216

  
218 217
    /* SCSI adapter */
219 218
    scsi_hba = esp_init(0x80002000, 0,
220
                        dma_read, dma_write, dmas[0],
219
                        rc4030_dma_read, rc4030_dma_write, dmas[0],
221 220
                        rc4030[5], &esp_reset);
222 221
    for (n = 0; n < ESP_MAX_DEVS; n++) {
223 222
        hd = drive_get_index(IF_SCSI, 0, n);

Also available in: Unified diff