Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-26 14:24:12 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

atarist.cpp : Correct DMA sound frequency calculation, Minor fix spacings (#6486)

Browse Source 
* atarist.cpp : Correct DMA sound frequency calculation, Minor fix spacings

* atarist.cpp : Minor revert
This commit is contained in:
cam900 2020-03-26 04:51:42 +09:00 committed by GitHub
parent ffe4446cb1
commit 362c4b54b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/mame/drivers/atarist.cpp
View File

@ -45,7 +45,7 @@
static const int IKBD_MOUSE_XYA[3][4] = { { 0, 0, 0, 0 }, { 1, 1, 0, 0 }, { 0, 1, 1, 0 } };
static const int IKBD_MOUSE_XYB[3][4] = { { 0, 0, 0, 0 }, { 0, 1, 1, 0 }, { 1, 1, 0, 0 } };
static const int DMASOUND_RATE[] = { int(Y2/640/8), int(Y2/640/4), int(Y2/640/2), int(Y2/640) };
static const double DMASOUND_RATE[] = { Y2/640.0/8.0, Y2/640.0/4.0, Y2/640.0/2.0, Y2/640.0 };
//**************************************************************************
@ -99,25 +99,29 @@ void st_state::flush_dma_fifo()
{
if (m_fdc_fifo_empty[m_fdc_fifo_sel]) return;
if (m_fdc_dmabytes) {
if (m_fdc_dmabytes)
{
address_space &program = m_maincpu->space(AS_PROGRAM);
for (int i = 0; i < 8; i++) {
for (int i = 0; i < 8; i++)
{
uint16_t data = m_fdc_fifo[m_fdc_fifo_sel][i];
if (LOG) logerror("Flushing DMA FIFO %u data %04x to address %06x\n", m_fdc_fifo_sel, data, m_dma_base);
if(m_dma_base >= 8)
if (m_dma_base >= 8)
program.write_word(m_dma_base, data);
m_dma_base += 2;
}
m_fdc_dmabytes -= 16;
if (!m_fdc_dmabytes) {
if (!m_fdc_dmabytes)
{
m_fdc_sectors--;
if (m_fdc_sectors)
m_fdc_dmabytes = DMA_SECTOR_SIZE;
}
} else
}
else
m_dma_error = 0;
m_fdc_fifo_empty[m_fdc_fifo_sel] = 1;
@ -130,9 +134,11 @@ void st_state::flush_dma_fifo()
void st_state::fill_dma_fifo()
{
if (m_fdc_dmabytes) {
if (m_fdc_dmabytes)
{
address_space &program = m_maincpu->space(AS_PROGRAM);
for (int i = 0; i < 8; i++) {
for (int i = 0; i < 8; i++)
{
uint16_t data = program.read_word(m_dma_base);
if (LOG) logerror("Filling DMA FIFO %u with data %04x from memory address %06x\n", m_fdc_fifo_sel, data, m_dma_base);
@ -141,13 +147,15 @@ void st_state::fill_dma_fifo()
m_dma_base += 2;
}
m_fdc_dmabytes -= 16;
if (!m_fdc_dmabytes) {
if (!m_fdc_dmabytes)
{
m_fdc_sectors--;
if (m_fdc_sectors)
m_fdc_dmabytes = DMA_SECTOR_SIZE;
}
} else
}
else
m_dma_error = 0;
m_fdc_fifo_empty[m_fdc_fifo_sel] = 0;
@ -434,7 +442,8 @@ WRITE16_MEMBER( st_state::berr_w )
READ16_MEMBER( st_state::berr_r )
{
if(!machine().side_effects_disabled()) {
if (!machine().side_effects_disabled())
{
m_maincpu->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE);
m_maincpu->set_input_line(M68K_LINE_BUSERROR, CLEAR_LINE);
}
@ -1700,11 +1709,11 @@ WRITE8_MEMBER( st_state::psg_pa_w )
floppy_image_device *floppy = nullptr;
if (!BIT(data, 1))
floppy = m_floppy[0]->get_device();
else if(!BIT(data, 2))
else if (!BIT(data, 2))
floppy = m_floppy[1]->get_device();
// side select
if(floppy)
if (floppy)
floppy->ss_w(BIT(data, 0) ? 0 : 1);
m_fdc->set_floppy(floppy);
@ -1744,11 +1753,11 @@ WRITE8_MEMBER( stbook_state::psg_pa_w )
floppy_image_device *floppy = nullptr;
if (!BIT(data, 1))
floppy = m_floppy[0]->get_device();
else if(!BIT(data, 2))
else if (!BIT(data, 2))
floppy = m_floppy[1]->get_device();
// side select
if(floppy)
if (floppy)
floppy->ss_w(BIT(data, 0) ? 0 : 1);
m_fdc->set_floppy(floppy);