diff options
Diffstat (limited to 'src/emu/machine')
30 files changed, 236 insertions, 253 deletions
diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c index 9bdc38a7b2e..82e54b70359 100644 --- a/src/emu/machine/53c810.c +++ b/src/emu/machine/53c810.c @@ -608,9 +608,9 @@ void lsi53c810_device::lsi53c810_reg_w(int offset, UINT8 data) void lsi53c810_device::add_opcode(UINT8 op, UINT8 mask, opcode_handler_delegate handler) { - for (int i = 0; i < 256; i++) + for (int i = 0; i < 256; i++) { - if ((i & mask) == op) + if ((i & mask) == op) { dma_opcode[i] = handler; } @@ -629,7 +629,7 @@ void lsi53c810_device::device_start() m_irq_cb.bind_relative_to(*owner()); m_dma_cb.bind_relative_to(*owner()); m_fetch_cb.bind_relative_to(*owner()); - + for (int i = 0; i < 256; i++) { dma_opcode[i] = opcode_handler_delegate(FUNC(lsi53c810_device::dmaop_invalid), this); diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c index eb72e4b7723..745a2722ca9 100644 --- a/src/emu/machine/6532riot.c +++ b/src/emu/machine/6532riot.c @@ -307,7 +307,7 @@ UINT8 riot6532_device::reg_r(UINT8 offset, bool debugger_access) if (!(*port->m_in_cb).isnull()) { port->m_in = (*port->m_in_cb)(0); - + /* changes to port A need to update the PA7 state */ if (port == &m_port[0]) { diff --git a/src/emu/machine/68307.c b/src/emu/machine/68307.c index 515b07d248d..1f65b7cccde 100644 --- a/src/emu/machine/68307.c +++ b/src/emu/machine/68307.c @@ -15,7 +15,7 @@ READ8_MEMBER( m68307cpu_device::m68307_internal_serial_r ) { m68307cpu_device *m68k = this; - + if (offset&1) return m_duart->read(*m68k->program, offset>>1); return 0x0000; } diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c index 8e750637ed7..2abb6615997 100644 --- a/src/emu/machine/6840ptm.c +++ b/src/emu/machine/6840ptm.c @@ -89,13 +89,13 @@ void ptm6840_device::device_start() m_out1_cb.resolve_safe(); m_out2_cb.resolve_safe(); m_irq_cb.resolve_safe(); - + for (int i = 0; i < 3; i++) { if ( m_external_clock[i] == 0 ) m_external_clock[i] = 1; } - + m_timer[0] = timer_alloc(0); m_timer[1] = timer_alloc(1); m_timer[2] = timer_alloc(2); diff --git a/src/emu/machine/aakart.c b/src/emu/machine/aakart.c index 3cbbb888514..f858f48f182 100644 --- a/src/emu/machine/aakart.c +++ b/src/emu/machine/aakart.c @@ -91,66 +91,66 @@ void aakart_device::device_reset() void aakart_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - if(id == TX_TIMER && m_new_command & 1) - { - switch(m_tx_latch) - { - case 0x00: - case 0x02: - case 0x03: - case 0x07: - // ---- -x-- scroll lock - // ---- --x- num lock - // ---- ---x caps lock - break; - case 0x20: - m_rx = 0x81; - m_out_tx_cb(ASSERT_LINE); - break; - case 0x30: - case 0x31: - case 0x32: - case 0x33: - m_keyb_enable = m_tx_latch & 1; - m_mouse_enable = (m_tx_latch & 2) >> 1; - if(m_keyb_enable & 1 && m_keyb_state & 1) - { - //printf("Got row\n"); - m_rx = m_keyb_row; - m_out_tx_cb(ASSERT_LINE); - } - - break; - case 0x3f: - if(m_keyb_enable & 1 && m_keyb_state & 1) - { - //printf("Got col\n"); - m_rx = m_keyb_col; - m_out_tx_cb(ASSERT_LINE); - m_keyb_state = 0; - } - - break; - case 0xfd: - m_rx = 0xfd; - m_out_tx_cb(ASSERT_LINE); - break; - case 0xfe: - m_rx = 0xfe; - m_out_tx_cb(ASSERT_LINE); - break; - case 0xff: - m_rx = 0xff; - m_out_tx_cb(ASSERT_LINE); - break; - default: - //printf("%02x %02x %02x\n",m_tx_latch,m_rx_latch,m_keyb_enable); - break; - } - - //m_new_command &= ~1; - m_out_rx_cb(ASSERT_LINE); - } + if(id == TX_TIMER && m_new_command & 1) + { + switch(m_tx_latch) + { + case 0x00: + case 0x02: + case 0x03: + case 0x07: + // ---- -x-- scroll lock + // ---- --x- num lock + // ---- ---x caps lock + break; + case 0x20: + m_rx = 0x81; + m_out_tx_cb(ASSERT_LINE); + break; + case 0x30: + case 0x31: + case 0x32: + case 0x33: + m_keyb_enable = m_tx_latch & 1; + m_mouse_enable = (m_tx_latch & 2) >> 1; + if(m_keyb_enable & 1 && m_keyb_state & 1) + { + //printf("Got row\n"); + m_rx = m_keyb_row; + m_out_tx_cb(ASSERT_LINE); + } + + break; + case 0x3f: + if(m_keyb_enable & 1 && m_keyb_state & 1) + { + //printf("Got col\n"); + m_rx = m_keyb_col; + m_out_tx_cb(ASSERT_LINE); + m_keyb_state = 0; + } + + break; + case 0xfd: + m_rx = 0xfd; + m_out_tx_cb(ASSERT_LINE); + break; + case 0xfe: + m_rx = 0xfe; + m_out_tx_cb(ASSERT_LINE); + break; + case 0xff: + m_rx = 0xff; + m_out_tx_cb(ASSERT_LINE); + break; + default: + //printf("%02x %02x %02x\n",m_tx_latch,m_rx_latch,m_keyb_enable); + break; + } + + //m_new_command &= ~1; + m_out_rx_cb(ASSERT_LINE); + } } @@ -162,8 +162,8 @@ void aakart_device::device_timer(emu_timer &timer, device_timer_id id, int param READ8_MEMBER( aakart_device::read ) { - m_out_tx_cb(CLEAR_LINE); - //debugger_break(machine()); + m_out_tx_cb(CLEAR_LINE); + //debugger_break(machine()); return m_rx; } @@ -172,22 +172,22 @@ WRITE8_MEMBER( aakart_device::write ) // if(m_new_command) printf("skip cmd %02x\n",data); m_tx_latch = data; - m_out_rx_cb(CLEAR_LINE); - m_new_command |= 1; + m_out_rx_cb(CLEAR_LINE); + m_new_command |= 1; } void aakart_device::send_keycode_down(UINT8 row, UINT8 col) { - //printf("keycode down\n"); - m_keyb_row = row | 0xc0; - m_keyb_col = col | 0xc0; - m_keyb_state = 1; + //printf("keycode down\n"); + m_keyb_row = row | 0xc0; + m_keyb_col = col | 0xc0; + m_keyb_state = 1; } void aakart_device::send_keycode_up(UINT8 row, UINT8 col) { - //printf("keycode up\n"); - m_keyb_row = row | 0xd0; - m_keyb_col = col | 0xd0; - m_keyb_state = 1; + //printf("keycode up\n"); + m_keyb_row = row | 0xd0; + m_keyb_col = col | 0xd0; + m_keyb_state = 1; } diff --git a/src/emu/machine/adc0808.c b/src/emu/machine/adc0808.c index 7deda583b54..30db128e148 100644 --- a/src/emu/machine/adc0808.c +++ b/src/emu/machine/adc0808.c @@ -89,9 +89,9 @@ void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int para /* sample input */ double vref_pos = m_in_vref_pos_cb(); double vref_neg = m_in_vref_neg_cb(); - + double input = 0; - + switch (m_address) { case 0: @@ -117,7 +117,7 @@ void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int para break; case 7: input = m_in_in_7_cb(); - break; + break; break; } m_sar = (255 * (input - vref_neg)) / (vref_pos - vref_neg); diff --git a/src/emu/machine/akiko.c b/src/emu/machine/akiko.c index c9eb0a30114..a109f87f755 100644 --- a/src/emu/machine/akiko.c +++ b/src/emu/machine/akiko.c @@ -1,13 +1,13 @@ /*************************************************************************** - Akiko + Akiko - ASIC used in the Amiga CD32. Commodore Part number 391563-01. + ASIC used in the Amiga CD32. Commodore Part number 391563-01. - - CD-ROM controller - - Builtin 1KB NVRAM - - Chunky to planar converter - - 2x CIA chips + - CD-ROM controller + - Builtin 1KB NVRAM + - Chunky to planar converter + - 2x CIA chips ***************************************************************************/ diff --git a/src/emu/machine/amigafdc.c b/src/emu/machine/amigafdc.c index ac4ddaae66d..e8d556af84c 100644 --- a/src/emu/machine/amigafdc.c +++ b/src/emu/machine/amigafdc.c @@ -238,7 +238,7 @@ void amiga_fdc::live_run(const attotime &limit) if(adkcon & 0x0400) { if(dma_state == DMA_WAIT_START) { cur_live.bit_counter = 0; - + if(!(dsklen & 0x3fff)) dma_done(); else if(dsklen & 0x4000) { @@ -286,23 +286,23 @@ void amiga_fdc::live_run(const attotime &limit) if(cur_live.bit_counter != 8) fatalerror("amiga_fdc::live_run - cur_live.bit_counter != 8\n"); cur_live.bit_counter = 0; - + switch(dma_state) { case DMA_IDLE: case DMA_WAIT_START: break; - + case DMA_RUNNING_BYTE_0: dma_state = DMA_RUNNING_BYTE_1; break; - + case DMA_RUNNING_BYTE_1: { dma_value = dma_read(); break; } } } - + cur_live.state = RUNNING; checkpoint(); break; @@ -331,7 +331,7 @@ void amiga_fdc::dma_check() cur_live.bit_counter = 0; dma_value = dma_read(); } - } + } } else { dskbyt |= 0x4000; if(dsklen & 0x4000) diff --git a/src/emu/machine/atahle.c b/src/emu/machine/atahle.c index ee1c5756e9f..ca41368ae0c 100644 --- a/src/emu/machine/atahle.c +++ b/src/emu/machine/atahle.c @@ -708,16 +708,16 @@ READ16_MEMBER( ata_hle_device::read_cs1 ) case IDE_CS1_ACTIVE_STATUS: /* - bit description - - 0 master active - 1 slave active - 2 complement of active disk head bit 0 - 3 complement of active disk head bit 1 - 4 complement of active disk head bit 2 - 5 complement of active disk head bit 3 - 6 write in progress - 7 floppy present (unused) + bit description + + 0 master active + 1 slave active + 2 complement of active disk head bit 0 + 3 complement of active disk head bit 1 + 4 complement of active disk head bit 2 + 5 complement of active disk head bit 3 + 6 write in progress + 7 floppy present (unused) */ if (device_selected()) diff --git a/src/emu/machine/autoconfig.c b/src/emu/machine/autoconfig.c index 3c93efa6cff..15ddfcb64d9 100644 --- a/src/emu/machine/autoconfig.c +++ b/src/emu/machine/autoconfig.c @@ -1,6 +1,6 @@ /*************************************************************************** - Amiga Autoconfig + Amiga Autoconfig ***************************************************************************/ diff --git a/src/emu/machine/corvushd.c b/src/emu/machine/corvushd.c index 6dc169bd773..7d450e3fcaf 100644 --- a/src/emu/machine/corvushd.c +++ b/src/emu/machine/corvushd.c @@ -224,7 +224,7 @@ bool corvus_hdc_t::parse_hdc_command(UINT8 data) { // // Prep Commands // - case PREP_MODE_SELECT: + case PREP_MODE_SELECT: case PREP_RESET_DRIVE: case PREP_FORMAT_DRIVE: case PREP_FILL_DRIVE_OMNI: @@ -692,14 +692,14 @@ UINT8 corvus_hdc_t::corvus_get_drive_parameters(UINT8 drv) { // This firmware string and revision were taken from the Corvus firmware // file CORVB184.CLR found on the SSE SoftBox distribution disk. - strcpy((char *) m_buffer.drive_param_response.firmware_desc, "V18.4 -- CONST II - 11/82 "); + strcpy((char *) m_buffer.drive_param_response.firmware_desc, "V18.4 -- CONST II - 11/82 "); m_buffer.drive_param_response.firmware_rev = 37; // Controller ROM version m_buffer.drive_param_response.rom_version = ROM_VERSION; // - // Track information + // Track information // m_buffer.drive_param_response.track_info.sectors_per_track = m_sectors_per_track; m_buffer.drive_param_response.track_info.tracks_per_cylinder = m_tracks_per_cylinder; @@ -766,10 +766,10 @@ UINT8 corvus_hdc_t::corvus_read_boot_block(UINT8 block) { // // Enter prep mode. In prep mode, only prep mode commands may be executed. // -// A "prep block" is 512 bytes of machine code that the host sends to the +// A "prep block" is 512 bytes of machine code that the host sends to the // controller. The controller will jump to this code after receiving it, // and it is what actually implements prep mode commands. This HLE ignores -// the prep block from the host. +// the prep block from the host. // // On the Rev B/H drives (which we emulate), a prep block is Z80 machine // code and only one prep block can be sent. Sending the "put drive into @@ -778,9 +778,9 @@ UINT8 corvus_hdc_t::corvus_read_boot_block(UINT8 block) { // distribution disk returns error 0x8f (unrecognized command) for this case. // // On the OmniDrive and Bank, a prep block is 6801 machine code. These -// controllers allow multiple prep blocks to be sent. The first time the +// controllers allow multiple prep blocks to be sent. The first time the // "put drive into prep mode" command is sent puts the drive into prep mode. -// The command can then be sent again up to 3 times with more prep blocks. +// The command can then be sent again up to 3 times with more prep blocks. // (Mass Storage GTI, pages 50-51) // // Pass: @@ -791,7 +791,7 @@ UINT8 corvus_hdc_t::corvus_read_boot_block(UINT8 block) { // Status of command // UINT8 corvus_hdc_t::corvus_enter_prep_mode(UINT8 drv, UINT8 *prep_block) { - // on rev b/h drives, sending the "put drive into prep mode" + // on rev b/h drives, sending the "put drive into prep mode" // command when already in prep mode is an error. if (m_prep_mode) { logerror("corvus_enter_prep_mode: Attempt to enter prep mode while in prep mode\n"); @@ -809,7 +809,7 @@ UINT8 corvus_hdc_t::corvus_enter_prep_mode(UINT8 drv, UINT8 *prep_block) { m_prep_mode = true; m_prep_drv = drv; - return STAT_SUCCESS; + return STAT_SUCCESS; } @@ -826,7 +826,7 @@ UINT8 corvus_hdc_t::corvus_exit_prep_mode() { LOG(("corvus_exit_prep_mode: Prep mode exited\n")); m_prep_mode = false; m_prep_drv = 0; - return STAT_SUCCESS; + return STAT_SUCCESS; } @@ -852,7 +852,7 @@ UINT8 corvus_hdc_t::corvus_read_firmware_block(UINT8 head, UINT8 sector) { LOG(("corvus_read_firmware_block: Reading firmware head: 0x%2.2x, sector: 0x%2.2x, relative_sector: 0x%2.2x\n", head, sector, relative_sector)); - status = corvus_read_sector(m_prep_drv, relative_sector, m_buffer.read_512_response.data, 512); + status = corvus_read_sector(m_prep_drv, relative_sector, m_buffer.read_512_response.data, 512); return status; } @@ -880,7 +880,7 @@ UINT8 corvus_hdc_t::corvus_write_firmware_block(UINT8 head, UINT8 sector, UINT8 LOG(("corvus_write_firmware_block: Writing firmware head: 0x%2.2x, sector: 0x%2.2x, relative_sector: 0x%2.2x\n", head, sector, relative_sector)); - status = corvus_write_sector(m_prep_drv, relative_sector, buffer, 512); + status = corvus_write_sector(m_prep_drv, relative_sector, buffer, 512); return status; } @@ -1067,7 +1067,7 @@ void corvus_hdc_t::corvus_process_command_packet(bool invalid_command_flag) { break; case PREP_MODE_SELECT: m_buffer.single_byte_response.status = - corvus_enter_prep_mode(m_buffer.prep_mode_command.drive, + corvus_enter_prep_mode(m_buffer.prep_mode_command.drive, m_buffer.prep_mode_command.prep_block); break; default: @@ -1082,11 +1082,11 @@ void corvus_hdc_t::corvus_process_command_packet(bool invalid_command_flag) { // when already in prep mode, some drives allow this command to // be sent again. see corvus_enter_prep_mode() for details. m_buffer.single_byte_response.status = - corvus_enter_prep_mode(m_buffer.prep_mode_command.drive, + corvus_enter_prep_mode(m_buffer.prep_mode_command.drive, m_buffer.prep_mode_command.prep_block); break; case PREP_RESET_DRIVE: - m_buffer.single_byte_response.status = + m_buffer.single_byte_response.status = corvus_exit_prep_mode(); break; case PREP_READ_FIRMWARE: @@ -1105,7 +1105,7 @@ void corvus_hdc_t::corvus_process_command_packet(bool invalid_command_flag) { break; case PREP_VERIFY: m_buffer.verify_drive_response.status = STAT_SUCCESS; - m_buffer.verify_drive_response.bad_sectors = 0; + m_buffer.verify_drive_response.bad_sectors = 0; break; default: m_xmit_bytes = 1; diff --git a/src/emu/machine/cr511b.c b/src/emu/machine/cr511b.c index 20968e1760b..83d393825db 100644 --- a/src/emu/machine/cr511b.c +++ b/src/emu/machine/cr511b.c @@ -1,12 +1,12 @@ /*************************************************************************** - CR-511-B CD-ROM drive + CR-511-B CD-ROM drive license: MAME, GPL-2.0+ copyright-holders: Dirk Best - CD-ROM drive with a custom MKE/Panasonic interface as used in the - Commodore CDTV and early SoundBlaster cards. + CD-ROM drive with a custom MKE/Panasonic interface as used in the + Commodore CDTV and early SoundBlaster cards. ***************************************************************************/ @@ -109,7 +109,6 @@ READ8_MEMBER( cr511b_device::read ) WRITE8_MEMBER ( cr511b_device::write ) { - } WRITE_LINE_MEMBER( cr511b_device::enable_w ) diff --git a/src/emu/machine/dmac.c b/src/emu/machine/dmac.c index 7f2f674a793..96f7782def4 100644 --- a/src/emu/machine/dmac.c +++ b/src/emu/machine/dmac.c @@ -462,6 +462,5 @@ WRITE_LINE_MEMBER( dmac_device::xdreq_w ) if (m_dma_active) { - } } diff --git a/src/emu/machine/eepromser.c b/src/emu/machine/eepromser.c index 25661f88a67..5b5d8a5b70a 100644 --- a/src/emu/machine/eepromser.c +++ b/src/emu/machine/eepromser.c @@ -763,7 +763,6 @@ WRITE_LINE_MEMBER(eeprom_serial_er5911_device::di_write) { base_di_write(state); eeprom_serial_x24c44_device::eeprom_serial_x24c44_device(const machine_config &mconfig, device_type devtype, const char *name, const char *tag, device_t *owner, const char *shortname, const char *file) : eeprom_serial_base_device(mconfig, devtype, name, tag, owner, shortname, file) { - } @@ -785,7 +784,7 @@ void eeprom_serial_x24c44_device::device_start() m_ram_length=0xf; for (i=0;i<16;i++){ - m_ram_data[i]=read(i); //autoreload at power up + m_ram_data[i]=read(i); //autoreload at power up } m_reading=0; m_store_latch=0; @@ -828,7 +827,7 @@ void eeprom_serial_x24c44_device::copy_ram_to_eeprom(){ }else{ LOG0(("Store command with store latch not set!\n")); } - + } //------------------------------------------------- @@ -902,7 +901,7 @@ void eeprom_serial_x24c44_device::execute_command() copy_ram_to_eeprom(); set_state(STATE_IN_RESET); break; - + default: throw emu_fatalerror("execute_command called with invalid command %d\n", m_command); } @@ -959,16 +958,16 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event) { // if we have enough bits for a command + address, check it out m_command_address_accum = (m_command_address_accum << 1) | m_di_state; - + m_bits_accum=m_bits_accum+1; - + if (m_bits_accum == 2 + m_command_address_bits){ //read command is only 2 bits all other are 3 bits!!! parse_command_and_address_2_bit(); } - + if (!m_reading){ if (m_bits_accum == 3 + m_command_address_bits){ execute_command(); @@ -983,23 +982,20 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event) case STATE_READING_DATA: if (event == EVENT_CLK_RISING_EDGE) { - int bit_index = m_bits_accum++; if (bit_index % m_data_bits == 0 && (bit_index == 0 || m_streaming_enabled)){ - m_shift_register=m_ram_data[m_address]; - + //m_shift_register=BITSWAP16(m_shift_register,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15); //m_shift_register=BITSWAP16(m_shift_register,7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8); m_shift_register= BITSWAP16(m_shift_register,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7); m_shift_register=m_shift_register<<16; - + LOG1(("read from RAM addr %02X data(from ram) %04X ,m_shift_register vale %04X \n",m_address,m_ram_data[m_address],m_shift_register)); } else{ - m_shift_register = (m_shift_register << 1) | 1; } @@ -1023,10 +1019,8 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event) case STATE_WAIT_FOR_DATA: if (event == EVENT_CLK_RISING_EDGE) { - m_shift_register = (m_shift_register << 1) | m_di_state; if (++m_bits_accum == m_data_bits){ - //m_shift_register=BITSWAP16(m_shift_register, 0, 1, 2, 3, 4, 5,6,7, 8, 9,10,11,12,13,14,15); //m_shift_register=BITSWAP16(m_shift_register, 7, 6, 5, 4, 3, 2,1,0,15,14,13,12,11,10, 9, 8); m_shift_register=BITSWAP16(m_shift_register,8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7); @@ -1042,7 +1036,7 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event) } break; - + // CS is asserted; waiting for completion; watch for CS falling case STATE_WAIT_FOR_COMPLETION: if (event == EVENT_CS_FALLING_EDGE) @@ -1059,7 +1053,6 @@ void eeprom_serial_x24c44_device::handle_event(eeprom_event event) void eeprom_serial_x24c44_device::parse_command_and_address() { - //command is start_bit - 4bit_address - 3bit_command // set the defaults @@ -1068,27 +1061,27 @@ void eeprom_serial_x24c44_device::parse_command_and_address() m_address = (m_command_address_accum >> 3) & 0x0f; LOG1(("EEPROM: command= %04X, address %02X\n", m_command_address_accum& 0x07, m_address)); - + switch (m_command_address_accum & 0x07) { - case 0: //reset write enable latch + case 0: //reset write enable latch LOG0(("Lock eeprom\n")); - m_command = COMMAND_LOCK; break; + m_command = COMMAND_LOCK; break; case 3: //write data into ram LOG0(("Write to ram\n")); - m_command = COMMAND_WRITE; break; + m_command = COMMAND_WRITE; break; case 4: //set write enable latch LOG0(("Unlock eeprom\n")); - m_command = COMMAND_UNLOCK; break; + m_command = COMMAND_UNLOCK; break; case 1: //store ram data in eeprom LOG0(("copy ram to eeprom\n")); m_command = COMMAND_COPY_RAM_TO_EEPROM; break; case 5: //reload eeprom data into ram LOG0(("copy eeprom to ram\n")); - m_command = COMMAND_COPY_EEPROM_TO_RAM; break; + m_command = COMMAND_COPY_EEPROM_TO_RAM; break; case 2: //reserved (Sleep on x2444) m_command = COMMAND_INVALID; - break; + break; } @@ -1096,10 +1089,7 @@ void eeprom_serial_x24c44_device::parse_command_and_address() void eeprom_serial_x24c44_device::parse_command_and_address_2_bit() { - - if ((m_command_address_accum & 0x03) == 0x03){ - m_command = COMMAND_READ; m_address = ((m_command_address_accum >> 2) & 0x0f); m_shift_register = 0; @@ -1108,7 +1098,7 @@ void eeprom_serial_x24c44_device::parse_command_and_address_2_bit() m_reading=1; m_bits_accum=0; } - + // warn about out-of-range addresses if (m_address >= (1 << m_address_bits)) LOG1(("EEPROM: out-of-range address 0x%X provided (maximum should be 0x%X)\n", m_address, (1 << m_address_bits) - 1)); diff --git a/src/emu/machine/gayle.c b/src/emu/machine/gayle.c index 2fcff8d6d5b..9328fff22e2 100644 --- a/src/emu/machine/gayle.c +++ b/src/emu/machine/gayle.c @@ -1,11 +1,11 @@ /*************************************************************************** - GAYLE + GAYLE license: MAME, GPL-2.0+ copyright-holders: Dirk Best - Gate array used in the Amiga 600 and Amiga 1200 computers. + Gate array used in the Amiga 600 and Amiga 1200 computers. ***************************************************************************/ diff --git a/src/emu/machine/hd63450.c b/src/emu/machine/hd63450.c index 061f574a069..18fbd7f462a 100644 --- a/src/emu/machine/hd63450.c +++ b/src/emu/machine/hd63450.c @@ -489,7 +489,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq0_w) { bool ostate = m_drq_state[0]; m_drq_state[0] = state; - + if((m_reg[0].ocr & 2) && (state && !ostate)) { // in cycle steal mode drq is supposed to be edge triggered @@ -518,7 +518,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq2_w) { bool ostate = m_drq_state[2]; m_drq_state[2] = state; - + if((m_reg[2].ocr & 2) && (state && !ostate)) { single_transfer(2); @@ -532,7 +532,7 @@ WRITE_LINE_MEMBER(hd63450_device::drq3_w) { bool ostate = m_drq_state[3]; m_drq_state[3] = state; - + if((m_reg[3].ocr & 2) && (state && !ostate)) { single_transfer(3); diff --git a/src/emu/machine/i8255.c b/src/emu/machine/i8255.c index a3f0812bc80..0bea38d4969 100644 --- a/src/emu/machine/i8255.c +++ b/src/emu/machine/i8255.c @@ -286,7 +286,7 @@ void i8255_device::device_start() m_out_pa_cb.resolve_safe(); m_out_pb_cb.resolve_safe(); m_out_pc_cb.resolve_safe(); - + // register for state saving save_item(NAME(m_control)); save_item(NAME(m_output)); @@ -522,7 +522,7 @@ void i8255_device::write_mode1(int port, UINT8 data) m_out_pb_cb((offs_t)0, m_output[port]); else m_out_pc_cb((offs_t)0, m_output[port]); - + // set output buffer full flag set_obf(port, 0); diff --git a/src/emu/machine/i8271.c b/src/emu/machine/i8271.c index 72ab86d3acd..24282df971e 100644 --- a/src/emu/machine/i8271.c +++ b/src/emu/machine/i8271.c @@ -1046,7 +1046,7 @@ void i8271_device::command_execute() /* these two do not appear to be set at all! ?? */ - if (m_floppy[0]) + if (m_floppy[0]) { if (m_floppy[0]->floppy_drive_get_flag_state(FLOPPY_DRIVE_READY)) { @@ -1054,7 +1054,7 @@ void i8271_device::command_execute() } } - if (m_floppy[1]) + if (m_floppy[1]) { if (m_floppy[1]->floppy_drive_get_flag_state(FLOPPY_DRIVE_READY)) { diff --git a/src/emu/machine/keyboard.c b/src/emu/machine/keyboard.c index 29271e817b7..dc64116d377 100644 --- a/src/emu/machine/keyboard.c +++ b/src/emu/machine/keyboard.c @@ -8,9 +8,9 @@ or for the case of a computer with an inbuilt (not serial) ascii keyboard. Example of usage in a driver. In MACHINE_CONFIG - - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) - MCFG_GENERIC_KEYBOARD_CB(WRITE8(xxx_state, kbd_put)) + + MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) + MCFG_GENERIC_KEYBOARD_CB(WRITE8(xxx_state, kbd_put)) In the code: diff --git a/src/emu/machine/mb89363b.c b/src/emu/machine/mb89363b.c index d8094ef935d..83119fb7354 100644 --- a/src/emu/machine/mb89363b.c +++ b/src/emu/machine/mb89363b.c @@ -1,4 +1,4 @@ -/* +/* (this acts as a trampoline to 2x i8255 chips) @@ -12,47 +12,47 @@ Note: MB89363B is compatible with 8255 Pin Assignment: - +5v - P P P P P P P P P V P P P P P P P P P - N N 5 4 4 4 4 4 4 4 4 C N 1 1 1 1 1 1 1 1 2 N N - C C 3 0 1 2 3 4 5 6 7 C C 7 6 5 4 3 2 1 0 3 C C - - | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | | - | | | | | | | | | | | | | | | | | | | | | | | | - | | v v v v v v v v v | | v v v v v v v v v | | - .-------------------------------------------------------. - | 6 6 6 6 6 5 5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 | - | 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 | - P52 <-> | 65 40 | <-> P22 - P51 <-> | 66 39 | <-> P21 - P50 <-> | 67 38 | <-> P20 - P54 <-> | 68 37 | <-> P24 - P55 <-> | 69 36 | <-> P25 - P56 <-> | 70 35 | <-> P26 - P57 <-> | 71 34 | <-> P27 - NC --- | 72 MB89363B 33 | --- NC + +5v + P P P P P P P P P V P P P P P P P P P + N N 5 4 4 4 4 4 4 4 4 C N 1 1 1 1 1 1 1 1 2 N N + C C 3 0 1 2 3 4 5 6 7 C C 7 6 5 4 3 2 1 0 3 C C + + | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | | ^ ^ ^ ^ ^ ^ ^ ^ ^ | | + | | | | | | | | | | | | | | | | | | | | | | | | + | | v v v v v v v v v | | v v v v v v v v v | | + .-------------------------------------------------------. + | 6 6 6 6 6 5 5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 | + | 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 | + P52 <-> | 65 40 | <-> P22 + P51 <-> | 66 39 | <-> P21 + P50 <-> | 67 38 | <-> P20 + P54 <-> | 68 37 | <-> P24 + P55 <-> | 69 36 | <-> P25 + P56 <-> | 70 35 | <-> P26 + P57 <-> | 71 34 | <-> P27 + NC --- | 72 MB89363B 33 | --- NC NC --- | 73 32 | <-- RSLCT1 GND --> | 74 31 | <-- RSLCT0 - CS2 --> | 75 30 | <-- GND - R --> | 76 29 | <-- CS1 - P30 <-> | 77 28 | <-> P00 - P31 <-> | 78 27 | <-> P01 - P32 <-> | 79 26 | <-> P02 - P33 <-> | 80 25 | <-> P03 - \ 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 | - \ 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 | - -----------------------------------------------------' - ^ ^ ^ ^ ^ ^ | | ^ | ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ | - | | | | | | | | | | | | | | | | | | | | | | | | - v v v v | | | | | | | v v v v v v v v v v v v | - - P P P P W R N N R N O D D D D D D D D P P P P N - 3 3 3 3 S C C H C U B B B B B B B B 0 0 0 0 C - 4 5 6 7 T / S 0 1 2 3 4 5 6 7 7 6 5 4 - R / - L I - N - S + CS2 --> | 75 30 | <-- GND + R --> | 76 29 | <-- CS1 + P30 <-> | 77 28 | <-> P00 + P31 <-> | 78 27 | <-> P01 + P32 <-> | 79 26 | <-> P02 + P33 <-> | 80 25 | <-> P03 + \ 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 | + \ 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 | + -----------------------------------------------------' + ^ ^ ^ ^ ^ ^ | | ^ | ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ | + | | | | | | | | | | | | | | | | | | | | | | | | + v v v v | | | | | | | v v v v v v v v v v v v | + + P P P P W R N N R N O D D D D D D D D P P P P N + 3 3 3 3 S C C H C U B B B B B B B B 0 0 0 0 C + 4 5 6 7 T / S 0 1 2 3 4 5 6 7 7 6 5 4 + R / + L I + N + S Block Diagram / Pin Descriptions: http://www.mess.org/_media/datasheets/fujitsu/mb89363b_partial.pdf diff --git a/src/emu/machine/mc68681.c b/src/emu/machine/mc68681.c index 4ac15448f5e..c6fd20968a6 100644 --- a/src/emu/machine/mc68681.c +++ b/src/emu/machine/mc68681.c @@ -246,21 +246,21 @@ TIMER_CALLBACK_MEMBER( mc68681_device::duart_timer_callback ) { UINT8 csr = m_chanA->get_chan_CSR(); - if ((csr & 0xf0) == 0xd0) // tx is timer driven + if ((csr & 0xf0) == 0xd0) // tx is timer driven { m_chanA->tx_clock_w(half_period); } - if ((csr & 0x0f) == 0x0d) // rx is timer driven + if ((csr & 0x0f) == 0x0d) // rx is timer driven { m_chanA->rx_clock_w(half_period); } - csr = m_chanB->get_chan_CSR(); - if ((csr & 0xf0) == 0xd0) // tx is timer driven + csr = m_chanB->get_chan_CSR(); + if ((csr & 0xf0) == 0xd0) // tx is timer driven { m_chanB->tx_clock_w(half_period); } - if ((csr & 0x0f) == 0x0d) // rx is timer driven + if ((csr & 0x0f) == 0x0d) // rx is timer driven { m_chanB->rx_clock_w(half_period); } @@ -721,7 +721,7 @@ void mc68681_channel::rcv_complete() void mc68681_channel::tra_complete() { -// printf("%s ch %d Tx complete\n", tag(), m_ch); +// printf("%s ch %d Tx complete\n", tag(), m_ch); tx_ready = 1; SR |= STATUS_TRANSMITTER_READY; @@ -1147,4 +1147,3 @@ UINT8 mc68681_channel::get_chan_CSR() { return CSR; } - diff --git a/src/emu/machine/ncr539x.c b/src/emu/machine/ncr539x.c index 7b53fc345db..577578be1c7 100644 --- a/src/emu/machine/ncr539x.c +++ b/src/emu/machine/ncr539x.c @@ -57,9 +57,9 @@ static const char *rdregs[16] = { "Command", // 3 "Status", // 4 "Interrupt Status", // 5 - "Internal State", // 6 - "Current FIFO/Internal State", // 7 - "Control Register 1", // 8 + "Internal State", // 6 + "Current FIFO/Internal State", // 7 + "Control Register 1", // 8 "0x9", "0xA", "Control Register 2", @@ -434,7 +434,7 @@ READ8_MEMBER( ncr539x_device::read ) WRITE8_MEMBER( ncr539x_device::write ) { #if VERBOSE - //if (offset != 2) + //if (offset != 2) printf("539x: Write %02x @ %s (%02x) (PC=%x)\n", data, wrregs[offset], offset, space.device().safe_pc()); #endif diff --git a/src/emu/machine/netlist.c b/src/emu/machine/netlist.c index 55ef624f35e..eec6e947b31 100644 --- a/src/emu/machine/netlist.c +++ b/src/emu/machine/netlist.c @@ -439,10 +439,10 @@ ATTR_COLD void netlist_mame_device_t::save_state() switch (s->m_dt) { case DT_DOUBLE: - { - double *td = s->resolved<double>(); - if (td != NULL) save_pointer(td, s->m_name, s->m_count); - } + { + double *td = s->resolved<double>(); + if (td != NULL) save_pointer(td, s->m_name, s->m_count); + } break; case DT_INT64: save_pointer((INT64 *) s->m_ptr, s->m_name, s->m_count); diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c index 2c4ad64fc0e..c13c0375e38 100644 --- a/src/emu/machine/roc10937.c +++ b/src/emu/machine/roc10937.c @@ -199,17 +199,17 @@ void rocvfd_t::update_display() } } -WRITE_LINE_MEMBER( rocvfd_t::sclk ) -{ - shift_clock(state); +WRITE_LINE_MEMBER( rocvfd_t::sclk ) +{ + shift_clock(state); } -WRITE_LINE_MEMBER( rocvfd_t::data ) -{ +WRITE_LINE_MEMBER( rocvfd_t::data ) +{ m_data = state; } -WRITE_LINE_MEMBER( rocvfd_t::por ) +WRITE_LINE_MEMBER( rocvfd_t::por ) { //If line goes low, reset mode is engaged, until such a time as it goes high again. if (!state) diff --git a/src/emu/machine/upd765.c b/src/emu/machine/upd765.c index d01a1563a38..3a77ca2021b 100644 --- a/src/emu/machine/upd765.c +++ b/src/emu/machine/upd765.c @@ -2523,5 +2523,3 @@ WRITE8_MEMBER(tc8566af_device::cr1_w) tc_w((m_cr1 & 0x01) ? true : false); } } - - diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c index a5b836db3bd..0d149af3598 100644 --- a/src/emu/machine/wd17xx.c +++ b/src/emu/machine/wd17xx.c @@ -1,6 +1,6 @@ /*************************************************************************** - !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!! + !!! DEPRECATED, USE src/emu/wd_fdc.h FOR NEW DRIVERS !!! wd17xx.c @@ -2024,11 +2024,11 @@ void wd1770_device::device_reset() for (int i = 0; i < 4; i++) { - if (m_floppy_drive_tags[i]) + if (m_floppy_drive_tags[i]) { legacy_floppy_image_device *img = siblingdevice<legacy_floppy_image_device>(m_floppy_drive_tags[i]); - if (img) + if (img) { img->floppy_drive_set_controller(this); img->floppy_drive_set_index_pulse_callback(wd17xx_index_pulse_callback); diff --git a/src/emu/machine/wd7600.c b/src/emu/machine/wd7600.c index 9a97733f5a5..5d1821471aa 100644 --- a/src/emu/machine/wd7600.c +++ b/src/emu/machine/wd7600.c @@ -284,20 +284,20 @@ WRITE_LINE_MEMBER( wd7600_device::ctc_out2_w ) // Keyboard WRITE8_MEMBER( wd7600_device::keyb_data_w ) { -// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag(), data); +// if(LOG) logerror("WD7600 '%s': keyboard data write %02x\n", tag(), data); m_keybc->data_w(space,0,data); } READ8_MEMBER( wd7600_device::keyb_data_r ) { UINT8 ret = m_keybc->data_r(space,0); -// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag(), ret); +// if(LOG) logerror("WD7600 '%s': keyboard data read %02x\n", tag(), ret); return ret; } WRITE8_MEMBER( wd7600_device::keyb_cmd_w ) { -// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag(), data); +// if(LOG) logerror("WD7600 '%s': keyboard command %02x\n", tag(), data); m_keybc->command_w(space,0,data); } diff --git a/src/emu/machine/wozfdc.c b/src/emu/machine/wozfdc.c index 3bc64af44a2..c479aa3f370 100644 --- a/src/emu/machine/wozfdc.c +++ b/src/emu/machine/wozfdc.c @@ -42,7 +42,7 @@ const rom_entry *wozfdc_device::device_rom_region() const // LIVE DEVICE //************************************************************************** -wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : +wozfdc_device::wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : device_t(mconfig, type, name, tag, owner, clock, shortname, source) { } @@ -99,7 +99,7 @@ void wozfdc_device::a3_update_drive_sel() } else { - switch (drvsel & 3) + switch (drvsel & 3) { case 0: newflop = floppy0->get_device(); @@ -213,7 +213,7 @@ void wozfdc_device::phase(int ph, bool on) floppy->stp_w(false); floppy->stp_w(true); } - } + } } } @@ -396,7 +396,7 @@ void wozfdc_device::commit_predicted() cur_lss.write_start_time = cur_lss.tm; cur_lss.write_position = 0; } - + predicted_lss.tm = attotime::never; } @@ -409,7 +409,7 @@ void wozfdc_device::lss_sync() while(cur_lss.tm < tm) { lss_predict(tm); commit_predicted(); - } + } } void wozfdc_device::lss_predict(attotime limit) @@ -450,7 +450,7 @@ void wozfdc_device::lss_predict(attotime limit) if(mode_write) { if((write_line_active && !(address & 0x80)) || - (!write_line_active && (address & 0x80))) { + (!write_line_active && (address & 0x80))) { write_line_active = !write_line_active; assert(predicted_lss.write_position != 32); predicted_lss.write_buffer[predicted_lss.write_position++] = cycles_to_time(cycles); @@ -538,36 +538,35 @@ void appleiii_fdc::control_dx(int offset) { switch (offset) { - case 0: // clear drive select bit 0 + case 0: // clear drive select bit 0 drvsel &= ~1; break; - case 1: // set drive select bit 0 + case 1: // set drive select bit 0 drvsel |= 1; break; - case 2: // clear drive select bit 1 + case 2: // clear drive select bit 1 drvsel &= ~2; break; - case 3: // set drive select bit 1 + case 3: // set drive select bit 1 drvsel |= 2; break; - case 4: // clear enable 1 + case 4: // clear enable 1 enable1 = 0; break; - case 5: // set enable 1 + case 5: // set enable 1 enable1 = 1; break; - case 6: // clear side 2 + case 6: // clear side 2 case 7: // set side 2 break; - default: // cod8-c0df are not FDC related + default: // cod8-c0df are not FDC related break; } } - diff --git a/src/emu/machine/ym2148.c b/src/emu/machine/ym2148.c index 5332377eb5e..d61be4bed96 100644 --- a/src/emu/machine/ym2148.c +++ b/src/emu/machine/ym2148.c @@ -124,7 +124,7 @@ void ym2148_device::update_irq() } if ((m_status & STATUS_TRANSMIT_READY) && (m_control & CONTROL_TRANSMIT_IRQ_ENABLE)) { -// m_irq_state = ASSERT_LINE; +// m_irq_state = ASSERT_LINE; } m_irq_handler(m_irq_state); @@ -205,4 +205,3 @@ WRITE_LINE_MEMBER(ym2148_device::write_rxd) { m_rxd = state; } - diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c index d0b9a9b7a18..1ca2ce556a5 100644 --- a/src/emu/machine/z80ctc.c +++ b/src/emu/machine/z80ctc.c @@ -137,7 +137,7 @@ void z80ctc_device::device_start() m_zc1_cb.resolve_safe(); m_zc2_cb.resolve_safe(); m_zc3_cb.resolve_safe(); - + // start each channel m_channel[0].start(this, 0); m_channel[1].start(this, 1); @@ -520,7 +520,7 @@ void z80ctc_device::ctc_channel::timer_callback() m_device->m_zc3_cb(0); break; } - + // reset the down counter m_down = m_tconst; } |