Cast mi_regs callbacks

Author: lambertjamesd

bus/controller.c

@@ -44,7 +44,7 @@ int bus_init(struct bus_controller *bus, int dd_present) {
   static const struct bus_controller_mapping mappings[NUM_MAPPINGS] = {
     {read_ai_regs, write_ai_regs, AI_REGS_BASE_ADDRESS, AI_REGS_ADDRESS_LEN},
     {read_dp_regs, write_dp_regs, DP_REGS_BASE_ADDRESS, DP_REGS_ADDRESS_LEN},
-    {read_mi_regs, write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN},
+    {(memory_rd_function)read_mi_regs, (memory_wr_function)write_mi_regs, MI_REGS_BASE_ADDRESS, MI_REGS_ADDRESS_LEN},
     {read_pi_regs, write_pi_regs, PI_REGS_BASE_ADDRESS, PI_REGS_ADDRESS_LEN},
     {read_ri_regs, write_ri_regs, RI_REGS_BASE_ADDRESS, RI_REGS_ADDRESS_LEN},
     {read_si_regs, write_si_regs, SI_REGS_BASE_ADDRESS, SI_REGS_ADDRESS_LEN},

vr4300/interface.c

@@ -89,8 +89,7 @@ void signal_rcp_interrupt(struct vr4300 *vr4300, enum rcp_interrupt_mask mask) {
 }
 
 // Reads a word from the MI MMIO register space.
-int read_mi_regs(void *opaque, uint32_t address, uint32_t *word) {
-  struct vr4300 *vr4300 = (struct vr4300*)opaque;
+int read_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t *word) {
   uint32_t offset = address - MI_REGS_BASE_ADDRESS;
   enum mi_register reg = (offset >> 2);
 
@@ -100,8 +99,7 @@ int read_mi_regs(void *opaque, uint32_t address, uint32_t *word) {
 }
 
 // Writes a word to the MI MMIO register space.
-int write_mi_regs(void *opaque, uint32_t address, uint32_t word, uint32_t dqm) {
-  struct vr4300 *vr4300 = (struct vr4300*)opaque;
+int write_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t word, uint32_t dqm) {
   uint32_t offset = address - MI_REGS_BASE_ADDRESS;
   enum mi_register reg = (offset >> 2);
   uint32_t result;

vr4300/interface.h

@@ -50,8 +50,8 @@ uint64_t vr4300_get_pc(struct vr4300 *vr4300);
 
 bool vr4300_read_word_vaddr(struct vr4300 *vr4300, uint64_t vaddr, uint32_t* result);
 
-int read_mi_regs(void *opaque, uint32_t address, uint32_t *word);
-int write_mi_regs(void *opaque, uint32_t address, uint32_t word, uint32_t dqm);
+int read_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t *word);
+int write_mi_regs(struct vr4300 *vr4300, uint32_t address, uint32_t word, uint32_t dqm);
 
 void clear_rcp_interrupt(struct vr4300 *vr4300, enum rcp_interrupt_mask mask);
 void signal_rcp_interrupt(struct vr4300 *vr4300, enum rcp_interrupt_mask mask);