diff options
Diffstat (limited to 'src/mess/machine')
| -rw-r--r-- | src/mess/machine/apollo.c | 6 | ||||
| -rw-r--r-- | src/mess/machine/apple2gs.c | 16 | ||||
| -rw-r--r-- | src/mess/machine/c2040.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/dccons.c | 3 | ||||
| -rw-r--r-- | src/mess/machine/iq151_disc2.h | 2 | ||||
| -rw-r--r-- | src/mess/machine/isa_aha1542.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/md_slot.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/md_slot.h | 6 | ||||
| -rw-r--r-- | src/mess/machine/md_svp.c | 64 | ||||
| -rw-r--r-- | src/mess/machine/md_svp.h | 8 | ||||
| -rw-r--r-- | src/mess/machine/nes_ines.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/nes_pcb.c | 14 | ||||
| -rw-r--r-- | src/mess/machine/psxcd.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/sat_slot.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/sns_event.c | 14 | ||||
| -rw-r--r-- | src/mess/machine/sns_event.h | 6 | ||||
| -rw-r--r-- | src/mess/machine/sns_rom.h | 4 | ||||
| -rw-r--r-- | src/mess/machine/sns_sufami.h | 2 | ||||
| -rw-r--r-- | src/mess/machine/sns_upd.h | 4 | ||||
| -rw-r--r-- | src/mess/machine/ti99/horizon.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/wangpc_lic.h | 2 | ||||
| -rw-r--r-- | src/mess/machine/wangpckb.h | 6 |
22 files changed, 84 insertions, 87 deletions
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index 06876d24fdb..438ac166b43 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -507,7 +507,7 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_word){ READ8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_r ) { UINT8 data = sc499_dack_r(&space.machine()); -// DLOG2(("dma ctape dack read %02x",data)); +// DLOG2(("dma ctape dack read %02x",data)); // hack for DN3000: select appropriate DMA channel No. dn3000_dma_channel1 = 1; // 1 = ctape, 2 = floppy dma channel @@ -516,7 +516,7 @@ READ8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_r ) { } WRITE8_MEMBER(apollo_state::apollo_dma8237_ctape_dack_w ) { -// DLOG2(("dma ctape dack write %02x", data)); +// DLOG2(("dma ctape dack write %02x", data)); sc499_dack_w(&space.machine(), data); // hack for DN3000: select appropriate DMA channel No. @@ -578,7 +578,7 @@ WRITE_LINE_MEMBER(apollo_state::apollo_dma_2_hrq_changed ) { // DLOG2(("dma 2 hrq changed state %02x", state)); machine().device(MAINCPU)->execute().set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); - /* Assert HLDA */ + /* Assert HLDA */ dynamic_cast<i8237_device*>(machine().device(APOLLO_DMA2_TAG))->i8237_hlda_w(state); } diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c index 21ef0ee8ce3..f6fb7e85ff4 100644 --- a/src/mess/machine/apple2gs.c +++ b/src/mess/machine/apple2gs.c @@ -2080,7 +2080,7 @@ UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset) { UINT8 rv = m_glu_regs[offset]; -// printf("MCU reads reg %x\n", offset); +// printf("MCU reads reg %x\n", offset); // the command full flag is cleared by the MCU reading // first the KGS register and then the command register @@ -2088,7 +2088,7 @@ UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset) { m_glu_regs[GLU_KG_STATUS] &= ~KGS_COMMAND_FULL; m_glu_mcu_read_kgs = false; -// printf("MCU reads COMMAND = %02x (drop command full)\n", rv); +// printf("MCU reads COMMAND = %02x (drop command full)\n", rv); } // prime for the next command register read to clear the command full flag @@ -2104,7 +2104,7 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) { m_glu_regs[offset] = data; -// printf("MCU writes %02x to reg %x\n", data, offset); +// printf("MCU writes %02x to reg %x\n", data, offset); switch (offset) { @@ -2114,8 +2114,8 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) m_glu_mouse_read_stat = false; // signal next read will be mouse X break; - case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here; both MCU programs write either 0x7f or 0xff -// printf("%d to ANY_KEY_DOWN (PC=%x)\n", data, m_adbmicro->pc()); + case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here; both MCU programs write either 0x7f or 0xff +// printf("%d to ANY_KEY_DOWN (PC=%x)\n", data, m_adbmicro->pc()); if (data & 0x80) { m_glu_regs[GLU_KG_STATUS] |= KGS_ANY_KEY_DOWN | KGS_KEYSTROBE; @@ -2125,7 +2125,7 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data) case GLU_DATA: m_glu_regs[GLU_KG_STATUS] |= KGS_DATA_FULL; m_glu_816_read_dstat = false; -// printf("MCU writes %02x to DATA\n", data); +// printf("MCU writes %02x to DATA\n", data); break; } } @@ -2212,7 +2212,7 @@ UINT8 apple2gs_state::keyglu_816_read(UINT8 offset) { m_glu_816_read_dstat = false; m_glu_regs[GLU_KG_STATUS] &= ~KGS_DATA_FULL; -// printf("816 reads %02x from DATA\n", m_glu_regs[GLU_DATA]); +// printf("816 reads %02x from DATA\n", m_glu_regs[GLU_DATA]); } return m_glu_regs[GLU_DATA]; @@ -2238,7 +2238,7 @@ void apple2gs_state::keyglu_816_write(UINT8 offset, UINT8 data) break; case GLU_COMMAND: -// printf("816 sets COMMAND to %02x (raise command full)\n", data); +// printf("816 sets COMMAND to %02x (raise command full)\n", data); m_glu_regs[GLU_KG_STATUS] |= KGS_COMMAND_FULL; break; diff --git a/src/mess/machine/c2040.c b/src/mess/machine/c2040.c index e522eec32fa..9388bcba6e3 100644 --- a/src/mess/machine/c2040.c +++ b/src/mess/machine/c2040.c @@ -11,7 +11,7 @@ TODO: - - 2040/3040/4040 have a Shugart SA390 drive (FLOPPY_525_SSSD_35T) + - 2040/3040/4040 have a Shugart SA390 drive (FLOPPY_525_SSSD_35T) - 2040 DOS 1 FDC rom (jumps to 104d while getting block header) diff --git a/src/mess/machine/dccons.c b/src/mess/machine/dccons.c index bee389bb2ed..50f7713ec5d 100644 --- a/src/mess/machine/dccons.c +++ b/src/mess/machine/dccons.c @@ -64,7 +64,6 @@ void dc_cons_state::gdrom_raise_irq() TIMER_CALLBACK_MEMBER(dc_cons_state::atapi_xfer_end ) { - UINT8 sector_buffer[ 4096 ]; atapi_timer->adjust(attotime::never); @@ -511,7 +510,7 @@ WRITE32_MEMBER(dc_cons_state::atapi_w ) void dc_cons_state::dreamcast_atapi_init() { xfer_mode = ATAPI_XFER_PIO; - + atapi_regs = auto_alloc_array_clear(machine(), UINT8, ATAPI_REG_MAX); atapi_regs[ATAPI_REG_CMDSTATUS] = 0; diff --git a/src/mess/machine/iq151_disc2.h b/src/mess/machine/iq151_disc2.h index 514158e9c1a..b1661e18216 100644 --- a/src/mess/machine/iq151_disc2.h +++ b/src/mess/machine/iq151_disc2.h @@ -31,7 +31,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + // iq151cart_interface overrides virtual void read(offs_t offset, UINT8 &data); virtual void io_read(offs_t offset, UINT8 &data); diff --git a/src/mess/machine/isa_aha1542.c b/src/mess/machine/isa_aha1542.c index 9e0056b04f8..bc2763b348d 100644 --- a/src/mess/machine/isa_aha1542.c +++ b/src/mess/machine/isa_aha1542.c @@ -185,7 +185,7 @@ machine_config_constructor aha1542_device::device_mconfig_additions() const } aha1542_device::aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : - device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ), + device_t(mconfig, AHA1542, "AHA1542 SCSI Controller", tag, owner, clock, "aha1542", __FILE__ ), device_isa16_card_interface(mconfig, *this) { } diff --git a/src/mess/machine/md_slot.c b/src/mess/machine/md_slot.c index 53e7ed3aab4..113d8bb4ae1 100644 --- a/src/mess/machine/md_slot.c +++ b/src/mess/machine/md_slot.c @@ -1065,7 +1065,7 @@ void base_md_cart_slot_device::file_logging(UINT8 *ROM8, UINT32 rom_len, UINT32 csum += (ROM8[i] | (ROM8[i + 1] << 8)); csum &= 0xffff; } - + logerror("INTERNAL HEADER\n" ); logerror("===============\n" ); logerror("Console: %.16s\n", console); diff --git a/src/mess/machine/md_slot.h b/src/mess/machine/md_slot.h index b881d1ec8d0..8b1e1580e43 100644 --- a/src/mess/machine/md_slot.h +++ b/src/mess/machine/md_slot.h @@ -99,8 +99,8 @@ public: virtual DECLARE_WRITE16_MEMBER(write_a13) {} virtual DECLARE_READ16_MEMBER(read_a15) { return 0xffff; } virtual DECLARE_WRITE16_MEMBER(write_a15) {} - - virtual int read_test() { return 0; } // used by Virtua Racing test + + virtual int read_test() { return 0; } // used by Virtua Racing test /* this probably should do more, like make Genesis V2 'die' if the SEGA string is not written promptly */ virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { logerror("Write to TMSS bank: offset %x data %x\n", 0xa14000 + (offset << 1), data); }; @@ -186,7 +186,7 @@ public: virtual DECLARE_WRITE16_MEMBER(write_a15); virtual DECLARE_WRITE16_MEMBER(write_tmss_bank) { if (m_cart) m_cart->write_tmss_bank(space, offset, data, mem_mask); }; - virtual int read_test() { if (m_cart) return m_cart->read_test(); else return 0; } // used by Virtua Racing test + virtual int read_test() { if (m_cart) return m_cart->read_test(); else return 0; } // used by Virtua Racing test // TODO: this only needs to be public because megasvp copies rom into memory region, so we need to rework that code... //private: diff --git a/src/mess/machine/md_svp.c b/src/mess/machine/md_svp.c index 5bb5db98118..05b0d06284e 100644 --- a/src/mess/machine/md_svp.c +++ b/src/mess/machine/md_svp.c @@ -91,11 +91,11 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) m_emu_status &= ~SSP_PMC_SET; return 0; } - + // just in case if (m_emu_status & SSP_PMC_HAVE_ADDR) m_emu_status &= ~SSP_PMC_HAVE_ADDR; - + if (reg == 4 || (m_svp->state().state_int(SSP_ST) & 0x60)) { #define CADDR ((((mode<<16)&0x7f0000)|addr)<<1) @@ -110,7 +110,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) int inc = get_inc(mode); if (mode & 0x0400) overwrite_write(&dram[addr], d); - else + else dram[addr] = d; m_pmac_write[reg] += inc; } @@ -131,7 +131,7 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) else { logerror("ssp FIXME: PM%i unhandled write mode %04x, [%06x] %04x\n", - reg, mode, CADDR, d); + reg, mode, CADDR, d); } } else @@ -153,27 +153,27 @@ UINT32 md_rom_svp_device::pm_io(int reg, int write, UINT32 d) else { logerror("ssp FIXME: PM%i unhandled read mode %04x, [%06x]\n", - reg, mode, CADDR); + reg, mode, CADDR); d = 0; } } - + // PMC value corresponds to last PMR accessed (not sure). if (write) m_pmc.d = m_pmac_write[reg]; else m_pmc.d = m_pmac_read[reg]; - + return d; } - + return (UINT32)-1; } READ16_MEMBER( md_rom_svp_device::read_pm0 ) { UINT32 d = pm_io(0, 0, 0); - if (d != (UINT32)-1) + if (d != (UINT32)-1) return d; d = m_xst2; m_xst2 &= ~2; // ? @@ -183,7 +183,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm0 ) WRITE16_MEMBER( md_rom_svp_device::write_pm0 ) { UINT32 r = pm_io(0, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; m_xst2 = data; // ? } @@ -191,7 +191,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm0 ) READ16_MEMBER( md_rom_svp_device::read_pm1 ) { UINT32 r = pm_io(1, 0, 0); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return r; logerror("svp: PM1 acces in non PM mode?\n"); return 0; @@ -200,7 +200,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm1 ) WRITE16_MEMBER( md_rom_svp_device::write_pm1 ) { UINT32 r = pm_io(1, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; logerror("svp: PM1 acces in non PM mode?\n"); } @@ -208,7 +208,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm1 ) READ16_MEMBER( md_rom_svp_device::read_pm2 ) { UINT32 r = pm_io(2, 0, 0); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return r; logerror("svp: PM2 acces in non PM mode?\n"); return 0; @@ -217,7 +217,7 @@ READ16_MEMBER( md_rom_svp_device::read_pm2 ) WRITE16_MEMBER( md_rom_svp_device::write_pm2 ) { UINT32 r = pm_io(2, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; logerror("svp: PM2 acces in non PM mode?\n"); } @@ -225,7 +225,7 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm2 ) READ16_MEMBER( md_rom_svp_device::read_xst ) { UINT32 d = pm_io(3, 0, 0); - if (d != (UINT32)-1) + if (d != (UINT32)-1) return d; return m_xst; } @@ -233,7 +233,7 @@ READ16_MEMBER( md_rom_svp_device::read_xst ) WRITE16_MEMBER( md_rom_svp_device::write_xst ) { UINT32 r = pm_io(3, 1, data); - if (r != (UINT32)-1) + if (r != (UINT32)-1) return; m_xst2 |= 1; m_xst = data; @@ -251,13 +251,13 @@ WRITE16_MEMBER( md_rom_svp_device::write_pm4 ) READ16_MEMBER( md_rom_svp_device::read_pmc ) { - if (m_emu_status & SSP_PMC_HAVE_ADDR) + if (m_emu_status & SSP_PMC_HAVE_ADDR) { m_emu_status |= SSP_PMC_SET; m_emu_status &= ~SSP_PMC_HAVE_ADDR; return ((m_pmc.w.l << 4) & 0xfff0) | ((m_pmc.w.l >> 4) & 0xf); - } - else + } + else { m_emu_status |= SSP_PMC_HAVE_ADDR; return m_pmc.w.l; @@ -266,13 +266,13 @@ READ16_MEMBER( md_rom_svp_device::read_pmc ) WRITE16_MEMBER( md_rom_svp_device::write_pmc ) { - if (m_emu_status & SSP_PMC_HAVE_ADDR) + if (m_emu_status & SSP_PMC_HAVE_ADDR) { m_emu_status |= SSP_PMC_SET; m_emu_status &= ~SSP_PMC_HAVE_ADDR; m_pmc.w.h = data; - } - else + } + else { m_emu_status |= SSP_PMC_HAVE_ADDR; m_pmc.w.l = data; @@ -293,16 +293,16 @@ WRITE16_MEMBER( md_rom_svp_device::write_al ) READ16_MEMBER( md_rom_svp_device::rom_read1 ) { UINT16 *IRAM = (UINT16 *)m_iram; - return IRAM[offset]; + return IRAM[offset]; } READ16_MEMBER( md_rom_svp_device::rom_read2 ) { - return m_rom[offset + 0x800/2]; + return m_rom[offset + 0x800/2]; } -int md_rom_svp_device::read_test() -{ +int md_rom_svp_device::read_test() +{ return m_test_ipt->read(); } @@ -319,8 +319,8 @@ INPUT_PORTS_END //------------------------------------------------- ADDRESS_MAP_START( md_svp_ssp_map, AS_PROGRAM, 16, md_rom_svp_device ) -// AM_RANGE(0x0000, 0x03ff) AM_READ(rom_read1) -// AM_RANGE(0x0400, 0xffff) AM_READ(rom_read2) +// AM_RANGE(0x0000, 0x03ff) AM_READ(rom_read1) +// AM_RANGE(0x0400, 0xffff) AM_READ(rom_read2) AM_RANGE(0x0000, 0x03ff) AM_ROMBANK("iram_svp") AM_RANGE(0x0400, 0xffff) AM_ROMBANK("cart_svp") ADDRESS_MAP_END @@ -390,7 +390,7 @@ void md_rom_svp_device::device_start() // IRAM m_iram = auto_alloc_array(machine(), UINT8, 0x800); this->membank("iram_svp")->set_base(m_iram); - // the other bank, "cart_svp", is setup at call_load + // the other bank, "cart_svp", is setup at call_load } READ16_MEMBER(md_rom_svp_device::read) @@ -415,9 +415,9 @@ READ16_MEMBER(md_rom_svp_device::read) a1 = (a1 & 0x7801) | ((a1 & 0x1e) << 6) | ((a1 & 0x7e0) >> 4); return DRAM[a1]; } - if (offset < 0x200000/2) - return m_rom[offset]; - else + if (offset < 0x200000/2) + return m_rom[offset]; + else { printf("read out of bound\n"); return 0xffff; diff --git a/src/mess/machine/md_svp.h b/src/mess/machine/md_svp.h index d71c977d92d..a27c6980273 100644 --- a/src/mess/machine/md_svp.h +++ b/src/mess/machine/md_svp.h @@ -11,23 +11,23 @@ // ======================> md_rom_svp_device class md_rom_svp_device : public device_t, - public device_md_cart_interface + public device_md_cart_interface { public: // construction/destruction md_rom_svp_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); md_rom_svp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + //protected: // device-level overrides virtual void device_start(); virtual machine_config_constructor device_mconfig_additions() const; virtual ioport_constructor device_input_ports() const; virtual void set_bank_to_rom(const char *banktag, UINT32 offset); - + required_device<device_t> m_svp; required_ioport m_test_ipt; - + // reading and writing virtual DECLARE_READ16_MEMBER(read); virtual DECLARE_WRITE16_MEMBER(write); diff --git a/src/mess/machine/nes_ines.c b/src/mess/machine/nes_ines.c index 0a65acdb2bc..6f51bbadb70 100644 --- a/src/mess/machine/nes_ines.c +++ b/src/mess/machine/nes_ines.c @@ -30,7 +30,7 @@ there are 3 dots to every 1 CPU cycle, hence 114 is the number of cycles per sca void nes_state::ffe_irq( int scanline, int vblank, int blanked ) { - // 114 is the number of cycles per scanline + // 114 is the number of cycles per scanline // TODO: change to reflect the actual number of cycles spent if (m_IRQ_enable) { diff --git a/src/mess/machine/nes_pcb.c b/src/mess/machine/nes_pcb.c index c63c1093048..53d12e35339 100644 --- a/src/mess/machine/nes_pcb.c +++ b/src/mess/machine/nes_pcb.c @@ -11740,21 +11740,21 @@ struct nes_pcb_intf {write8_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0), read8_delegate(FUNC(b), DEVICE_SELF, (nes_state *)0)} #define NES_SCANLINE_NULL \ - ppu2c0x_scanline_delegate() + ppu2c0x_scanline_delegate() #define NES_HBLANK_NULL \ - ppu2c0x_hblank_delegate() + ppu2c0x_hblank_delegate() #define NES_HBLANK(a) \ - ppu2c0x_hblank_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0) + ppu2c0x_hblank_delegate(FUNC(a), DEVICE_SELF, (nes_state *)0) #define NES_LATCH_NULL \ - ppu2c0x_latch_delegate() + ppu2c0x_latch_delegate() + + #define NES_LATCH(a) \ + ppu2c0x_latch_delegate(FUNC(a),DEVICE_SELF, (nes_state *)0) - #define NES_LATCH(a) \ - ppu2c0x_latch_delegate(FUNC(a),DEVICE_SELF, (nes_state *)0) - WRITE8_MEMBER(nes_carts_state::dummy_l_w) { logerror("write access, offset: %04x, data: %02x\n", offset + 0x4100, data); diff --git a/src/mess/machine/psxcd.c b/src/mess/machine/psxcd.c index c6cafed8e75..3d8c07c18a2 100644 --- a/src/mess/machine/psxcd.c +++ b/src/mess/machine/psxcd.c @@ -463,7 +463,7 @@ void psxcd_device::cdcmd_setloc() void psxcd_device::cdcmd_play() { if(cmdbuf[0] && m_param_count) - loc.w = lba_to_msf_ps(cdrom_get_track_start(m_cdrom_handle, bcd_to_decimal(cmdbuf[0]) - 1)); + loc.w = lba_to_msf_ps(cdrom_get_track_start(m_cdrom_handle, bcd_to_decimal(cmdbuf[0]) - 1)); curpos.w = loc.w; if (!curpos.w) diff --git a/src/mess/machine/sat_slot.c b/src/mess/machine/sat_slot.c index 98fb5d6b61d..c05e15c8b05 100644 --- a/src/mess/machine/sat_slot.c +++ b/src/mess/machine/sat_slot.c @@ -143,7 +143,7 @@ bool sat_cart_slot_device::call_load() fread(ROM, len); // fix endianness.... - for (int i = 0; i < len/4; i ++) + for (int i = 0; i < len/4; i ++) ROM[i] = BITSWAP32(ROM[i],7,6,5,4,3,2,1,0,15,14,13,12,11,10,9,8,23,22,21,20,19,18,17,16,31,30,29,28,27,26,25,24); // UINT8 tempa = ROM[i+0]; // UINT8 tempb = ROM[i+1]; diff --git a/src/mess/machine/sns_event.c b/src/mess/machine/sns_event.c index 862fe6d1a4d..53b0f19cf27 100644 --- a/src/mess/machine/sns_event.c +++ b/src/mess/machine/sns_event.c @@ -3,10 +3,10 @@ Super NES/Famicom Event cartridges emulation (for SNES/SFC) Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Visit http://mamedev.org for licensing and usage restrictions. TODO: figure out how the Test Mode switch works... - + ***********************************************************************************************************/ @@ -62,7 +62,7 @@ READ8_MEMBER(sns_pfest94_device::read_l) if ((offset & 0x208000) == 0x208000) { int bank = ((offset - 0x200000) / 0x10000) & 7; - return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } else { @@ -79,7 +79,7 @@ READ8_MEMBER(sns_pfest94_device::read_h) if ((offset & 0x208000) == 0x208000) { int bank = ((offset - 0x200000) / 0x8000) & 7; - return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[bank] * 0x8000 + (offset & 0x7fff)]; } // called beyond 0x400000! @@ -93,7 +93,7 @@ READ8_MEMBER(sns_pfest94_device::read_h) { offset &= 0x3fffff; int bank = offset / 0x8000; - return m_rom[rom_bank_map[m_base_bank + (bank & m_mask)] * 0x8000 + (offset & 0x7fff)]; + return m_rom[rom_bank_map[m_base_bank + (bank & m_mask)] * 0x8000 + (offset & 0x7fff)]; } } @@ -279,10 +279,8 @@ void sns_pfest94_device::device_timer(emu_timer &timer, device_timer_id id, int if (!m_count) { m_status |= 2; - pfest94_timer->reset(); + pfest94_timer->reset(); } m_count--; } } - - diff --git a/src/mess/machine/sns_event.h b/src/mess/machine/sns_event.h index 12a1e050f4b..cbe602b4748 100644 --- a/src/mess/machine/sns_event.h +++ b/src/mess/machine/sns_event.h @@ -31,16 +31,16 @@ public: virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_READ8_MEMBER(chip_read); virtual DECLARE_WRITE8_MEMBER(chip_write); - + virtual DECLARE_READ32_MEMBER(necdsp_prg_r); virtual DECLARE_READ16_MEMBER(necdsp_data_r); - + private: UINT8 m_base_bank; UINT8 m_mask; UINT8 m_status; UINT32 m_count; - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; diff --git a/src/mess/machine/sns_rom.h b/src/mess/machine/sns_rom.h index dbc37d7b6ee..561c3fd0d29 100644 --- a/src/mess/machine/sns_rom.h +++ b/src/mess/machine/sns_rom.h @@ -16,7 +16,7 @@ public: // device-level overrides virtual void device_start(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_h); @@ -147,7 +147,7 @@ public: // device-level overrides virtual void device_start(); - + // reading and writing virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_h); diff --git a/src/mess/machine/sns_sufami.h b/src/mess/machine/sns_sufami.h index 874470e9f26..10bbf1abc13 100644 --- a/src/mess/machine/sns_sufami.h +++ b/src/mess/machine/sns_sufami.h @@ -38,7 +38,7 @@ public: // device-level overrides virtual void device_start(); - + // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); }; diff --git a/src/mess/machine/sns_upd.h b/src/mess/machine/sns_upd.h index 770ae9908cf..950c89cd752 100644 --- a/src/mess/machine/sns_upd.h +++ b/src/mess/machine/sns_upd.h @@ -28,7 +28,7 @@ public: virtual DECLARE_READ32_MEMBER(necdsp_prg_r); virtual DECLARE_READ16_MEMBER(necdsp_data_r); - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; }; @@ -80,7 +80,7 @@ public: virtual DECLARE_READ32_MEMBER(setadsp_prg_r); virtual DECLARE_READ16_MEMBER(setadsp_data_r); - + UINT32 *m_dsp_prg; UINT16 *m_dsp_data; }; diff --git a/src/mess/machine/ti99/horizon.c b/src/mess/machine/ti99/horizon.c index 99b9ba7e71d..24670d86986 100644 --- a/src/mess/machine/ti99/horizon.c +++ b/src/mess/machine/ti99/horizon.c @@ -65,7 +65,7 @@ horizon_ramdisk_device::horizon_ramdisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : ti_expansion_card_device(mconfig, TI99_HORIZON, "Horizon 4000 Ramdisk", tag, owner, clock,"ti99_horizon",__FILE__), - device_nvram_interface(mconfig, *this) + device_nvram_interface(mconfig, *this) { } diff --git a/src/mess/machine/wangpc_lic.h b/src/mess/machine/wangpc_lic.h index 7576f0780fc..7a40bec9899 100644 --- a/src/mess/machine/wangpc_lic.h +++ b/src/mess/machine/wangpc_lic.h @@ -39,7 +39,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + // device_wangpcbus_card_interface overrides virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); diff --git a/src/mess/machine/wangpckb.h b/src/mess/machine/wangpckb.h index 2619e92e567..d9993e04ad9 100644 --- a/src/mess/machine/wangpckb.h +++ b/src/mess/machine/wangpckb.h @@ -1,9 +1,9 @@ /********************************************************************** - Wang PC keyboard emulation + Wang PC keyboard emulation - Copyright MESS Team. - Visit http://mamedev.org for licensing and usage restrictions. + Copyright MESS Team. + Visit http://mamedev.org for licensing and usage restrictions. *********************************************************************/ |
