Clean up rc4030 init function
PATCH 1/1 Clean up rc4030 init function
Hi,
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 <[email protected]>
Hervé
mips.h +6 -4
@@ -28,9 +28,11 @@/* rc4030.c */ typedef struct rc4030DMAState *rc4030_dma ; -typedef void (*rc4030_dma_function )(void *dma,uint8_t *buf,int len); -qemu_irq *rc4030_init (qemu_irq timer,qemu_irq jazz_bus, -rc4030_dma **dmas, -rc4030_dma_function *dma_read,rc4030_dma_function *dma_write); +void rc4030_dma_memory_rw (void *opaque,target_phys_addr_t addr,uint8_t *buf,int len,int is_write); +void rc4030_dma_read (void *dma,uint8_t *buf,int len); +void rc4030_dma_write (void *dma,uint8_t *buf,int len); +void *rc4030_init (qemu_irq timer,qemu_irq jazz_bus, +qemu_irq **irqs,rc4030_dma **dmas); +#endif
mips_jazz.c +3 -4
@@ -133,7 +133,7 @@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 @@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 @@/* 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);
rc4030.c +7 -9
@@ -675,7 +675,7 @@qemu_put_be32 (f, s->itr); } -static void rc4030_dma_memory_rw (void *opaque,target_phys_addr_t addr,uint8_t *buf,int len,int is_write) +void rc4030_dma_memory_rw (void *opaque,target_phys_addr_t addr,uint8_t *buf,int len,int is_write) {rc4030State *s = opaque;target_phys_addr_t entry_addr;
@@ -766,13 +766,13 @@int n; }; -static void rc4030_dma_read (void *dma,uint8_t *buf,int len) +void rc4030_dma_read (void *dma,uint8_t *buf,int len) {rc4030_dma s = dma;rc4030_do_dma (s->opaque, s->n, buf, len,0 ); } -static void rc4030_dma_write (void *dma,uint8_t *buf,int len) +void rc4030_dma_write (void *dma,uint8_t *buf,int len) {rc4030_dma s = dma;rc4030_do_dma (s->opaque, s->n, buf, len,1 );
@@ -795,18 +795,16 @@return s; } -qemu_irq *rc4030_init (qemu_irq timer,qemu_irq jazz_bus, -rc4030_dma **dmas, -rc4030_dma_function *dma_read,rc4030_dma_function *dma_write) +void *rc4030_init (qemu_irq timer,qemu_irq jazz_bus, +qemu_irq **irqs,rc4030_dma **dmas) {rc4030State *s;int s_chipset, s_jazzio; s =qemu_mallocz (sizeof (rc4030State)); + *irqs =qemu_allocate_irqs (rc4030_irq_jazz_request, s,16 ); *dmas =rc4030_allocate_dmas (s,4 ); - *dma_read = rc4030_dma_read; - *dma_write = rc4030_dma_write; s->periodic_timer =qemu_new_timer (vm_clock, rc4030_periodic_timer, s); s->timer_irq = timer;
@@ -821,5 +819,5 @@ s_jazzio =cpu_register_io_memory (0 , jazzio_read, jazzio_write, s);cpu_register_physical_memory (0xf0000000 ,0x00001000 , s_jazzio); -return qemu_allocate_irqs (rc4030_irq_jazz_request, s,16 ); +return s; }
Aurelien Jarno
AppliedQuoted 10 lines · Hervé Poussineau
Hi,
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 <[email protected]>Hervé
Thanks, applied.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net