diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-11 07:44:56 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2013-02-11 07:44:56 +0000 |
commit | a440a8e0200a36491ae540f6f00beae59c148549 (patch) | |
tree | b4c31ebadaa2857396c37178674086420bf1658f /src/emu/machine | |
parent | 4b0b4e6b2fa7eb5105859f561354662d479f53be (diff) |
Cleanups and version bumpmame0148u1
Diffstat (limited to 'src/emu/machine')
-rw-r--r-- | src/emu/machine/mos6551.c | 20 | ||||
-rw-r--r-- | src/emu/machine/mos6551.h | 10 | ||||
-rw-r--r-- | src/emu/machine/n68681.c | 1 | ||||
-rw-r--r-- | src/emu/machine/s3c24xx.c | 2 | ||||
-rw-r--r-- | src/emu/machine/wd_fdc.c | 4 |
5 files changed, 18 insertions, 19 deletions
diff --git a/src/emu/machine/mos6551.c b/src/emu/machine/mos6551.c index 06c3927c95a..a20e1aebc9b 100644 --- a/src/emu/machine/mos6551.c +++ b/src/emu/machine/mos6551.c @@ -9,12 +9,12 @@ /* - TODO: + TODO: - - receiver disable - - IRQ on DCD/DSR change - - parity - - framing error + - receiver disable + - IRQ on DCD/DSR change + - parity + - framing error */ @@ -100,7 +100,7 @@ void mos6551_device::tra_complete() { transmit_register_setup(m_tdr); m_st |= ST_TDRE; - + if ((m_cmd & CMD_TC_MASK) == CMD_TC_TIE_RTS_LO) { m_st |= ST_IRQ; @@ -120,7 +120,7 @@ void mos6551_device::rcv_complete() { m_st |= ST_OR; } - + m_st &= ~(ST_FE | ST_PE); m_st |= ST_RDRF; @@ -159,7 +159,7 @@ void mos6551_device::update_serial() else { int baud = clock() / brg_divider[brg] / 16; - + set_tra_rate(baud); if (m_ctrl & CTRL_RXC_BRG) @@ -250,12 +250,12 @@ WRITE8_MEMBER( mos6551_device::write ) case 0: m_tdr = data; m_st &= ~ST_TDRE; - + if (is_transmit_register_empty()) { transmit_register_setup(m_tdr); m_st |= ST_TDRE; - + if ((m_cmd & CMD_TC_MASK) == CMD_TC_TIE_RTS_LO) { m_st |= ST_IRQ; diff --git a/src/emu/machine/mos6551.h b/src/emu/machine/mos6551.h index b3b1367461a..d11ec355328 100644 --- a/src/emu/machine/mos6551.h +++ b/src/emu/machine/mos6551.h @@ -93,17 +93,17 @@ protected: CTRL_BRG_9600, CTRL_BRG_19200, CTRL_BRG_MASK = 0x0f, - + CTRL_RXC_EXT = 0x00, CTRL_RXC_BRG = 0x10, CTRL_RXC_MASK = 0x10, - + CTRL_WL_8 = 0x00, CTRL_WL_7 = 0x20, CTRL_WL_6 = 0x40, CTRL_WL_5 = 0x60, CTRL_WL_MASK = 0x60, - + CTRL_SB_1 = 0x00, CTRL_SB_2 = 0x80, CTRL_SB_MASK = 0x80 @@ -112,9 +112,9 @@ protected: enum { CMD_DTR = 0x01, - + CMD_RIE = 0x02, - + CMD_TC_RTS_HI = 0x00, CMD_TC_TIE_RTS_LO = 0x04, CMD_TC_RTS_LO = 0x08, diff --git a/src/emu/machine/n68681.c b/src/emu/machine/n68681.c index 10dd04f86a6..e8d01d700c6 100644 --- a/src/emu/machine/n68681.c +++ b/src/emu/machine/n68681.c @@ -976,4 +976,3 @@ void duart68681_channel::ACR_updated() { write_chan_reg(1, CSR); } - diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c index 4cbd9d9b3de..521effa5c8e 100644 --- a/src/emu/machine/s3c24xx.c +++ b/src/emu/machine/s3c24xx.c @@ -3679,7 +3679,7 @@ static DEVICE_RESET( s3c24xx ) static DEVICE_START( s3c24xx ) { s3c24xx_t *s3c24xx = get_token( device); - + s3c24xx->m_cpu = device->machine().device( "maincpu"); verboselog( device->machine(), 1, "s3c24xx device start\n"); diff --git a/src/emu/machine/wd_fdc.c b/src/emu/machine/wd_fdc.c index 0711626d948..bb353c176c6 100644 --- a/src/emu/machine/wd_fdc.c +++ b/src/emu/machine/wd_fdc.c @@ -1002,10 +1002,10 @@ void wd_fdc_t::sector_w(UINT8 val) if (inverted_bus) val ^= 0xff; // No more than one write in flight - // C1581 accesses this register with an INC opcode, + // C1581 accesses this register with an INC opcode, // i.e. write old value, write new value, and the new value gets ignored by this //if(sector_buffer != -1) - // return; + // return; sector_buffer = val; delay_cycles(t_sector, dden ? delay_register_commit*2 : delay_register_commit); |