diff options
| author | 2025-11-23 03:26:42 +1100 | |
|---|---|---|
| committer | 2025-11-23 03:26:42 +1100 | |
| commit | 04c025b999ac206179902256c2b59b4634b9face (patch) | |
| tree | 2ea371ae048ea3bfdcd3e9a9b4243eb680bafb13 | |
| parent | 449dd209023f1cd1277b4efd79b50bf83bd8a804 (diff) | |
pc/pc_t1t.h: Missing change corresponding to previous commit. Also srcclean.
72 files changed, 340 insertions, 327 deletions
diff --git a/hash/mz80k_cass.xml b/hash/mz80k_cass.xml index e41b8c4f00a..aa5dbcebf0b 100644 --- a/hash/mz80k_cass.xml +++ b/hash/mz80k_cass.xml @@ -5,7 +5,7 @@ As with other Sharp MZ series machines, there is no built in BASIC so this needs to be loaded from cassette before any BASIC programs can be run. -Machine code programs (including BASIC interpreters) can be loaded directly from the monitor, using LOAD +Machine code programs (including BASIC interpreters) can be loaded directly from the monitor, using LOAD (or L on the MZ-80A) then RETURN. For BASIC programs, once BASIC loads, insert the programme cassette and type LOAD then RETURN. diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp index acd065b06ea..b728beb1370 100644 --- a/src/devices/bus/a2bus/a2swyft.cpp +++ b/src/devices/bus/a2bus/a2swyft.cpp @@ -55,7 +55,7 @@ protected: virtual uint16_t inh_end() override { return 0xffff; } virtual int inh_type() override; virtual void reset_from_bus() override; - + private: required_region_ptr<uint8_t> m_rom; int m_rombank = 0; diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index ed04c34d99e..130fe6e1d4c 100644 --- a/src/devices/bus/a2bus/a2videoterm.cpp +++ b/src/devices/bus/a2bus/a2videoterm.cpp @@ -480,7 +480,7 @@ MC6845_UPDATE_ROW( a2bus_videx80_device::crtc_update_row ) for (int i = 0; i < x_count; i++) { - uint16_t offset = (ma + i) & 0x7ff; + uint16_t offset = (ma + i) & 0x7ff; uint8_t chr = m_ram[offset]; uint8_t data = (BIT(chr, 7) ? chr_base1 : chr_base0)[(chr & 0x7f) * 16]; rgb_t fg = rgb_t::white(); diff --git a/src/devices/bus/nscsi/dtc510.cpp b/src/devices/bus/nscsi/dtc510.cpp index c0c874915d3..177a508c636 100644 --- a/src/devices/bus/nscsi/dtc510.cpp +++ b/src/devices/bus/nscsi/dtc510.cpp @@ -56,7 +56,7 @@ void nscsi_dtc510_device::scsi_command() { memset(scsi_sense_buffer, 0, sizeof(scsi_sense_buffer)); -// printf("CMD %02x %02x\n", scsi_cmdbuf[0], scsi_cmdbuf[1]); +// printf("CMD %02x %02x\n", scsi_cmdbuf[0], scsi_cmdbuf[1]); switch(scsi_cmdbuf[0]) { case SC_TEST_UNIT_READY: @@ -215,10 +215,10 @@ void nscsi_dtc510_device::scsi_put_data(int id, int pos, uint8_t data) LOGMASKED(LOG_DATA, "s1410: scsi_put_data, id:%d pos:%d data:%02x %c\n", id, pos, data, data >= 0x20 && data < 0x7f ? (char)data : ' '); break; -// case SC_INIT_DRIVE_PARAMS: -// LOGMASKED(LOG_DATA, "s1410: scsi_put_data, id:%d pos:%d data:%02x %c\n", id, pos, data, data >= 0x20 && data < 0x7f ? (char)data : ' '); -// params[pos] = data; -// break; +// case SC_INIT_DRIVE_PARAMS: +// LOGMASKED(LOG_DATA, "s1410: scsi_put_data, id:%d pos:%d data:%02x %c\n", id, pos, data, data >= 0x20 && data < 0x7f ? (char)data : ' '); +// params[pos] = data; +// break; // case SC_WRITE_SECTOR_BUFFER: LOGMASKED(LOG_DATA, "s1410: scsi_put_data, id:%d pos:%d data:%02x %c\n", id, pos, data, data >= 0x20 && data < 0x7f ? (char)data : ' '); diff --git a/src/devices/bus/nscsi/pc8801_30.cpp b/src/devices/bus/nscsi/pc8801_30.cpp index e541c600813..64db9c3eb2a 100644 --- a/src/devices/bus/nscsi/pc8801_30.cpp +++ b/src/devices/bus/nscsi/pc8801_30.cpp @@ -88,7 +88,7 @@ bool nscsi_cdrom_pc8801_30_device::scsi_command_done(u8 command, u8 length) //attotime nscsi_cdrom_pc8801_30_device::scsi_data_command_delay() //{ -// return attotime::from_msec(1'000'000 / 44'150); +// return attotime::from_msec(1'000'000 / 44'150); //} // diff --git a/src/devices/bus/nscsi/pc8801_30.h b/src/devices/bus/nscsi/pc8801_30.h index 01903a81f07..a7713c7e19d 100644 --- a/src/devices/bus/nscsi/pc8801_30.h +++ b/src/devices/bus/nscsi/pc8801_30.h @@ -29,7 +29,7 @@ protected: virtual void scsi_command() override; virtual bool scsi_command_done(u8 command, u8 length) override; -// virtual attotime scsi_data_command_delay() override; +// virtual attotime scsi_data_command_delay() override; virtual TIMER_CALLBACK_MEMBER(cdda_fader_cb); private: diff --git a/src/devices/bus/pc8801/pc8801_31.cpp b/src/devices/bus/pc8801/pc8801_31.cpp index 184a8e6fb1a..3ef4b9b4cb9 100644 --- a/src/devices/bus/pc8801/pc8801_31.cpp +++ b/src/devices/bus/pc8801/pc8801_31.cpp @@ -313,7 +313,7 @@ void pc8801_31_device::sasi_req_w(int state) m_drq_cb(1); } // else if (m_sasi->cd_r()) - // m_irq_cb(1); + // m_irq_cb(1); } else if(m_sasi_req && !state) { diff --git a/src/devices/bus/pc98_54simm/simm.h b/src/devices/bus/pc98_54simm/simm.h index 5b6d3128523..cb10acff738 100644 --- a/src/devices/bus/pc98_54simm/simm.h +++ b/src/devices/bus/pc98_54simm/simm.h @@ -9,7 +9,7 @@ #include "slot.h" class pc9801_54_2mb_device : public device_t - , public device_pc9801_54_interface + , public device_pc9801_54_interface { public: pc9801_54_2mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -19,7 +19,7 @@ protected: }; class pc9801_54_4mb_device : public device_t - , public device_pc9801_54_interface + , public device_pc9801_54_interface { public: pc9801_54_4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -29,7 +29,7 @@ protected: }; class pc9801_54_7mb_device : public device_t - , public device_pc9801_54_interface + , public device_pc9801_54_interface { public: pc9801_54_7mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -40,7 +40,7 @@ protected: class pc9801_54_8mb_device : public device_t - , public device_pc9801_54_interface + , public device_pc9801_54_interface { public: pc9801_54_8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -50,7 +50,7 @@ protected: }; class pc9801_54_9mb_device : public device_t - , public device_pc9801_54_interface + , public device_pc9801_54_interface { public: pc9801_54_9mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -60,7 +60,7 @@ protected: }; class pc9801_54_15mb_device : public device_t - , public device_pc9801_54_interface + , public device_pc9801_54_interface { public: pc9801_54_15mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/pc98_61simm/simm.h b/src/devices/bus/pc98_61simm/simm.h index 16ead04480a..e2858c7e057 100644 --- a/src/devices/bus/pc98_61simm/simm.h +++ b/src/devices/bus/pc98_61simm/simm.h @@ -9,7 +9,7 @@ #include "slot.h" class pc9801_61_2mb_device : public device_t - , public device_pc9801_61_interface + , public device_pc9801_61_interface { public: pc9801_61_2mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -19,7 +19,7 @@ protected: }; class pc9801_61_4mb_device : public device_t - , public device_pc9801_61_interface + , public device_pc9801_61_interface { public: pc9801_61_4mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -29,7 +29,7 @@ protected: }; class pc9801_61_8mb_device : public device_t - , public device_pc9801_61_interface + , public device_pc9801_61_interface { public: pc9801_61_8mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -39,7 +39,7 @@ protected: }; class pc9801_61_16mb_device : public device_t - , public device_pc9801_61_interface + , public device_pc9801_61_interface { public: pc9801_61_16mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -49,7 +49,7 @@ protected: }; class pc9801_61_20mb_device : public device_t - , public device_pc9801_61_interface + , public device_pc9801_61_interface { public: pc9801_61_20mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -59,7 +59,7 @@ protected: }; class pc9801_61_32mb_device : public device_t - , public device_pc9801_61_interface + , public device_pc9801_61_interface { public: pc9801_61_32mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -69,7 +69,7 @@ protected: }; class pc9801_61_64mb_device : public device_t - , public device_pc9801_61_interface + , public device_pc9801_61_interface { public: pc9801_61_64mb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/pc98_cbus/amd98.h b/src/devices/bus/pc98_cbus/amd98.h index f7a68caf4bb..964f106afa8 100644 --- a/src/devices/bus/pc98_cbus/amd98.h +++ b/src/devices/bus/pc98_cbus/amd98.h @@ -22,7 +22,7 @@ // ======================> amd98_device class amd98_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/fdd_2dd.h b/src/devices/bus/pc98_cbus/fdd_2dd.h index c61007f2a67..ac1aa2db7c5 100644 --- a/src/devices/bus/pc98_cbus/fdd_2dd.h +++ b/src/devices/bus/pc98_cbus/fdd_2dd.h @@ -15,7 +15,7 @@ // ======================> mpu_pc98_device class fdd_2dd_bridge_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/fdd_2hd.h b/src/devices/bus/pc98_cbus/fdd_2hd.h index a5993dec5f0..0772cae6006 100644 --- a/src/devices/bus/pc98_cbus/fdd_2hd.h +++ b/src/devices/bus/pc98_cbus/fdd_2hd.h @@ -15,7 +15,7 @@ // ======================> mpu_pc98_device class fdd_2hd_bridge_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/mif201.h b/src/devices/bus/pc98_cbus/mif201.h index e53c1becc9d..0b0c61ee3d7 100644 --- a/src/devices/bus/pc98_cbus/mif201.h +++ b/src/devices/bus/pc98_cbus/mif201.h @@ -16,7 +16,7 @@ // ======================> mpu_pc98_device class mif201_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/mpu_pc98.h b/src/devices/bus/pc98_cbus/mpu_pc98.h index 1da2a30d5de..d6566a9860a 100644 --- a/src/devices/bus/pc98_cbus/mpu_pc98.h +++ b/src/devices/bus/pc98_cbus/mpu_pc98.h @@ -15,7 +15,7 @@ // ======================> mpu_pc98_device class mpu_pc98_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/options.cpp b/src/devices/bus/pc98_cbus/options.cpp index ccbba07f39c..ecd622fcc84 100644 --- a/src/devices/bus/pc98_cbus/options.cpp +++ b/src/devices/bus/pc98_cbus/options.cpp @@ -70,8 +70,8 @@ void pc98_cbus_ram_devices(device_slot_interface &device) void pc88va_cbus_devices(device_slot_interface &device) { device.option_add("pc9801_27", PC9801_27); -// device.option_add("pc9801_55u", PC9801_55U); -// device.option_add("pc9801_55l", PC9801_55L); +// device.option_add("pc9801_55u", PC9801_55U); +// device.option_add("pc9801_55l", PC9801_55L); device.option_add("mif_201", MIF201); device.option_add("mpu_pc98", MPU_PC98); } diff --git a/src/devices/bus/pc98_cbus/pc9801_118.h b/src/devices/bus/pc98_cbus/pc9801_118.h index 9e166cc3790..af13a3e3932 100644 --- a/src/devices/bus/pc98_cbus/pc9801_118.h +++ b/src/devices/bus/pc98_cbus/pc9801_118.h @@ -22,7 +22,7 @@ // ======================> pc9801_118_device class pc9801_118_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/pc9801_27.cpp b/src/devices/bus/pc98_cbus/pc9801_27.cpp index 19b7bb8c2ed..19deed0d25d 100644 --- a/src/devices/bus/pc98_cbus/pc9801_27.cpp +++ b/src/devices/bus/pc98_cbus/pc9801_27.cpp @@ -23,7 +23,7 @@ pc9801_27_device::pc9801_27_device(const machine_config &mconfig, const char *ta : device_t(mconfig, PC9801_27, tag, owner, clock) , device_pc98_cbus_slot_interface(mconfig, *this) , m_sasibus(*this, "sasi") -// , m_harddisk(*this, "sasi:0:harddisk") +// , m_harddisk(*this, "sasi:0:harddisk") , m_sasi(*this, "sasi:7:sasicb") , m_bios(*this, "bios") { @@ -247,7 +247,7 @@ void pc9801_27_device::sasi_cd_w(int state) void pc9801_27_device::sasi_io_w(int state) { - LOG("IO %d -> %d\n", m_sasi_io, state); + LOG("IO %d -> %d\n", m_sasi_io, state); if (m_sasi_io != state) update_irq(); m_sasi_io = state; @@ -256,7 +256,7 @@ void pc9801_27_device::sasi_io_w(int state) void pc9801_27_device::sasi_msg_w(int state) { - LOG("MSG %d -> %d\n", m_sasi_msg, state); + LOG("MSG %d -> %d\n", m_sasi_msg, state); if (m_sasi_msg != state) update_irq(); @@ -265,7 +265,7 @@ void pc9801_27_device::sasi_msg_w(int state) void pc9801_27_device::sasi_ack_w(int state) { - LOG("ACK %d -> %d\n", m_sasi_ack, state); + LOG("ACK %d -> %d\n", m_sasi_ack, state); m_sasi_ack = state; } @@ -292,6 +292,6 @@ void pc9801_27_device::update_irq() void pc9801_27_device::update_drq() { -// m_bus->drq_w(0, !(m_sasi_req && !(m_sasi_cd) && BIT(m_control, 1))); +// m_bus->drq_w(0, !(m_sasi_req && !(m_sasi_cd) && BIT(m_control, 1))); m_bus->drq_w(0, m_sasi->req_r() && !m_sasi->cd_r() && BIT(m_control, 1)); } diff --git a/src/devices/bus/pc98_cbus/pc9801_55.cpp b/src/devices/bus/pc98_cbus/pc9801_55.cpp index 53323744a8e..fa229cfbc7c 100644 --- a/src/devices/bus/pc98_cbus/pc9801_55.cpp +++ b/src/devices/bus/pc98_cbus/pc9801_55.cpp @@ -94,7 +94,7 @@ void pc9801_55_device::scsi_drq_w(int state) u8 pc9801_55_device::dack_r(int line) { //if (!m_dma_enable) - // return 0xff; + // return 0xff; const u8 res = m_wdc->dma_r(); return res; } @@ -102,7 +102,7 @@ u8 pc9801_55_device::dack_r(int line) void pc9801_55_device::dack_w(int line, u8 data) { //if (!m_dma_enable) - // return; + // return; m_wdc->dma_w(data); } diff --git a/src/devices/bus/pc98_cbus/pc9801_55.h b/src/devices/bus/pc98_cbus/pc9801_55.h index f5bac9eb720..470a06bce4d 100644 --- a/src/devices/bus/pc98_cbus/pc9801_55.h +++ b/src/devices/bus/pc98_cbus/pc9801_55.h @@ -24,7 +24,7 @@ class pc9801_55_device : public device_t , public device_memory_interface - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/sb16_ct2720.h b/src/devices/bus/pc98_cbus/sb16_ct2720.h index f0a02853fd3..71e77a0758f 100644 --- a/src/devices/bus/pc98_cbus/sb16_ct2720.h +++ b/src/devices/bus/pc98_cbus/sb16_ct2720.h @@ -20,7 +20,7 @@ //************************************************************************** class sb16_ct2720_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/speakboard.h b/src/devices/bus/pc98_cbus/speakboard.h index 4db37a9da3f..92e89052eb7 100644 --- a/src/devices/bus/pc98_cbus/speakboard.h +++ b/src/devices/bus/pc98_cbus/speakboard.h @@ -10,7 +10,7 @@ #include "sound/ymopn.h" class speakboard_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: // construction/destruction diff --git a/src/devices/bus/pc98_cbus/wavestar.cpp b/src/devices/bus/pc98_cbus/wavestar.cpp index e72ae1f8bef..2c688978e9a 100644 --- a/src/devices/bus/pc98_cbus/wavestar.cpp +++ b/src/devices/bus/pc98_cbus/wavestar.cpp @@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(QVISION_WAVESTAR, qvision_wavestar_device, "qvision_wavestar" qvision_wavestar_device::qvision_wavestar_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, QVISION_WAVESTAR, tag, owner, clock) - , device_pc98_cbus_slot_interface(mconfig, *this) + , device_pc98_cbus_slot_interface(mconfig, *this) , m_cpu(*this, "cpu") { } diff --git a/src/devices/bus/pc98_cbus/wavestar.h b/src/devices/bus/pc98_cbus/wavestar.h index 44338c11d50..4511f9cf8d9 100644 --- a/src/devices/bus/pc98_cbus/wavestar.h +++ b/src/devices/bus/pc98_cbus/wavestar.h @@ -11,7 +11,7 @@ #include "cpu/h8/h83042.h" class qvision_wavestar_device : public device_t - , public device_pc98_cbus_slot_interface + , public device_pc98_cbus_slot_interface { public: qvision_wavestar_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/cpu/dsp563xx/dsp563xx-interp.cpp b/src/devices/cpu/dsp563xx/dsp563xx-interp.cpp index 1536d4e3dde..67ef9a43f55 100644 --- a/src/devices/cpu/dsp563xx/dsp563xx-interp.cpp +++ b/src/devices/cpu/dsp563xx/dsp563xx-interp.cpp @@ -12,7 +12,7 @@ void dsp563xx_device::execute_ipar(u16 kipar) case 0: { // - break; } - case 1: { // + case 1: { // break; } case 2: { // abs a @@ -1332,7 +1332,7 @@ void dsp563xx_device::execute_pre_move(u16 kmove, u32 opcode, u32 exv) case 0: { // - break; } - case 1: { // + case 1: { // break; } case 2: { // #[i],x0 @@ -14806,7 +14806,7 @@ void dsp563xx_device::execute_post_move(u16 kmove, u32 opcode, u32 exv) case 0: { // - break; } - case 1: { // + case 1: { // break; } case 2: { // #[i],x0 @@ -27100,7 +27100,7 @@ void dsp563xx_device::execute_npar(u16 knpar, u32 opcode, u32 exv) case 0: { // - break; } - case 1: { // + case 1: { // break; } case 2: { // move x:(r+[o]),x0 diff --git a/src/devices/cpu/dsp563xx/dsp563xx.h b/src/devices/cpu/dsp563xx/dsp563xx.h index 8448f6e9582..337dda0ccf3 100644 --- a/src/devices/cpu/dsp563xx/dsp563xx.h +++ b/src/devices/cpu/dsp563xx/dsp563xx.h @@ -64,7 +64,7 @@ protected: static const u64 t_move_ex[40]; static const u64 t_npar_ex[72]; - + dsp563xx_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor map_p, address_map_constructor map_x, address_map_constructor map_y); diff --git a/src/devices/cpu/dsp563xx/dsp563xx.lst b/src/devices/cpu/dsp563xx/dsp563xx.lst index 55c1e66fb33..3d5e4964744 100644 --- a/src/devices/cpu/dsp563xx/dsp563xx.lst +++ b/src/devices/cpu/dsp563xx/dsp563xx.lst @@ -378,7 +378,7 @@ c000.. s1,x:eax y:eay,d2 - eax:xyeax(8) eay:xyeay(20, 13, 10) s1:tbrx(18) d2 0d1840 bcc r - r:ar(8) cc:cc(0) cond if($cc) { - m_npc = m_pc + $r; + m_npc = m_pc + $r; } 0b4000 bchg #n,xy:ea - ea:eam1(8) xy:xyc(6) n:bit5(0) diff --git a/src/devices/cpu/dsp563xx/dsp563xxd.cpp b/src/devices/cpu/dsp563xx/dsp563xxd.cpp index 6c277fbd343..bdb2730dc1e 100644 --- a/src/devices/cpu/dsp563xx/dsp563xxd.cpp +++ b/src/devices/cpu/dsp563xx/dsp563xxd.cpp @@ -12,35 +12,35 @@ dsp563xx_disassembler::dsp563xx_disassembler() u32 dsp563xx_disassembler::opcode_alignment() const { - return 1; + return 1; } offs_t dsp563xx_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) { - u32 opcode = opcodes.r32(pc) & 0xffffff; - u8 kmove = t_move[opcode >> 8]; - u8 knpar = kmove || opcode >= 0x100000 ? 0 : t_npar[opcode]; - u8 kipar = knpar ? 0 : t_ipar[opcode & 0xff]; - bool ex = BIT(t_move_ex, kmove) || BIT(t_npar_ex[knpar >> 6], knpar & 0x3f); - u32 exv = ex ? opcodes.r32(pc+1) : 0; + u32 opcode = opcodes.r32(pc) & 0xffffff; + u8 kmove = t_move[opcode >> 8]; + u8 knpar = kmove || opcode >= 0x100000 ? 0 : t_npar[opcode]; + u8 kipar = knpar ? 0 : t_ipar[opcode & 0xff]; + bool ex = BIT(t_move_ex, kmove) || BIT(t_npar_ex[knpar >> 6], knpar & 0x3f); + u32 exv = ex ? opcodes.r32(pc+1) : 0; - std::string smove = disasm_move(kmove, opcode, exv, pc); - std::string snpar = disasm_npar(knpar, opcode, exv, pc); - std::string sipar = disasm_ipar(kipar, opcode, exv, pc); + std::string smove = disasm_move(kmove, opcode, exv, pc); + std::string snpar = disasm_npar(knpar, opcode, exv, pc); + std::string sipar = disasm_ipar(kipar, opcode, exv, pc); - std::string s = "unknown"; + std::string s = "unknown"; - if(opcode == 0x000000) + if(opcode == 0x000000) s = "nop"; - else if(knpar) + else if(knpar) s = snpar; - else if(!sipar.empty()) { + else if(!sipar.empty()) { if(!smove.empty()) - s = sipar + ' ' + smove; + s = sipar + ' ' + smove; else if(kmove) - s = sipar; - } else if(!smove.empty() && kipar) + s = sipar; + } else if(!smove.empty() && kipar) s = "move " + smove; - stream << s; - return (ex ? 2 : 1) | t_npar_flags[knpar] | SUPPORTED; + stream << s; + return (ex ? 2 : 1) | t_npar_flags[knpar] | SUPPORTED; } diff --git a/src/devices/cpu/dsp563xx/hi08.cpp b/src/devices/cpu/dsp563xx/hi08.cpp index 4666ac78f60..99655b61b37 100644 --- a/src/devices/cpu/dsp563xx/hi08.cpp +++ b/src/devices/cpu/dsp563xx/hi08.cpp @@ -10,181 +10,181 @@ DEFINE_DEVICE_TYPE(HI08, hi08_device, "hi08", "DSP563xx HI08 host interface") hi08_device::hi08_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) : - device_t(mconfig, HI08, tag, owner, clock), - m_cpu(*this, DEVICE_SELF_OWNER) + device_t(mconfig, HI08, tag, owner, clock), + m_cpu(*this, DEVICE_SELF_OWNER) { } void hi08_device::device_start() { - save_item(NAME(m_hcr)); - save_item(NAME(m_hpcr)); - save_item(NAME(m_hbar)); - save_item(NAME(m_hrx)); - save_item(NAME(m_htx)); - save_item(NAME(m_tx)); - save_item(NAME(m_icr)); - save_item(NAME(m_cvr)); - save_item(NAME(m_isr)); - save_item(NAME(m_ivr)); + save_item(NAME(m_hcr)); + save_item(NAME(m_hpcr)); + save_item(NAME(m_hbar)); + save_item(NAME(m_hrx)); + save_item(NAME(m_htx)); + save_item(NAME(m_tx)); + save_item(NAME(m_icr)); + save_item(NAME(m_cvr)); + save_item(NAME(m_isr)); + save_item(NAME(m_ivr)); } void hi08_device::device_reset() { - m_hcr = 0; - m_hpcr = 0; - m_hbar = 0x80; - m_hrx = 0; - m_htx = 0; - m_tx = 0; - m_icr = 0; - m_cvr = 0x32; - m_isr = 3; - m_ivr = 15; + m_hcr = 0; + m_hpcr = 0; + m_hbar = 0x80; + m_hrx = 0; + m_htx = 0; + m_tx = 0; + m_icr = 0; + m_cvr = 0x32; + m_isr = 3; + m_ivr = 15; } void hi08_device::write(offs_t offset, u8 data) { - switch(offset) { - case 0: + switch(offset) { + case 0: m_icr = data & 0xbf; logerror("host write isr %02x (%s)\n", m_isr, machine().describe_context()); break; - case 1: + case 1: m_cvr = data; logerror("host write cvr %02x (%s)\n", m_cvr, machine().describe_context()); break; - case 2: + case 2: logerror("host rejected write isr %02x (%s)\n", data, machine().describe_context()); break; - case 3: + case 3: m_ivr = data; logerror("host write ivr %02x (%s)\n", m_ivr, machine().describe_context()); break; - case 4: + case 4: logerror("host rejected write unused %02x (%s)\n", data, machine().describe_context()); break; - case 5: + case 5: if(m_icr & ICR_HLEND) - m_tx = (m_tx & 0xffff00) | data; + m_tx = (m_tx & 0xffff00) | data; else - m_tx = (m_tx & 0x00ffff) | (data << 16); + m_tx = (m_tx & 0x00ffff) | (data << 16); break; - case 6: + case 6: m_tx = (m_tx & 0xff00ff) | (data << 8); break; - case 7: + case 7: if(m_icr & ICR_HLEND) - m_tx = (m_tx & 0x00ffff) | (data << 16); + m_tx = (m_tx & 0x00ffff) | (data << 16); else - m_tx = (m_tx & 0xffff00) | data; + m_tx = (m_tx & 0xffff00) | data; m_hrx = m_tx; logerror("received %06x (%s)\n", m_hrx, machine().describe_context()); m_isr &= ~ISR_TXDE; if(!(m_isr & ISR_RXDF)) - m_isr |= ISR_TRDY; + m_isr |= ISR_TRDY; machine().scheduler().synchronize(); break; - } + } } u8 hi08_device::read(offs_t offset) { - switch(offset) { - case 0: + switch(offset) { + case 0: logerror("host read icr (%s)\n", machine().describe_context()); return m_icr; - case 1: + case 1: logerror("host read cvr (%s)\n", machine().describe_context()); return m_cvr; - case 2: + case 2: logerror("host read isr (%s)\n", machine().describe_context()); return m_isr; - case 3: + case 3: logerror("host read ivr (%s)\n", machine().describe_context()); return m_ivr; - case 4: + case 4: logerror("host read unused (%s)\n", machine().describe_context()); return 0x00; - case 5: + case 5: return m_htx >> (m_icr & ICR_HLEND ? 0 : 16); - case 6: + case 6: return m_htx >> 8; - case 7: + case 7: return m_htx >> (m_icr & ICR_HLEND ? 16 : 0); - } - return 0; + } + return 0; } void hi08_device::map(address_map &map) { - map(0*4, 0*4+3).rw(FUNC(hi08_device::hcr_r), FUNC(hi08_device::hcr_w)); - map(1*4, 1*4+3).r(FUNC(hi08_device::hsr_r)); - map(2*4, 2*4+3).rw(FUNC(hi08_device::hpcr_r), FUNC(hi08_device::hpcr_w)); - map(3*4, 3*4+3).rw(FUNC(hi08_device::hbar_r), FUNC(hi08_device::hbar_w)); - map(4*4, 4*4+3).r(FUNC(hi08_device::hrx_r)); - map(5*4, 5*4+3).w(FUNC(hi08_device::htx_w)); + map(0*4, 0*4+3).rw(FUNC(hi08_device::hcr_r), FUNC(hi08_device::hcr_w)); + map(1*4, 1*4+3).r(FUNC(hi08_device::hsr_r)); + map(2*4, 2*4+3).rw(FUNC(hi08_device::hpcr_r), FUNC(hi08_device::hpcr_w)); + map(3*4, 3*4+3).rw(FUNC(hi08_device::hbar_r), FUNC(hi08_device::hbar_w)); + map(4*4, 4*4+3).r(FUNC(hi08_device::hrx_r)); + map(5*4, 5*4+3).w(FUNC(hi08_device::htx_w)); } void hi08_device::hcr_w(u32 data) { - m_hcr = data & 0x1f; - logerror("hcr_w %02x (%s)\n", m_hcr, machine().describe_context()); + m_hcr = data & 0x1f; + logerror("hcr_w %02x (%s)\n", m_hcr, machine().describe_context()); } u32 hi08_device::hcr_r() { - logerror("hcr_r %02x (%s)\n", m_hcr, machine().describe_context()); - return m_hcr; + logerror("hcr_r %02x (%s)\n", m_hcr, machine().describe_context()); + return m_hcr; } u32 hi08_device::hsr_r() { - u16 hsr = 0; - if(!(m_isr & ISR_TXDE)) + u16 hsr = 0; + if(!(m_isr & ISR_TXDE)) hsr |= HSR_HRDF; - if(!(m_isr & ISR_RXDF)) + if(!(m_isr & ISR_RXDF)) hsr |= HSR_HTDE; - if(m_cvr & CVR_HC) + if(m_cvr & CVR_HC) hsr |= HSR_HCP; - hsr |= m_icr & (ICR_HF1 | ICR_HF0); - return hsr; + hsr |= m_icr & (ICR_HF1 | ICR_HF0); + return hsr; } void hi08_device::hpcr_w(u32 data) { - m_hpcr = data & 0xff7f; - logerror("hpcr_w %04x (%s)\n", m_hpcr, machine().describe_context()); + m_hpcr = data & 0xff7f; + logerror("hpcr_w %04x (%s)\n", m_hpcr, machine().describe_context()); } u32 hi08_device::hpcr_r() { - logerror("hpcr_r %04x (%s)\n", m_hpcr, machine().describe_context()); - return m_hpcr; + logerror("hpcr_r %04x (%s)\n", m_hpcr, machine().describe_context()); + return m_hpcr; } void hi08_device::hbar_w(u32 data) { - m_hbar = data; - logerror("hbar_w %02x (%s)\n", m_hbar, machine().describe_context()); + m_hbar = data; + logerror("hbar_w %02x (%s)\n", m_hbar, machine().describe_context()); } u32 hi08_device::hbar_r() { - logerror("hbar_r (%s)\n", machine().describe_context()); - return m_hbar; + logerror("hbar_r (%s)\n", machine().describe_context()); + return m_hbar; } u32 hi08_device::hrx_r() { - logerror("hrx_r %06x (%s)\n", m_hrx, machine().describe_context()); - m_isr = (m_isr & ~ISR_TRDY) | ISR_TXDE; - machine().scheduler().synchronize(); - return m_hrx; + logerror("hrx_r %06x (%s)\n", m_hrx, machine().describe_context()); + m_isr = (m_isr & ~ISR_TRDY) | ISR_TXDE; + machine().scheduler().synchronize(); + return m_hrx; } void hi08_device::htx_w(u32 data) { - logerror("htx_w %06x (%s)\n", data, machine().describe_context()); + logerror("htx_w %06x (%s)\n", data, machine().describe_context()); } diff --git a/src/devices/cpu/tms32031/32031ops.hxx b/src/devices/cpu/tms32031/32031ops.hxx index a2a4b826bdd..eb9ffe09e51 100644 --- a/src/devices/cpu/tms32031/32031ops.hxx +++ b/src/devices/cpu/tms32031/32031ops.hxx @@ -1410,33 +1410,33 @@ uint32_t tms3203x_device::modillegal_def(uint32_t op, uint8_t ar, uint32_t *&def #define ABSF(dreg, sreg) \ { \ int32_t man = FREGMAN(sreg); \ - int8_t fexp = FREGEXP(sreg); \ + int8_t fexp = FREGEXP(sreg); \ CLR_NZVUF(); \ m_r[dreg] = m_r[sreg]; \ - if (fexp == -128) \ - { /* if sreg was misformed, it should come out 80:00000000 */ \ - m_r[dreg].set_mantissa(0); \ - } \ - else \ + if (fexp == -128) \ + { /* if sreg was misformed, it should come out 80:00000000 */ \ + m_r[dreg].set_mantissa(0); \ + } \ + else \ if (man < 0) \ { \ if (man == (int32_t)0x80000000) \ { \ - if (fexp == 127) \ + if (fexp == 127) \ { /* total overflow result: 7F:7FFFFFFFF */ \ - IREG(TMR_ST) |= VFLAG | LVFLAG; \ - m_r[dreg].set_mantissa(0x7fffffff); \ - } \ - else \ + IREG(TMR_ST) |= VFLAG | LVFLAG; \ + m_r[dreg].set_mantissa(0x7fffffff); \ + } \ + else \ { /* man overflow -80000000 to +80000000 : increment exp */ \ - m_r[dreg].set_exponent(fexp + 1); \ - m_r[dreg].set_mantissa(0); \ - } \ - } \ - else \ + m_r[dreg].set_exponent(fexp + 1); \ + m_r[dreg].set_mantissa(0); \ + } \ + } \ + else \ { /* normal case */ \ m_r[dreg].set_mantissa(-man); /* aka (~man)+1 */ \ - } \ + } \ } \ OR_NZF(m_r[dreg]); \ } diff --git a/src/devices/machine/i82443bx_host.h b/src/devices/machine/i82443bx_host.h index f3c06dc88c1..35c213feb23 100644 --- a/src/devices/machine/i82443bx_host.h +++ b/src/devices/machine/i82443bx_host.h @@ -66,7 +66,7 @@ public: T &&gui_tag ) : i82443bx_bridge_device(mconfig, tag, owner, clock) { - set_ids_bridge(0x80867191, 0x00); + set_ids_bridge(0x80867191, 0x00); //set_multifunction_device(true); //m_vga.set_tag(std::forward<T>(gui_tag)); }*/ diff --git a/src/devices/machine/spg2xx_video.cpp b/src/devices/machine/spg2xx_video.cpp index 7ae2c2d6b37..bb1f5f55e23 100644 --- a/src/devices/machine/spg2xx_video.cpp +++ b/src/devices/machine/spg2xx_video.cpp @@ -114,7 +114,7 @@ uint32_t spg2xx_video_device::screen_update(screen_device &screen, bitmap_rgb32 m_renderer->draw_page(cliprect, scanline, i, page2_addr, page2_scroll, page2_regs, mem, m_paletteram, m_scrollram, 1); m_renderer->draw_sprites(cliprect, scanline, i, sprite_addr, mem, m_paletteram, m_spriteram, m_sprlimit_read_cb()); } - + m_renderer->apply_saturation_and_fade(bitmap, cliprect, scanline); } diff --git a/src/devices/sound/cem3394.cpp b/src/devices/sound/cem3394.cpp index 6c28d5348bd..1288fbf5ccf 100644 --- a/src/devices/sound/cem3394.cpp +++ b/src/devices/sound/cem3394.cpp @@ -184,7 +184,7 @@ cem3394_device &cem3394_device::configure(double r_vco, double c_vco, double c_v m_hpf_k = 1.0 - exp((-1 / (R_AC * c_ac)) * m_inv_sample_rate); LOGMASKED(LOG_CONFIG, "CEM3394 config - vco zero freq: %f, filter zero freq: %f, sample rate: %d\n", - m_vco_zero_freq, m_filter_zero_freq, int(sample_rate)); + m_vco_zero_freq, m_filter_zero_freq, int(sample_rate)); return *this; } diff --git a/src/devices/sound/scsp.cpp b/src/devices/sound/scsp.cpp index 6125ee155be..e346be5ccff 100644 --- a/src/devices/sound/scsp.cpp +++ b/src/devices/sound/scsp.cpp @@ -942,8 +942,8 @@ void scsp_device::UpdateRegR(int reg) break; //case 0x20: - // m_udata.data[0x20/2] ^= 0x400; - // break; + // m_udata.data[0x20/2] ^= 0x400; + // break; case 0x2a: case 0x2b: diff --git a/src/devices/sound/swp00.cpp b/src/devices/sound/swp00.cpp index d32a89ab124..931bfef8bf9 100644 --- a/src/devices/sound/swp00.cpp +++ b/src/devices/sound/swp00.cpp @@ -88,26 +88,26 @@ u16 swp00_device::interpolation_step(u32 speed, u32 sample_counter) // Phase is incorrect, and very weird if(speed >= 0x78) - return 0x7f; + return 0x7f; - u32 k0 = speed >> 3; - u32 k1 = speed & 7; + u32 k0 = speed >> 3; + u32 k1 = speed & 7; - if(speed >= 0x58) { - k0 -= 10; + if(speed >= 0x58) { + k0 -= 10; u32 a = (4 << k0) - 1; - u32 b = (2 << k0) - 1; - static const u8 mx[8] = { 0x00, 0x80, 0x88, 0xa8, 0xaa, 0xea, 0xee, 0xfe }; - return ((mx[k1] << (sample_counter & 7)) & 0x80) ? a : b; + u32 b = (2 << k0) - 1; + static const u8 mx[8] = { 0x00, 0x80, 0x88, 0xa8, 0xaa, 0xea, 0xee, 0xfe }; + return ((mx[k1] << (sample_counter & 7)) & 0x80) ? a : b; } - k0 = 10 - k0; + k0 = 10 - k0; if(sample_counter & util::make_bitmask<u32>(k0)) return 0; static const u16 mx[8] = { 0xaaaa, 0xeaaa, 0xeaea, 0xeeea, 0xeeee, 0xfeee, 0xfefe, 0xfffe }; - return (mx[k1] << ((sample_counter >> k0) & 0xf)) & 0x8000 ? 1 : 0; + return (mx[k1] << ((sample_counter >> k0) & 0xf)) & 0x8000 ? 1 : 0; } @@ -277,7 +277,7 @@ void swp00_device::streaming_block::read_8c(memory_access<24, 0, 0, ENDIANNESS_L dpcm_step(wave.read_byte(m_address + m_dpcm_pos)); m_dpcm_pos++; } - + val0 = m_dpcm_s0; val1 = m_dpcm_s1; } @@ -323,7 +323,7 @@ std::pair<s16, bool> swp00_device::streaming_block::step(memory_access<24, 0, 0, } } } - return std::make_pair(result, false); + return std::make_pair(result, false); } template<int sel> void swp00_device::streaming_block::phase_w(u8 data) @@ -614,7 +614,7 @@ void swp00_device::envelope_block::decay_speed_w(u8 data) m_decay_speed = data; m_envelope_mode = DECAY; - } else if(m_envelope_mode == DECAY_DONE) + } else if(m_envelope_mode == DECAY_DONE) m_decay_speed = data; } @@ -700,7 +700,7 @@ s32 swp00_device::filter_block::step(s16 input, s32 lmod, u32 sample_counter) m_k += swp00_device::interpolation_step(m_speed & 0x7f, sample_counter); if(m_k > m_k_target) m_k = m_k_target; - + } else if(m_k > m_k_target) { m_k -= swp00_device::interpolation_step(m_speed & 0x7f, sample_counter); if(m_k < m_k_target) @@ -941,7 +941,7 @@ s32 swp00_device::mixer_block::volume_apply(s32 level, s32 sample) return 0; s32 e = level >> 8; - s32 m = level & 0xff; + s32 m = level & 0xff; s64 mul = (0x1000000 - (m << 15)) >> e; return (sample * mul) >> 24; } @@ -1738,7 +1738,7 @@ u8 swp00_device::state_r() case 4: // panning l return m_mixer[chan].status_panl(); - + case 5: // panning r return m_mixer[chan].status_panr(); } diff --git a/src/devices/sound/tms3631.cpp b/src/devices/sound/tms3631.cpp index 77a08b34eb7..380e909cf72 100644 --- a/src/devices/sound/tms3631.cpp +++ b/src/devices/sound/tms3631.cpp @@ -21,7 +21,7 @@ tms3631_device::tms3631_device(const machine_config &mconfig, const char *tag, d , m_basefreq(0) , m_enable(0) { -// std::fill(std::begin(m_counter8), std::end(m_counter8), 0); +// std::fill(std::begin(m_counter8), std::end(m_counter8), 0); std::fill(std::begin(m_channel_data), std::end(m_channel_data), 0); } @@ -39,7 +39,7 @@ void tms3631_device::device_start() void tms3631_device::sound_stream_update(sound_stream &stream) { -// int samplerate = stream.sample_rate(); +// int samplerate = stream.sample_rate(); for (int i = 0; i < 8; i++) stream.fill(i, 0); diff --git a/src/devices/sound/tms3631.h b/src/devices/sound/tms3631.h index 62affa48bb5..00335ecbc12 100644 --- a/src/devices/sound/tms3631.h +++ b/src/devices/sound/tms3631.h @@ -32,8 +32,8 @@ private: sound_stream *m_stream; int m_samplerate; int m_basefreq; -// int m_counter8[8]; -// int m_output8; +// int m_counter8[8]; +// int m_output8; int m_enable; int m_wclk, m_ce; u8 m_channel_select; diff --git a/src/lib/formats/adam_dsk.cpp b/src/lib/formats/adam_dsk.cpp index 5ab33cea344..78ae0761afb 100644 --- a/src/lib/formats/adam_dsk.cpp +++ b/src/lib/formats/adam_dsk.cpp @@ -18,16 +18,16 @@ permutation of the sectors to transform their native interleave to or from the non-native interleave. - Track description for 160KB SSDD format: - 100x4e 12x00 3xf5 fe 2x00 01 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 100x4e 12x00 3xf5 fe 2x00 02 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 100x4e 12x00 3xf5 fe 2x00 03 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 100x4e 12x00 3xf5 fe 2x00 04 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 100x4e 12x00 3xf5 fe 2x00 05 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 100x4e 12x00 3xf5 fe 2x00 06 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 100x4e 12x00 3xf5 fe 2x00 07 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 100x4e 12x00 3xf5 fe 2x00 08 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 - 859x4e + Track description for 160KB SSDD format: + 100x4e 12x00 3xf5 fe 2x00 01 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 100x4e 12x00 3xf5 fe 2x00 02 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 100x4e 12x00 3xf5 fe 2x00 03 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 100x4e 12x00 3xf5 fe 2x00 04 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 100x4e 12x00 3xf5 fe 2x00 05 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 100x4e 12x00 3xf5 fe 2x00 06 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 100x4e 12x00 3xf5 fe 2x00 07 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 100x4e 12x00 3xf5 fe 2x00 08 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7 + 859x4e ***************************************************************************/ diff --git a/src/lib/formats/wren_dsk.cpp b/src/lib/formats/wren_dsk.cpp index b9726f5050b..87ab652776b 100644 --- a/src/lib/formats/wren_dsk.cpp +++ b/src/lib/formats/wren_dsk.cpp @@ -15,24 +15,24 @@ wren_format::wren_format() : wd177x_format(formats) { } -const char *wren_format::name() const noexcept +const char *wren_format::name() const noexcept { return "wren"; } -const char *wren_format::description() const noexcept +const char *wren_format::description() const noexcept { return "Wren Executive disk image"; } -const char *wren_format::extensions() const noexcept +const char *wren_format::extensions() const noexcept { return "img"; } const wren_format::format wren_format::formats[] = { - { + { floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM, 2000, 10, 40, 1, 512, {}, 1, {}, 20, 22, 24 // gaps unverified }, diff --git a/src/mame/apple/apple2e.cpp b/src/mame/apple/apple2e.cpp index 4a2e259bd78..aca26b96a9c 100644 --- a/src/mame/apple/apple2e.cpp +++ b/src/mame/apple/apple2e.cpp @@ -868,7 +868,7 @@ void apple2e_state::memexp_w(offs_t offset, u8 data) break; case 3: -// printf("Write %02x to RAM[%x]\n", data, m_exp_liveptr); +// printf("Write %02x to RAM[%x]\n", data, m_exp_liveptr); if (m_exp_liveptr <= m_exp_addrmask) { m_exp_ram[m_exp_liveptr] = data; diff --git a/src/mame/bfm/bfm_ad5.cpp b/src/mame/bfm/bfm_ad5.cpp index 2db3c073af7..f05590aeb40 100644 --- a/src/mame/bfm/bfm_ad5.cpp +++ b/src/mame/bfm/bfm_ad5.cpp @@ -167,7 +167,7 @@ void adder5_state::ad5_map(address_map &map) map(0x80000000, 0x8000ffff).ram(); map(0x80800000, 0x8080ffff).ram(); -// map(0xffff0000, 0xffff03ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::dev_r), FUNC(mcf5206e_peripheral_device::dev_w)); // technically this can be moved with MBAR +// map(0xffff0000, 0xffff03ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::dev_r), FUNC(mcf5206e_peripheral_device::dev_w)); // technically this can be moved with MBAR } INPUT_PORTS_START( bfm_ad5 ) diff --git a/src/mame/bfm/bfm_sc5.cpp b/src/mame/bfm/bfm_sc5.cpp index 813a20164ca..ae4f2f7c1ef 100644 --- a/src/mame/bfm/bfm_sc5.cpp +++ b/src/mame/bfm/bfm_sc5.cpp @@ -276,7 +276,7 @@ void bfm_sc5_state::sc5_map(address_map &map) map(0x40000000, 0x4000ffff).ram(); // peripherals -// map(0xffff0000, 0xffff03ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::dev_r), FUNC(mcf5206e_peripheral_device::dev_w)); // technically this can be moved with MBAR +// map(0xffff0000, 0xffff03ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::dev_r), FUNC(mcf5206e_peripheral_device::dev_w)); // technically this can be moved with MBAR } INPUT_PORTS_START( bfm_sc5 ) diff --git a/src/mame/ensoniq/esqvfd.cpp b/src/mame/ensoniq/esqvfd.cpp index 8f3b181604e..47041626297 100644 --- a/src/mame/ensoniq/esqvfd.cpp +++ b/src/mame/ensoniq/esqvfd.cpp @@ -18,7 +18,7 @@ DEFINE_DEVICE_TYPE(ESQ2X40_VFX, esq2x40_vfx_device, "esq2x40_vfx", "Ensoniq 2x40 // adapted from bfm_bd1, rearranged to work with ASCII data used by the Ensoniq h/w static const uint16_t font[] = { - // FEDC BA98 7654 3210 + // FEDC BA98 7654 3210 0x0000, // 0000 0000 0000 0000 (space) 0x0000, // 0000 0000 0000 0000 ! (not defined) 0x0009, // 0000 0000 0000 1001 ". diff --git a/src/mame/handheld/evolution_handheld.cpp b/src/mame/handheld/evolution_handheld.cpp index 067ad4393b9..c6e9b57a43c 100644 --- a/src/mame/handheld/evolution_handheld.cpp +++ b/src/mame/handheld/evolution_handheld.cpp @@ -144,7 +144,7 @@ CONS( 2020, buttdtct, 0, 0, evolhh, evolhh, evolution_handheldgame CONS( 2015, pokexyqz, 0, 0, evolhh, evolhh, evolution_handheldgame_state, empty_init, "Takara Tomy", "Pokemon Encyclopedia Z Pokemon XY Quiz Game Rotom (Japan)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) -// ロトム図鑑 サン&ムーン ポケモン クイズ +// ロトム図鑑 サン&ムーン ポケモン クイズ CONS( 2015, pokesmqz, 0, 0, evolhh, evolhh, evolution_handheldgame_state, empty_init, "Takara Tomy", "Pokedex Sun & Moon Pokemon Quiz Rotom (Japan)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) CONS( 201?, tomyspt, 0, 0, evolhh, evolhh, evolution_handheldgame_state, empty_init, "Takara Tomy", "Pretty Rhythm Smart Pod Touch (Japan)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING ) diff --git a/src/mame/handheld/tama_4u.cpp b/src/mame/handheld/tama_4u.cpp index ebf9bd7cdd3..d37ba5d6767 100644 --- a/src/mame/handheld/tama_4u.cpp +++ b/src/mame/handheld/tama_4u.cpp @@ -65,7 +65,7 @@ void tama_4u_state::tama4u(machine_config &config) SCREEN(config, m_screen, SCREEN_TYPE_LCD); m_screen->set_refresh_hz(60); m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(128, 128); + m_screen->set_size(128, 128); m_screen->set_visarea(0, 128 - 1, 0, 128 - 1); m_screen->set_screen_update(FUNC(tama_4u_state::screen_update)); @@ -74,7 +74,7 @@ void tama_4u_state::tama4u(machine_config &config) ROM_START( tama4u ) ROM_REGION( 0x800000, "maincpu", 0 ) - // vector table(?) at 0x400000, similar to tamaid + // vector table(?) at 0x400000, similar to tamaid ROM_LOAD( "mx29lb640eb.u4", 0x000000, 0x800000, CRC(f9dcc04a) SHA1(5f5d738357219b2a4a1452835455abef25fe7dcb) ) ROM_END diff --git a/src/mame/handheld/tama_id.cpp b/src/mame/handheld/tama_id.cpp index f827d25f335..c428f5c9238 100644 --- a/src/mame/handheld/tama_id.cpp +++ b/src/mame/handheld/tama_id.cpp @@ -64,7 +64,7 @@ void tama_id_state::tamaid(machine_config &config) SCREEN(config, m_screen, SCREEN_TYPE_LCD); m_screen->set_refresh_hz(60); m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(128, 128); + m_screen->set_size(128, 128); m_screen->set_visarea(0, 128 - 1, 0, 128 - 1); m_screen->set_screen_update(FUNC(tama_id_state::screen_update)); diff --git a/src/mame/handheld/tama_mix.cpp b/src/mame/handheld/tama_mix.cpp index 09eb243d3e3..d5dcf5bd842 100644 --- a/src/mame/handheld/tama_mix.cpp +++ b/src/mame/handheld/tama_mix.cpp @@ -65,7 +65,7 @@ void tama_mix_state::tama_mix(machine_config &config) SCREEN(config, m_screen, SCREEN_TYPE_LCD); m_screen->set_refresh_hz(60); m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(128, 128); + m_screen->set_size(128, 128); m_screen->set_visarea(0, 128 - 1, 0, 128 - 1); m_screen->set_screen_update(FUNC(tama_mix_state::screen_update)); diff --git a/src/mame/igs/goldstar.cpp b/src/mame/igs/goldstar.cpp index 38f25b82111..d7c569717c6 100644 --- a/src/mame/igs/goldstar.cpp +++ b/src/mame/igs/goldstar.cpp @@ -709,7 +709,7 @@ private: void magodds_outb850_w(uint8_t data); void magodds_outb860_w(uint8_t data); void fl7w4_outc802_w(uint8_t data); - void flaming7_outputc_w(uint8_t data); + void flaming7_outputc_w(uint8_t data); void system_outputa_w(uint8_t data); void system_outputb_w(uint8_t data); void system_outputc_w(uint8_t data); @@ -2668,7 +2668,7 @@ void goldstar_state::p2_lamps_w(uint8_t data) m_lamps[8 + 7] = BIT(data, 7); m_ticket_dispenser->motor_w(BIT(data,1)); - + // popmessage("p2 lamps: %02X", data); } @@ -2759,13 +2759,13 @@ void sanghopm_state::coincount_w(uint8_t data) void sanghopm_state::enablebg_w(uint8_t data) { m_reel_ena = data; -// logerror("enablebg: %02x\n", data); +// logerror("enablebg: %02x\n", data); } void sanghopm_state::enablerl_w(uint8_t data) { m_enable_reg = data; -// logerror("enablerl: %02x\n", data); +// logerror("enablerl: %02x\n", data); } void cmaster_state::coincount_w(uint8_t data) @@ -3061,8 +3061,8 @@ void wingco_state::system_outputc_w(uint8_t data) m_reel_tilemap[0]->mark_all_dirty(); m_reel_tilemap[1]->mark_all_dirty(); - m_reel_tilemap[2]->mark_all_dirty(); - + m_reel_tilemap[2]->mark_all_dirty(); + // popmessage("system_outputc_w %02x",data); } @@ -3074,11 +3074,11 @@ void wingco_state::flaming7_outputc_w(uint8_t data) if (!m_nmi_enable) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - + m_reel_tilemap[0]->mark_all_dirty(); m_reel_tilemap[1]->mark_all_dirty(); m_reel_tilemap[2]->mark_all_dirty(); - + // popmessage("system_outputc_w %02x",data); } @@ -3766,7 +3766,7 @@ void sanghopm_state::star100_readport(address_map &map) void cb3_state::ncb3_map(address_map &map) { -// map(0x0000, 0xb7ff).rom(); +// map(0x0000, 0xb7ff).rom(); map(0x0000, 0xffff).rom(); map(0xb800, 0xbfff).ram().share("nvram"); map(0xc000, 0xc7ff).ram(); @@ -4638,7 +4638,7 @@ void wingco_state::flaming7_map(address_map &map) map(0xb041, 0xb08f).ram().share(m_reel_scroll[0]); // offsetted 1 byte to cover the first tile of the 12-tiles symbols map(0xb081, 0xb0bf).ram().share(m_reel_scroll[1]); // offsetted 1 byte to cover the first tile of the 12-tiles symbols map(0xb0c1, 0xb0ff).ram().share(m_reel_scroll[3]); // offsetted 1 byte to mantain compatibility - map(0xb101, 0xb13f).ram().share(m_reel_scroll[2]); // offsetted 1 byte to cover the first tile of the 12-tiles symbols + map(0xb101, 0xb13f).ram().share(m_reel_scroll[2]); // offsetted 1 byte to cover the first tile of the 12-tiles symbols map(0xb140, 0xb7ff).ram(); map(0xb800, 0xb803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); // Input Ports (92) @@ -4680,7 +4680,7 @@ void wingco_state::flam7_w4_map(address_map &map) map(0xb040, 0xb08f).ram().share(m_reel_scroll[0]); map(0xb080, 0xb0bf).ram().share(m_reel_scroll[1]); map(0xb0c0, 0xb0ff).ram().share(m_reel_scroll[3]); - map(0xb100, 0xb13f).ram().share(m_reel_scroll[2]); + map(0xb100, 0xb13f).ram().share(m_reel_scroll[2]); map(0xb140, 0xb7ff).ram(); map(0xb800, 0xb803).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write)); // Input Ports (92) @@ -14588,7 +14588,7 @@ static INPUT_PORTS_START( flam7_w4 ) PORT_START("IN4") // b811 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("WT RXD") -// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("COUT RTS") // related to hopper... +// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("COUT RTS") // related to hopper... PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", FUNC(ticket_dispenser_device::line_r)) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Y) PORT_NAME("IN4-3") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_U) PORT_NAME("IN4-4 Active") // This one is active in real PCB. @@ -14738,7 +14738,7 @@ static INPUT_PORTS_START( flaming7 ) PORT_START("IN4") // b811 PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) PORT_NAME("WT RXD") -// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("COUT RTS") // related to hopper... +// PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_NAME("COUT RTS") // related to hopper... PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", FUNC(ticket_dispenser_device::line_r)) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Y) PORT_NAME("IN4-3") PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_U) PORT_NAME("IN4-4 Active") // this one is active in real PCB. @@ -15471,7 +15471,7 @@ static GFXDECODE_START( gfx_chry10 ) GFXDECODE_END static GFXDECODE_START( gfx_cb3c ) -// GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_lsb, 0, 16 ) +// GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_packed_lsb, 0, 16 ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x3_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx2", 0, cb3c_tiles8x32_layout, 128, 8 ) GFXDECODE_END @@ -16385,7 +16385,7 @@ void wingco_state::flaming7(machine_config &config) m_ppi[0]->out_pc_callback().set(FUNC(wingco_state::fl7w4_outc802_w)); m_ppi[2]->out_pc_callback().set(FUNC(wingco_state::flaming7_outputc_w)); - + DS2401(config, m_fl7w4_id); } @@ -16405,7 +16405,7 @@ void wingco_state::flam7_tw(machine_config &config) // to do serial protection. m_ppi[0]->out_pc_callback().set(FUNC(wingco_state::fl7w4_outc802_w)); - + m_ppi[2]->out_pc_callback().set(FUNC(wingco_state::flaming7_outputc_w)); DS2401(config, m_fl7w4_id); @@ -30941,7 +30941,7 @@ void cb3_state::init_cb3c() rom[i] = bitswap<8>(rom[i], 1, 0, 6, 4, 7, 5, 3, 2); } - // skip checksum + // skip checksum rom[0x0004] = 0x00; rom[0x0005] = 0x02; rom[0x0269] = 0xbb; diff --git a/src/mame/igs/pgmcrypt.cpp b/src/mame/igs/pgmcrypt.cpp index 2a38ac59539..67c7bed6cff 100644 --- a/src/mame/igs/pgmcrypt.cpp +++ b/src/mame/igs/pgmcrypt.cpp @@ -2088,14 +2088,14 @@ void texashld_decrypt(running_machine &machine) { uint16_t x = src[i]; - IGS27_CRYPT1 // $02d00 + IGS27_CRYPT1 // $02d00 IGS27_CRYPT2 IGS27_CRYPT3 - IGS27_CRYPT4 // $02ce0 + IGS27_CRYPT4 // $02ce0 IGS27_CRYPT5 IGS27_CRYPT6_ALT IGS27_CRYPT7 - IGS27_CRYPT8 // $01300 + IGS27_CRYPT8 // $01300 x ^= texashld_tab[(i >> 1) & 0xff] << 8; @@ -2105,22 +2105,22 @@ void texashld_decrypt(running_machine &machine) // V102US 2007 static const uint8_t crzybug2_tab[0x100] = { - 0x49, 0x47, 0x53, 0x30, 0x33, 0x30, 0x34, 0x52, 0x44, 0x34, 0x30, 0x37, 0x30, 0x36, 0x31, 0x31, // IGS0304RD4070611 - 0x72, 0xba, 0x6a, 0x0e, 0xaf, 0x03, 0x46, 0x16, 0x8d, 0xd9, 0xd8, 0xb9, 0xe1, 0x8f, 0x35, 0xe5, - 0xea, 0x2b, 0x3f, 0x5c, 0xf0, 0xb6, 0x69, 0x9e, 0x1e, 0xc3, 0xad, 0x17, 0x9c, 0x3e, 0xca, 0x85, - 0xf0, 0x77, 0xc3, 0xad, 0x96, 0x6f, 0x94, 0x3e, 0xdf, 0x62, 0x37, 0x05, 0x07, 0x95, 0xd8, 0x53, - 0x9a, 0x61, 0x54, 0xac, 0x09, 0x80, 0xf8, 0xb1, 0x87, 0x97, 0x77, 0x4f, 0x2a, 0x04, 0x2c, 0x29, - 0x3f, 0xeb, 0x92, 0x44, 0xee, 0x7b, 0x01, 0xf2, 0x0f, 0x86, 0xab, 0x01, 0x4b, 0x41, 0xd6, 0x24, - 0x77, 0x58, 0x5c, 0xa1, 0x2d, 0x35, 0x60, 0x3c, 0xad, 0x92, 0x52, 0x63, 0xf2, 0x3d, 0x26, 0x9c, - 0x18, 0x2b, 0xd0, 0x2c, 0xee, 0xc1, 0x03, 0x0a, 0xd7, 0x5e, 0x2b, 0x03, 0xe6, 0x2c, 0xa9, 0x2e, - 0x3a, 0x28, 0x4e, 0x93, 0x96, 0x70, 0x1a, 0x17, 0x45, 0xcd, 0x36, 0xaa, 0x2d, 0x80, 0x2f, 0xb5, - 0x32, 0x52, 0x75, 0xbe, 0xce, 0xd6, 0x13, 0x5e, 0xee, 0x01, 0xb1, 0x65, 0x0f, 0xee, 0xc7, 0x4b, - 0x99, 0xea, 0x23, 0xda, 0x7c, 0xc7, 0x9e, 0x1a, 0x09, 0x5f, 0x1b, 0x7d, 0x12, 0x66, 0xc0, 0x4b, - 0x46, 0x75, 0x78, 0x51, 0xc6, 0x54, 0xa9, 0xc6, 0x0c, 0x88, 0x33, 0x7d, 0xfe, 0x1e, 0xa9, 0x51, - 0x4e, 0xb6, 0xd3, 0xce, 0x15, 0xd2, 0x64, 0x1d, 0xb0, 0x61, 0xf8, 0x32, 0xda, 0x87, 0x51, 0x38, - 0x0a, 0xaf, 0xd3, 0x3c, 0x0f, 0xd3, 0x3d, 0x1a, 0xea, 0x0b, 0xaa, 0xa5, 0xec, 0x54, 0xc7, 0x1a, - 0x11, 0xa3, 0x56, 0xc7, 0x9b, 0x2a, 0xe4, 0xf8, 0xf2, 0xea, 0xc6, 0x22, 0xbc, 0x7a, 0x5a, 0x53, - 0x38, 0x16, 0x7c, 0xd9, 0xe0, 0xeb, 0x47, 0x32, 0x3f, 0xa1, 0x0d, 0x34, 0x10, 0x2a, 0x99, 0x7d + 0x49, 0x47, 0x53, 0x30, 0x33, 0x30, 0x34, 0x52, 0x44, 0x34, 0x30, 0x37, 0x30, 0x36, 0x31, 0x31, // IGS0304RD4070611 + 0x72, 0xba, 0x6a, 0x0e, 0xaf, 0x03, 0x46, 0x16, 0x8d, 0xd9, 0xd8, 0xb9, 0xe1, 0x8f, 0x35, 0xe5, + 0xea, 0x2b, 0x3f, 0x5c, 0xf0, 0xb6, 0x69, 0x9e, 0x1e, 0xc3, 0xad, 0x17, 0x9c, 0x3e, 0xca, 0x85, + 0xf0, 0x77, 0xc3, 0xad, 0x96, 0x6f, 0x94, 0x3e, 0xdf, 0x62, 0x37, 0x05, 0x07, 0x95, 0xd8, 0x53, + 0x9a, 0x61, 0x54, 0xac, 0x09, 0x80, 0xf8, 0xb1, 0x87, 0x97, 0x77, 0x4f, 0x2a, 0x04, 0x2c, 0x29, + 0x3f, 0xeb, 0x92, 0x44, 0xee, 0x7b, 0x01, 0xf2, 0x0f, 0x86, 0xab, 0x01, 0x4b, 0x41, 0xd6, 0x24, + 0x77, 0x58, 0x5c, 0xa1, 0x2d, 0x35, 0x60, 0x3c, 0xad, 0x92, 0x52, 0x63, 0xf2, 0x3d, 0x26, 0x9c, + 0x18, 0x2b, 0xd0, 0x2c, 0xee, 0xc1, 0x03, 0x0a, 0xd7, 0x5e, 0x2b, 0x03, 0xe6, 0x2c, 0xa9, 0x2e, + 0x3a, 0x28, 0x4e, 0x93, 0x96, 0x70, 0x1a, 0x17, 0x45, 0xcd, 0x36, 0xaa, 0x2d, 0x80, 0x2f, 0xb5, + 0x32, 0x52, 0x75, 0xbe, 0xce, 0xd6, 0x13, 0x5e, 0xee, 0x01, 0xb1, 0x65, 0x0f, 0xee, 0xc7, 0x4b, + 0x99, 0xea, 0x23, 0xda, 0x7c, 0xc7, 0x9e, 0x1a, 0x09, 0x5f, 0x1b, 0x7d, 0x12, 0x66, 0xc0, 0x4b, + 0x46, 0x75, 0x78, 0x51, 0xc6, 0x54, 0xa9, 0xc6, 0x0c, 0x88, 0x33, 0x7d, 0xfe, 0x1e, 0xa9, 0x51, + 0x4e, 0xb6, 0xd3, 0xce, 0x15, 0xd2, 0x64, 0x1d, 0xb0, 0x61, 0xf8, 0x32, 0xda, 0x87, 0x51, 0x38, + 0x0a, 0xaf, 0xd3, 0x3c, 0x0f, 0xd3, 0x3d, 0x1a, 0xea, 0x0b, 0xaa, 0xa5, 0xec, 0x54, 0xc7, 0x1a, + 0x11, 0xa3, 0x56, 0xc7, 0x9b, 0x2a, 0xe4, 0xf8, 0xf2, 0xea, 0xc6, 0x22, 0xbc, 0x7a, 0x5a, 0x53, + 0x38, 0x16, 0x7c, 0xd9, 0xe0, 0xeb, 0x47, 0x32, 0x3f, 0xa1, 0x0d, 0x34, 0x10, 0x2a, 0x99, 0x7d }; void crzybug2_decrypt(running_machine &machine) @@ -2133,14 +2133,14 @@ void crzybug2_decrypt(running_machine &machine) { uint16_t x = src[i]; - IGS27_CRYPT1_ALT // $1900 - IGS27_CRYPT2_ALT // $1b230 + IGS27_CRYPT1_ALT // $1900 + IGS27_CRYPT2_ALT // $1b230 IGS27_CRYPT3 - IGS27_CRYPT4 + IGS27_CRYPT4 IGS27_CRYPT5 IGS27_CRYPT6_ALT IGS27_CRYPT7 - IGS27_CRYPT8 + IGS27_CRYPT8 x ^= crzybug2_tab[(i >> 1) & 0xff] << 8; diff --git a/src/mame/jpm/jpmsys7.cpp b/src/mame/jpm/jpmsys7.cpp index 02cf7ad3ff0..383c21170db 100644 --- a/src/mame/jpm/jpmsys7.cpp +++ b/src/mame/jpm/jpmsys7.cpp @@ -51,7 +51,7 @@ void jpmsys7_state::jpmsys7_map(address_map &map) map(0x20000018, 0x2000001b).nopw(); // large data upload like astra/pluto? map(0x50000000, 0x50001fff).ram(); -// map(0xf0000000, 0xf00003ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::dev_r), FUNC(mcf5206e_peripheral_device::dev_w)); // technically this can be moved with MBAR +// map(0xf0000000, 0xf00003ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::dev_r), FUNC(mcf5206e_peripheral_device::dev_w)); // technically this can be moved with MBAR } static INPUT_PORTS_START( jpmsys7 ) diff --git a/src/mame/layout/kn5000.lay b/src/mame/layout/kn5000.lay index cb841c9deb1..327cc60b05a 100644 --- a/src/mame/layout/kn5000.lay +++ b/src/mame/layout/kn5000.lay @@ -14,7 +14,7 @@ license:CC0-1.0 <rect y="382" width="1280" height="258" fill="#303031"/> <!-- Outline around the region of the fill-in, intro & ending, - start/stop, synchro & break, and tap tempo buttons. --> + start/stop, synchro & break, and tap tempo buttons. --> <path transform="translate(441, 568)" stroke="#000" fill="#333333" stroke-width="1" d=" M 1.9,0.5 C 1.1,7.1 0.6,13.8 0.5,20.5 0.6,27.2 1.1,33.9 1.9,40.5 H 393.1 c 0.8,-6.6 1.3,-13.3 1.4,-20 -0,-6.7 -0.3,-13.4 -1,-20 H 235.8 @@ -711,14 +711,14 @@ license:CC0-1.0 <!-- Review this: - <element ref="screen_up_and_down_button" inputtag="CPL_SEG10" inputmask="0x30"> screen button: up+down 1 <bounds x="493" y="372" width="26" height="9"/></element> - <element ref="screen_up_and_down_button" inputtag="CPL_SEG10" inputmask="0xc0"> screen button: up+down 2 <bounds x="531" y="372" width="26" height="9"/></element> - <element ref="screen_up_and_down_button" inputtag="CPL_SEG9" inputmask="0x30"> screen button: up+down 3 <bounds x="568" y="372" width="26" height="9"/></element> - <element ref="screen_up_and_down_button" inputtag="CPL_SEG9" inputmask="0xc0"> screen button: up+down 4 <bounds x="607" y="372" width="26" height="9"/></element> - <element ref="screen_up_and_down_button" inputtag="CPL_SEG8" inputmask="0x30"> screen button: up+down 5 <bounds x="645" y="372" width="26" height="9"/></element> - <element ref="screen_up_and_down_button" inputtag="CPL_SEG8" inputmask="0xc0"> screen button: up+down 6 <bounds x="683" y="372" width="26" height="9"/></element> - <element ref="screen_up_and_down_button" inputtag="CPL_SEG7" inputmask="0x30"> screen button: up+down 7 <bounds x="722" y="372" width="26" height="9"/></element> - <element ref="screen_up_and_down_button" inputtag="CPL_SEG7" inputmask="0xc0"> screen button: up+down 8 <bounds x="760" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG10" inputmask="0x30"> screen button: up+down 1 <bounds x="493" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG10" inputmask="0xc0"> screen button: up+down 2 <bounds x="531" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG9" inputmask="0x30"> screen button: up+down 3 <bounds x="568" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG9" inputmask="0xc0"> screen button: up+down 4 <bounds x="607" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG8" inputmask="0x30"> screen button: up+down 5 <bounds x="645" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG8" inputmask="0xc0"> screen button: up+down 6 <bounds x="683" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG7" inputmask="0x30"> screen button: up+down 7 <bounds x="722" y="372" width="26" height="9"/></element> + <element ref="screen_up_and_down_button" inputtag="CPL_SEG7" inputmask="0xc0"> screen button: up+down 8 <bounds x="760" y="372" width="26" height="9"/></element> --> <element ref="screen_up_and_down_button"><!-- screen button: up+down 1 --><bounds x="493" y="372" width="26" height="9"/></element> @@ -1320,10 +1320,10 @@ license:CC0-1.0 <!-- TODO: - <view name="Full Unit"> - <bounds x="?" y="?" width="?" height="?"/> - <group ref="fullunit"><bounds x="?" y="?" width="?" height="?"/></group> - </view> + <view name="Full Unit"> + <bounds x="?" y="?" width="?" height="?"/> + <group ref="fullunit"><bounds x="?" y="?" width="?" height="?"/></group> + </view> --> <view name="Compact"> <bounds x="0" y="0" width="1280" height="640"/> diff --git a/src/mame/layout/patinho.lay b/src/mame/layout/patinho.lay index 0971423601e..2a30b28fbec 100644 --- a/src/mame/layout/patinho.lay +++ b/src/mame/layout/patinho.lay @@ -51,7 +51,7 @@ Front panel of the Patinho Feio mini-computer with clickable buttons, switches a <bounds x="7" y="10" width="20" height="20"/> <data><![CDATA[ <svg width="20" height="20"> - <path + <path fill="#b3b3b3" stroke="#808080" stroke-width="1" d="m 5.5,0.5 4,4 -8,8 6,6 8,-8 4,4 v -14 z" /> </svg> @@ -61,7 +61,7 @@ Front panel of the Patinho Feio mini-computer with clickable buttons, switches a <bounds x="10" y="10" width="20" height="20"/> <data><![CDATA[ <svg width="20" height="20"> - <path + <path fill="#b3b3b3" stroke="#808080" stroke-width="1" d="m 0.5,14.5 4,-4 8,8 6,-6 -8,-8 4,-4 h -14 z" /> </svg> @@ -1297,7 +1297,7 @@ Front panel of the Patinho Feio mini-computer with clickable buttons, switches a <element ref="right_arrow"> <bounds x="629" y="310" width="22" height="14" /> </element> - + <element ref="right_arrow"> <bounds x="629" y="339" width="22" height="14" /> </element> diff --git a/src/mame/layout/virusa.lay b/src/mame/layout/virusa.lay index ee0d7b4a7eb..aa9d33fb276 100644 --- a/src/mame/layout/virusa.lay +++ b/src/mame/layout/virusa.lay @@ -97,8 +97,8 @@ license:CC0-1.0 currently unsupported element rotations with arbitrary angles: <rect> - <color red="0.6" green="0.6" blue="0.6"/> - <bounds x="22" y="2" width="3" height="12"/> + <color red="0.6" green="0.6" blue="0.6"/> + <bounds x="22" y="2" width="3" height="12"/> </rect> --> <disk> @@ -459,7 +459,7 @@ license:CC0-1.0 <element name="mode_text"><text string="MODE"><color red="0.8" green="0.8" blue="0.8"/></text></element> <element name="amount_text"><text string="AMOUNT"><color red="0.8" green="0.8" blue="0.8"/></text></element> - + <element name="lfo_2_text"><text string="LFO 2"><color red="0.8" green="0.8" blue="0.8"/></text></element> <element name="trigger_text"><text string="TRIGGER"><color red="0.8" green="0.8" blue="0.8"/></text></element> <element name="shape_1plus2_text"><text string="SHAPE 1+2"><color red="0.8" green="0.8" blue="0.8"/></text></element> diff --git a/src/mame/layout/virusb.lay b/src/mame/layout/virusb.lay index 9d9707e7e5b..0dc915c6057 100644 --- a/src/mame/layout/virusb.lay +++ b/src/mame/layout/virusb.lay @@ -88,8 +88,8 @@ license:CC0-1.0 currently unsupported element rotations with arbitrary angles: <rect> - <color red="0.6" green="0.6" blue="0.6"/> - <bounds x="22" y="2" width="3" height="12"/> + <color red="0.6" green="0.6" blue="0.6"/> + <bounds x="22" y="2" width="3" height="12"/> </rect> --> <disk> diff --git a/src/mame/layout/virusc.lay b/src/mame/layout/virusc.lay index f068b7bba4f..4a01416c49b 100644 --- a/src/mame/layout/virusc.lay +++ b/src/mame/layout/virusc.lay @@ -85,8 +85,8 @@ license:CC0-1.0 currently unsupported element rotations with arbitrary angles: <rect> - <color red="0.6" green="0.6" blue="0.6"/> - <bounds x="22" y="2" width="3" height="12"/> + <color red="0.6" green="0.6" blue="0.6"/> + <bounds x="22" y="2" width="3" height="12"/> </rect> --> diff --git a/src/mame/layout/viruscl.lay b/src/mame/layout/viruscl.lay index 145d45e6abc..76f42971653 100644 --- a/src/mame/layout/viruscl.lay +++ b/src/mame/layout/viruscl.lay @@ -88,8 +88,8 @@ license:CC0-1.0 currently unsupported element rotations with arbitrary angles: <rect> - <color red="0.6" green="0.6" blue="0.6"/> - <bounds x="22" y="2" width="3" height="12"/> + <color red="0.6" green="0.6" blue="0.6"/> + <bounds x="22" y="2" width="3" height="12"/> </rect> --> <disk> diff --git a/src/mame/layout/virusrck.lay b/src/mame/layout/virusrck.lay index 8b89d7d93a2..7912e9a59a3 100644 --- a/src/mame/layout/virusrck.lay +++ b/src/mame/layout/virusrck.lay @@ -78,8 +78,8 @@ license:CC0-1.0 currently unsupported element rotations with arbitrary angles: <rect> - <color red="0.6" green="0.6" blue="0.6"/> - <bounds x="22" y="2" width="3" height="12"/> + <color red="0.6" green="0.6" blue="0.6"/> + <bounds x="22" y="2" width="3" height="12"/> </rect> --> @@ -378,9 +378,9 @@ license:CC0-1.0 <element ref="program_text"><bounds x="890" y="158" width="34" height="9"/></element> <!-- NOTE: - The exact positioning of buttons is not very precise. Here I use non-zero values for x and y - just to get a resonable result (something that looks good, even though it is not precise). - Someday someone (myself, perhaps?!) should fine-tune this layout to more closely match the exact coordinates. + The exact positioning of buttons is not very precise. Here I use non-zero values for x and y + just to get a resonable result (something that looks good, even though it is not precise). + Someday someone (myself, perhaps?!) should fine-tune this layout to more closely match the exact coordinates. --> <element ref="outlines"><bounds x="20" y="1" width="1700" height="180"/></element> <element ref="rack_r_text"><bounds x="1163" y="-10" width="61" height="190"/></element> diff --git a/src/mame/layout/virusrckxl.lay b/src/mame/layout/virusrckxl.lay index 2c8d0517032..83d182e8e1a 100644 --- a/src/mame/layout/virusrckxl.lay +++ b/src/mame/layout/virusrckxl.lay @@ -78,8 +78,8 @@ license:CC0-1.0 currently unsupported element rotations with arbitrary angles: <rect> - <color red="0.6" green="0.6" blue="0.6"/> - <bounds x="22" y="2" width="3" height="12"/> + <color red="0.6" green="0.6" blue="0.6"/> + <bounds x="22" y="2" width="3" height="12"/> </rect> --> diff --git a/src/mame/nec/pc8801.cpp b/src/mame/nec/pc8801.cpp index 8fcf3c2dcb4..009e4b793da 100644 --- a/src/mame/nec/pc8801.cpp +++ b/src/mame/nec/pc8801.cpp @@ -279,13 +279,13 @@ uint8_t pc8801_state::dma_mem_r(offs_t offset) { // TODO: TVRAM readback //if ((offset & 0xf000) == 0xf000) - // return m_hi_work_ram[offset & 0xfff]; + // return m_hi_work_ram[offset & 0xfff]; return m_work_ram[offset & 0xffff]; } void pc8801_state::dma_mem_w(offs_t offset, u8 data) { -// printf("%04x %02x\n", offset, data); +// printf("%04x %02x\n", offset, data); m_work_ram[offset & 0xffff] = data; } @@ -1651,7 +1651,7 @@ void pc8801_state::pc8801(machine_config &config) m_maincpu->set_irq_acknowledge_callback(FUNC(pc8801_state::int_ack_cb)); PC80S31(config, m_pc80s31, MASTER_CLOCK); -// config.set_perfect_quantum(m_maincpu); +// config.set_perfect_quantum(m_maincpu); // TODO: get rid of this config.set_perfect_quantum("pc80s31:fdc_cpu"); @@ -1805,7 +1805,7 @@ void pc8801mc_state::pc8801mc(machine_config &config) m_cdrom_if->rom_bank_cb().set([this](bool state) { m_cdrom_bank = state; }); m_cdrom_if->drq_cb().set(m_dma, FUNC(i8257_device::dreq1_w)); m_dma->in_ior_cb<1>().set(m_cdrom_if, FUNC(pc8801_31_device::dma_r)); -// m_dma->out_iow_cb<1>().set([] (u8 data) { printf("SASI iow\n"); }); +// m_dma->out_iow_cb<1>().set([] (u8 data) { printf("SASI iow\n"); }); } ROM_START( pc8801 ) diff --git a/src/mame/nec/pc9801.cpp b/src/mame/nec/pc9801.cpp index 4de53095b95..d53b3a42dfd 100644 --- a/src/mame/nec/pc9801.cpp +++ b/src/mame/nec/pc9801.cpp @@ -215,8 +215,8 @@ void pc9801_state::pc9801_map(address_map &map) map(0xa8000, 0xbffff).rw(FUNC(pc9801_state::gvram_r), FUNC(pc9801_state::gvram_w)); //bitmap VRAM map(0xc0000, 0xdffff).rw("cbus_root", FUNC(pc98_cbus_root_device::mem_slot_r), FUNC(pc98_cbus_root_device::mem_slot_w)); // map(0xcc000, 0xcffff).rom().region("sound_bios", 0); //sound BIOS -// map(0xd6000, 0xd6fff).rom().region("fdc_bios_2dd", 0); //floppy BIOS 2dd -// map(0xd7000, 0xd7fff).rom().region("fdc_bios_2hd", 0); //floppy BIOS 2hd +// map(0xd6000, 0xd6fff).rom().region("fdc_bios_2dd", 0); //floppy BIOS 2dd +// map(0xd7000, 0xd7fff).rom().region("fdc_bios_2hd", 0); //floppy BIOS 2hd map(0xe8000, 0xfffff).rom().region("ipl", 0); } @@ -252,8 +252,8 @@ void pc9801_state::pc9801_io(address_map &map) map(0x0020, 0x002f).w(FUNC(pc9801_state::dmapg4_w)).umask16(0xff00); map(0x0050, 0x0057).m("fdd_2d", FUNC(pc80s31k_device::host_map)).umask16(0xff00); map(0x0068, 0x0068).w(FUNC(pc9801_state::pc9801_video_ff_w)); //mode FF / <undefined> -// map(0x0080, 0x0080).rw(FUNC(pc9801_state::sasi_data_r), FUNC(pc9801_state::sasi_data_w)); -// map(0x0082, 0x0082).rw(FUNC(pc9801_state::sasi_status_r), FUNC(pc9801_state::sasi_ctrl_w)); +// map(0x0080, 0x0080).rw(FUNC(pc9801_state::sasi_data_r), FUNC(pc9801_state::sasi_data_w)); +// map(0x0082, 0x0082).rw(FUNC(pc9801_state::sasi_status_r), FUNC(pc9801_state::sasi_ctrl_w)); map(0x0090, 0x0090).r(m_fdc_2hd, FUNC(upd765a_device::msr_r)); map(0x0092, 0x0092).rw(m_fdc_2hd, FUNC(upd765a_device::fifo_r), FUNC(upd765a_device::fifo_w)); map(0x0094, 0x0094).rw(FUNC(pc9801_state::fdc_2hd_ctrl_r), FUNC(pc9801_state::fdc_2hd_ctrl_w)); diff --git a/src/mame/nec/pc98ha.cpp b/src/mame/nec/pc98ha.cpp index 42f2ab4d453..619d4ec500f 100644 --- a/src/mame/nec/pc98ha.cpp +++ b/src/mame/nec/pc98ha.cpp @@ -475,7 +475,7 @@ void pc98lt_state::lt_config(machine_config &config) UPD765A(config, m_fdc, 8'000'000, false, true); m_fdc->intrq_wr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ6); m_fdc->drq_wr_callback().set(m_maincpu, FUNC(v50_device::dreq_w<2>)).invert(); -// m_fdc->drq_wr_callback().set(m_maincpu, FUNC(v50_device::dreq_w<3>)).invert(); // 2dd +// m_fdc->drq_wr_callback().set(m_maincpu, FUNC(v50_device::dreq_w<3>)).invert(); // 2dd FLOPPY_CONNECTOR(config, "upd765:0", pc9801_floppies, "525hd", pc9801_state::floppy_formats); FLOPPY_CONNECTOR(config, "upd765:1", pc9801_floppies, "525hd", pc9801_state::floppy_formats); diff --git a/src/mame/olivetti/m24_kbd.cpp b/src/mame/olivetti/m24_kbd.cpp index 367922156d0..29c8f26c01d 100644 --- a/src/mame/olivetti/m24_kbd.cpp +++ b/src/mame/olivetti/m24_kbd.cpp @@ -263,8 +263,13 @@ uint8_t m24_keyboard_device::p2_r() // co-ordinates. The +1 is to put one signal 90 degrees out of phase with // respect to the other, to produce the required "quadrature" encoding, // which lets the MCU determine the direction of movement. - return (m_keypress << 7) | m_mousebtn->read() | - BIT(mx+1, 1) | BIT(mx, 1) << 1 | BIT(my, 1) << 2 | BIT(my+1, 1) << 3; + return + (m_keypress << 7) | + m_mousebtn->read() | + BIT(mx + 1, 1) | + BIT(mx, 1) << 1 | + BIT(my, 1) << 2 | + BIT(my + 1, 1) << 3; } int m24_keyboard_device::t0_r() diff --git a/src/mame/pc/pc_t1t.h b/src/mame/pc/pc_t1t.h index 6696b50c765..281487ff404 100644 --- a/src/mame/pc/pc_t1t.h +++ b/src/mame/pc/pc_t1t.h @@ -196,6 +196,9 @@ public: template <typename T> pcvideo_pcjr_device &set_chr_gen_tag(T &&tag) { m_chr_gen.set_tag(std::forward<T>(tag)); return *this; } template <typename T> pcvideo_pcjr_device &set_kanji_tag(T &&tag) { m_jxkanji.set_tag(std::forward<T>(tag)); return *this; } + // this needs to be called when the video RAM size is known + void set_16bit(bool val) { m_16bit = val; } + uint8_t read(address_space &space, offs_t offset); void write(offs_t offset, uint8_t data); @@ -212,20 +215,25 @@ protected: memory_access<17, 0, 0, ENDIANNESS_LITTLE>::cache m_vram; optional_region_ptr<uint8_t> m_jxkanji; devcb_write_line m_vsync_cb; + bool m_16bit; uint8_t m_address_data_ff; uint8_t m_mode_ctrl_1, m_mode_ctrl_2; private: - void pc_pcjr_mode_switch(); + void mode_switch(); void vga_data_w(uint8_t data); void pcjr_vsync_changed(int state); virtual MC6845_UPDATE_ROW( crtc_update_row ) override; + MC6845_UPDATE_ROW( text_inten_high_8bit_update_row ); MC6845_UPDATE_ROW( text_blink_update_row ); + MC6845_UPDATE_ROW( text_blink_high_8bit_update_row ); MC6845_UPDATE_ROW( pcjx_text_update_row ); + MC6845_UPDATE_ROW( gfx_4bpp_high_8bit_update_row ); MC6845_UPDATE_ROW( gfx_2bpp_update_row ); + MC6845_UPDATE_ROW( gfx_2bpp_high_8bit_update_row ); MC6845_UPDATE_ROW( gfx_1bpp_update_row ); }; diff --git a/src/mame/psion/mc600.cpp b/src/mame/psion/mc600.cpp index 34ffba474fb..66d7f5c43cb 100644 --- a/src/mame/psion/mc600.cpp +++ b/src/mame/psion/mc600.cpp @@ -341,10 +341,10 @@ INPUT_CHANGED_MEMBER(mc600_state::key_on) //INPUT_CHANGED_MEMBER(mc600_state::reset) //{ -// if (newval) -// { -// m_asic2->reset_w(0); -// } +// if (newval) +// { +// m_asic2->reset_w(0); +// } //} diff --git a/src/mame/sega/dcchk.cpp b/src/mame/sega/dcchk.cpp index 5bcc62dc204..da6dd439100 100644 --- a/src/mame/sega/dcchk.cpp +++ b/src/mame/sega/dcchk.cpp @@ -85,7 +85,7 @@ private: void dcchk_state::md_68k_map(address_map &map) { map.unmap_value_high(); -// map(0x000000, 0x3fffff).rw(m_md_cart, FUNC(megadrive_cart_slot_device::base_r), FUNC(megadrive_cart_slot_device::base_w)); +// map(0x000000, 0x3fffff).rw(m_md_cart, FUNC(megadrive_cart_slot_device::base_r), FUNC(megadrive_cart_slot_device::base_w)); map(0x000000, 0x07ffff).rom().region("bios", 0); // $400000 maple bus interactions @@ -96,7 +96,7 @@ void dcchk_state::md_68k_map(address_map &map) // TODO: checked at startup, still used for Maple interactions? // map(0xa10000, 0xa100ff) I/O -// map(0xa10000, 0xa100ff).m(*this, FUNC(dcchk_state::md_ioctrl_map)); +// map(0xa10000, 0xa100ff).m(*this, FUNC(dcchk_state::md_ioctrl_map)); // map(0xa11000, 0xa110ff) memory mode register // map(0xa11100, 0xa111ff) Z80 BUSREQ/BUSACK @@ -148,7 +148,7 @@ void dcchk_state::md_68k_map(address_map &map) // map(0xa11400, 0xa1dfff) <unmapped> (no DTACK generation, freezes machine without additional HW) // map(0xa12000, 0xa120ff).m(m_exp, FUNC(...::fdc_map)); -// map(0xa13000, 0xa130ff).rw(m_md_cart, FUNC(megadrive_cart_slot_device::time_r), FUNC(megadrive_cart_slot_device::time_w)); +// map(0xa13000, 0xa130ff).rw(m_md_cart, FUNC(megadrive_cart_slot_device::time_r), FUNC(megadrive_cart_slot_device::time_w)); // map(0xa14000, 0xa14003) TMSS lock // map(0xa15100, 0xa153ff) 32X registers if present, <unmapped> otherwise // map(0xc00000, 0xdfffff) VDP and PSG (with mirrors and holes) diff --git a/src/mame/sega/model2_v.cpp b/src/mame/sega/model2_v.cpp index 7e2ee2a8ac2..a40d4fed500 100644 --- a/src/mame/sega/model2_v.cpp +++ b/src/mame/sega/model2_v.cpp @@ -81,10 +81,10 @@ in the texture header tells the rasterizer which texture map to use. The rasterizer then can average two texture maps to do mip mapping. More information can be found on the 2B manual, on the 'Texturing' and 'Data Format' chapters. - The rasterizer supports 128x128 'microtextures' which are typically used to add more details to a texture when it is - close enough to the viewer. - - Polygons are rendered from front-to-back. A fill buffer is used to track which pixels in the framebuffer have already - been drawn to and prevents them from being overwritten. The real hardware does this to ensure that the polygons closest - to the camera are rendered first, in case the renderer runs out of time and has to skip ahead to the next frame. + close enough to the viewer. + - Polygons are rendered from front-to-back. A fill buffer is used to track which pixels in the framebuffer have already + been drawn to and prevents them from being overwritten. The real hardware does this to ensure that the polygons closest + to the camera are rendered first, in case the renderer runs out of time and has to skip ahead to the next frame. *********************************************************************************************************************************/ diff --git a/src/mame/sega/model2rd.ipp b/src/mame/sega/model2rd.ipp index c6456241e4c..eafab09754c 100644 --- a/src/mame/sega/model2rd.ipp +++ b/src/mame/sega/model2rd.ipp @@ -142,7 +142,7 @@ u32 model2_renderer::fetch_bilinear_texel(const m2_poly_extra_data& object, cons v1 = v0, v0--, vfrac = 0x100; // bottom edge of texture } - // read the four texels from the texture sheet + // read the four texels from the texture sheet u32 tex00 = get_texel(tex_x, tex_y, u0, v0, sheet) << 4; u32 tex01 = get_texel(tex_x, tex_y, u1, v0, sheet) << 4; u32 tex10 = get_texel(tex_x, tex_y, u0, v1, sheet) << 4; @@ -259,7 +259,7 @@ void model2_renderer::draw_scanline_tex(int32_t scanline, const extent_t &extent float z = recip_approx(ooz); - s32 mml = -object.texlod + fast_log2(z); // equivalent to log2(z^2) + s32 mml = -object.texlod + fast_log2(z); // equivalent to log2(z^2) s32 level = std::clamp(mml >> 7, 0, max_level); // we give texture coordinates 8 fractional bits diff --git a/src/mame/sequential/sixtrak.cpp b/src/mame/sequential/sixtrak.cpp index dd8bbe3c60b..4f2bf05a57f 100644 --- a/src/mame/sequential/sixtrak.cpp +++ b/src/mame/sequential/sixtrak.cpp @@ -621,7 +621,7 @@ void sixtrak_state::update_tuning_timer() const attotime t = attotime::from_hz(freq); m_tuning_timer->adjust(t, 0, t); LOGMASKED(LOG_AUTOTUNE, "Autotuning voice: %d is_filter: %d frequency: %f\n", - loudest_voice, tuning_filter, freq); + loudest_voice, tuning_filter, freq); } TIMER_CALLBACK_MEMBER(sixtrak_state::tuning_timer_tick) @@ -984,10 +984,10 @@ DECLARE_INPUT_CHANGED_MEMBER(sixtrak_state::dac_trimmer_changed) const u16 prev_dac_value = m_dac_value; m_dac_value = 0; LOGMASKED(LOG_CALIBRATION, "DAC inverter trimmer adjusted ( 0V). V: %f, -V: %f, offset: %f\n", - get_dac_v(false), get_dac_v(true), get_dac_v(false) - get_dac_v(true)); + get_dac_v(false), get_dac_v(true), get_dac_v(false) - get_dac_v(true)); m_dac_value = 0x0fff; LOGMASKED(LOG_CALIBRATION, "DAC inverter trimmer adjusted (-4V). V: %f, -V: %f\n", - get_dac_v(false), get_dac_v(true)); + get_dac_v(false), get_dac_v(true)); m_dac_value = prev_dac_value; } diff --git a/src/mame/seta/seta2.cpp b/src/mame/seta/seta2.cpp index 523e87e995a..a4529cd9a24 100644 --- a/src/mame/seta/seta2.cpp +++ b/src/mame/seta/seta2.cpp @@ -831,7 +831,7 @@ void funcube_state::funcube2_map(address_map &map) map(0x00c00000, 0x00c002ff).rw(FUNC(funcube_state::nvram_r), FUNC(funcube_state::nvram_w)).umask32(0x00ff00ff); -// map(0xf0000000, 0xf00001ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_r), FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_w)); // technically this can be moved with MBAR +// map(0xf0000000, 0xf00001ff).rw("maincpu_onboard", FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_r), FUNC(mcf5206e_peripheral_device::seta2_coldfire_regs_w)); // technically this can be moved with MBAR map(0xffffe000, 0xffffffff).ram(); // SRAM } @@ -2739,10 +2739,10 @@ ROM_END void funcube_state::init_funcube() { -// uint16_t *main_cpu = (uint16_t *) memregion("maincpu")->base(); +// uint16_t *main_cpu = (uint16_t *) memregion("maincpu")->base(); // -// main_cpu[0x064/2] = 0x0000; -// main_cpu[0x066/2] = 0x042a; // PIC protection? +// main_cpu[0x064/2] = 0x0000; +// main_cpu[0x066/2] = 0x042a; // PIC protection? } diff --git a/src/mame/skeleton/aws.cpp b/src/mame/skeleton/aws.cpp index 6b1f526eda1..f162110b5ae 100644 --- a/src/mame/skeleton/aws.cpp +++ b/src/mame/skeleton/aws.cpp @@ -210,11 +210,11 @@ void aws_state::fdc_board(machine_config &config) PIC8259(config, m_pic, 0); PIT8253(config, m_fdc_pit, 0); m_fdc_pit->set_clk<0>(19.6608_MHz_XTAL / 16); // 1.23 MHz -// m_fdc_pit->out_handler<0>().set(FUNC(aws_state::pit_out0_w)); // INT5 +// m_fdc_pit->out_handler<0>().set(FUNC(aws_state::pit_out0_w)); // INT5 m_fdc_pit->set_clk<1>(19.6608_MHz_XTAL / 16); // 1.23 MHz -// m_fdc_pit->out_handler<1>().set(FUNC(aws_state::pit_out1_w)); // RS-232C port B +// m_fdc_pit->out_handler<1>().set(FUNC(aws_state::pit_out1_w)); // RS-232C port B m_fdc_pit->set_clk<2>(19.6608_MHz_XTAL / 16); // 1.23 MHz -// m_fdc_pit->out_handler<2>().set(FUNC(aws_state::pit_out2_w)); // RS-232C port A +// m_fdc_pit->out_handler<2>().set(FUNC(aws_state::pit_out2_w)); // RS-232C port A UPD7201(config, m_fdc_serial, 24_MHz_XTAL / 8); } diff --git a/src/mame/skeleton/aws_kb.h b/src/mame/skeleton/aws_kb.h index a2f8c86d1aa..bb993c80306 100644 --- a/src/mame/skeleton/aws_kb.h +++ b/src/mame/skeleton/aws_kb.h @@ -10,8 +10,8 @@ #include "bus/rs232/rs232.h" class aws_keyboard_device : public device_t, - public device_buffered_serial_interface<8U>, - public device_rs232_port_interface + public device_buffered_serial_interface<8U>, + public device_rs232_port_interface { public: aws_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/mame/skeleton/lgtz80.cpp b/src/mame/skeleton/lgtz80.cpp index e478eb7c9d5..0fe2e64767f 100644 --- a/src/mame/skeleton/lgtz80.cpp +++ b/src/mame/skeleton/lgtz80.cpp @@ -24,7 +24,7 @@ besides rudimentary ROM banking and port I/O. Pharaoh's Gold has a 'Wing' string plus other strings typically associated to Wing games. TODO: -- arthurkn uploads code to NVRAM if missing, fruitcat and pharmyst seemingly need +- arthurkn uploads code to NVRAM if missing, fruitcat and pharmyst seemingly need NVRAM pre-populated, thus currently run off the rails when calling to NVRAM, seem to fortuitously recover, but never populate tile RAM - arthurkn runs correctly and needs the following: diff --git a/src/mame/tvgames/xavix_v.cpp b/src/mame/tvgames/xavix_v.cpp index 5dedca17dcd..cdcafb5014e 100644 --- a/src/mame/tvgames/xavix_v.cpp +++ b/src/mame/tvgames/xavix_v.cpp @@ -1469,11 +1469,11 @@ void superxavix_state::draw_bitmap_layer(screen_device &screen, bitmap_rgb32 &bi /* if (m_extra) { - if (start & 0x4000) - { - start &= 0x3fff; - start ^= 0xc00; - } + if (start & 0x4000) + { + start &= 0x3fff; + start ^= 0xc00; + } } */ |
