diff options
author | 2013-01-11 19:43:14 +0000 | |
---|---|---|
committer | 2013-01-11 19:43:14 +0000 | |
commit | 1940866c70674f0a625a79677b90f9f4a33b2e25 (patch) | |
tree | 0b18ac32397ff89ef7fc1ed27ff03fb8fbc92fa6 /src/mess/machine | |
parent | cff79778372c37b3b2eb9f64e31bd0abfdab978d (diff) |
output of new srcclean changes that are relatively small [smf]
Diffstat (limited to 'src/mess/machine')
77 files changed, 27 insertions, 237 deletions
diff --git a/src/mess/machine/3c505.c b/src/mess/machine/3c505.c index 7aef5608ce3..956ff1c21f9 100644 --- a/src/mess/machine/3c505.c +++ b/src/mess/machine/3c505.c @@ -864,7 +864,6 @@ int threecom3c505_device::ethernet_packet_is_for_me(const UINT8 mac_address[]) void threecom3c505_device::recv_cb(UINT8 *data, int length) { - if (length < ETHERNET_ADDR_SIZE || !ethernet_packet_is_for_me(data)) { // skip packet diff --git a/src/mess/machine/a2bus.h b/src/mess/machine/a2bus.h index a0aec65e118..5fb717682c4 100644 --- a/src/mess/machine/a2bus.h +++ b/src/mess/machine/a2bus.h @@ -22,13 +22,11 @@ #define MCFG_A2BUS_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, A2BUS, 0) \ MCFG_DEVICE_CONFIG(_config) \ - a2bus_device::static_set_cputag(*device, _cputag); \ - + a2bus_device::static_set_cputag(*device, _cputag); #define MCFG_A2BUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, A2BUS_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - a2bus_slot_device::static_set_a2bus_slot(*device, _nbtag, _tag); \ - + a2bus_slot_device::static_set_a2bus_slot(*device, _nbtag, _tag); #define MCFG_A2BUS_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/a2eauxslot.h b/src/mess/machine/a2eauxslot.h index 48c00480db3..2e2df363f9a 100644 --- a/src/mess/machine/a2eauxslot.h +++ b/src/mess/machine/a2eauxslot.h @@ -21,13 +21,11 @@ #define MCFG_A2EAUXSLOT_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - a2eauxslot_device::static_set_cputag(*device, _cputag); \ - + a2eauxslot_device::static_set_cputag(*device, _cputag); #define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - a2eauxslot_slot_device::static_set_a2eauxslot_slot(*device, _nbtag, _tag); \ - + a2eauxslot_slot_device::static_set_a2eauxslot_slot(*device, _nbtag, _tag); #define MCFG_A2EAUXSLOT_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index f5254205a7c..4efc3b982fc 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -217,7 +217,6 @@ static UINT16 cpu_control_register = 0x0000; static int apollo_csr_get_servicemode() { - return cpu_status_register & APOLLO_CSR_SR_SERVICE ? 0 : 1; } @@ -506,7 +505,6 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_word){ } static READ8_DEVICE_HANDLER( apollo_dma8237_ctape_dack_r ) { - UINT8 data = sc499_dack_r(&space.machine()); DLOG2(("dma ctape dack read %02x",data)); @@ -1101,7 +1099,6 @@ WRITE8_DEVICE_HANDLER(apollo_sio_w) static TIMER_CALLBACK(kbd_timer_callback) { - #if defined(APOLLO_FOR_LINUX) device_t *device = (device_t *) ptr; address_space &space = device->machine().device(MAINCPU)->memory().space(AS_PROGRAM); @@ -1304,7 +1301,6 @@ static void apollo_3c505_set_irq(device_t *device, int state) { static int apollo_3c505_tx_data(device_t *device, const UINT8 tx_data_buffer[], int tx_data_length) { - // transmit all transmitted packets to the apollo_netserver apollo_netserver_receive(device, tx_data_buffer, tx_data_length); @@ -1319,13 +1315,11 @@ static int apollo_3c505_setfilter(device_t *device, int node_id) static int apollo_3c505_rx_data(device_t *device, const UINT8 rx_data_buffer[], int rx_data_length) { - // transmit all received packets to the threecom3c505 receiver return threecom3c505_receive(device, rx_data_buffer, rx_data_length); } static void apollo_3c505_tx_init(device_t *device) { - apollo_eth_init(device, apollo_3c505_rx_data); // setup to receive all packets from the apollo_netserver diff --git a/src/mess/machine/apollo_dbg.c b/src/mess/machine/apollo_dbg.c index ce4bcac5094..d50f2e68d59 100644 --- a/src/mess/machine/apollo_dbg.c +++ b/src/mess/machine/apollo_dbg.c @@ -797,7 +797,6 @@ static const char* trap7[] = { //------------------------------------------------------ static const char* trap8[] = { - /* 0x00 - 0x07 */"MST_$MAP", "u,x,x,x,x,x,x", /* 0x01 - 0x08 */"MST_$MAP_AT", "x,u,x,x,x,x,x,x", /* 0x02 - 0x07 */"MST_$MAP_GLOBAL", "u,x,x,x,x,x,x", @@ -1054,7 +1053,6 @@ static const char * disassemble(m68ki_cpu_core *m68k, offs_t pc, char* sb) oprom[i] = opram[i] = m68k->memory.read8(pc + i); if (m68k->mmu_tmp_buserror_occurred) { - sprintf(sb, "- (apollo_disassemble failed at %08x)", pc + i); // restore previous bus error state diff --git a/src/mess/machine/apollo_eth.c b/src/mess/machine/apollo_eth.c index 831465edf7e..2ed69b4541e 100644 --- a/src/mess/machine/apollo_eth.c +++ b/src/mess/machine/apollo_eth.c @@ -170,7 +170,6 @@ static TIMER_CALLBACK(receive_interrupt) ***************************************************************************/ int apollo_eth_transmit(device_t *device, const UINT8 data[], int length) { - if (eth_socket != -1) { if (memcmp(data, eth_hw_address, ETHERNET_ADDR_SIZE) == 0) diff --git a/src/mess/machine/apollo_kbd.c b/src/mess/machine/apollo_kbd.c index a2e83c7746c..606fa0b24ad 100644 --- a/src/mess/machine/apollo_kbd.c +++ b/src/mess/machine/apollo_kbd.c @@ -867,7 +867,6 @@ TIMER_CALLBACK( apollo_kbd_device::static_poll_callback ) } UINT16 apollo_kbd_device::m_code_table[] = { - /* Key | Keycap | Down | Up |Unshifted|Shifted|Control|Caps Lock|Up Trans|Auto */ /* Number| Legend | Code | Code|Code | Code | Code |Code | Code |Repeat*/ diff --git a/src/mess/machine/apollo_net.c b/src/mess/machine/apollo_net.c index f9b02730a6b..cfcfba8d8fd 100644 --- a/src/mess/machine/apollo_net.c +++ b/src/mess/machine/apollo_net.c @@ -478,7 +478,6 @@ static void log_data(const device_t *device, const char *type, } static UINT16 get_socket(const UINT8 rx_data_buffer[], int rx_data_length) { - const UINT8 * packet_buffer = rx_data_buffer + ETHERNET_HEADER_SIZE; int packet_length = rx_data_length - ETHERNET_HEADER_SIZE; @@ -622,7 +621,6 @@ static int ethernet_packet_is_for_me(const UINT8 ethernet_packet_header[], static int is_apollo_request(const UINT8 ethernet_header[], const int data_length) { - return data_length >= 0x30 && // get_word(ethernet_header + 0x0c) == ETHERNET_PACKET_TYPE_APOLLO; } @@ -677,7 +675,6 @@ static UINT16 in_checksum(UINT8 *ptr, UINT32 nbytes) static int arp_server(const device_t *device, const UINT8 rx_data[], int rx_data_length, UINT8 tx_data[]) { - // static UINT8 arp_response[] = { // 0x08,0x00,0x1e,0x02,0x61,0x6d, // 0x00: Ethernet address of destination // 0x08,0x00,0x1e,0x04,0x20,0xe8, // 0x06: Ethernet address of sender @@ -724,7 +721,6 @@ static int arp_server(const device_t *device, static int echo_server(const device_t *device, const UINT8 rx_data[], int rx_data_length, UINT8 tx_data[]) { - static const UINT32 ip_offset = sizeof(ethernet_header); static const UINT32 icmp_offset = ip_offset + sizeof(ip_header); @@ -763,7 +759,6 @@ static int echo_server(const device_t *device, static int netserver(const device_t *device, const UINT8 rx_data[], int rx_data_length, UINT8 tx_data[]) { - if (!ethernet_packet_is_for_me(rx_data, rx_data_length)) return 0; // skip else if (is_apollo_request(rx_data, rx_data_length)) diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c index a0bbb559a19..49a65e662d8 100644 --- a/src/mess/machine/apple2gs.c +++ b/src/mess/machine/apple2gs.c @@ -1881,7 +1881,6 @@ READ8_MEMBER(apple2gs_state::apple2gs_read_vector) MACHINE_RESET_MEMBER(apple2gs_state,apple2gs) { - apple2gs_refresh_delegates(); m_cur_slot6_image = NULL; @@ -1929,7 +1928,6 @@ MACHINE_RESET_MEMBER(apple2gs_state,apple2gs) MACHINE_START_MEMBER(apple2gs_state,apple2gscommon) { - apple2gs_refresh_delegates(); apple2_init_common(machine()); diff --git a/src/mess/machine/at45dbxx.h b/src/mess/machine/at45dbxx.h index d8f5ec81e33..96239474168 100644 --- a/src/mess/machine/at45dbxx.h +++ b/src/mess/machine/at45dbxx.h @@ -43,8 +43,7 @@ extern const device_type AT45DB041; #define MCFG_AT45DB041_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, AT45DB041, 0) \ - + MCFG_DEVICE_ADD(_tag, AT45DB041, 0) class at45db081_device : public at45db041_device { public: @@ -58,8 +57,7 @@ extern const device_type AT45DB081; #define MCFG_AT45DB081_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, AT45DB081, 0) \ - + MCFG_DEVICE_ADD(_tag, AT45DB081, 0) class at45db161_device : public at45db041_device { public: @@ -73,8 +71,7 @@ extern const device_type AT45DB161; #define MCFG_AT45DB161_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, AT45DB161, 0) \ - + MCFG_DEVICE_ADD(_tag, AT45DB161, 0) /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/mess/machine/at_keybc.h b/src/mess/machine/at_keybc.h index b4604e7ff84..01a5bb0f6ec 100644 --- a/src/mess/machine/at_keybc.h +++ b/src/mess/machine/at_keybc.h @@ -45,7 +45,6 @@ struct at_keyboard_controller_interface class at_keyboard_controller_device : public device_t, public at_keyboard_controller_interface { - public: // construction/destruction at_keyboard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c index a0ff5378001..be13452bd8f 100644 --- a/src/mess/machine/b2m.c +++ b/src/mess/machine/b2m.c @@ -288,7 +288,6 @@ DRIVER_INIT_MEMBER(b2m_state,b2m) WRITE8_MEMBER(b2m_state::b2m_palette_w) { - UINT8 b = (3 - ((data >> 6) & 3)) * 0x55; UINT8 g = (3 - ((data >> 4) & 3)) * 0x55; UINT8 r = (3 - ((data >> 2) & 3)) * 0x55; diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index 05d1148f7a9..fe90477da4a 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -1310,7 +1310,6 @@ static void MC6850_Receive_Clock(running_machine &machine, int new_clock) TIMER_CALLBACK_MEMBER(bbc_state::bbc_tape_timer_cb) { - double dev_val; dev_val=machine().device<cassette_image_device>(CASSETTE_TAG)->input(); diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c index 59b4ca81a6f..85a8bf05283 100644 --- a/src/mess/machine/beta.c +++ b/src/mess/machine/beta.c @@ -129,7 +129,6 @@ READ8_DEVICE_HANDLER(betadisk_sector_r) READ8_DEVICE_HANDLER(betadisk_data_r) { - beta_disk_state *beta = get_safe_token(device); if (beta->betadisk_active==1) { diff --git a/src/mess/machine/c1581.h b/src/mess/machine/c1581.h index 9bc3257fe42..64fd71ce8d6 100644 --- a/src/mess/machine/c1581.h +++ b/src/mess/machine/c1581.h @@ -39,7 +39,6 @@ class base_c1581_device : public device_t, public device_cbm_iec_interface { - public: // construction/destruction base_c1581_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant); diff --git a/src/mess/machine/c2n.h b/src/mess/machine/c2n.h index 30507e42d40..d7049af1889 100644 --- a/src/mess/machine/c2n.h +++ b/src/mess/machine/c2n.h @@ -28,7 +28,6 @@ class c2n_device : public device_t, public device_pet_datassette_port_interface { - public: // construction/destruction c2n_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/coco_vhd.c b/src/mess/machine/coco_vhd.c index bcf9cfe30f1..dfa1c95214f 100644 --- a/src/mess/machine/coco_vhd.c +++ b/src/mess/machine/coco_vhd.c @@ -73,7 +73,6 @@ coco_vhd_image_device::coco_vhd_image_device(const machine_config &mconfig, cons : device_t(mconfig, COCO_VHD, "Virtual Hard Disk", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/mess/machine/coco_vhd.h b/src/mess/machine/coco_vhd.h index 2c182ccdc6d..e68eabcb4b8 100644 --- a/src/mess/machine/coco_vhd.h +++ b/src/mess/machine/coco_vhd.h @@ -68,6 +68,5 @@ extern const device_type COCO_VHD; ***************************************************************************/ #define MCFG_COCO_VHD_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, COCO_VHD, 0) \ - + MCFG_DEVICE_ADD(_tag, COCO_VHD, 0) #endif /* COCOVHD_H */ diff --git a/src/mess/machine/compis.c b/src/mess/machine/compis.c index 69ecf6c4ba8..e0a2274c86e 100644 --- a/src/mess/machine/compis.c +++ b/src/mess/machine/compis.c @@ -1302,7 +1302,6 @@ static IRQ_CALLBACK( compis_irq_callback ) DRIVER_INIT_MEMBER(compis_state,compis) { - machine().device("maincpu")->execute().set_irq_acknowledge_callback(compis_irq_callback); memset (&m_compis, 0, sizeof (m_compis) ); } diff --git a/src/mess/machine/corvushd.c b/src/mess/machine/corvushd.c index 169616cb23f..0045040b83d 100644 --- a/src/mess/machine/corvushd.c +++ b/src/mess/machine/corvushd.c @@ -395,7 +395,6 @@ static corvus_cmd_t corvus_prep_cmd[0x82]; // Prep Command sizes and their // nada // static void dump_buffer(UINT8 *buffer, UINT16 length) { - UINT16 offset; char ascii_dump[16]; @@ -436,7 +435,6 @@ static void dump_buffer(UINT8 *buffer, UINT16 length) { // Whether the command was invalid or not (TRUE = invalid command) // static UINT8 parse_hdc_command(UINT8 data) { - corvus_hdc_t *c = &corvus_hdc; c->awaiting_modifier = FALSE; // This is the case by definition @@ -545,7 +543,6 @@ static UINT8 parse_hdc_command(UINT8 data) { // status: Command status // static UINT8 corvus_write_sector(running_machine &machine, UINT8 drv, UINT32 sector, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; hard_disk_file @@ -606,7 +603,6 @@ static UINT8 corvus_write_sector(running_machine &machine, UINT8 drv, UINT32 sec // status: Corvus status // static UINT8 corvus_write_logical_sector(running_machine &machine, dadr_t *dadr, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; UINT8 status; // Status returned from Physical Sector read @@ -656,7 +652,6 @@ static UINT8 corvus_write_logical_sector(running_machine &machine, dadr_t *dadr, // status: Corvus status // static UINT8 corvus_read_sector(running_machine &machine, UINT8 drv, UINT32 sector, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; hard_disk_file @@ -706,7 +701,6 @@ static UINT8 corvus_read_sector(running_machine &machine, UINT8 drv, UINT32 sect // status: Corvus status // static UINT8 corvus_read_logical_sector(running_machine &machine, dadr_t *dadr, UINT8 *buffer, int len) { - corvus_hdc_t *c = &corvus_hdc; UINT8 status; // Status returned from Physical Sector read @@ -757,7 +751,6 @@ static UINT8 corvus_read_logical_sector(running_machine &machine, dadr_t *dadr, // Fills in the semaphore result code // static UINT8 corvus_lock_semaphore(running_machine &machine, UINT8 *name) { - corvus_hdc_t *c = &corvus_hdc; semaphore_table_block_t @@ -835,7 +828,6 @@ static UINT8 corvus_lock_semaphore(running_machine &machine, UINT8 *name) { // Fills in the semaphore result code // static UINT8 corvus_unlock_semaphore(running_machine &machine, UINT8 *name) { - corvus_hdc_t *c = &corvus_hdc; semaphore_table_block_t @@ -903,7 +895,6 @@ static UINT8 corvus_unlock_semaphore(running_machine &machine, UINT8 *name) { // // static UINT8 corvus_init_semaphore_table( running_machine &machine ) { - semaphore_table_block_t semaphore_table; UINT8 status; @@ -933,7 +924,6 @@ static UINT8 corvus_init_semaphore_table( running_machine &machine ) { // Status of command // static UINT8 corvus_get_drive_parameters(running_machine &machine, UINT8 drv) { - corvus_hdc_t *c = &corvus_hdc; UINT16 capacity; // Number of usable 512-byte blocks @@ -1042,7 +1032,6 @@ static UINT8 corvus_get_drive_parameters(running_machine &machine, UINT8 drv) { // status: Status of read operation // static UINT8 corvus_read_boot_block(running_machine &machine, UINT8 block) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure LOG(("corvus_read_boot_block: Reading boot block: %d\n", block)); @@ -1066,7 +1055,6 @@ static UINT8 corvus_read_boot_block(running_machine &machine, UINT8 block) { // Status of command // static UINT8 corvus_read_firmware_block(running_machine &machine, UINT8 head, UINT8 sector) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure UINT16 relative_sector; // Relative sector on drive for Physical Read @@ -1097,7 +1085,6 @@ static UINT8 corvus_read_firmware_block(running_machine &machine, UINT8 head, UI // Status of command // static UINT8 corvus_write_firmware_block(running_machine &machine, UINT8 head, UINT8 sector, UINT8 *buffer) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure UINT16 relative_sector; // Relative sector on drive for Physical Read @@ -1126,7 +1113,6 @@ static UINT8 corvus_write_firmware_block(running_machine &machine, UINT8 head, U // Status of command // static UINT8 corvus_format_drive(running_machine &machine, UINT8 *pattern, UINT16 len) { - corvus_hdc_t *c = &corvus_hdc; UINT32 sector; @@ -1206,7 +1192,6 @@ static hard_disk_file *corvus_hdc_file(running_machine &machine, int id) { // Nothing // static void corvus_process_command_packet(running_machine &machine, UINT8 invalid_command_flag) { - corvus_hdc_t *c = &corvus_hdc; if (VERBOSE_RESPONSES) @@ -1434,7 +1419,6 @@ static TIMER_CALLBACK(corvus_hdc_callback) // NULL if there's no file to attach to // UINT8 corvus_hdc_init(running_machine &machine) { - corvus_hdc_t *c = &corvus_hdc; // Pick up global controller structure hard_disk_file *disk; // Structures for interface to CHD routines hard_disk_info *info; @@ -1577,7 +1561,6 @@ UINT8 corvus_hdc_init(running_machine &machine) { // Value in the controller status register // READ8_HANDLER ( corvus_hdc_status_r ) { - corvus_hdc_t *c = &corvus_hdc; return c->status; @@ -1599,7 +1582,6 @@ READ8_HANDLER ( corvus_hdc_status_r ) { // Value in the controller data register // READ8_HANDLER ( corvus_hdc_data_r ) { - corvus_hdc_t *c = &corvus_hdc; UINT8 result; @@ -1649,7 +1631,6 @@ READ8_HANDLER ( corvus_hdc_data_r ) { // Nothing // WRITE8_HANDLER ( corvus_hdc_data_w ) { - corvus_hdc_t *c = &corvus_hdc; // diff --git a/src/mess/machine/cpc_rom.c b/src/mess/machine/cpc_rom.c index 84fac10c88d..bc2350a3300 100644 --- a/src/mess/machine/cpc_rom.c +++ b/src/mess/machine/cpc_rom.c @@ -84,7 +84,6 @@ rom_image_device::rom_image_device(const machine_config &mconfig, const char *ta : device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock), device_image_interface(mconfig, *this) { - } //------------------------------------------------- diff --git a/src/mess/machine/cpc_rom.h b/src/mess/machine/cpc_rom.h index daddbbf689a..9d0a8319041 100644 --- a/src/mess/machine/cpc_rom.h +++ b/src/mess/machine/cpc_rom.h @@ -54,8 +54,7 @@ extern const device_type ROMSLOT; #define MCFG_ROMSLOT_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, ROMSLOT, 0) \ - + MCFG_DEVICE_ADD(_tag, ROMSLOT, 0) /*** ROM box device ***/ diff --git a/src/mess/machine/d9060.h b/src/mess/machine/d9060.h index e7b9b46d557..9ea327a0a25 100644 --- a/src/mess/machine/d9060.h +++ b/src/mess/machine/d9060.h @@ -43,7 +43,6 @@ class base_d9060_device : public device_t, public device_ieee488_interface { - public: enum { diff --git a/src/mess/machine/dai.c b/src/mess/machine/dai.c index ea38b2e121e..67f72e08a2f 100644 --- a/src/mess/machine/dai.c +++ b/src/mess/machine/dai.c @@ -112,7 +112,6 @@ TIMER_CALLBACK_MEMBER(dai_state::dai_timer) void dai_state::machine_start() { - membank("bank2")->configure_entries(0, 4, memregion("maincpu")->base() + 0x010000, 0x1000); machine().scheduler().timer_set(attotime::zero, timer_expired_delegate(FUNC(dai_state::dai_bootstrap_callback),this)); machine().scheduler().timer_pulse(attotime::from_hz(100), timer_expired_delegate(FUNC(dai_state::dai_timer),this)); /* timer for tms5501 */ diff --git a/src/mess/machine/diag264_lb_tape.h b/src/mess/machine/diag264_lb_tape.h index de15ca236ac..4a2eafdb26e 100644 --- a/src/mess/machine/diag264_lb_tape.h +++ b/src/mess/machine/diag264_lb_tape.h @@ -27,7 +27,6 @@ class diag264_cassette_loopback_device : public device_t, public device_pet_datassette_port_interface { - public: // construction/destruction diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/fm_scsi.h b/src/mess/machine/fm_scsi.h index 179a825cdaa..b9dc4bb852f 100644 --- a/src/mess/machine/fm_scsi.h +++ b/src/mess/machine/fm_scsi.h @@ -34,11 +34,9 @@ MCFG_DEVICE_ADD(_tag, FMSCSI, 0) #define MCFG_FMSCSI_IRQ_HANDLER(_devcb) \ - devcb = &fmscsi_device::set_irq_handler(*device, DEVCB2_##_devcb); \ - + devcb = &fmscsi_device::set_irq_handler(*device, DEVCB2_##_devcb); #define MCFG_FMSCSI_DRQ_HANDLER(_devcb) \ - devcb = &fmscsi_device::set_drq_handler(*device, DEVCB2_##_devcb); \ - + devcb = &fmscsi_device::set_drq_handler(*device, DEVCB2_##_devcb); class fmscsi_device : public device_t { public: diff --git a/src/mess/machine/gb.c b/src/mess/machine/gb.c index 79676a8e357..97c5c99c198 100644 --- a/src/mess/machine/gb.c +++ b/src/mess/machine/gb.c @@ -321,7 +321,6 @@ MACHINE_RESET_MEMBER(gb_state,gb) MACHINE_START_MEMBER(gb_state,sgb) { - m_sgb_packets = -1; m_sgb_tile_data = auto_alloc_array_clear(machine(), UINT8, 0x2000 ); diff --git a/src/mess/machine/hec2hrp.c b/src/mess/machine/hec2hrp.c index c0567ba384c..3c6524cc066 100644 --- a/src/mess/machine/hec2hrp.c +++ b/src/mess/machine/hec2hrp.c @@ -370,7 +370,6 @@ WRITE8_MEMBER(hec2hrp_state::hector_sn_3000_w) /* Color Interface */ WRITE8_MEMBER(hec2hrp_state::hector_color_a_w) { - if (data & 0x40) { /* Bit 6 => motor ON/OFF => for cassette state!*/ @@ -448,7 +447,6 @@ static cassette_image_device *cassette_device_image(running_machine &machine) /******************* READ PIO 8255 *******************/ READ8_MEMBER(hec2hrp_state::hector_io_8255_r) { - /* 8255 in mode 0 */ UINT8 data =0; UINT8 data_l=0; diff --git a/src/mess/machine/hp48.c b/src/mess/machine/hp48.c index b4309af817b..a396110a3c7 100644 --- a/src/mess/machine/hp48.c +++ b/src/mess/machine/hp48.c @@ -369,7 +369,6 @@ WRITE8_MEMBER(hp48_state::hp48_io_w) switch( offset ) { - /* CRC register */ case 0x04: m_crc = (m_crc & 0xfff0) | data; break; case 0x05: m_crc = (m_crc & 0xff0f) | (data << 4); break; @@ -483,7 +482,6 @@ READ8_MEMBER(hp48_state::hp48_io_r) switch( offset ) { - /* CRC register */ case 0x04: data = m_crc & 0xf; break; case 0x05: data = (m_crc >> 4) & 0xf; break; diff --git a/src/mess/machine/i8271.c b/src/mess/machine/i8271.c index d05112e147f..d6ce2a37036 100644 --- a/src/mess/machine/i8271.c +++ b/src/mess/machine/i8271.c @@ -231,7 +231,6 @@ static void i8271_seek_to_track(device_t *device,int track) } else { - signed int SignedTracks; /* calculate number of tracks to seek */ @@ -573,7 +572,6 @@ static void i8271_command_continue(device_t *device) /* end command? */ if (i8271->Counter==0) { - i8271_timed_command_complete(device); return; } @@ -596,7 +594,6 @@ static void i8271_command_continue(device_t *device) /* end command? */ if (i8271->Counter==0) { - i8271_timed_command_complete(device); return; } @@ -1036,7 +1033,6 @@ static void i8271_command_execute(device_t *device) case I8271_SPECIAL_REGISTER_DRIVE_CONTROL_INPUT_PORT: { - FDC_LOG_COMMAND("Write Drive Control Input port\n"); // i8271->drive_control_input = i8271->CommandParameters[1]; @@ -1258,7 +1254,6 @@ static void i8271_command_execute(device_t *device) } else { - i8271->drive_control_output |=1; i8271_seek_to_track(device,i8271->CommandParameters[0]); @@ -1289,7 +1284,6 @@ static void i8271_command_execute(device_t *device) } else { - i8271->Counter = i8271->CommandParameters[2]; i8271_seek_to_track(device,i8271->CommandParameters[0]); @@ -1469,7 +1463,6 @@ READ8_DEVICE_HANDLER(i8271_r) case 1: { - if ((i8271->StatusRegister & I8271_STATUS_COMMAND_BUSY)==0) { /* clear IRQ */ diff --git a/src/mess/machine/intv.c b/src/mess/machine/intv.c index d62729981b2..83221c8e330 100644 --- a/src/mess/machine/intv.c +++ b/src/mess/machine/intv.c @@ -547,7 +547,6 @@ static int intv_load_rom_file(device_image_interface &image) DEVICE_IMAGE_LOAD( intv_cart ) { - if (image.software_entry() == NULL) return intv_load_rom_file(image); else diff --git a/src/mess/machine/isa.h b/src/mess/machine/isa.h index ed27d0238fa..3cd295e99c5 100644 --- a/src/mess/machine/isa.h +++ b/src/mess/machine/isa.h @@ -75,23 +75,19 @@ #define MCFG_ISA8_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, ISA8, 0) \ MCFG_DEVICE_CONFIG(_config) \ - isa8_device::static_set_cputag(*device, _cputag); \ - + isa8_device::static_set_cputag(*device, _cputag); #define MCFG_ISA8_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _def_inp, _fixed) \ MCFG_DEVICE_ADD(_tag, ISA8_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) \ - isa8_slot_device::static_set_isa8_slot(*device, owner, _isatag); \ - + isa8_slot_device::static_set_isa8_slot(*device, owner, _isatag); #define MCFG_ISA16_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, ISA16, 0) \ MCFG_DEVICE_CONFIG(_config) \ - isa8_device::static_set_cputag(*device, _cputag); \ - + isa8_device::static_set_cputag(*device, _cputag); #define MCFG_ISA16_SLOT_ADD(_isatag, _tag, _slot_intf, _def_slot, _def_inp, _fixed) \ MCFG_DEVICE_ADD(_tag, ISA16_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, _fixed) \ - isa16_slot_device::static_set_isa16_slot(*device, owner, _isatag); \ - + isa16_slot_device::static_set_isa16_slot(*device, owner, _isatag); //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/mess/machine/isa_ide_cd.c b/src/mess/machine/isa_ide_cd.c index 9b03c3adc4e..1a693d5a298 100644 --- a/src/mess/machine/isa_ide_cd.c +++ b/src/mess/machine/isa_ide_cd.c @@ -93,7 +93,6 @@ READ16_MEMBER( isa16_ide_cd_device::atapi_r ) data |= ( m_atapi_data[m_atapi_data_ptr++] << 8 ); if( m_atapi_data_ptr >= m_atapi_data_len ) { - m_atapi_data_ptr = 0; m_atapi_data_len = 0; diff --git a/src/mess/machine/kc.c b/src/mess/machine/kc.c index 28a3be5b96e..3fb642e2f73 100644 --- a/src/mess/machine/kc.c +++ b/src/mess/machine/kc.c @@ -212,7 +212,6 @@ void kc_state::update_cassette(int state) TIMER_CALLBACK_MEMBER(kc_state::kc_cassette_oneshot_timer) { - update_cassette(0); m_cassette_oneshot_timer->reset(); @@ -222,7 +221,6 @@ TIMER_CALLBACK_MEMBER(kc_state::kc_cassette_oneshot_timer) // enabled only when cassette motor is on TIMER_CALLBACK_MEMBER(kc_state::kc_cassette_timer_callback) { - // read cassette data int bit = (m_cassette->input() > 0.0038) ? 1 : 0; diff --git a/src/mess/machine/kc_keyb.h b/src/mess/machine/kc_keyb.h index 199f5fec8b9..47216c8de37 100644 --- a/src/mess/machine/kc_keyb.h +++ b/src/mess/machine/kc_keyb.h @@ -71,6 +71,5 @@ extern const device_type KC_KEYBOARD; #define MCFG_KC_KEYBOARD_ADD(_tag,_clock,_config) \ MCFG_DEVICE_ADD(_tag, KC_KEYBOARD, _clock) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #endif /* __KC_KEYB_H__ */ diff --git a/src/mess/machine/lisa.c b/src/mess/machine/lisa.c index 05c94df14a5..981aee1d4e3 100644 --- a/src/mess/machine/lisa.c +++ b/src/mess/machine/lisa.c @@ -877,7 +877,6 @@ DIRECT_UPDATE_HANDLER (lisa_OPbaseoverride) switch ((mmu_entry_t)state->m_mmu_regs[the_seg][segment].type) { - case RAM_r: case RAM_rw: if (seg_offset > state->m_mmu_regs[the_seg][segment].slim) @@ -1408,7 +1407,6 @@ READ16_MEMBER(lisa_state::lisa_r) switch (m_mmu_regs[the_seg][segment].type) { - case RAM_stack_r: case RAM_stack_rw: if (address <= m_mmu_regs[the_seg][segment].slim) @@ -1612,7 +1610,6 @@ WRITE16_MEMBER(lisa_state::lisa_w) switch (m_mmu_regs[the_seg][segment].type) { - case RAM_stack_rw: if (address <= m_mmu_regs[the_seg][segment].slim) { diff --git a/src/mess/machine/mboard.c b/src/mess/machine/mboard.c index 7bdcd8a5e3f..9eb49144fe7 100644 --- a/src/mess/machine/mboard.c +++ b/src/mess/machine/mboard.c @@ -119,7 +119,6 @@ data: 0 0000 0000 all fields occupied void mboard_state::write_board(UINT8 data) { - Line18_REED=data; if (read_board_flag && !strcmp(machine().system().name,"glasgow") ) //HACK @@ -371,7 +370,6 @@ void mboard_state::check_board_buttons() if ((data != 0xff) && (!mouse_down) ) { - pos2num_res = pos_to_num(data); field=64-(board_row*8+8-pos2num_res); @@ -434,7 +432,6 @@ void mboard_state::check_board_buttons() /* check additional buttons */ if (data == 0xff) { - port_input=machine().root_device().ioport("B_BUTTONS")->read(); if (port_input==0x01) { diff --git a/src/mess/machine/mc6843.c b/src/mess/machine/mc6843.c index 20da19f6eb2..a3a4660be3b 100644 --- a/src/mess/machine/mc6843.c +++ b/src/mess/machine/mc6843.c @@ -44,7 +44,6 @@ struct mc6843_t { - /* interface */ const mc6843_interface* iface; @@ -256,7 +255,6 @@ static int mc6843_address_search( device_t *device, chrn_id* id ) while ( 1 ) { - if ( ( ! floppy_drive_get_next_id( img, mc6843->side, id ) ) || ( id->flags & ID_FLAG_CRC_ERROR_IN_ID_FIELD ) || ( id->N != 0 ) ) { /* read address error */ @@ -421,7 +419,6 @@ READ8_DEVICE_HANDLER ( mc6843_r ) UINT8 data = 0; switch ( offset ) { - case 0: /* Data Input Register (DIR) */ { int cmd = mc6843->CMR & 0x0f; @@ -560,7 +557,6 @@ WRITE8_DEVICE_HANDLER ( mc6843_w ) { mc6843_t* mc6843 = get_safe_token( device ); switch ( offset ) { - case 0: /* Data Output Register (DOR) */ { int cmd = mc6843->CMR & 0x0f; diff --git a/src/mess/machine/mc6846.c b/src/mess/machine/mc6846.c index 77853441162..2db1709d9cd 100644 --- a/src/mess/machine/mc6846.c +++ b/src/mess/machine/mc6846.c @@ -30,7 +30,6 @@ struct mc6846_t { - const mc6846_interface* iface; /* registers */ @@ -179,7 +178,6 @@ INLINE void mc6846_timer_launch ( device_t *device ) switch( MODE ) { - case 0x00: case 0x10: /* continuous */ mc6846->cto = 0; diff --git a/src/mess/machine/mc6854.c b/src/mess/machine/mc6854.c index 8e6129dba08..f453647b60b 100644 --- a/src/mess/machine/mc6854.c +++ b/src/mess/machine/mc6854.c @@ -356,7 +356,6 @@ static TIMER_CALLBACK(mc6854_tfifo_cb) switch ( mc6854->tstate ) { - case 2: /* 8-bit address field */ if ( ( data & 1 ) || ( ! AEX ) ) mc6854->tstate = 3; @@ -464,7 +463,6 @@ static void mc6854_rfifo_push( device_t *device, UINT8 d ) switch ( mc6854->rstate ) { - case 0: case 1: case 2: /* 8-bit address field */ @@ -804,7 +802,6 @@ READ8_DEVICE_HANDLER ( mc6854_r ) mc6854_t* mc6854 = get_safe_token( device ); switch ( offset ) { - case 0: /* status register 1 */ mc6854_update_sr1( mc6854 ); LOG(( "%f $%04x mc6854_r: get SR1=$%02X (rda=%i,s2rq=%i,fd=%i,cts=%i,tu=%i,tdra=%i,irq=%i)\n", @@ -847,7 +844,6 @@ WRITE8_DEVICE_HANDLER ( mc6854_w ) mc6854_t* mc6854 = get_safe_token( device ); switch ( offset ) { - case 0: /* control register 1 */ mc6854->cr1 = data; LOG(( "%f $%04x mc6854_w: set CR1=$%02X (ac=%i,irq=%c%c,%sreset=%c%c)\n", diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c index 6ecc0d53e4a..7ed7a29b898 100644 --- a/src/mess/machine/msx.c +++ b/src/mess/machine/msx.c @@ -842,7 +842,6 @@ static void msx_memory_init (running_machine &machine) state->layout = layout; for (; layout->entry != MSX_LAYOUT_LAST; layout++) { - switch (layout->entry) { case MSX_LAYOUT_SLOT_ENTRY: prim = layout->slot_primary; @@ -895,7 +894,6 @@ static void msx_memory_init (running_machine &machine) if (!st) { switch (slot->mem_type) { - case MSX_MEM_HANDLER: case MSX_MEM_ROM: mem = machine.root_device().memregion("maincpu")->base() + option; diff --git a/src/mess/machine/mz700.c b/src/mess/machine/mz700.c index 0051af8f718..7bcb209e0f0 100644 --- a/src/mess/machine/mz700.c +++ b/src/mess/machine/mz700.c @@ -99,7 +99,6 @@ DRIVER_INIT_MEMBER(mz_state,mz800) void mz_state::machine_start() { - m_pit = machine().device("pit8253"); m_ppi = machine().device<i8255_device>("ppi8255"); @@ -374,7 +373,6 @@ WRITE8_MEMBER(mz_state::mz700_bank_5_w) WRITE8_MEMBER(mz_state::mz700_bank_6_w) { - if (m_mz700_mode) { m_mz700_ram_lock = FALSE; @@ -610,7 +608,6 @@ WRITE8_MEMBER(mz_state::mz800_read_format_w) */ WRITE8_MEMBER(mz_state::mz800_display_mode_w) { - m_mz700_mode = BIT(data, 3); m_hires_mode = BIT(data, 2); m_screen = data & 0x03; diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c index f609d95f956..538a1be0540 100644 --- a/src/mess/machine/nascom1.c +++ b/src/mess/machine/nascom1.c @@ -110,7 +110,6 @@ READ8_MEMBER(nascom1_state::nascom1_port_00_r) WRITE8_MEMBER(nascom1_state::nascom1_port_00_w) { - machine().device<cassette_image_device>(CASSETTE_TAG)->change_state( ( data & 0x10 ) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR ); diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c index 476baa9c5b5..680e942b6b2 100644 --- a/src/mess/machine/nes.c +++ b/src/mess/machine/nes.c @@ -208,7 +208,6 @@ int nes_ppu_vidaccess( device_t *device, int address, int data ) void nes_state::machine_reset() { - /* Reset the mapper variables. Will also mark the char-gen ram as dirty */ if (m_disk_expansion && m_pcb_id == NO_BOARD) m_ppu->set_hblank_callback(fds_irq); @@ -1645,7 +1644,6 @@ READ8_MEMBER(nes_state::nes_fds_r) WRITE8_MEMBER(nes_state::nes_fds_w) { - switch (offset) { case 0x00: @@ -1714,7 +1712,6 @@ static void nes_unload_proc( device_image_interface &image ) DRIVER_INIT_MEMBER(nes_state,famicom) { - /* clear some of the variables we don't use */ m_trainer = 0; m_battery = 0; diff --git a/src/mess/machine/nes_mmc.c b/src/mess/machine/nes_mmc.c index ff4c741dc4a..f6fef2d7b12 100644 --- a/src/mess/machine/nes_mmc.c +++ b/src/mess/machine/nes_mmc.c @@ -211,7 +211,6 @@ READ8_MEMBER(nes_state::nes_nt_r) WRITE8_MEMBER(nes_state::nes_low_mapper_w) { - if (!m_mmc_write_low.isnull()) (m_mmc_write_low)(space, offset, data, mem_mask); else @@ -220,7 +219,6 @@ WRITE8_MEMBER(nes_state::nes_low_mapper_w) READ8_MEMBER(nes_state::nes_low_mapper_r) { - if (!m_mmc_read_low.isnull()) return (m_mmc_read_low)(space, offset, mem_mask); else diff --git a/src/mess/machine/nes_pcb.c b/src/mess/machine/nes_pcb.c index 75319b1ec50..6520fccaaca 100644 --- a/src/mess/machine/nes_pcb.c +++ b/src/mess/machine/nes_pcb.c @@ -1906,7 +1906,6 @@ READ8_MEMBER(nes_carts_state::exrom_l_r) WRITE8_MEMBER(nes_carts_state::exrom_l_w) { - // LOG_MMC(("Mapper 5 write, offset: %04x, data: %02x\n", offset + 0x4100, data)); /* Send $5000-$5015 to the sound chip */ if ((offset >= 0xf00) && (offset <= 0xf15)) @@ -2408,7 +2407,6 @@ static void ntbrom_mirror( running_machine &machine, int mirror, int mirr0, int WRITE8_MEMBER(nes_carts_state::ntbrom_w) { - LOG_MMC(("ntbrom_w, offset %04x, data: %02x\n", offset, data)); switch (offset & 0x7000) @@ -10695,7 +10693,6 @@ static void bmc_ball11_set_banks( running_machine &machine ) WRITE8_MEMBER(nes_carts_state::bmc_ball11_m_w) { - LOG_MMC(("bmc_ball11_m_w, offset: %04x, data: %02x\n", offset, data)); m_mmc_reg[0] = ((data >> 1) & 0x01) | ((data >> 3) & 0x02); @@ -10704,7 +10701,6 @@ WRITE8_MEMBER(nes_carts_state::bmc_ball11_m_w) WRITE8_MEMBER(nes_carts_state::bmc_ball11_w) { - LOG_MMC(("bmc_ball11_w, offset: %04x, data: %02x\n", offset, data)); switch (offset & 0x6000) @@ -11524,7 +11520,6 @@ static void someri_mmc1_set_chr( running_machine &machine ) WRITE8_MEMBER(nes_carts_state::someri_mmc1_w) { - assert(m_mmc_cmd1 == 2); if (data & 0x80) diff --git a/src/mess/machine/nubus.h b/src/mess/machine/nubus.h index 3e7661ef6e6..719fb244b9f 100644 --- a/src/mess/machine/nubus.h +++ b/src/mess/machine/nubus.h @@ -21,13 +21,11 @@ #define MCFG_NUBUS_BUS_ADD(_tag, _cputag, _config) \ MCFG_DEVICE_ADD(_tag, NUBUS, 0) \ MCFG_DEVICE_CONFIG(_config) \ - nubus_device::static_set_cputag(*device, _cputag); \ - + nubus_device::static_set_cputag(*device, _cputag); #define MCFG_NUBUS_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, NUBUS_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - nubus_slot_device::static_set_nubus_slot(*device, _nbtag, _tag); \ - + nubus_slot_device::static_set_nubus_slot(*device, _nbtag, _tag); #define MCFG_NUBUS_SLOT_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/omti8621.c b/src/mess/machine/omti8621.c index 6cbc513e534..c38a5d85514 100644 --- a/src/mess/machine/omti8621.c +++ b/src/mess/machine/omti8621.c @@ -424,7 +424,6 @@ static void set_data_transfer(omti8621_state *state, UINT8 *data, UINT16 length) static void read_sectors_from_disk(omti8621_state *state, INT32 diskaddr, UINT8 count, UINT8 lun) { - UINT8 *data_buffer = state->sector_buffer; device_image_interface *image = state->disk[lun]->image; @@ -445,7 +444,6 @@ static void read_sectors_from_disk(omti8621_state *state, INT32 diskaddr, static void write_sectors_to_disk(omti8621_state *state, INT32 diskaddr, UINT8 count, UINT8 lun) { - UINT8 *data_buffer = state->sector_buffer; device_image_interface *image = state->disk[lun]->image; @@ -671,7 +669,6 @@ static void log_data(const omti8621_state *state) { static void do_command(omti8621_state *state, const UINT8 cdb[], const UINT16 cdb_length) { - UINT8 lun = get_lun(cdb); disk_data *disk = state->disk[lun]; int command_duration = 0; // ms diff --git a/src/mess/machine/osborne1.c b/src/mess/machine/osborne1.c index 00e63944330..3cbb524ff40 100644 --- a/src/mess/machine/osborne1.c +++ b/src/mess/machine/osborne1.c @@ -445,7 +445,6 @@ void osborne1_state::machine_reset() DRIVER_INIT_MEMBER(osborne1_state,osborne1) { - m_empty_4K = auto_alloc_array(machine(), UINT8, 0x1000 ); memset( m_empty_4K, 0xFF, 0x1000 ); diff --git a/src/mess/machine/pc1350.c b/src/mess/machine/pc1350.c index 46e1f8e66b8..3227381a7f7 100644 --- a/src/mess/machine/pc1350.c +++ b/src/mess/machine/pc1350.c @@ -21,7 +21,6 @@ void pc1350_outb(device_t *device, int data) void pc1350_outc(device_t *device, int data) { - } int pc1350_ina(device_t *device) diff --git a/src/mess/machine/pc9801_118.c b/src/mess/machine/pc9801_118.c index 464e24ec0f4..9ea047f90f6 100644 --- a/src/mess/machine/pc9801_118.c +++ b/src/mess/machine/pc9801_118.c @@ -131,7 +131,6 @@ pc9801_118_device::pc9801_118_device(const machine_config &mconfig, const char * // m_maincpu(*owner, "maincpu"), m_opn3(*this, "opn3") { - } diff --git a/src/mess/machine/pc9801_26.c b/src/mess/machine/pc9801_26.c index 52375395ba5..497106b3358 100644 --- a/src/mess/machine/pc9801_26.c +++ b/src/mess/machine/pc9801_26.c @@ -123,7 +123,6 @@ pc9801_26_device::pc9801_26_device(const machine_config &mconfig, const char *ta // m_maincpu(*owner, "maincpu"), m_opn(*this, "opn") { - } @@ -163,7 +162,6 @@ void pc9801_26_device::install_device(offs_t start, offs_t end, offs_t mask, off void pc9801_26_device::device_start() { - } diff --git a/src/mess/machine/pc9801_86.c b/src/mess/machine/pc9801_86.c index 66cf8cdd36d..f916fb4e5e0 100644 --- a/src/mess/machine/pc9801_86.c +++ b/src/mess/machine/pc9801_86.c @@ -131,7 +131,6 @@ pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *ta // m_maincpu(*owner, "maincpu"), m_opna(*this, "opna") { - } @@ -171,7 +170,6 @@ void pc9801_86_device::install_device(offs_t start, offs_t end, offs_t mask, off void pc9801_86_device::device_start() { - } diff --git a/src/mess/machine/pc9801_kbd.c b/src/mess/machine/pc9801_kbd.c index 4ec418becba..eb3119e2e3d 100644 --- a/src/mess/machine/pc9801_kbd.c +++ b/src/mess/machine/pc9801_kbd.c @@ -36,7 +36,6 @@ const device_type PC9801_KBD = &device_creator<pc9801_kbd_device>; pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, PC9801_KBD, "pc9801_kbd", tag, owner, clock) { - } //------------------------------------------------- diff --git a/src/mess/machine/pc_joy.c b/src/mess/machine/pc_joy.c index 2350a0b622e..6406c54afd3 100644 --- a/src/mess/machine/pc_joy.c +++ b/src/mess/machine/pc_joy.c @@ -28,7 +28,6 @@ READ8_HANDLER ( pc_JOY_r ) /* timer overflow? Nope, otherwise some HWs can't verify the port properly */ //if ((new_time - JOY_time) > attotime::from_msec(10)) //{ - //} //else { diff --git a/src/mess/machine/pc_kbdc.h b/src/mess/machine/pc_kbdc.h index ad4b079e795..36a1c5adf1b 100644 --- a/src/mess/machine/pc_kbdc.h +++ b/src/mess/machine/pc_kbdc.h @@ -21,13 +21,11 @@ set the data line and then set the clock line. #define MCFG_PC_KBDC_ADD(_tag, _config) \ MCFG_DEVICE_ADD(_tag, PC_KBDC, 0) \ - MCFG_DEVICE_CONFIG(_config) \ - + MCFG_DEVICE_CONFIG(_config) #define MCFG_PC_KBDC_SLOT_ADD(_kbdc_tag, _tag, _slot_intf, _def_slot, _def_inp ) \ MCFG_DEVICE_ADD(_tag, PC_KBDC_SLOT, 0 ) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - pc_kbdc_slot_device::static_set_pc_kbdc_slot(*device, owner->subdevice(_kbdc_tag) ); \ - + pc_kbdc_slot_device::static_set_pc_kbdc_slot(*device, owner->subdevice(_kbdc_tag) ); //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mess/machine/pce220_ser.h b/src/mess/machine/pce220_ser.h index 5e51c6fc5e7..80782499200 100644 --- a/src/mess/machine/pce220_ser.h +++ b/src/mess/machine/pce220_ser.h @@ -89,6 +89,5 @@ extern const device_type PCE220SERIAL; #define PCE220SERIAL_TAG "serial" #define MCFG_PCE220_SERIAL_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PCE220SERIAL, 0) \ - + MCFG_DEVICE_ADD(_tag, PCE220SERIAL, 0) #endif /* __PCE220_SER_H__ */ diff --git a/src/mess/machine/pcf8593.h b/src/mess/machine/pcf8593.h index e2fc8fc6206..1837e5be2d8 100644 --- a/src/mess/machine/pcf8593.h +++ b/src/mess/machine/pcf8593.h @@ -38,8 +38,7 @@ extern const device_type PCF8593; #define MCFG_PCF8593_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PCF8593, 0) \ - + MCFG_DEVICE_ADD(_tag, PCF8593, 0) #define MCFG_PCF8593_REMOVE(_tag) \ MCFG_DEVICE_REMOVE(_tag) diff --git a/src/mess/machine/pecom.c b/src/mess/machine/pecom.c index 24fc6ce0cd8..afe91a7ce08 100644 --- a/src/mess/machine/pecom.c +++ b/src/mess/machine/pecom.c @@ -14,7 +14,6 @@ TIMER_CALLBACK_MEMBER(pecom_state::reset_tick) { - m_reset = 1; } diff --git a/src/mess/machine/pet.c b/src/mess/machine/pet.c index 192530564e8..aa0522551e5 100644 --- a/src/mess/machine/pet.c +++ b/src/mess/machine/pet.c @@ -705,7 +705,6 @@ DRIVER_INIT_MEMBER(pet_state,superpet) void pet_state::machine_reset() { - if (m_superpet) { m_spet.rom = 0; diff --git a/src/mess/machine/poly88.c b/src/mess/machine/poly88.c index 64bdb8c3eaa..f3d59e126fb 100644 --- a/src/mess/machine/poly88.c +++ b/src/mess/machine/poly88.c @@ -50,7 +50,6 @@ TIMER_CALLBACK_MEMBER(poly88_state::keyboard_callback) for(i = 0; i < 7; i++) { - code = machine().root_device().ioport(keynames[i])->read(); if (code != 0) { diff --git a/src/mess/machine/primo.c b/src/mess/machine/primo.c index e116bed7b42..aaf964b182c 100644 --- a/src/mess/machine/primo.c +++ b/src/mess/machine/primo.c @@ -170,7 +170,6 @@ WRITE8_MEMBER(primo_state::primo_ki_1_w) WRITE8_MEMBER(primo_state::primo_ki_2_w) { - // bit 7, 6 - not used // bit 5 - SCLK diff --git a/src/mess/machine/psion_pack.h b/src/mess/machine/psion_pack.h index 232eb030794..5760a427915 100644 --- a/src/mess/machine/psion_pack.h +++ b/src/mess/machine/psion_pack.h @@ -73,6 +73,5 @@ extern const device_type PSION_DATAPACK; ***************************************************************************/ #define MCFG_PSION_DATAPACK_ADD(_tag) \ - MCFG_DEVICE_ADD(_tag, PSION_DATAPACK, 0) \ - + MCFG_DEVICE_ADD(_tag, PSION_DATAPACK, 0) #endif /* __PSION_PACK_H__ */ diff --git a/src/mess/machine/psxcd.h b/src/mess/machine/psxcd.h index fdfb86c6f44..d0f4068f9db 100644 --- a/src/mess/machine/psxcd.h +++ b/src/mess/machine/psxcd.h @@ -32,8 +32,7 @@ const int num_commands=0x20; devcb = &psxcd_device::set_irq_handler(*device, DEVCB2_##_devcb); #define MCFG_PSXCD_DEVNAME(_name) \ - psxcd_device::static_set_devname(*device, _name); \ - + psxcd_device::static_set_devname(*device, _name); struct psxcd_interface { }; diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c index f7fa24c04b2..b38f6269827 100644 --- a/src/mess/machine/rmnimbus.c +++ b/src/mess/machine/rmnimbus.c @@ -595,7 +595,6 @@ static void internal_timer_update(running_machine &machine, /* if we have real changes, update things */ if (diff != 0) { - /* if we're going off, make sure our timers are gone */ if ((diff & 0x8000) && !(new_control & 0x8000)) { @@ -1645,7 +1644,6 @@ static void decode_subbios(device_t *device,offs_t pc, UINT8 raw_flag) case 10 : { - set_type("t_acoustics"); switch(bx) @@ -2944,7 +2942,6 @@ TIMER_CALLBACK_MEMBER(rmnimbus_state::mouse_callback) if ((intstate_x==1) && (state->m_intstate_x==0)) // if (intstate_x!=state->m_intstate_x) { - xint=mxa ? EXTERNAL_INT_MOUSE_XR : EXTERNAL_INT_MOUSE_XL; external_int(machine(),0,xint); diff --git a/src/mess/machine/s100.h b/src/mess/machine/s100.h index f7b7c55a3e4..0ef291b191b 100644 --- a/src/mess/machine/s100.h +++ b/src/mess/machine/s100.h @@ -84,8 +84,7 @@ #define MCFG_S100_BUS_ADD(_cpu_tag, _config) \ MCFG_DEVICE_ADD(S100_TAG, S100, 0) \ MCFG_DEVICE_CONFIG(_config) \ - s100_device::static_set_cputag(*device, _cpu_tag); \ - + s100_device::static_set_cputag(*device, _cpu_tag); #define S100_INTERFACE(_name) \ const s100_bus_interface (_name) = @@ -94,8 +93,7 @@ #define MCFG_S100_SLOT_ADD(_tag, _slot_intf, _def_slot, _def_inp) \ MCFG_DEVICE_ADD(_tag, S100_SLOT, 0) \ MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - s100_slot_device::static_set_s100_slot(*device, S100_TAG); \ - + s100_slot_device::static_set_s100_slot(*device, S100_TAG); //************************************************************************** diff --git a/src/mess/machine/serialbox.h b/src/mess/machine/serialbox.h index 8422c53f549..2d13bcac689 100644 --- a/src/mess/machine/serialbox.h +++ b/src/mess/machine/serialbox.h @@ -36,7 +36,6 @@ class serial_box_device : public device_t, public device_cbm_iec_interface { - public: // construction/destruction serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c index acf1ea47d11..e506581e002 100644 --- a/src/mess/machine/sms.c +++ b/src/mess/machine/sms.c @@ -234,7 +234,6 @@ void sms_state::map_bios_8k( UINT16 address, UINT16 bank ) WRITE8_MEMBER(sms_state::sms_input_write) { - switch (offset) { case 0: @@ -488,7 +487,6 @@ static void lphaser2_sensor_check( running_machine &machine ) // if so, we turn on crosshair and the lightgun timer TIMER_CALLBACK_MEMBER(sms_state::lightgun_tick) { - if ((ioport("CTRLSEL")->read_safe(0x00) & 0x0f) == 0x01) { /* enable crosshair */ @@ -697,7 +695,6 @@ static void sms_get_inputs( address_space &space ) WRITE8_MEMBER(sms_state::sms_fm_detect_w) { - if (m_has_fm) m_fm_detect = (data & 0x01); } @@ -705,7 +702,6 @@ WRITE8_MEMBER(sms_state::sms_fm_detect_w) READ8_MEMBER(sms_state::sms_fm_detect_r) { - if (m_has_fm) { return m_fm_detect; @@ -758,7 +754,6 @@ WRITE8_MEMBER(sms_state::sms_io_control_w) READ8_MEMBER(sms_state::sms_count_r) { - if (offset & 0x01) return m_vdp->hcount_latch_read(*m_space, offset); else @@ -795,7 +790,6 @@ WRITE_LINE_MEMBER(sms_state::sms_pause_callback) READ8_MEMBER(sms_state::sms_input_port_0_r) { - if (m_bios_port & IO_CHIP) { return 0xff; @@ -810,7 +804,6 @@ READ8_MEMBER(sms_state::sms_input_port_0_r) READ8_MEMBER(sms_state::sms_input_port_1_r) { - if (m_bios_port & IO_CHIP) return 0xff; @@ -851,7 +844,6 @@ READ8_MEMBER(sms_state::sms_input_port_1_r) WRITE8_MEMBER(sms_state::sms_ym2413_register_port_0_w) { - if (m_has_fm) ym2413_w(m_ym, space, 0, (data & 0x3f)); } @@ -859,7 +851,6 @@ WRITE8_MEMBER(sms_state::sms_ym2413_register_port_0_w) WRITE8_MEMBER(sms_state::sms_ym2413_data_port_0_w) { - if (m_has_fm) { logerror("data_port_0_w %x %x\n", offset, data); @@ -870,7 +861,6 @@ WRITE8_MEMBER(sms_state::sms_ym2413_data_port_0_w) READ8_MEMBER(sms_state::gg_input_port_2_r) { - //logerror("joy 2 read, val: %02x, pc: %04x\n", ((m_is_region_japan ? 0x00 : 0x40) | (machine.root_device().ioport("START")->read() & 0x80)), activecpu_get_pc()); return ((m_is_region_japan ? 0x00 : 0x40) | (ioport("START")->read() & 0x80)); } @@ -936,7 +926,6 @@ READ8_MEMBER(sms_state::sms_tvdraw_data_r) WRITE8_MEMBER(sms_state::sms_93c46_w) { - if ( m_cartridge[m_current_cartridge].m_93c46_enabled ) { m_cartridge[m_current_cartridge].m_93c46_lines = data; @@ -1115,7 +1104,6 @@ WRITE8_MEMBER(sms_state::sms_mapper_w) WRITE8_MEMBER(sms_state::sms_korean_zemina_banksw_w) { - if (m_cartridge[m_current_cartridge].features & CF_KOREAN_ZEMINA_MAPPER) { if (!m_cartridge[m_current_cartridge].ROM) @@ -1142,7 +1130,6 @@ WRITE8_MEMBER(sms_state::sms_korean_zemina_banksw_w) WRITE8_MEMBER(sms_state::sms_codemasters_page0_w) { - if (m_cartridge[m_current_cartridge].ROM && m_cartridge[m_current_cartridge].features & CF_CODEMASTERS_MAPPER) { map_cart_16k( 0x0000, data ); @@ -1152,7 +1139,6 @@ WRITE8_MEMBER(sms_state::sms_codemasters_page0_w) WRITE8_MEMBER(sms_state::sms_codemasters_page1_w) { - if (m_cartridge[m_current_cartridge].ROM && m_cartridge[m_current_cartridge].features & CF_CODEMASTERS_MAPPER) { /* Check if we need to switch in some RAM */ @@ -1172,7 +1158,6 @@ WRITE8_MEMBER(sms_state::sms_codemasters_page1_w) WRITE8_MEMBER(sms_state::sms_4pak_page0_w) { - m_cartridge[m_current_cartridge].m_4pak_page0 = data; map_cart_16k( 0x0000, data ); @@ -1182,7 +1167,6 @@ WRITE8_MEMBER(sms_state::sms_4pak_page0_w) WRITE8_MEMBER(sms_state::sms_4pak_page1_w) { - m_cartridge[m_current_cartridge].m_4pak_page1 = data; map_cart_16k( 0x4000, data ); @@ -1191,7 +1175,6 @@ WRITE8_MEMBER(sms_state::sms_4pak_page1_w) WRITE8_MEMBER(sms_state::sms_4pak_page2_w) { - m_cartridge[m_current_cartridge].m_4pak_page2 = data; map_cart_16k( 0x8000, ( m_cartridge[m_current_cartridge].m_4pak_page0 & 0x30 ) + m_cartridge[m_current_cartridge].m_4pak_page2 ); @@ -1200,28 +1183,24 @@ WRITE8_MEMBER(sms_state::sms_4pak_page2_w) WRITE8_MEMBER(sms_state::sms_janggun_bank0_w) { - map_cart_8k( 0x4000, data ); } WRITE8_MEMBER(sms_state::sms_janggun_bank1_w) { - map_cart_8k( 0x6000, data ); } WRITE8_MEMBER(sms_state::sms_janggun_bank2_w) { - map_cart_8k( 0x8000, data ); } WRITE8_MEMBER(sms_state::sms_janggun_bank3_w) { - map_cart_8k( 0xA000, data ); } @@ -1238,7 +1217,6 @@ WRITE8_MEMBER(sms_state::sms_bios_w) WRITE8_MEMBER(sms_state::sms_cartram2_w) { - if (m_mapper[0] & 0x08) { logerror("write %02X to cartram at offset #%04X\n", data, offset + 0x2000); @@ -1930,7 +1908,6 @@ static void setup_banks( running_machine &machine ) MACHINE_START_MEMBER(sms_state,sms) { - machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(sms_machine_stop),&machine())); m_rapid_fire_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sms_state::rapid_fire_callback),this)); m_rapid_fire_timer->adjust(attotime::from_hz(10), 0, attotime::from_hz(10)); diff --git a/src/mess/machine/softbox.h b/src/mess/machine/softbox.h index 463823911cc..344ee7ec4f8 100644 --- a/src/mess/machine/softbox.h +++ b/src/mess/machine/softbox.h @@ -31,7 +31,6 @@ class softbox_device : public device_t, public device_ieee488_interface { - public: // construction/destruction softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/mess/machine/svi318.c b/src/mess/machine/svi318.c index 3f12728e00d..a5846060acb 100644 --- a/src/mess/machine/svi318.c +++ b/src/mess/machine/svi318.c @@ -209,7 +209,6 @@ WRITE8_MEMBER(svi318_state::svi318_ppi_port_c_w) /* cassette motor on/off */ if (svi318_cassette_present(machine(), 0)) { - machine().device<cassette_image_device>(CASSETTE_TAG)->change_state( (data & 0x10) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MOTOR_DISABLED); diff --git a/src/mess/machine/thomflop.c b/src/mess/machine/thomflop.c index 4aaf006f97c..fd66f746e76 100644 --- a/src/mess/machine/thomflop.c +++ b/src/mess/machine/thomflop.c @@ -625,7 +625,6 @@ static void to7_qdd_write_byte( running_machine &machine, UINT8 data ) data==0xA5 || data==0x5A ) && /* first byte of tentative field */ to7qdd->data_idx <to7qdd->data_size ) { - /* this is the first byte of the field */ if ( to7qdd->start_idx == to7qdd->data_idx ) to7qdd->data_crc = 0; @@ -643,7 +642,6 @@ static void to7_qdd_write_byte( running_machine &machine, UINT8 data ) to7qdd->data[ to7qdd->start_idx ] == 0xA5 && to7qdd->data[ to7qdd->start_idx + 3 ] == to7qdd->data_crc ) { - /* got an id field => format */ int sector = (int) to7qdd->data[ to7qdd->start_idx + 1 ] * 256 + (int) to7qdd->data[ to7qdd->start_idx + 2 ]; UINT8 filler = 0xff; @@ -662,7 +660,6 @@ static void to7_qdd_write_byte( running_machine &machine, UINT8 data ) to7qdd->data[ to7qdd->start_idx ] == 0x5A && to7qdd->data[ to7qdd->start_idx + 129 ] == to7qdd->data_crc ) { - /* look backwards for previous id field */ for ( i = to7qdd->start_idx - 3; i >= 0; i-- ) { @@ -698,7 +695,6 @@ static READ8_HANDLER ( to7_qdd_r ) { switch ( offset ) { - case 0: /* MC6852 status */ to7_qdd_stat_update(space.machine()); VLOG(( "%f $%04x to7_qdd_r: STAT=$%02X irq=%i pe=%i ovr=%i und=%i tr=%i rd=%i ncts=%i\n", @@ -741,7 +737,6 @@ static WRITE8_HANDLER( to7_qdd_w ) { switch ( offset ) { - case 0: /* MC6852 control 1 */ /* reset */ if ( data & QDD_C1_RRESET ) @@ -763,7 +758,6 @@ static WRITE8_HANDLER( to7_qdd_w ) case 1: switch ( to7qdd->ctrl1 >> 6 ) { - case 0: /* MC6852 control 2 */ { #if 0 @@ -908,7 +902,6 @@ static void to7_qdd_init( running_machine &machine ) struct thmfc1_t { - UINT8 op; UINT8 sector; /* target sector, in [1,16] */ UINT32 sector_id; @@ -994,7 +987,6 @@ static int thmfc_floppy_find_sector ( running_machine &machine, chrn_id* dst ) /* scan track, try 4 revolutions */ while ( r < 4 ) { - if ( floppy_drive_get_next_id( img, thmfc1->side, &id ) ) { if ( id.C == thmfc1->track && @@ -1118,7 +1110,6 @@ static void thmfc_floppy_qdd_write_byte ( running_machine &machine, UINT8 data ) ( thmfc1->data_idx || data==0xA5 || data==0x5A ) && thmfc1->data_raw_idx < THOM_MAXBUF ) { - if ( ! thmfc1->data_raw_size ) { thmfc1->data_raw_size = thom_qdd_make_disk ( thmfc_floppy_image(machine), thmfc1->data ); @@ -1144,7 +1135,6 @@ static void thmfc_floppy_qdd_write_byte ( running_machine &machine, UINT8 data ) thmfc1->data[ thmfc1->data_idx - 1 ] == 0xA5 && thmfc1->data[ thmfc1->data_idx + 2 ] == thmfc1->data_crc ) { - /* got an id field => format */ int sector = (int) thmfc1->data[ thmfc1->data_idx ] * 256 + (int) thmfc1->data[ thmfc1->data_idx + 1 ]; UINT8 filler = 0xff; @@ -1160,7 +1150,6 @@ static void thmfc_floppy_qdd_write_byte ( running_machine &machine, UINT8 data ) thmfc1->data[ thmfc1->data_idx - 1 ] == 0x5A && thmfc1->data[ thmfc1->data_idx + 128 ] == thmfc1->data_crc ) { - /* look backwards for previous id field */ for ( i = thmfc1->data_idx - 4; i >= 0; i-- ) { @@ -1231,7 +1220,6 @@ static void thmfc_floppy_format_byte ( running_machine &machine, UINT8 data ) thmfc1->data_idx++; if ( thmfc1->data_idx > 11 ) { - if ( !memcmp ( thmfc1->data, header, sizeof( header ) ) ) { /* got id field => format */ @@ -1261,7 +1249,6 @@ READ8_HANDLER ( thmfc_floppy_r ) { switch ( offset ) { - case 0: /* STAT0 */ thmfc1->stat0 ^= THMFC1_STAT0_SYNCHRO | THMFC1_STAT0_BYTE_READY_POL; VLOG(( "%f $%04x thmfc_floppy_r: STAT0=$%02X\n", space.machine().time().as_double(), space.machine().device("maincpu")->safe_pcbase(), thmfc1->stat0 )); @@ -1329,7 +1316,6 @@ READ8_HANDLER ( thmfc_floppy_r ) WRITE8_HANDLER ( thmfc_floppy_w ) { switch ( offset ) { - case 0: /* CMD0 */ { int wsync = (data >> 4) & 1; @@ -1348,7 +1334,6 @@ WRITE8_HANDLER ( thmfc_floppy_w ) switch ( data & 3 ) { - case THMFC1_OP_RESET: thmfc1->stat0 = THMFC1_STAT0_FINISHED; break; @@ -1782,7 +1767,6 @@ void to7_floppy_reset ( running_machine &machine ) switch ( to7_controller_type ) { - case 1: to7_floppy_bank = 1; to7_5p14sd_reset(machine); @@ -1822,7 +1806,6 @@ READ8_HANDLER ( to7_floppy_r ) { switch ( to7_controller_type ) { - case 1: return to7_5p14sd_r( space, offset, mem_mask ); @@ -1848,7 +1831,6 @@ WRITE8_HANDLER ( to7_floppy_w ) { switch ( to7_controller_type ) { - case 1: to7_5p14sd_w( space, offset, data, mem_mask ); return; diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c index e4065131d10..91f7ba6ec74 100644 --- a/src/mess/machine/thomson.c +++ b/src/mess/machine/thomson.c @@ -1272,7 +1272,6 @@ READ8_HANDLER ( to7_midi_r ) switch ( offset ) { - case 0: /* get status */ /* bit 0: data received */ /* bit 1: ready to transmit data */ @@ -1325,7 +1324,6 @@ WRITE8_HANDLER ( to7_midi_w ) switch ( offset ) { - case 0: /* set control */ /* bits 0-1: clock divide (ignored) or reset */ if ( (data & 3) == 3 ) @@ -2311,7 +2309,6 @@ READ8_HANDLER ( to9_vreg_r ) { switch ( offset ) { - case 0: /* palette data */ { UINT8 c = to9_palette_data[ to9_palette_idx ]; @@ -2343,7 +2340,6 @@ WRITE8_HANDLER ( to9_vreg_w ) switch ( offset ) { - case 0: /* palette data */ { UINT16 color, idx; @@ -2656,7 +2652,6 @@ READ8_HANDLER ( to9_kbd_r ) switch ( offset ) { - case 0: /* get status */ /* bit 0: data received */ /* bit 1: ready to transmit data (always 1) */ @@ -2704,7 +2699,6 @@ WRITE8_HANDLER ( to9_kbd_w ) switch ( offset ) { - case 0: /* set control */ /* bits 0-1: clock divide (ignored) or reset */ if ( (data & 3) == 3 ) @@ -2941,7 +2935,6 @@ static TIMER_CALLBACK(to9_kbd_timer_cb) switch ( to9_kbd_byte_count ) { - case 0: /* key */ to9_kbd_send( machine, to9_kbd_get_key(machine), 0 ); break; @@ -3882,7 +3875,6 @@ READ8_HANDLER ( to8_gatearray_r ) switch ( offset ) { - case 0: /* system 2 / lightpen register 1 */ if ( to7_lightpen ) res = (count >> 8) & 0xff; @@ -3937,7 +3929,6 @@ WRITE8_HANDLER ( to8_gatearray_w ) switch ( offset ) { - case 0: /* switch */ to7_lightpen = data & 1; break; @@ -3990,7 +3981,6 @@ READ8_HANDLER ( to8_vreg_r ) switch ( offset ) { - case 0: /* palette data */ { UINT8 c = to9_palette_data[ to9_palette_idx ]; @@ -4024,7 +4014,6 @@ WRITE8_HANDLER ( to8_vreg_w ) switch ( offset ) { - case 0: /* palette data */ { UINT16 color, idx; @@ -4533,7 +4522,6 @@ static void mo6_update_cart_bank (running_machine &machine) } else { - if (old_cart_bank < 12) { if ( bank_is_read_only ) @@ -4941,7 +4929,6 @@ READ8_HANDLER ( mo6_gatearray_r ) switch ( offset ) { - case 0: /* system 2 / lightpen register 1 */ if ( to7_lightpen ) res = (count >> 8) & 0xff; @@ -4996,7 +4983,6 @@ WRITE8_HANDLER ( mo6_gatearray_w ) switch ( offset ) { - case 0: /* switch */ to7_lightpen = data & 1; break; @@ -5041,7 +5027,6 @@ READ8_HANDLER ( mo6_vreg_r ) switch ( offset ) { - case 0: /* palette data */ case 1: /* palette address */ return to8_vreg_r( space, offset ); @@ -5066,7 +5051,6 @@ WRITE8_HANDLER ( mo6_vreg_w ) switch ( offset ) { - case 0: /* palette data */ case 1: /* palette address */ to8_vreg_w( space, offset, data ); diff --git a/src/mess/machine/ti85.c b/src/mess/machine/ti85.c index 2ea2f39743d..e37bcca2178 100644 --- a/src/mess/machine/ti85.c +++ b/src/mess/machine/ti85.c @@ -287,7 +287,6 @@ READ8_MEMBER(ti85_state::ti85_port_0006_r) READ8_MEMBER(ti85_state::ti8x_serial_r) { - //ti85_update_serial(m_serial); return (m_white_out<<3) | (m_red_out<<2) @@ -339,7 +338,6 @@ READ8_MEMBER(ti85_state::ti83_port_0003_r ) READ8_MEMBER(ti85_state::ti8x_plus_serial_r) { - //ti85_update_serial(m_serial); return (m_white_out<<3) | (m_red_out<<2) @@ -403,7 +401,6 @@ WRITE8_MEMBER(ti85_state::ti85_port_0006_w) WRITE8_MEMBER(ti85_state::ti8x_serial_w) { - speaker_level_w(m_speaker, ( (data>>2)|(data>>3) ) & 0x01); m_red_out=(data>>2)&0x01; m_white_out=(data>>3)&0x01; @@ -456,7 +453,6 @@ WRITE8_MEMBER(ti85_state::ti83_port_0003_w) WRITE8_MEMBER(ti85_state::ti8x_plus_serial_w) { - speaker_level_w(m_speaker,( (data>>0)|(data>>1) )&0x01 ); m_red_out=(data>>0)&0x01; m_white_out=(data>>1)&0x01; diff --git a/src/mess/machine/ti99/mapper8.c b/src/mess/machine/ti99/mapper8.c index 40c17d6d975..215e0a2de6d 100644 --- a/src/mess/machine/ti99/mapper8.c +++ b/src/mess/machine/ti99/mapper8.c @@ -323,7 +323,6 @@ bool ti998_mapper_device::search_logically_addressed_w(address_space& space, off || ((dev->m_config->mode == TI99EM) && (m_CRUS==true)) || ((dev->m_config->mode == PATGEN) && (m_PTGE==true))) { - if ((offset & dev->m_config->address_mask)==(dev->m_config->select_pattern | dev->m_config->write_select)) { if (dev->m_device == MAP8_SRAM) diff --git a/src/mess/machine/trs80.c b/src/mess/machine/trs80.c index 7bbfa535144..fc922b05889 100644 --- a/src/mess/machine/trs80.c +++ b/src/mess/machine/trs80.c @@ -452,7 +452,6 @@ WRITE8_MEMBER( trs80_state::trs80m4_ea_w ) } else { - /* not emulated d7,d6 Not used d5 Secondary Unassigned, pin 18 diff --git a/src/mess/machine/tvcexp.h b/src/mess/machine/tvcexp.h index b189460302c..819fdbc26be 100644 --- a/src/mess/machine/tvcexp.h +++ b/src/mess/machine/tvcexp.h @@ -128,6 +128,5 @@ extern const device_type TVCEXP_SLOT; #define MCFG_TVC64_EXPANSION_ADD(_tag,_config,_slot_intf,_def_slot,_def_inp) \ MCFG_DEVICE_ADD(_tag, TVCEXP_SLOT, 0) \ MCFG_DEVICE_CONFIG(_config) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) \ - + MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, _def_inp, false) #endif /* __TVCEXP_H__ */ diff --git a/src/mess/machine/wangpc_wdc.c b/src/mess/machine/wangpc_wdc.c index 2b731504133..fe5de2d2444 100644 --- a/src/mess/machine/wangpc_wdc.c +++ b/src/mess/machine/wangpc_wdc.c @@ -295,7 +295,6 @@ UINT8 wangpc_wdc_device::wangpcbus_dack_r(address_space &space, int line) void wangpc_wdc_device::wangpcbus_dack_w(address_space &space, int line, UINT8 data) { - } |