diff options
| author | 2015-04-29 08:18:54 +0200 | |
|---|---|---|
| committer | 2015-04-29 08:18:54 +0200 | |
| commit | 76b978d039f922ed84796deb999389ebb1579191 (patch) | |
| tree | 90e4fe3efe7a18b896e49fd7fb65ba7a144cac0f /src/mess | |
| parent | 64219f27d20c0f6f2dc8c168c8c19ba9420f889d (diff) | |
Cleanups and version bumpmame0161
Diffstat (limited to 'src/mess')
| -rw-r--r-- | src/mess/drivers/abc80.c | 6 | ||||
| -rw-r--r-- | src/mess/drivers/gba.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/hh_hmcs40.c | 12 | ||||
| -rw-r--r-- | src/mess/drivers/hh_pic16.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/hh_tms1k.c | 40 | ||||
| -rw-r--r-- | src/mess/drivers/hh_ucom4.c | 26 | ||||
| -rw-r--r-- | src/mess/drivers/msx.c | 6 | ||||
| -rw-r--r-- | src/mess/drivers/pc88va.c | 4 | ||||
| -rw-r--r-- | src/mess/drivers/pegasus.c | 2 | ||||
| -rw-r--r-- | src/mess/drivers/spc1000.c | 10 | ||||
| -rw-r--r-- | src/mess/includes/abc80.h | 4 | ||||
| -rw-r--r-- | src/mess/layout/ssimon.lay | 2 | ||||
| -rw-r--r-- | src/mess/machine/pce_cd.c | 2 | ||||
| -rw-r--r-- | src/mess/machine/pce_cd.h | 2 |
14 files changed, 61 insertions, 61 deletions
diff --git a/src/mess/drivers/abc80.c b/src/mess/drivers/abc80.c index c53e8bb1d23..686ae144b8d 100644 --- a/src/mess/drivers/abc80.c +++ b/src/mess/drivers/abc80.c @@ -394,8 +394,8 @@ WRITE8_MEMBER( abc80_state::kbd_w ) /* DEVICE_INPUT_DEFAULTS_START( abc830_slow ) - DEVICE_INPUT_DEFAULTS("SW1", 0x0f, 0x03) - DEVICE_INPUT_DEFAULTS("S1", 0x01, 0x01) + DEVICE_INPUT_DEFAULTS("SW1", 0x0f, 0x03) + DEVICE_INPUT_DEFAULTS("S1", 0x01, 0x01) DEVICE_INPUT_DEFAULTS_END */ @@ -555,7 +555,7 @@ static MACHINE_CONFIG_START( abc80, abc80_state ) MCFG_ABC80_KEYBOARD_KEYDOWN_CALLBACK(WRITELINE(abc80_state, keydown_w)) MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abc80_cards, "abcexp") - + MCFG_RS232_PORT_ADD(RS232_TAG, default_rs232_devices, NULL) MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) MCFG_GENERIC_KEYBOARD_CB(WRITE8(abc80_state, kbd_w)) diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c index d36760b65c7..da9f891ba8a 100644 --- a/src/mess/drivers/gba.c +++ b/src/mess/drivers/gba.c @@ -161,7 +161,7 @@ void gba_state::dma_exec(FPTR ch) else { // if (dst >= 0x6000000 && dst <= 0x6017fff) -// printf("DMA exec: ch %d from %08x to %08x, mode %04x, count %04x (%s)\n", (int)ch, src, dst, ctrl, cnt, ((ctrl>>10) & 1) ? "32" : "16"); +// printf("DMA exec: ch %d from %08x to %08x, mode %04x, count %04x (%s)\n", (int)ch, src, dst, ctrl, cnt, ((ctrl>>10) & 1) ? "32" : "16"); } for (int i = 0; i < cnt; i++) @@ -1559,7 +1559,7 @@ WRITE32_MEMBER(gba_state::gba_io_w) ch = offset / 3; -// printf("%08x: DMA(%d): %x to reg %d (mask %08x)\n", space.device().safe_pc(), ch, data, offset%3, ~mem_mask); +// printf("%08x: DMA(%d): %x to reg %d (mask %08x)\n", space.device().safe_pc(), ch, data, offset%3, ~mem_mask); if (((offset % 3) == 2) && ((~mem_mask & 0xffff0000) == 0)) { diff --git a/src/mess/drivers/hh_hmcs40.c b/src/mess/drivers/hh_hmcs40.c index b657e330b62..c8efaad5854 100644 --- a/src/mess/drivers/hh_hmcs40.c +++ b/src/mess/drivers/hh_hmcs40.c @@ -25,7 +25,7 @@ @73 HD38800A 1982, Bandai(Mattel) Star Hawk (PT-317B) @77 HD38800A 1982, Bandai Frisky Tom (PT-327A) @88 HD38800A 1984, Tomy Tron (THN-02) - + @01 HD38800B 1982, Gakken Crazy Kong @23 HD38800B 1982, Tomy Kingman (THF-01II) *24 HD38800B 1982, Actronics(Hanzawa) Wanted G-Man @@ -795,7 +795,7 @@ MACHINE_CONFIG_END * PCBs are labeled Kaken, PT-317B * Hitachi HD38800A73 MCU * cyan/red VFD display Futaba DM-41ZK, with partial color overlay + bezel - + Kaken was a subsidiary of Bandai. The original Japanese release is unknown, was it canceled and only released in the USA? @@ -1084,7 +1084,7 @@ WRITE16_MEMBER(bdoramon_state::grid_w) // D8-D15: vfd matrix grid m_grid = data >> 8 & 0xff; - + // D0-D3: plate 15-18 (update display there) plate_w(space, 4, data & 0xf); } @@ -1233,7 +1233,7 @@ MACHINE_CONFIG_END Coleco Alien Attack (manufactured in Taiwan) * Hitachi HD38800A25 MCU * cyan/red VFD display Futaba DM-19Z 1J - + It looks like Coleco took Gakken's Heiankyo Alien and turned it into a more action-oriented game. @@ -1960,7 +1960,7 @@ MACHINE_CONFIG_END * PCB labels ENTEX PAC-MAN PB-093/094 80-210149/50/51 * Hitachi QFP HD38820A23 MCU * cyan/red VFD display Futaba DM-28Z 1G(cyan Pac-Man) or DM-28 1K(orange Pac-Man) - + 2 VFD revisions are known, the difference is Pac-Man's color: cyan or red. NOTE!: MESS external artwork is recommended @@ -2406,7 +2406,7 @@ MACHINE_CONFIG_END * PCB label MEL-001 Baseball Rev. B * Hitachi QFP HD38820A09 MCU * cyan/red/green VFD display Futaba DM-24ZK 1G, with etched overlay - + To start the game in 2-player mode, simply turn the game on. For 1-player, turn the game on while holding the 1-key and use the visitor's side keypad to play offsense. diff --git a/src/mess/drivers/hh_pic16.c b/src/mess/drivers/hh_pic16.c index 091d1827741..fe5bed0aed7 100644 --- a/src/mess/drivers/hh_pic16.c +++ b/src/mess/drivers/hh_pic16.c @@ -148,7 +148,7 @@ void hh_pic16_state::display_update() int state = active_state[y] >> x & 1; char buf1[0x10]; // lampyx char buf2[0x10]; // y.x - + if (x == m_display_maxx) { // always-on if selected diff --git a/src/mess/drivers/hh_tms1k.c b/src/mess/drivers/hh_tms1k.c index 5c531cc5e26..6af4ff64e89 100644 --- a/src/mess/drivers/hh_tms1k.c +++ b/src/mess/drivers/hh_tms1k.c @@ -195,7 +195,7 @@ void hh_tms1k_state::display_update() int state = active_state[y] >> x & 1; char buf1[0x10]; // lampyx char buf2[0x10]; // y.x - + if (x == m_display_maxx) { // always-on if selected @@ -669,7 +669,7 @@ WRITE16_MEMBER(h2hbaseb_state::write_r) { // R10: speaker out m_speaker->level_w(data >> 10 & 1); - + // R4-R7: input mux m_inp_mux = data >> 4 & 0xf; @@ -803,10 +803,10 @@ WRITE16_MEMBER(h2hfootb_state::write_r) { // R10: speaker out m_speaker->level_w(data >> 10 & 1); - + // R0-R8: input mux m_inp_mux = data & 0x1ff; - + // R0-R8: select led // R9: led between digits m_r = data; @@ -829,7 +829,7 @@ READ8_MEMBER(h2hfootb_state::read_k) for (int i = 0; i < 4; i++) if (m_inp_matrix[i]->read() & m_inp_mux) k |= 1 << i; - + return k; } @@ -1530,7 +1530,7 @@ void einvader_state::prepare_display() // R7-R9 are 7segs for (int y = 7; y < 10; y++) m_display_segmask[y] = 0x7f; - + display_matrix(8, 10, m_o, m_r); } @@ -1656,7 +1656,7 @@ void raisedvl_state::prepare_display() // R0-R2 are 7segs for (int y = 0; y < 3; y++) m_display_segmask[y] = 0x7f; - + display_matrix(7, 10, m_o, m_r); } @@ -1664,10 +1664,10 @@ WRITE16_MEMBER(raisedvl_state::write_r) { // R10: speaker out m_speaker->level_w(data >> 10 & 1); - + // R0,R1: input mux m_inp_mux = data & 3; - + // R0-R9: led select m_r = data; prepare_display(); @@ -1795,10 +1795,10 @@ WRITE16_MEMBER(gpoker_state::write_r) { // R15: enable beeper m_beeper->set_state(data >> 15 & 1); - + // R0-R6: input mux m_inp_mux = data & 0x7f; - + // R0-R10: select digit // R11-R14: card symbols m_r = data; @@ -2018,7 +2018,7 @@ MACHINE_CONFIG_END Ideal Electronic Detective * TMS0980NLL MP6100A (die labeled 0980B-00) * 10-digit 7seg LED display, 1bit sound - + hardware (and concept) is very similar to Parker Bros Stop Thief This is an electronic board game. It requires game cards with suspect info, @@ -2306,7 +2306,7 @@ WRITE16_MEMBER(astro_state::write_r) { // R0-R7: input mux m_inp_mux = data & 0xff; - + // R0-R9: led select m_r = data; prepare_display(); @@ -2636,13 +2636,13 @@ WRITE16_MEMBER(ssimon_state::write_r) { // R0-R3,R9,R10: input mux m_inp_mux = (data & 0xf) | (data >> 5 & 0x30); - + // R4: yellow lamps // R5: green lamps // R6: blue lamps // R7: red lamps display_matrix(4, 1, data >> 4, 1); - + // R8: speaker out m_speaker->level_w(data >> 8 & 1); } @@ -2753,7 +2753,7 @@ MACHINE_CONFIG_END * SN75494N Hex digit LED driver, 1 lamp, 3-level sound * gearbox with magnetic clutch, 1 IR led+sensor, 2 motors(middle wheels) * 24-button keypad, ext in/out ports - + Big Trak is a programmable toy car, up to 16 steps. Supported commands include driving and turning, firing a photon cannon(hey, have some imagination!), and I/O ports. The output port was used for powering the dump truck accessory. @@ -2800,7 +2800,7 @@ WRITE16_MEMBER(bigtrak_state::write_r) { // R0-R5,R8: input mux (keypad, ext in enable) m_inp_mux = (data & 0x3f) | (data >> 2 & 0x40); - + // R6: N/C // R7: IR led on // R9: lamp on @@ -2996,11 +2996,11 @@ READ8_MEMBER(cnsector_state::read_k) COMBAT INFORMATION CENTER [NEXT SHIP] [RECALL] [MOVE SHIP] - + [LEFT] [RIGHT] o [SLOWER] [FASTER] STEERING EVASIVE SUB SPEED o (on/off switch) NAVIGATIONAL PROGRAMMING | - + [RANGE] [AIM] [FIRE] o [TEACH MODE] SONAR CONTROL SUB FINDER */ @@ -3186,7 +3186,7 @@ MACHINE_CONFIG_END The TMS1400CR MCU has the same pinout as a standard TMS1100. The hardware outside of the MCU is exactly the same as Merlin. - + The included minigames are: 1: Three Shells 2: Hi/Lo diff --git a/src/mess/drivers/hh_ucom4.c b/src/mess/drivers/hh_ucom4.c index 2a755133655..3aa5b42d7dc 100644 --- a/src/mess/drivers/hh_ucom4.c +++ b/src/mess/drivers/hh_ucom4.c @@ -4,9 +4,9 @@ NEC uCOM4 MCU tabletops/handhelds or other simple devices, most of them are VFD electronic games/toys. - + Commonly used VFD(vacuum fluorescent display) are by NEC or Futaba. - + NEC FIP9AM20T (example, Epoch Astro Command) grcss @@ -264,7 +264,7 @@ UINT8 hh_ucom4_state::read_inputs(int columns) * PCB label Emix Corp. ET-02 * NEC uCOM-44 MCU, labeled EMIX D552C 017 * cyan VFD display Emix-101, with blue color overlay - + This is Bambino's first game, it is not known if ET-01 exists. Emix Corp. wasn't initially a toy company, the first release was through Tomy. Emix created the Bambino brand afterwards. It is claimed to be the first @@ -380,7 +380,7 @@ MACHINE_CONFIG_END * PCB label Emix Corp. ET-03 * NEC uCOM-43 MCU, labeled D553C 031 * cyan VFD display Emix-102, with bezel - + The game was rereleased in 1982 as Classic Football, with an improved VFD. Press the Kick button to start the game, an automatic sequence follows. @@ -452,7 +452,7 @@ READ8_MEMBER(ssfball_state::input_b_r) [A] [B] [C] [PASS] [KICK/ ^FORMATION^ DISPLAY] - + [^] [<>] (game lvl sw) [v] @@ -522,7 +522,7 @@ MACHINE_CONFIG_END * PCB label Emix Corp. ET-10/08 (PCB is for 2 possible games) * NEC uCOM-44 MCU, labeled D552C 043 * cyan VFD display Emix-105, with bezel overlay - + Press the Display button twice to start the game. Action won't start until player 1 presses one of the directional keys. In 2-player mode, player 2 controls the goalkeeper, defensive players are still controlled by the CPU. @@ -573,7 +573,7 @@ WRITE8_MEMBER(bmsoccer_state::plate_w) // E012,F012,G012,H,I: vfd matrix plate int shift = (offset - NEC_UCOM4_PORTE) * 4; m_plate = (m_plate & ~(0xf << shift)) | (data << shift); - + // E3: grid 8 if (offset == NEC_UCOM4_PORTE) grid_w(space, offset, data >> 3 & 1); @@ -688,7 +688,7 @@ WRITE8_MEMBER(bmsafari_state::plate_w) // E012,H,I: vfd matrix plate int shift = (offset == NEC_UCOM4_PORTE) ? 8 : (offset - NEC_UCOM4_PORTH) * 4; m_plate = (m_plate & ~(0xf << shift)) | (data << shift); - + // E3: grid 0 if (offset == NEC_UCOM4_PORTE) grid_w(space, offset, data >> 3 & 1); @@ -754,7 +754,7 @@ MACHINE_CONFIG_END * PCB label Emix Corp. ET-12 * NEC uCOM-43 MCU, labeled D553C 055 * cyan VFD display Emix-104, with blue or green color overlay - + This is basically a revamp of their earlier Boxing game (ET-06), case and buttons are exactly the same. @@ -1143,7 +1143,7 @@ WRITE8_MEMBER(efball_state::grid_w) // H2: speaker out if (offset == NEC_UCOM4_PORTH) m_speaker->level_w(data >> 2 & 1); - + // F,G,H01: vfd matrix grid int shift = (offset - NEC_UCOM4_PORTF) * 4; m_grid = (m_grid & ~(0xf << shift)) | (data << shift); @@ -1257,7 +1257,7 @@ WRITE8_MEMBER(galaxy2_state::grid_w) // E3: speaker out if (offset == NEC_UCOM4_PORTE) m_speaker->level_w(data >> 3 & 1); - + // C,D,E01: vfd matrix grid int shift = (offset - NEC_UCOM4_PORTC) * 4; m_grid = (m_grid & ~(0xf << shift)) | (data << shift); @@ -1557,7 +1557,7 @@ WRITE8_MEMBER(mvbfree_state::grid_w) // E23,F,G,H: vfd matrix grid int shift = (offset - NEC_UCOM4_PORTE) * 4; m_grid = (m_grid & ~(0xf << shift)) | (data << shift); - + // E01: plate 0,1 if (offset == NEC_UCOM4_PORTE) plate_w(space, 2 + NEC_UCOM4_PORTC, data & 3); @@ -1735,7 +1735,7 @@ MACHINE_CONFIG_END Press the Serve button to start, then hit the ball by pressing one of the positional buttons when the ball flies over it. - + NOTE!: MESS external artwork is recommended ***************************************************************************/ diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c index 5f47632305c..f5e7014d255 100644 --- a/src/mess/drivers/msx.c +++ b/src/mess/drivers/msx.c @@ -1258,14 +1258,14 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( msx2p_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msx2p_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not? + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not? MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( msxr_floplist ) MCFG_SOFTWARE_LIST_ADD("flop_list", "msxr_flop") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2p_flp_l", "msx2p_flop") - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") // maybe not? - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not? + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx2_flp_l", "msx2_flop") // maybe not? + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("msx1_flp_l", "msx1_flop") // maybe not? MACHINE_CONFIG_END FLOPPY_FORMATS_MEMBER( msx_state::floppy_formats ) diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index b2eb7413f7b..33d350af686 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -1727,9 +1727,9 @@ WRITE_LINE_MEMBER( pc88va_state::fdc_irq ) WRITE_LINE_MEMBER(pc88va_state::pc88va_hlda_w) { -// m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); +// m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); - m_dmac->hack_w(state); + m_dmac->hack_w(state); // printf("%02x HLDA\n",state); } diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c index dc74d93eff0..b39777f045c 100644 --- a/src/mess/drivers/pegasus.c +++ b/src/mess/drivers/pegasus.c @@ -383,7 +383,7 @@ static GFXDECODE_START( pegasus ) GFXDECODE_END -// An encrypted single rom starts with 02, decrypted with 20. +// An encrypted single rom starts with 02, decrypted with 20. // The 2nd and 3rd part of a multi-rom set will have no obvious byte, // so we check the first 4 bytes for a signature, and decrypt if found. void pegasus_state::pegasus_decrypt_rom(UINT8 *ROM) diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c index 071dfe9d731..246a5f494bf 100644 --- a/src/mess/drivers/spc1000.c +++ b/src/mess/drivers/spc1000.c @@ -24,14 +24,14 @@ NOTE: 2014-09-13: added code from someone's modified MESS driver for floppy 2014-10-11: Replaced above code with MESS-compliant code [Meeso Kim] - -IMPORTANT NOTE for tape usage: you *FIRST* press PLAY on the tape drive - (e.g. by pressing F2 in partial emulated keyboard mode) and *THEN* you + +IMPORTANT NOTE for tape usage: you *FIRST* press PLAY on the tape drive + (e.g. by pressing F2 in partial emulated keyboard mode) and *THEN* you type LOAD on the BASIC prompt! Otherwise, the system turns the tape motor ON but it does not receive any data from tape, and it turns it OFF before the user can press PLAY. - - + + ****************************************************************************/ /* * SAMSUNG SPC-1000 Series (info from zannylim) diff --git a/src/mess/includes/abc80.h b/src/mess/includes/abc80.h index bdbb0743438..4e169b4903e 100644 --- a/src/mess/includes/abc80.h +++ b/src/mess/includes/abc80.h @@ -58,8 +58,8 @@ #define Z80PIO_TAG "cd67" #define SN76477_TAG "g8" #define RS232_TAG "ser" -#define CASSETTE_TAG "cassette" -#define KEYBOARD_TAG "keyboard" +#define CASSETTE_TAG "cassette" +#define KEYBOARD_TAG "keyboard" #define TIMER_CASSETTE_TAG "cass" class abc80_state : public driver_device diff --git a/src/mess/layout/ssimon.lay b/src/mess/layout/ssimon.lay index b37b7a3600e..38540fbfaf4 100644 --- a/src/mess/layout/ssimon.lay +++ b/src/mess/layout/ssimon.lay @@ -77,7 +77,7 @@ <bezel element="static_black"> <bounds left="0" right="47" top="0" bottom="53" /> </bezel> - + <!-- lamps --> <bezel name="lamp3" element="lamp_r" inputtag="IN.1" inputmask="0x08"> diff --git a/src/mess/machine/pce_cd.c b/src/mess/machine/pce_cd.c index 03e5b8cfdf7..ffec0a7e5b4 100644 --- a/src/mess/machine/pce_cd.c +++ b/src/mess/machine/pce_cd.c @@ -232,7 +232,7 @@ void pce_cd_device::late_setup() void pce_cd_device::nvram_init(nvram_device &nvram, void *data, size_t size) { static const UINT8 init[8] = { 0x48, 0x55, 0x42, 0x4d, 0x00, 0xa0, 0x10, 0x80 }; - + memset(data, 0x00, size); memcpy(data, init, sizeof(init)); } diff --git a/src/mess/machine/pce_cd.h b/src/mess/machine/pce_cd.h index 580884c8f86..bf2b29423b9 100644 --- a/src/mess/machine/pce_cd.h +++ b/src/mess/machine/pce_cd.h @@ -61,7 +61,7 @@ public: DECLARE_READ8_MEMBER(acard_r); void nvram_init(nvram_device &nvram, void *data, size_t size); - + private: void adpcm_stop(UINT8 irq_flag); void adpcm_play(); |
