diff options
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/atarixga.h | 62 | ||||
-rw-r--r-- | src/mame/machine/dccons.cpp | 12 | ||||
-rw-r--r-- | src/mame/machine/dec_lk201.cpp | 36 | ||||
-rw-r--r-- | src/mame/machine/dec_lk201.h | 8 | ||||
-rw-r--r-- | src/mame/machine/fd1094.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/kaneko_toybox.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/m2comm.cpp | 6 | ||||
-rw-r--r-- | src/mame/machine/namcoic.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/pcecommn.h | 2 | ||||
-rw-r--r-- | src/mame/machine/seibucop/seibucop.cpp | 128 | ||||
-rw-r--r-- | src/mame/machine/seibucop/seibucop.h | 24 | ||||
-rw-r--r-- | src/mame/machine/sms.cpp | 4 | ||||
-rw-r--r-- | src/mame/machine/xbox.cpp | 22 |
13 files changed, 156 insertions, 156 deletions
diff --git a/src/mame/machine/atarixga.h b/src/mame/machine/atarixga.h index 710aedb22c2..8d6980a3ac3 100644 --- a/src/mame/machine/atarixga.h +++ b/src/mame/machine/atarixga.h @@ -3,7 +3,7 @@ /************************************************************************* atarixga.h - + Atari XGA encryption FPGA *************************************************************************/ @@ -16,38 +16,38 @@ extern const device_type ATARI_XGA; class atari_xga_device : public device_t { public: - // construction/destruction - atari_xga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - - DECLARE_WRITE32_MEMBER(write); - DECLARE_READ32_MEMBER(read); - + // construction/destruction + atari_xga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + + DECLARE_WRITE32_MEMBER(write); + DECLARE_READ32_MEMBER(read); + protected: - virtual void device_start() override; - virtual void device_reset() override; - + virtual void device_start() override; + virtual void device_reset() override; + private: - static const size_t RAM_WORDS = 2048; - - enum fpga_mode - { - FPGA_RESET, - FPGA_SETKEY, - FPGA_DECIPHER - }; - - UINT16 powers2(UINT8 k, UINT16 x); - UINT16 lfsr2(UINT16 x); - UINT16 lfsr1(UINT16 x); - UINT16 parity(UINT16 x); - size_t popcount(UINT16 x); - UINT16 ctz(UINT16 x); - UINT16 decipher(UINT8 k, UINT16 c); - - fpga_mode m_mode; - UINT16 m_address; // last written address - UINT16 m_ciphertext; // last written ciphertext - std::unique_ptr<UINT16[]> m_ram; // CY7C185-45PC, only 16-Kbit used + static const size_t RAM_WORDS = 2048; + + enum fpga_mode + { + FPGA_RESET, + FPGA_SETKEY, + FPGA_DECIPHER + }; + + UINT16 powers2(UINT8 k, UINT16 x); + UINT16 lfsr2(UINT16 x); + UINT16 lfsr1(UINT16 x); + UINT16 parity(UINT16 x); + size_t popcount(UINT16 x); + UINT16 ctz(UINT16 x); + UINT16 decipher(UINT8 k, UINT16 c); + + fpga_mode m_mode; + UINT16 m_address; // last written address + UINT16 m_ciphertext; // last written ciphertext + std::unique_ptr<UINT16[]> m_ram; // CY7C185-45PC, only 16-Kbit used }; diff --git a/src/mame/machine/dccons.cpp b/src/mame/machine/dccons.cpp index 776e6d8ead2..0a0792c14d6 100644 --- a/src/mame/machine/dccons.cpp +++ b/src/mame/machine/dccons.cpp @@ -126,12 +126,12 @@ READ32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_r ) case SB_GDLEND: //machine().debug_break(); return atapi_xferlen; // TODO: check me - case SB_SECUR_EADR: // always read 0xFF on hardware + case SB_SECUR_EADR: // always read 0xFF on hardware return 0x000000ff; - case SB_SECUR_STATE: // state of BIOS checksum security system (R/O): + case SB_SECUR_STATE: // state of BIOS checksum security system (R/O): // 3 - check passed OK, G1 ATA (5F70xx) registers area accessible - // 2 - check failed, G1 ATA area blocked (read FFFFFFFFh) - // 0 - check in progress, BIOS data summed, G1 ATA area blocked (read FFFFFFFFh) + // 2 - check failed, G1 ATA area blocked (read FFFFFFFFh) + // 0 - check in progress, BIOS data summed, G1 ATA area blocked (read FFFFFFFFh) return 3; default: printf("G1CTRL: Unmapped read %08x\n", 0x5f7400+offset*4); @@ -185,10 +185,10 @@ WRITE32_MEMBER(dc_cons_state::dc_mess_g1_ctrl_w ) if values doesn't match - security system switch to state 2 (check fail): - G1 ATA locked - - can be switched to state 0 by write to SB_SECUR_EADR register, however passing valid data block through security system set it back to state 2 + - can be switched to state 0 by write to SB_SECUR_EADR register, however passing valid data block through security system set it back to state 2 - the only exit from this state - power off/on or reset; - current state can be read from SB_SECUR_STATE register + current state can be read from SB_SECUR_STATE register actual checksum algorithm is unknown, but its supposed to be simple and weak, known few modded BIOSes which succesfully passes this CRC check, because of good luck diff --git a/src/mame/machine/dec_lk201.cpp b/src/mame/machine/dec_lk201.cpp index 353856f928c..0ba3d6a0fdc 100644 --- a/src/mame/machine/dec_lk201.cpp +++ b/src/mame/machine/dec_lk201.cpp @@ -3,7 +3,7 @@ /* DEC LK-201 keyboard Emulation by R. Belmont & M. Burke -with contributions by Cracyc and Karl-Ludwig Deisenhofer (2016) +with contributions by Cracyc and Karl-Ludwig Deisenhofer (2016) This is the later "cost-reduced" 6805 version with green LEDs; there's also an 8048 version. The LK-201 mechanical elements are described in US Patent 4,467,150 @@ -181,10 +181,10 @@ const device_type LK201 = &device_creator<lk201_device>; ROM_START( lk201 ) ROM_REGION(0x2000, LK201_CPU_TAG, 0) -// 23-001s9-00.bin is for the newer LK201 version (green LEDs, Motorola 6805) +// 23-001s9-00.bin is for the newer LK201 version (green LEDs, Motorola 6805) ROM_LOAD( "23-001s9-00.bin", 0x0000, 0x2000, CRC(be293c51) SHA1(a11ae004d2d6055d7279da3560c3e56610a19fdb) ) -// 23-004M1 or 23-004M2 are in the older LK201 keyboard with red LEDs (8051) +// 23-004M1 or 23-004M2 are in the older LK201 keyboard with red LEDs (8051) ROM_END @@ -541,10 +541,10 @@ void lk201_device::device_timer(emu_timer &timer, device_timer_id id, int param, { switch (id) { - case 1: - m_timer.tsr |= TSR_OCFL; + case 1: + m_timer.tsr |= TSR_OCFL; - if ((m_timer.tcr & TCR_OCIE) && (m_timer.tsr & TSR_OCFL)) + if ((m_timer.tcr & TCR_OCIE) && (m_timer.tsr & TSR_OCFL)) m_maincpu->set_input_line(M68HC05EG_INT_TIMER, ASSERT_LINE); break; @@ -567,7 +567,7 @@ void lk201_device::rcv_complete() int data = get_received_char(); m_kbd_state = data; -// printf("\nlk201 got %02x\n", m_kbd_state); +// printf("\nlk201 got %02x\n", m_kbd_state); } void lk201_device::tra_complete() @@ -602,7 +602,7 @@ READ8_MEMBER( lk201_device::timer_r ) switch (offset) { case 8: // ACRH (high value is stored and reused when reading low) - count = (m_maincpu->total_cycles() / 4) & 0x0000ffff; + count = (m_maincpu->total_cycles() / 4) & 0x0000ffff; ret = count >> 8; break; case 9: // ACRL @@ -637,7 +637,7 @@ WRITE8_MEMBER( lk201_device::timer_w ) count |= m_timer.ocrl; m_timer.ocrh = count >> 8; - m_timer.tsr = save_tsr; // restore flags + m_timer.tsr = save_tsr; // restore flags break; } } @@ -675,7 +675,7 @@ WRITE8_MEMBER( lk201_device::ports_w ) UINT8 olddata = ports[offset]; ports[offset] = data; // "port writes are independent of DDRC" send_port(space, offset, olddata & ddrs[offset]); -// printf("\nPORT %c write %02x (OLD = %02x) (DDR = %02x) (PC=%x)\n", 'A' + offset, data, olddata, ddrs[offset], m_maincpu->pc()); +// printf("\nPORT %c write %02x (OLD = %02x) (DDR = %02x) (PC=%x)\n", 'A' + offset, data, olddata, ddrs[offset], m_maincpu->pc()); } void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) @@ -719,8 +719,8 @@ void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) // Check for LED update strobe if (((portc & 0x80) == 0) && (olddata & 0x80)) { - if(ddrs[2] != 0x00) - { // Lower nibble contains the LED values (1 = on, 0 = off) + if(ddrs[2] != 0x00) + { // Lower nibble contains the LED values (1 = on, 0 = off) machine().output().set_value("led_wait" , (led_data & 0x1) == 1); machine().output().set_value("led_compose", (led_data & 0x2) == 2); machine().output().set_value("led_lock" , (led_data & 0x4) == 4); @@ -731,11 +731,11 @@ void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) m_speaker->set_state(1); // Beeps < 20 ms are clipped. A key click on a LK201 lasts 2 ms... if(m_kbd_state == LK_CMD_BELL) - m_beeper->adjust(attotime::from_msec(125)); - else + m_beeper->adjust(attotime::from_msec(125)); + else m_beeper->adjust(attotime::from_msec(25)); // see note } - // Upper 4 bits of LED_DATA contain encoded volume info + // Upper 4 bits of LED_DATA contain encoded volume info switch (led_data & 0xf0) { case 0xf0: // 8 - (see TABLE 4 in 68HC05xx ROM) @@ -765,10 +765,10 @@ void lk201_device::send_port(address_space &space, UINT8 offset, UINT8 olddata) default: ; } // switch (volume) - + } // if (update_strobe) - - } // outer switch + + } // outer switch } READ8_MEMBER( lk201_device::sci_r ) diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h index 1df36577b7b..3185a0a139f 100644 --- a/src/mame/machine/dec_lk201.h +++ b/src/mame/machine/dec_lk201.h @@ -24,12 +24,12 @@ #define LK_CMD_ENB_BELL 0x23 /* enable the bell - 1st param: volume */ #define LK_CMD_BELL 0xa7 /* emit a bell - 1st param: volume */ -// TCR - Timer Compare Register +// TCR - Timer Compare Register #define TCR_OCIE 0x40 // Bit 6 (output compare IRQ enable) -#define TCR_OLVL 0x01 // Bit 1 (output level) +#define TCR_OLVL 0x01 // Bit 1 (output level) -// TSR - Timer Status Register -#define TSR_OCFL 0x40 // TSR (68HC05 output compare flag) +// TSR - Timer Status Register +#define TSR_OCFL 0x40 // TSR (68HC05 output compare flag) //************************************************************************** // INTERFACE CONFIGURATION MACROS diff --git a/src/mame/machine/fd1094.cpp b/src/mame/machine/fd1094.cpp index ed358b97cc2..4a37174d306 100644 --- a/src/mame/machine/fd1094.cpp +++ b/src/mame/machine/fd1094.cpp @@ -816,7 +816,7 @@ UINT16 fd1094_device::decrypt_one(offs_t address, UINT16 val, const UINT8 *main_ val = BITSWAP16(val, 15, 9,10,13, 3,12, 0,14, 6, 5, 2,11, 8, 1, 4, 7); if (!global_xor1) if (~val & 0x0800) val ^= 0x3002; // 1,12,13 - if (true) if (~val & 0x0020) val ^= 0x0044; // 2,6 + if (true) if (~val & 0x0020) val ^= 0x0044; // 2,6 if (!key_1b) if (~val & 0x0400) val ^= 0x0890; // 4,7,11 if (!global_swap2) if (!key_0c) val ^= 0x0308; // 3,8,9 val ^= 0x6561; diff --git a/src/mame/machine/kaneko_toybox.cpp b/src/mame/machine/kaneko_toybox.cpp index ee863a303d7..0815db16863 100644 --- a/src/mame/machine/kaneko_toybox.cpp +++ b/src/mame/machine/kaneko_toybox.cpp @@ -192,7 +192,7 @@ void kaneko_toybox_device::mcu_run() case 0x42: // Write to NVRAM { - eeprom_serial_93cxx_device *eeprom = machine().device<eeprom_serial_93cxx_device>(":eeprom"); + eeprom_serial_93cxx_device *eeprom = machine().device<eeprom_serial_93cxx_device>(":eeprom"); UINT8* nvdat = (UINT8*)&m_mcuram[mcu_offset]; for (int i=0;i<0x80;i++) { diff --git a/src/mame/machine/m2comm.cpp b/src/mame/machine/m2comm.cpp index 4b3f4dbe3c3..92756c75806 100644 --- a/src/mame/machine/m2comm.cpp +++ b/src/mame/machine/m2comm.cpp @@ -328,7 +328,7 @@ void m2comm_device::comm_init() { // TODO - check EPR-16726 on Daytona USA and Sega Rally Championship // EPR-18643(A) - these are accessed by VirtuaON and Sega Touring Car Championship - + // frameSize - 0xe00 m_shared[0x12] = 0x00; m_shared[0x13] = 0x0e; @@ -343,10 +343,10 @@ void m2comm_device::comm_tick() if (m_linkenable == 0x01) { m_zfg ^= 1; - + int frameSize = m_shared[0x13] << 8 | m_shared[0x12]; int frameOffset = m_shared[0x15] << 8 | m_shared[0x14]; - + int dataSize = frameSize + 1; int togo = 0; int recv = 0; diff --git a/src/mame/machine/namcoic.cpp b/src/mame/machine/namcoic.cpp index dc8c34c8645..4e49a755686 100644 --- a/src/mame/machine/namcoic.cpp +++ b/src/mame/machine/namcoic.cpp @@ -79,7 +79,7 @@ void namcos2_shared_state::namco_tilemap_init( int gfxbank, void *maskBaseAddr, mTilemapInfo.tmap[i]->set_scrolldx( -dx, 288+dx ); mTilemapInfo.tmap[i]->set_scrolldy( -24, 224+24 ); } - + save_item(NAME(mTilemapInfo.control)); save_pointer(NAME(mTilemapInfo.videoram.get()), 0x10000); } /* namco_tilemap_init */ @@ -822,7 +822,7 @@ void namcos2_shared_state::c355_obj_init(int gfxbank, int pal_xor, c355_obj_code memset(m_c355_obj_ram, 0, sizeof(m_c355_obj_ram)); // needed for Nebulas Ray memset(m_c355_obj_position, 0, sizeof(m_c355_obj_position)); - + save_item(NAME(m_c355_obj_position)); save_item(NAME(m_c355_obj_ram)); save_item(NAME(m_player_mux)); diff --git a/src/mame/machine/pcecommn.h b/src/mame/machine/pcecommn.h index 732b044768f..c4318f80230 100644 --- a/src/mame/machine/pcecommn.h +++ b/src/mame/machine/pcecommn.h @@ -33,7 +33,7 @@ public: virtual UINT8 joy_read(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<huc6260_device> m_huc6260; - + private: UINT8 m_io_port_options; /*driver-specific options for the PCE*/ int m_joystick_port_select; /* internal index of joystick ports */ diff --git a/src/mame/machine/seibucop/seibucop.cpp b/src/mame/machine/seibucop/seibucop.cpp index 1490ef5cd81..06f093a0d0d 100644 --- a/src/mame/machine/seibucop/seibucop.cpp +++ b/src/mame/machine/seibucop/seibucop.cpp @@ -2,63 +2,63 @@ // copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina /*************************************************************************** - Seibu Cop (Co-Processor) device emulation - a.k.a. known as Toshiba gate array TC25SC rebadged as: - SEI300 - Legionnaire PCB - [...] - There's also a ROM labeled COP-Dx, which is probably used for some in-game maths: - COP-D1 - Seibu Cup Soccer PCBs - COP-D2 - legionna.cpp and raiden2.cpp, latter might use another component too - COP-D3 - New Zero Team / Raiden 2 V33 HWs - Raiden 2 first boss arms is known to behave strangely without this ROM on a real PCB - - TODO: - - improve documentation, ffs! - - split into files, still needed: - - BCD; - - collision detection; - - command parser -> to cmd file; - - sd gundam sprite dma -> to dma file; - - convert to internal memory map, remove trampolines along the way. - - DMA mode needs to be cleaned up; - - improve class OO public/protected/private; - - nuke legacy command implementations; - - assert for something that needs actual playtesting is bad. - - add better debug facilities in a new sub-class, including but not limited to: - - disable collision detection; - - printing facilities; - - debugger break on pre-setted commands; - - ... - - per-game TODO: - Legionnaire - - (fixed) player walks on spot on stage clear; - - several if not all enemies definitely wants some sort of "axis aligned bounding box" in order to stop from going out of range - (when i.e. first boss goes to bottom of the screen and become unreachable) - - (btanb) Throw is made by quickly double jumping (!) - Heated Barrel - - gives random value to hi-score if you continue (only the first time, not a bug?); - - (fixed?) throws random address exceptions at level 3 and above, a RAM address arrives corrupt in the snippet at 0x136a; - - (fixed?) some corrupt sprites, probably a non-fatal version of the one above; - - stage 2 boss attacks only in vertical (regressed with the 130e / 3b30 / 42c2 command merge); - - (fixed) level 3+ boss movements looks wrong; - - stage 3 "homing" missiles doesn't seem to like our 6200 hookup here, except it's NOT 6200!? - - barrels seen in later levels seems to fail an axis aligned bounding box, not unlike Legionnaire. - SD Gundam - - stage 3 mid-boss still has the sprite garbage bug; - - stage 4: has sprite stuck on bottom-left of screen; - - palette dims too much on attract / continue screen. + Seibu Cop (Co-Processor) device emulation + a.k.a. known as Toshiba gate array TC25SC rebadged as: + SEI300 - Legionnaire PCB + [...] + There's also a ROM labeled COP-Dx, which is probably used for some in-game maths: + COP-D1 - Seibu Cup Soccer PCBs + COP-D2 - legionna.cpp and raiden2.cpp, latter might use another component too + COP-D3 - New Zero Team / Raiden 2 V33 HWs + Raiden 2 first boss arms is known to behave strangely without this ROM on a real PCB + + TODO: + - improve documentation, ffs! + - split into files, still needed: + - BCD; + - collision detection; + - command parser -> to cmd file; + - sd gundam sprite dma -> to dma file; + - convert to internal memory map, remove trampolines along the way. + - DMA mode needs to be cleaned up; + - improve class OO public/protected/private; + - nuke legacy command implementations; + - assert for something that needs actual playtesting is bad. + - add better debug facilities in a new sub-class, including but not limited to: + - disable collision detection; + - printing facilities; + - debugger break on pre-setted commands; + - ... + + per-game TODO: + Legionnaire + - (fixed) player walks on spot on stage clear; + - several if not all enemies definitely wants some sort of "axis aligned bounding box" in order to stop from going out of range + (when i.e. first boss goes to bottom of the screen and become unreachable) + - (btanb) Throw is made by quickly double jumping (!) + Heated Barrel + - gives random value to hi-score if you continue (only the first time, not a bug?); + - (fixed?) throws random address exceptions at level 3 and above, a RAM address arrives corrupt in the snippet at 0x136a; + - (fixed?) some corrupt sprites, probably a non-fatal version of the one above; + - stage 2 boss attacks only in vertical (regressed with the 130e / 3b30 / 42c2 command merge); + - (fixed) level 3+ boss movements looks wrong; + - stage 3 "homing" missiles doesn't seem to like our 6200 hookup here, except it's NOT 6200!? + - barrels seen in later levels seems to fail an axis aligned bounding box, not unlike Legionnaire. + SD Gundam + - stage 3 mid-boss still has the sprite garbage bug; + - stage 4: has sprite stuck on bottom-left of screen; + - palette dims too much on attract / continue screen. It's known that the DMA data arrangement gives same results on a real Legionnaire board, so shrug? - - Tech notes (to move into mainpage): - ----------- - [0x6fc] DMA mode bit scheme: - ---1 ---1 ---- ---- fill op if true, else transfer - ---- ---- x--- ---- palette brightness - ---- ---- ---x ---- internal buffer selector - ---- ---- ---- x--- size modifier? Bus transfer size actually? - ---- ---- ---- -xxx select channel - + + Tech notes (to move into mainpage): + ----------- + [0x6fc] DMA mode bit scheme: + ---1 ---1 ---- ---- fill op if true, else transfer + ---- ---- x--- ---- palette brightness + ---- ---- ---x ---- internal buffer selector + ---- ---- ---- x--- size modifier? Bus transfer size actually? + ---- ---- ---- -xxx select channel + ***************************************************************************/ #include "emu.h" @@ -242,7 +242,7 @@ void raiden2cop_device::device_start() m_host_cpu = machine().device<cpu_device>("maincpu"); m_host_space = &m_host_cpu->space(AS_PROGRAM); m_host_endian = m_host_space->endianness() == ENDIANNESS_BIG; // m_cpu_is_68k - + m_byte_endian_val = m_host_endian ? 3 : 0; m_word_endian_val = m_host_endian ? 2 : 0; } @@ -708,11 +708,11 @@ WRITE16_MEMBER(raiden2cop_device::cop_dma_trigger_w) switch (cop_dma_mode) { case 0x14: - { + { dma_tilemap_buffer(); break; } - + case 0x15: { dma_palette_buffer(); @@ -727,10 +727,10 @@ WRITE16_MEMBER(raiden2cop_device::cop_dma_trigger_w) case 0x85: case 0x86: case 0x87: - { dma_palette_brightness(); + { dma_palette_brightness(); break; } - + /********************************************************************************************************************/ case 0x09: { UINT32 src, dst, size; @@ -795,7 +795,7 @@ WRITE16_MEMBER(raiden2cop_device::cop_dma_trigger_w) case 0x11c: case 0x11d: case 0x11e: - case 0x11f: + case 0x11f: { dma_fill(); break; @@ -843,7 +843,7 @@ WRITE16_MEMBER(raiden2cop_device::cop_itoa_low_w) WRITE16_MEMBER(raiden2cop_device::cop_itoa_high_w) { cop_itoa = (cop_itoa & ~(mem_mask << 16)) | ((data & mem_mask) << 16); - + // Godzilla cares, otherwise you get 2p score overflow in 1p vs 2p, TODO: might actually be HW endianness dependant? bcd_update(); } @@ -1553,7 +1553,7 @@ WRITE16_MEMBER(raiden2cop_device::LEGACY_cop_cmd_w) { if(data == 0xf105) // cupsoc transition from presentation to kick off return; - + printf("did not execute %04x\n", data); // cup soccer triggers this a lot (and others) } } diff --git a/src/mame/machine/seibucop/seibucop.h b/src/mame/machine/seibucop/seibucop.h index 1e6e2c4c9fa..fbf8ecced76 100644 --- a/src/mame/machine/seibucop/seibucop.h +++ b/src/mame/machine/seibucop/seibucop.h @@ -10,9 +10,9 @@ #ifndef RAIDEN2COP_H #define RAIDEN2COP_H -#define LOG_Commands 0 -#define LOG_Phytagoras 0 -#define LOG_Division 0 +#define LOG_Commands 0 +#define LOG_Phytagoras 0 +#define LOG_Division 0 #define LOG_Move0205 0 #define LOG_Move0905 0 @@ -211,14 +211,14 @@ private: // internal state devcb_write16 m_videoramout_cb; required_device<palette_device> m_palette; - - cpu_device *m_host_cpu; /**< reference to the host cpu */ + + cpu_device *m_host_cpu; /**< reference to the host cpu */ address_space *m_host_space; /**< reference to the host cpu space */ - bool m_host_endian; /**< reference to the host cpu endianness, some commands cares! */ - UINT8 m_byte_endian_val; /**< 2 if m_host_endian is big (68k) else 0 */ - UINT8 m_word_endian_val; /**< 3 if m_host_endian is big (68k) else 0 */ + bool m_host_endian; /**< reference to the host cpu endianness, some commands cares! */ + UINT8 m_byte_endian_val; /**< 2 if m_host_endian is big (68k) else 0 */ + UINT8 m_word_endian_val; /**< 3 if m_host_endian is big (68k) else 0 */ + - void cop_collision_read_pos(int slot, UINT32 spradr, bool allow_swap); // commands, TODO: needs commenting! @@ -257,15 +257,15 @@ private: void LEGACY_execute_d104(int offset, UINT16 data); void LEGACY_execute_6980(int offset, UINT16 data); void LEGACY_execute_c480(int offset, UINT16 data); - + void cop_collision_update_hitbox(UINT16 data, int slot, UINT32 hitadr); void bcd_update(); - + UINT16 cop_read_word(int address); UINT8 cop_read_byte(int address); void cop_write_word(int address, UINT16 data); void cop_write_byte(int address, UINT8 data); - + void dma_tilemap_buffer(); void dma_palette_buffer(); void dma_fill(); diff --git a/src/mame/machine/sms.cpp b/src/mame/machine/sms.cpp index 8941b2513f2..2a1f57da928 100644 --- a/src/mame/machine/sms.cpp +++ b/src/mame/machine/sms.cpp @@ -800,7 +800,7 @@ WRITE8_MEMBER(sms_state::sms_mem_control_w) READ8_MEMBER(sms_state::sg1000m3_peripheral_r) { bool joy_ports_disabled = m_sgexpslot->is_readable(offset); - + if (joy_ports_disabled) { return m_sgexpslot->read(space, offset); @@ -818,7 +818,7 @@ READ8_MEMBER(sms_state::sg1000m3_peripheral_r) WRITE8_MEMBER(sms_state::sg1000m3_peripheral_w) { bool joy_ports_disabled = m_sgexpslot->is_writeable(offset); - + if (joy_ports_disabled) { m_sgexpslot->write(space, offset, data); diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index e4cdcee007b..35654e90b42 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -2362,17 +2362,17 @@ int xbox_base_state::smbus_cx25871(int command, int rw, int data) // let's try to fake the missing eeprom, make sure its ntsc static int dummyeeprom[256] = { - 0x39, 0xe3, 0xcc, 0x81, 0xb0, 0xa9, 0x97, 0x09, 0x57, 0xac, 0x57, 0x12, 0xf7, 0xc2, 0xc0, 0x21, 0xce, 0x0d, 0x0a, 0xdb, 0x20, 0x7a, 0xf3, 0xff, - 0xdf, 0x67, 0xed, 0xf4, 0xf8, 0x95, 0x5c, 0xd0, 0x9b, 0xef, 0x7b, 0x81, 0xda, 0xd5, 0x98, 0xc1, 0xb1, 0xb3, 0x74, 0x18, 0x86, 0x05, 0xe2, 0x7c, - 0xd1, 0xad, 0xc9, 0x90, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x00, 0x00, - 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xab, 0xcd, 0xef, 0xba, 0xdc, 0xfe, 0xa1, 0xb2, 0xc3, 0xd3, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x39, 0xe3, 0xcc, 0x81, 0xb0, 0xa9, 0x97, 0x09, 0x57, 0xac, 0x57, 0x12, 0xf7, 0xc2, 0xc0, 0x21, 0xce, 0x0d, 0x0a, 0xdb, 0x20, 0x7a, 0xf3, 0xff, + 0xdf, 0x67, 0xed, 0xf4, 0xf8, 0x95, 0x5c, 0xd0, 0x9b, 0xef, 0x7b, 0x81, 0xda, 0xd5, 0x98, 0xc1, 0xb1, 0xb3, 0x74, 0x18, 0x86, 0x05, 0xe2, 0x7c, + 0xd1, 0xad, 0xc9, 0x90, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x41, 0x42, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x00, 0x00, + 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0xab, 0xcd, 0xef, 0xba, 0xdc, 0xfe, 0xa1, 0xb2, 0xc3, 0xd3, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; int smbus_callback_eeprom(xbox_base_state &chs, int command, int rw, int data) { |