diff --git a/hw/xbox/dsp/dsp.c b/hw/xbox/dsp/dsp.c index b310ce2c75..3030a8427f 100644 --- a/hw/xbox/dsp/dsp.c +++ b/hw/xbox/dsp/dsp.c @@ -179,8 +179,8 @@ void dsp_info(dsp_core_t* dsp) fputs("\n", stderr); fprintf(stderr, "- Pending ints: "); - for (i = 0; i < ARRAYSIZE(dsp->interrupt_isPending); i++) { - fprintf(stderr, " %04hx", dsp->interrupt_isPending[i]); + for (i = 0; i < ARRAYSIZE(dsp->interrupt_is_pending); i++) { + fprintf(stderr, " %04hx", dsp->interrupt_is_pending[i]); } fputs("\n", stderr); } diff --git a/hw/xbox/dsp/dsp_cpu.c b/hw/xbox/dsp/dsp_cpu.c index 8bf14f726a..d19b009f24 100644 --- a/hw/xbox/dsp/dsp_cpu.c +++ b/hw/xbox/dsp/dsp_cpu.c @@ -377,7 +377,7 @@ void dsp56k_init_cpu(dsp_core_t* dsp) } /* Interruptions */ - memset(dsp->interrupt_isPending, 0, sizeof(dsp->interrupt_isPending)); + memset(dsp->interrupt_is_pending, 0, sizeof(dsp->interrupt_is_pending)); dsp->interrupt_state = DSP_INTERRUPT_NONE; dsp->interrupt_instr_fetch = -1; dsp->interrupt_save_pc = -1; @@ -761,8 +761,8 @@ void dsp56k_add_interrupt(dsp_core_t* dsp, uint16_t inter) return; /* add this interrupt to the pending interrupts table */ - if (dsp->interrupt_isPending[inter] == 0) { - dsp->interrupt_isPending[inter] = 1; + if (dsp->interrupt_is_pending[inter] == 0) { + dsp->interrupt_is_pending[inter] = 1; dsp->interrupt_counter ++; } } @@ -797,7 +797,7 @@ static void dsp_postexecute_interrupts(dsp_core_t* dsp) dsp->registers[DSP_REG_SR] &= BITMASK(16)-((1<registers[DSP_REG_SR] |= dsp->interrupt_IplToRaise<registers[DSP_REG_SR] |= dsp->interrupt_ipl_to_raise<interrupt_pipeline_count --; return; @@ -811,7 +811,7 @@ static void dsp_postexecute_interrupts(dsp_core_t* dsp) dsp->registers[DSP_REG_SR] &= BITMASK(16)-((1<registers[DSP_REG_SR] |= dsp->interrupt_IplToRaise<registers[DSP_REG_SR] |= dsp->interrupt_ipl_to_raise<interrupt_pipeline_count --; @@ -857,7 +857,7 @@ static void dsp_postexecute_interrupts(dsp_core_t* dsp) /* Arbitrate between all pending interrupts */ for (i=0; i<12; i++) { - if (dsp->interrupt_isPending[i] == 1) { + if (dsp->interrupt_is_pending[i] == 1) { /* level 3 interrupt ? */ if (dsp->interrupt_ipl[i] == 3) { @@ -886,7 +886,7 @@ static void dsp_postexecute_interrupts(dsp_core_t* dsp) } /* remove this interrupt from the pending interrupts table */ - dsp->interrupt_isPending[index] = 0; + dsp->interrupt_is_pending[index] = 0; dsp->interrupt_counter --; /* process arbritrated interrupt */ @@ -898,7 +898,7 @@ static void dsp_postexecute_interrupts(dsp_core_t* dsp) dsp->interrupt_instr_fetch = dsp_interrupt[index].vectorAddr; dsp->interrupt_pipeline_count = 5; dsp->interrupt_state = DSP_INTERRUPT_DISABLED; - dsp->interrupt_IplToRaise = ipl_to_raise; + dsp->interrupt_ipl_to_raise = ipl_to_raise; DPRINTF("Dsp interrupt: %s\n", dsp_interrupt[index].name); diff --git a/hw/xbox/dsp/dsp_int.h b/hw/xbox/dsp/dsp_int.h index 35026659ac..9e4a337d79 100644 --- a/hw/xbox/dsp/dsp_int.h +++ b/hw/xbox/dsp/dsp_int.h @@ -173,10 +173,10 @@ struct dsp_core_s { uint16_t interrupt_instr_fetch; /* vector of the current interrupt */ uint16_t interrupt_save_pc; /* save next pc value before interrupt */ uint16_t interrupt_counter; /* count number of pending interrupts */ - uint16_t interrupt_IplToRaise; /* save the IPL level to save in the SR register */ + uint16_t interrupt_ipl_to_raise; /* save the IPL level to save in the SR register */ uint16_t interrupt_pipeline_count; /* used to prefetch correctly the 2 inter instructions */ int16_t interrupt_ipl[12]; /* store the current IPL for each interrupt */ - uint16_t interrupt_isPending[12]; /* store if interrupt is pending for each interrupt */ + uint16_t interrupt_is_pending[12]; /* store if interrupt is pending for each interrupt */ /* runtime data */