mirror of
https://github.com/holub/mame
synced 2025-05-03 13:06:47 +03:00
MSVC compilation fixes (nw)
This commit is contained in:
parent
8823a66274
commit
1c33ce6113
@ -734,7 +734,7 @@ READ8_MEMBER( trs80m2_state::pio_pa_r )
|
||||
UINT8 data = 0;
|
||||
|
||||
// floppy interrupt
|
||||
data |= m_fdc->intrq_r();
|
||||
data |= (m_fdc->intrq_r() ? 0x01 : 0x00);
|
||||
|
||||
// 2-sided diskette
|
||||
data |= (m_floppy ? m_floppy->twosid_r() : 1) << 1;
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
#include "emu.h"
|
||||
#include "machine/cbmipt.h"
|
||||
#include "machine/c64_neoram.h"
|
||||
|
||||
|
||||
/***************************** Commodore 64 ****************************************
|
||||
|
@ -216,7 +216,7 @@ WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w )
|
||||
m_dma_irq = state;
|
||||
|
||||
// FDC and DMA interrupts are wire-ORed to the Z80
|
||||
m_maincpu->set_input_line(INPUT_LINE_IRQ0, m_fdc_irq | m_dma_irq);
|
||||
m_maincpu->set_input_line(INPUT_LINE_IRQ0, m_fdc_irq || m_dma_irq);
|
||||
}
|
||||
|
||||
static UINT8 memory_read_byte(address_space &space, offs_t address, UINT8 mem_mask) { return space.read_byte(address); }
|
||||
|
@ -136,7 +136,7 @@ READ8_MEMBER(tvc_hbf_device::io_read)
|
||||
case 0x00:
|
||||
return m_fdc->read(space, offset & 3);
|
||||
case 0x01:
|
||||
return (m_fdc->drq_r()<<7) | m_fdc->intrq_r();
|
||||
return (m_fdc->drq_r()<<7) | (m_fdc->intrq_r() ? 0x01 : 0x00);
|
||||
default:
|
||||
return 0x00;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user