diff options
Diffstat (limited to 'src/mame/machine/megacdcd.cpp')
-rw-r--r-- | src/mame/machine/megacdcd.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/src/mame/machine/megacdcd.cpp b/src/mame/machine/megacdcd.cpp index ca63439541e..2c49485424e 100644 --- a/src/mame/machine/megacdcd.cpp +++ b/src/mame/machine/megacdcd.cpp @@ -12,7 +12,7 @@ const device_type LC89510_TEMP = &device_creator<lc89510_temp_device>; -lc89510_temp_device::lc89510_temp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +lc89510_temp_device::lc89510_temp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, LC89510_TEMP, "lc89510_temp_device", tag, owner, clock, "lc89510_temp", __FILE__) { segacd_dma_callback = segacd_dma_delegate(FUNC(lc89510_temp_device::Fake_CDC_Do_DMA), this); @@ -71,7 +71,7 @@ void lc89510_temp_device::set_is_neoCD(device_t &device, bool is_neoCD) } // HACK for DMA handling, this gets replaced -void lc89510_temp_device::Fake_CDC_Do_DMA(int &dmacount, UINT8 *CDC_BUFFER, UINT16 &dma_addrc, UINT16 &destination ) +void lc89510_temp_device::Fake_CDC_Do_DMA(int &dmacount, uint8_t *CDC_BUFFER, uint16_t &dma_addrc, uint16_t &destination ) { fatalerror("Fake_CDC_Do_DMA\n"); } @@ -192,7 +192,7 @@ void lc89510_temp_device::CDD_Export(bool neocd_hack) void lc89510_temp_device::CDD_GetStatus(void) { - UINT16 s = (CDD_STATUS & 0x0f00); + uint16_t s = (CDD_STATUS & 0x0f00); if ((s == 0x0200) || (s == 0x0700) || (s == 0x0e00)) CDD_STATUS = (SCD_STATUS & 0xff00) | (CDD_STATUS & 0x00ff); @@ -218,7 +218,7 @@ void lc89510_temp_device::CDD_Stop(running_machine &machine) void lc89510_temp_device::CDD_GetPos(void) { CLEAR_CDD_RESULT - UINT32 msf; + uint32_t msf; CDD_STATUS &= 0xFF; if(segacd.cd == nullptr) // no CD is there, bail out return; @@ -233,9 +233,9 @@ void lc89510_temp_device::CDD_GetTrackPos(void) { CLEAR_CDD_RESULT int elapsedlba; - UINT32 msf; + uint32_t msf; CDD_STATUS &= 0xFF; - // UINT32 end_msf = ; + // uint32_t end_msf = ; if(segacd.cd == nullptr) // no CD is there, bail out return; CDD_STATUS |= SCD_STATUS; @@ -266,8 +266,8 @@ void lc89510_temp_device::CDD_Length(void) return; CDD_STATUS |= SCD_STATUS; - UINT32 startlba = (segacd.toc->tracks[cdrom_get_last_track(segacd.cd)].logframeofs); - UINT32 startmsf = lba_to_msf_alt( startlba ); + uint32_t startlba = (segacd.toc->tracks[cdrom_get_last_track(segacd.cd)].logframeofs); + uint32_t startmsf = lba_to_msf_alt( startlba ); CDD_MIN = to_bcd((startmsf&0x00ff0000)>>16,false); CDD_SEC = to_bcd((startmsf&0x0000ff00)>>8,false); @@ -304,8 +304,8 @@ void lc89510_temp_device::CDD_GetTrackAdr(void) if (track < 1) track = 1; - UINT32 startlba = (segacd.toc->tracks[track-1].logframeofs); - UINT32 startmsf = lba_to_msf_alt( startlba+150 ); + uint32_t startlba = (segacd.toc->tracks[track-1].logframeofs); + uint32_t startmsf = lba_to_msf_alt( startlba+150 ); CDD_MIN = to_bcd((startmsf&0x00ff0000)>>16,false); CDD_SEC = to_bcd((startmsf&0x0000ff00)>>8,false); @@ -346,9 +346,9 @@ void lc89510_temp_device::CDD_GetTrackType(void) } -UINT32 lc89510_temp_device::getmsf_from_regs(void) +uint32_t lc89510_temp_device::getmsf_from_regs(void) { - UINT32 msf = 0; + uint32_t msf = 0; msf = ((CDD_TX[3] & 0xF) + (CDD_TX[2] & 0xF) * 10) << 16; msf |= ((CDD_TX[5] & 0xF) + (CDD_TX[4] & 0xF) * 10) << 8; @@ -360,11 +360,11 @@ UINT32 lc89510_temp_device::getmsf_from_regs(void) void lc89510_temp_device::CDD_Play(running_machine &machine) { CLEAR_CDD_RESULT - UINT32 msf = getmsf_from_regs(); + uint32_t msf = getmsf_from_regs(); SCD_CURLBA = msf_to_lba(msf)-150; if(segacd.cd == nullptr) // no CD is there, bail out return; - UINT32 end_msf = segacd.toc->tracks[ cdrom_get_track(segacd.cd, SCD_CURLBA) + 1 ].logframeofs; + uint32_t end_msf = segacd.toc->tracks[ cdrom_get_track(segacd.cd, SCD_CURLBA) + 1 ].logframeofs; SCD_CURTRK = cdrom_get_track(segacd.cd, SCD_CURLBA)+1; LC8951UpdateHeader(); SCD_STATUS = CDD_PLAYINGCDDA; @@ -385,7 +385,7 @@ void lc89510_temp_device::CDD_Play(running_machine &machine) void lc89510_temp_device::CDD_Seek(void) { CLEAR_CDD_RESULT - UINT32 msf = getmsf_from_regs(); + uint32_t msf = getmsf_from_regs(); SCD_CURLBA = msf_to_lba(msf)-150; if(segacd.cd == nullptr) // no CD is there, bail out return; @@ -524,9 +524,9 @@ void lc89510_temp_device::lc89510_Reset(void) void lc89510_temp_device::CDC_Do_DMA(running_machine& machine, int rate) { - UINT32 length; + uint32_t length; - UINT16 destination = CDC_REG0 & 0x0700; + uint16_t destination = CDC_REG0 & 0x0700; if (!(SCD_DMA_ENABLED)) return; @@ -550,7 +550,7 @@ void lc89510_temp_device::CDC_Do_DMA(running_machine& machine, int rate) int dmacount = length; - UINT16 dma_addrc = LC8951RegistersW[REG_W_DACL] | (LC8951RegistersW[REG_W_DACH]<<8); + uint16_t dma_addrc = LC8951RegistersW[REG_W_DACL] | (LC8951RegistersW[REG_W_DACH]<<8); // HACK segacd_dma_callback(dmacount, CDC_BUFFER, dma_addrc, destination ); @@ -571,9 +571,9 @@ void lc89510_temp_device::CDC_Do_DMA(running_machine& machine, int rate) -UINT16 lc89510_temp_device::CDC_Host_r(running_machine& machine, UINT16 type) +uint16_t lc89510_temp_device::CDC_Host_r(running_machine& machine, uint16_t type) { - UINT16 destination = CDC_REG0 & 0x0700; + uint16_t destination = CDC_REG0 & 0x0700; if (SCD_DMA_ENABLED) { @@ -592,9 +592,9 @@ UINT16 lc89510_temp_device::CDC_Host_r(running_machine& machine, UINT16 type) LC8951RegistersW[REG_W_DBCL] = dma_count_register & 0xff; LC8951RegistersW[REG_W_DBCH] = (dma_count_register>>8) & 0xff; - UINT16 dma_addrc = LC8951RegistersW[REG_W_DACL] | (LC8951RegistersW[REG_W_DACH]<<8); + uint16_t dma_addrc = LC8951RegistersW[REG_W_DACL] | (LC8951RegistersW[REG_W_DACH]<<8); - UINT16 data = (CDC_BUFFER[dma_addrc]<<8) | CDC_BUFFER[dma_addrc+1]; + uint16_t data = (CDC_BUFFER[dma_addrc]<<8) | CDC_BUFFER[dma_addrc+1]; dma_addrc += 2; LC8951RegistersW[REG_W_DACL] = dma_addrc & 0xff; LC8951RegistersW[REG_W_DACH] = (dma_addrc >> 8) & 0xff; @@ -610,13 +610,13 @@ UINT16 lc89510_temp_device::CDC_Host_r(running_machine& machine, UINT16 type) -UINT8 lc89510_temp_device::CDC_Reg_r(void) +uint8_t lc89510_temp_device::CDC_Reg_r(void) { int reg = CDC_REG0 & 0xF; - UINT8 ret = 0; + uint8_t ret = 0; - UINT16 decoderegs = 0x73F2; + uint16_t decoderegs = 0x73F2; if ((decoderegs>>reg)&1) CDC_DECODE |= (1 << reg); @@ -665,7 +665,7 @@ UINT8 lc89510_temp_device::CDC_Reg_r(void) return ret; } -void lc89510_temp_device::CDC_Reg_w(UINT8 data) +void lc89510_temp_device::CDC_Reg_w(uint8_t data) { int reg = CDC_REG0 & 0xF; @@ -843,7 +843,7 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_cdc_data_w ) READ16_MEMBER( lc89510_temp_device::segacd_cdc_data_r ) { - UINT16 retdat = 0x0000; + uint16_t retdat = 0x0000; if (ACCESSING_BITS_0_7) retdat |= CDC_Reg_r(); @@ -874,7 +874,7 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_irq_mask_w ) { if (ACCESSING_BITS_0_7) { - UINT16 control = CDD_CONTROL; + uint16_t control = CDD_CONTROL; // printf("segacd_irq_mask_w %04x %04x (CDD control is %04x)\n",data, mem_mask, control); @@ -910,7 +910,7 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_cdd_ctrl_w ) { if (ACCESSING_BITS_0_7) { - UINT16 control = CDD_CONTROL; + uint16_t control = CDD_CONTROL; //printf("segacd_cdd_ctrl_w %04x %04x (control %04x irq %04x\n", data, mem_mask, control, segacd_irq_mask); @@ -938,9 +938,9 @@ WRITE16_MEMBER( lc89510_temp_device::segacd_cdd_ctrl_w ) // mapped as serial -UINT8 lc89510_temp_device::neocd_cdd_rx_r() +uint8_t lc89510_temp_device::neocd_cdd_rx_r() { - UINT8 ret = 0; + uint8_t ret = 0; if (NeoCDCommsWordCount >= 0 && NeoCDCommsWordCount < 10) { ret = CDD_RX[NeoCDCommsWordCount] & 0x0F; @@ -960,7 +960,7 @@ READ8_MEMBER( lc89510_temp_device::segacd_cdd_rx_r ) } // mapped as serial -void lc89510_temp_device::neocd_cdd_tx_w(UINT8 data) +void lc89510_temp_device::neocd_cdd_tx_w(uint8_t data) { //printf("neocd_cdd_tx_w %d, %02x\n", NeoCDCommsWordCount, data); @@ -1107,7 +1107,7 @@ void lc89510_temp_device::NeoCDCommsReset() -void lc89510_temp_device::NeoCDCommsControl(UINT8 clock, UINT8 send) +void lc89510_temp_device::NeoCDCommsControl(uint8_t clock, uint8_t send) { if (clock && !bNeoCDCommsClock) { NeoCDCommsWordCount++; @@ -1144,7 +1144,7 @@ void lc89510_temp_device::LC8951UpdateHeader() // neocd } else { // HEAD registers have header - UINT32 msf = lba_to_msf_alt(SCD_CURLBA+150); + uint32_t msf = lba_to_msf_alt(SCD_CURLBA+150); LC8951RegistersR[REG_R_HEAD0] = to_bcd (((msf & 0x00ff0000)>>16), true); // HEAD0 LC8951RegistersR[REG_R_HEAD1] = to_bcd (((msf & 0x0000ff00)>>8), true); // HEAD1 @@ -1319,14 +1319,14 @@ int lc89510_temp_device::Read_LBA_To_Buffer(running_machine& machine) -void lc89510_temp_device::nff0002_set(UINT16 wordValue) +void lc89510_temp_device::nff0002_set(uint16_t wordValue) { nff0002 = wordValue; } -void lc89510_temp_device::nff0016_set(UINT16 wordValue) +void lc89510_temp_device::nff0016_set(uint16_t wordValue) { nff0016 = wordValue; } -UINT16 lc89510_temp_device::nff0016_r(void) { return nff0016; } +uint16_t lc89510_temp_device::nff0016_r(void) { return nff0016; } |