diff options
author | 2015-01-28 09:20:10 +0100 | |
---|---|---|
committer | 2015-01-28 09:20:10 +0100 | |
commit | 26e7a17b6326aa5a75a6276e52cf84a94c16d7a0 (patch) | |
tree | bab4468226c59d590688e0ece892f5bfbca58736 /src/mess/drivers | |
parent | 13b862c4fae88f0f819c2c4416d49249e4de45b9 (diff) |
Cleanups and version bumpmame0158
Diffstat (limited to 'src/mess/drivers')
-rw-r--r-- | src/mess/drivers/a2600.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/banctec.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/cat.c | 20 | ||||
-rw-r--r-- | src/mess/drivers/gamate.c | 215 | ||||
-rw-r--r-- | src/mess/drivers/hp16500.c | 10 | ||||
-rw-r--r-- | src/mess/drivers/hp9k_3xx.c | 88 | ||||
-rw-r--r-- | src/mess/drivers/nes.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/ngen.c | 32 | ||||
-rw-r--r-- | src/mess/drivers/pasogo.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/splitsec.c | 6 | ||||
-rw-r--r-- | src/mess/drivers/tispeak.c | 2 |
11 files changed, 190 insertions, 193 deletions
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c index 44a94ebd043..4cd6f991f77 100644 --- a/src/mess/drivers/a2600.c +++ b/src/mess/drivers/a2600.c @@ -316,7 +316,7 @@ MACHINE_START_MEMBER(a2600_state,a2600) /* Banks may have changed, reset the cpu so it uses the correct reset vector */ m_maincpu->reset(); - + save_item(NAME(m_current_screen_height)); } diff --git a/src/mess/drivers/banctec.c b/src/mess/drivers/banctec.c index b4710668719..c69df794909 100644 --- a/src/mess/drivers/banctec.c +++ b/src/mess/drivers/banctec.c @@ -59,7 +59,7 @@ UINT32 banctec_state::screen_update_banctec(screen_device &screen, bitmap_ind16 MC6845_ON_UPDATE_ADDR_CHANGED(banctec_state::crtc_addr) { - /* What is this function meant to do ? */ + /* What is this function meant to do ? */ } /****************************** @@ -103,7 +103,7 @@ static MACHINE_CONFIG_START( banctec, banctec_state ) MCFG_GFXDECODE_ADD("gfxdecode", "palette", banctec) MCFG_PALETTE_ADD("palette", 2) -// MCFG_PALETTE_INIT_OWNER(banctec_state, banctec) +// MCFG_PALETTE_INIT_OWNER(banctec_state, banctec) MCFG_MC6845_ADD("crtc", R6545_1, "screen", XTAL_20MHz) /* (?) */ MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index d5e51e66185..27543b3f780 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -223,7 +223,7 @@ J4: 18-pin sip header for keyboard ribbon cable; bottom edge of board is pin 1 Pins: 1: GND through 220k resistor r78 2: ? phone hook related? anode of diode d7; one of the pins of relay k2; topmost (boardwise) pin of transistor Q10 - 3: 74HCT34 pin + 3: 74HCT34 pin J5: locking-tab-type "CONN HEADER VERT 4POS .100 TIN" connector for supplying power through a small cable with a berg connector at the other end, to the floppy drive @@ -240,7 +240,7 @@ J9: unpopulated DIL 40-pin straight connector for a ROM debug/expansion/RAM-shad /HICE is !a15 /ROM_OE comes from pin 14 of DECODE_E pal, and is shorted to /ROM_OE' by the cuttable jumper B1 which is not cut /ROM_OE' goes to the two EPROMS - DECODE_18 is DECODE_E pal pin 18 + DECODE_18 is DECODE_E pal pin 18 pin 1 (GND) is in the lower left and the pins count low-high then to the right (gnd N/C E_CLK R/W /ROM_OE a17 vcc a14 a13 a8 a9 a11 /ROM_OE' a10 a15 d7 d6 d5 d4 d3 ) (GND /IPL1 DECODE_18 /RESET gnd a16 vcc a12 a7 a6 a5 a4 a3 a2 a1 a0 d0 d1 d2 gnd) @@ -369,10 +369,10 @@ ToDo: // pin 13 (PB3) : // pin 14 (PB4) : // pin 15 (PB5) : -// pin 16 (PB6) : +// pin 16 (PB6) : // pin 17 (PB7) : -// pin 18 (CB1) : ?from/to? Floppy connector j3 pin 8 -// pin 19 (CB2) : ?from/to? 6522 @ u35 pin 16 (PB6) +// pin 18 (CB1) : ?from/to? Floppy connector j3 pin 8 +// pin 19 (CB2) : ?from/to? 6522 @ u35 pin 16 (PB6) // pin 21 (/IRQ) : out to 68008 /IPL1 pin 41 // pin 22 (R/W) : in from 68008 R/W pin 30 // pin 23 (/CS2) : in from DECODE E pin 18 @@ -384,7 +384,7 @@ ToDo: // pin 39 (CA2) is through inductor L11 and resistor r128 to peripheral connector pin 35 <end minus 26> // pin 40 (CA1) is through inductor L30 and resistor r138 to peripheral connector pin 53 <end minus 8> -// 6522 @ u35 +// 6522 @ u35 // pin 2 (PA0) : // pin 3 (PA1) : // pin 4 (PA2) : @@ -421,9 +421,9 @@ ToDo: // pin 4 (Y2) : out to 6522 @u35 pin 11 // pin 5 (A2) : in from 4N37 @ u48 pin 5 (output side emitter pin) (tied via R189 to gnd) <ring indicator?> // pin 6 (B2) : in from 4N37 @ u48 pin 5 (output side emitter pin) (tied via R189 to gnd) <ring indicator?> -// pin 8 (B3) : -// pin 9 (A3) : -// pin 10 (Y3) : +// pin 8 (B3) : +// pin 9 (A3) : +// pin 10 (Y3) : // pin 11 (B4) : in from 68008 A15 // pin 12 (A4) : in from 68008 A15 // pin 13 (Y4) : out to EPROM @ U31 /CE @@ -1743,7 +1743,7 @@ ROM_START( swyft ) * ||||\-------------Q? ? * |||\--------------Q? ? * ||\---------------Q> output to decode pal pin 2 - * |\----------------->? output? to ram multiplexer 'A' pins + * |\----------------->? output? to ram multiplexer 'A' pins * \------------------< ? */ ROM_LOAD( "timing_b.ampal16r4a.u9.jed", 0x0000, 0xb08, CRC(643e6e83) SHA1(7db167883f9d6cf385ce496d08976dc16fc3e2c3)) diff --git a/src/mess/drivers/gamate.c b/src/mess/drivers/gamate.c index cc18fa3ba98..3e0480b3d4f 100644 --- a/src/mess/drivers/gamate.c +++ b/src/mess/drivers/gamate.c @@ -20,7 +20,7 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_cart(*this, "cartslot") -#ifdef USE_GFX +#ifdef USE_GFX , m_gfxdecode(*this, "gfxdecode") #endif , m_io_joy(*this, "JOY") @@ -53,25 +53,25 @@ private: struct { - UINT8 reg[8]; - struct { - bool write; - bool page2; // else page1 + UINT8 reg[8]; + struct { + bool write; + bool page2; // else page1 UINT8 ypos, xpos/*tennis*/; - UINT8 data[2][0x100][0x20]; - } bitmap; - UINT8 x, y; + UINT8 data[2][0x100][0x20]; + } bitmap; + UINT8 x, y; bool y_increment; } video; struct { - bool set; + bool set; int bit_shifter; UINT8 cartridge_byte; UINT16 address; // in reality something more like short local cartridge address offset bool unprotected; bool failed; - + } card_protection; required_device<cpu_device> m_maincpu; @@ -84,14 +84,14 @@ private: required_shared_ptr<UINT8> m_bios; emu_timer *timer1; emu_timer *timer2; - UINT8 bank_multi; + UINT8 bank_multi; UINT8 *m_cart_ptr; }; WRITE8_MEMBER( gamate_state::gamate_cart_protection_w ) { - logerror("%.6f protection write %x %x address:%x data:%x shift:%d\n",machine().time().as_double(), offset, data, card_protection.address, card_protection.cartridge_byte, card_protection.bit_shifter); - + logerror("%.6f protection write %x %x address:%x data:%x shift:%d\n",machine().time().as_double(), offset, data, card_protection.address, card_protection.cartridge_byte, card_protection.bit_shifter); + switch (offset) { case 0: card_protection.failed= card_protection.failed || ((card_protection.cartridge_byte&0x80)!=0) != ((data&4)!=0); @@ -105,11 +105,10 @@ WRITE8_MEMBER( gamate_state::gamate_cart_protection_w ) } READ8_MEMBER( gamate_state::gamate_cart_protection_r ) { - - UINT8 ret=1; - if (card_protection.bit_shifter==7 && card_protection.unprotected) { - ret=m_cart_ptr[bank_multi*0x4000]; - } else { + UINT8 ret=1; + if (card_protection.bit_shifter==7 && card_protection.unprotected) { + ret=m_cart_ptr[bank_multi*0x4000]; + } else { card_protection.bit_shifter++; if (card_protection.bit_shifter==8) { card_protection.bit_shifter=0; @@ -118,62 +117,62 @@ READ8_MEMBER( gamate_state::gamate_cart_protection_r ) } ret=(card_protection.cartridge_byte&0x80)?2:0; if (card_protection.bit_shifter==7 && !card_protection.failed) { // now protection chip on cartridge activates cartridge chip select on cpu accesses -// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r)); // next time I will try to get this working +// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r)); // next time I will try to get this working } card_protection.cartridge_byte<<=1; - } - logerror("%.6f protection read %x %x address:%x data:%x shift:%d\n",machine().time().as_double(), offset, ret, card_protection.address, card_protection.cartridge_byte, card_protection.bit_shifter); - return ret; + } + logerror("%.6f protection read %x %x address:%x data:%x shift:%d\n",machine().time().as_double(), offset, ret, card_protection.address, card_protection.cartridge_byte, card_protection.bit_shifter); + return ret; } READ8_MEMBER( gamate_state::protection_r ) { return card_protection.set? 3: 1; } // bits 0 and 1 checked WRITE8_MEMBER( gamate_state::protection_reset ) { - // writes 0x20 - card_protection.address=0x6005-0x6001; - card_protection.bit_shifter=0; - card_protection.cartridge_byte=m_cart_ptr[card_protection.address++];//m_cart_rom[card_protection.address++]; - card_protection.failed=false; - card_protection.unprotected=false; + // writes 0x20 + card_protection.address=0x6005-0x6001; + card_protection.bit_shifter=0; + card_protection.cartridge_byte=m_cart_ptr[card_protection.address++];//m_cart_rom[card_protection.address++]; + card_protection.failed=false; + card_protection.unprotected=false; } READ8_MEMBER( gamate_state::newer_protection_set ) { - card_protection.set=true; - return 0; + card_protection.set=true; + return 0; } WRITE8_MEMBER( gamate_state::gamate_video_w ) { - video.reg[offset]=data; - switch (offset) { - case 1: video.bitmap.write=data&0xc0; // more addressing mode + video.reg[offset]=data; + switch (offset) { + case 1: video.bitmap.write=data&0xc0; // more addressing mode video.y_increment=data&0x40; break; case 2: video.bitmap.xpos=data;break; // at least 7 bits case 3: video.bitmap.ypos=data;break; // at least 7 bits - case 4: video.bitmap.page2=data&0x80;video.x=data&0x7f;break; - case 5: video.y=data;break; - case 7: - if (video.bitmap.write) { - if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) - video.bitmap.data[video.bitmap.page2][video.y][video.x]=data; - else - logerror("%.6f %04x video bitmap x %x invalid\n",machine().time().as_double(), m_maincpu->pc(), video.x); - } else { - video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]=data; - } - if (video.y_increment) video.y++; + case 4: video.bitmap.page2=data&0x80;video.x=data&0x7f;break; + case 5: video.y=data;break; + case 7: + if (video.bitmap.write) { + if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) + video.bitmap.data[video.bitmap.page2][video.y][video.x]=data; + else + logerror("%.6f %04x video bitmap x %x invalid\n",machine().time().as_double(), m_maincpu->pc(), video.x); + } else { + video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]=data; + } + if (video.y_increment) video.y++; else video.x++; - } + } } WRITE8_MEMBER( gamate_state::cart_bankswitchmulti_w ) { - bank_multi=data; - membank("bankmulti")->set_base(m_cart_ptr+0x4000*data+1); + bank_multi=data; + membank("bankmulti")->set_base(m_cart_ptr+0x4000*data+1); } WRITE8_MEMBER( gamate_state::cart_bankswitch_w ) @@ -184,55 +183,55 @@ WRITE8_MEMBER( gamate_state::cart_bankswitch_w ) READ8_MEMBER( gamate_state::gamate_video_r ) { if (offset!=6) return 0; - UINT8 data=0; - if (video.bitmap.write) { - if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) - data=video.bitmap.data[video.bitmap.page2][video.y][video.x]; - else - logerror("%.6f video bitmap x %x invalid\n",machine().time().as_double(),video.x); - } else { - data=video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]; - } - if (m_maincpu->pc()<0xf000) - logerror("%.6f video read %04x %02x\n",machine().time().as_double(),offset, data); - return data; + UINT8 data=0; + if (video.bitmap.write) { + if (video.x<ARRAY_LENGTH(video.bitmap.data[0][0]) /*&& video.y<ARRAY_LENGTH(video.bitmap.data[0])*/) + data=video.bitmap.data[video.bitmap.page2][video.y][video.x]; + else + logerror("%.6f video bitmap x %x invalid\n",machine().time().as_double(),video.x); + } else { + data=video.bitmap.data[0][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)]; + } + if (m_maincpu->pc()<0xf000) + logerror("%.6f video read %04x %02x\n",machine().time().as_double(),offset, data); + return data; } WRITE8_MEMBER( gamate_state::gamate_audio_w ) { - logerror("%.6f %04x audio write %04x %02x\n",machine().time().as_double(),m_maincpu->pc(),offset,data); + logerror("%.6f %04x audio write %04x %02x\n",machine().time().as_double(),m_maincpu->pc(),offset,data); } READ8_MEMBER( gamate_state::gamate_audio_r ) { - logerror("%.6f %04x audio read %04x \n",machine().time().as_double(),m_maincpu->pc(),offset); + logerror("%.6f %04x audio read %04x \n",machine().time().as_double(),m_maincpu->pc(),offset); return 0; } READ8_MEMBER( gamate_state::gamate_pad_r ) { - UINT8 data=m_io_joy->read(); - return data; + UINT8 data=m_io_joy->read(); + return data; } static ADDRESS_MAP_START( gamate_mem, AS_PROGRAM, 8, gamate_state ) - AM_RANGE(0x0000, 0x03ff) AM_RAM - AM_RANGE(0x4000, 0x400d) AM_READWRITE(gamate_audio_r, gamate_audio_w) - AM_RANGE(0x4400, 0x4400) AM_READ(gamate_pad_r) - AM_RANGE(0x5000, 0x5007) AM_READWRITE(gamate_video_r, gamate_video_w) - AM_RANGE(0x5800, 0x5800) AM_READ(newer_protection_set) - AM_RANGE(0x5900, 0x5900) AM_WRITE(protection_reset) - AM_RANGE(0x5a00, 0x5a00) AM_READ(protection_r) + AM_RANGE(0x0000, 0x03ff) AM_RAM + AM_RANGE(0x4000, 0x400d) AM_READWRITE(gamate_audio_r, gamate_audio_w) + AM_RANGE(0x4400, 0x4400) AM_READ(gamate_pad_r) + AM_RANGE(0x5000, 0x5007) AM_READWRITE(gamate_video_r, gamate_video_w) + AM_RANGE(0x5800, 0x5800) AM_READ(newer_protection_set) + AM_RANGE(0x5900, 0x5900) AM_WRITE(protection_reset) + AM_RANGE(0x5a00, 0x5a00) AM_READ(protection_r) - AM_RANGE(0x6001, 0x9fff) AM_READ_BANK("bankmulti") - AM_RANGE(0xa000, 0xdfff) AM_READ_BANK("bank") + AM_RANGE(0x6001, 0x9fff) AM_READ_BANK("bankmulti") + AM_RANGE(0xa000, 0xdfff) AM_READ_BANK("bank") AM_RANGE(0x6000, 0x6000) AM_READWRITE(gamate_cart_protection_r, gamate_cart_protection_w) AM_RANGE(0x8000, 0x8000) AM_WRITE(cart_bankswitchmulti_w) AM_RANGE(0xc000, 0xc000) AM_WRITE(cart_bankswitch_w) - AM_RANGE(0xf000, 0xffff) AM_ROM AM_SHARE("bios") + AM_RANGE(0xf000, 0xffff) AM_ROM AM_SHARE("bios") ADDRESS_MAP_END @@ -251,30 +250,30 @@ INPUT_PORTS_END #ifdef USE_GFX static const struct gfx_layout gamate_charlayout = { - 4, /* width of object */ - 1, /* height of object */ - 256,/* 256 characters */ - 2, /* bits per pixel */ - { 0,4 }, /* no bitplanes */ - /* x offsets */ - { 0,1,2,3 }, - /* y offsets */ - { 0 }, - 8*1 /* size of 1 object in bits */ + 4, /* width of object */ + 1, /* height of object */ + 256,/* 256 characters */ + 2, /* bits per pixel */ + { 0,4 }, /* no bitplanes */ + /* x offsets */ + { 0,1,2,3 }, + /* y offsets */ + { 0 }, + 8*1 /* size of 1 object in bits */ }; static GFXDECODE_START( gamate ) - GFXDECODE_ENTRY( "gfx1", 0x0000, gamate_charlayout, 0, 0x100 ) + GFXDECODE_ENTRY( "gfx1", 0x0000, gamate_charlayout, 0, 0x100 ) GFXDECODE_END #endif /* palette in red, green, blue tribles */ static const unsigned char gamate_colors[4][3] = { - { 255,255,255 }, - { 0xa0, 0xa0, 0xa0 }, - { 0x60, 0x60, 0x60 }, - { 0, 0, 0 } + { 255,255,255 }, + { 0xa0, 0xa0, 0xa0 }, + { 0x60, 0x60, 0x60 }, + { 0, 0, 0 } }; PALETTE_INIT_MEMBER(gamate_state, gamate) @@ -299,21 +298,21 @@ static void BlitPlane(UINT16* line, UINT8 plane1, UINT8 plane2) UINT32 gamate_state::screen_update_gamate(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - int x, y, j; - for (y=0;y<152;y++) { - for (x=-(video.bitmap.xpos&7), j=0;x<160;x+=8, j++) { - UINT8 d1=video.bitmap.data[0][(y+video.bitmap.ypos)&0xff][(j+video.bitmap.xpos/8)&0x1f]; - UINT8 d2=video.bitmap.data[1][(y+video.bitmap.ypos)&0xff][(j+video.bitmap.xpos/8)&0x1f]; + int x, y, j; + for (y=0;y<152;y++) { + for (x=-(video.bitmap.xpos&7), j=0;x<160;x+=8, j++) { + UINT8 d1=video.bitmap.data[0][(y+video.bitmap.ypos)&0xff][(j+video.bitmap.xpos/8)&0x1f]; + UINT8 d2=video.bitmap.data[1][(y+video.bitmap.ypos)&0xff][(j+video.bitmap.xpos/8)&0x1f]; #ifdef USE_GFX - m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, (d1&0xf)|((d2&0xf)<<4), 0,0,0,x+4,y); + m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, (d1&0xf)|((d2&0xf)<<4), 0,0,0,x+4,y); m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, (d1>>4)|(d2&0xf0),0,0,0,x,y); #else - BlitPlane(&bitmap.pix16(y, x+4), d1, d2); - BlitPlane(&bitmap.pix16(y, x), d1>>4, d2>>4); -#endif - } - } - return 0; + BlitPlane(&bitmap.pix16(y, x+4), d1, d2); + BlitPlane(&bitmap.pix16(y, x), d1>>4, d2>>4); +#endif + } + } + return 0; } DRIVER_INIT_MEMBER(gamate_state,gamate) @@ -322,7 +321,7 @@ DRIVER_INIT_MEMBER(gamate_state,gamate) #ifdef USE_GFX UINT8 *gfx=memregion("gfx1")->base(); for (int i=0; i<256; i++) gfx[i]=i; -#endif +#endif timer1 = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gamate_state::gamate_timer),this)); timer2 = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(gamate_state::gamate_timer2),this)); } @@ -332,12 +331,12 @@ void gamate_state::machine_start() { m_cart_ptr = memregion("maincpu")->base() + 0x6000; if (m_cart->exists()) { -// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r)); +// m_maincpu->space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, READ8_DELEGATE(gamate_state, gamate_cart_protection_r)); m_cart_ptr = m_cart->get_rom_base(); membank("bankmulti")->set_base(m_cart->get_rom_base()+1); membank("bank")->set_base(m_cart->get_rom_base()+0x4000); // bankswitched games in reality no offset } -// m_bios[0xdf1]=0xea; m_bios[0xdf2]=0xea; // default bios: $47 protection readback +// m_bios[0xdf1]=0xea; m_bios[0xdf2]=0xea; // default bios: $47 protection readback card_protection.set=false; bank_multi=0; card_protection.unprotected=false; @@ -390,7 +389,7 @@ static MACHINE_CONFIG_START( gamate, gamate_state ) #ifdef USE_GFX MCFG_GFXDECODE_ADD("gfxdecode", "palette", gamate ) -#endif +#endif MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(gamate_colors)) MCFG_PALETTE_INIT_OWNER(gamate_state, gamate) MCFG_DEFAULT_LAYOUT(layout_lcd) @@ -408,13 +407,11 @@ ROM_START(gamate) ROMX_LOAD("gamate_bios_umc.bin", 0xf000, 0x1000, CRC(07090415) SHA1(ea449dc607601f9a68d855ad6ab53800d2e99297), ROM_BIOS(1) ) ROM_SYSTEM_BIOS(1, "newer", "NEWER") ROMX_LOAD("gamate_bios_9130__unknown__bit_icasc00001_9130-bs_r32261.bin", 0xf000, 0x1000, CRC(03a5f3a7) SHA1(4e9dfbfe916ca485530ef4221593ab68738e2217), ROM_BIOS(2) ) -#ifdef USE_GFX +#ifdef USE_GFX ROM_REGION(0x100,"gfx1", ROMREGION_ERASEFF) -#endif +#endif ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME */ CONS( 19??, gamate, 0, 0, gamate, gamate, gamate_state, gamate, "Bit Corp", "Gamate", GAME_NO_SOUND) - - diff --git a/src/mess/drivers/hp16500.c b/src/mess/drivers/hp16500.c index 158cc05e8a2..ea9f58d37a6 100644 --- a/src/mess/drivers/hp16500.c +++ b/src/mess/drivers/hp16500.c @@ -19,7 +19,7 @@ MC68000 @ 10 MHz MC68A45 CRTC Z0765A08PSC floppy controller (NEC765 type) - TMS9914A GPIB bus interface + TMS9914A GPIB bus interface SCN2661 DUART/timer 16500b: @@ -50,10 +50,10 @@ #include "video/mc6845.h" #include "machine/mc68681.h" -#define MAINCPU_TAG "maincpu" -#define CRTC_TAG "crtc" -#define SCREEN_TAG "screen" -#define DUART_TAG "duart" +#define MAINCPU_TAG "maincpu" +#define CRTC_TAG "crtc" +#define SCREEN_TAG "screen" +#define DUART_TAG "duart" class hp16500_state : public driver_device { diff --git a/src/mess/drivers/hp9k_3xx.c b/src/mess/drivers/hp9k_3xx.c index 5996047b29a..f79f09b94c1 100644 --- a/src/mess/drivers/hp9k_3xx.c +++ b/src/mess/drivers/hp9k_3xx.c @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:R. Belmont /*************************************************************************** - + hp9k3xx.c: preliminary driver for HP9000 300 Series (aka HP9000/3xx) Currently supporting: @@ -16,20 +16,20 @@ MC68881 FPU 330: - MC68020 CPU @ 16.67 MHz - MC68851 MMU - MC68881 FPU + MC68020 CPU @ 16.67 MHz + MC68851 MMU + MC68881 FPU 340: MC68030 CPU @ 16.67 MHz w/built-in MMU - MC68881 FPU + MC68881 FPU 380: MC68040 CPU @ 25 MHz w/built-in MMU and FPU 382: MC68040 CPU @ 25? MHz w/built-in MMU and FPU - Built-in VGA compatible video + Built-in VGA compatible video All models have an MC6840 PIT on IRQ6 clocked at 250 kHz. @@ -132,28 +132,28 @@ UINT32 hp9k3xx_state::hp98544_update(screen_device &screen, bitmap_rgb32 &bitmap // shared mappings for all 9000/3xx systems static ADDRESS_MAP_START(hp9k3xx_common, AS_PROGRAM, 32, hp9k3xx_state) - AM_RANGE(0x00000000, 0x0001ffff) AM_ROM AM_REGION("maincpu",0) AM_WRITENOP // writes to 1fffc are the LED + AM_RANGE(0x00000000, 0x0001ffff) AM_ROM AM_REGION("maincpu",0) AM_WRITENOP // writes to 1fffc are the LED - AM_RANGE(0x00500000, 0x0050000f) AM_RAM // this is sufficient to pass the DMA test for now + AM_RANGE(0x00500000, 0x0050000f) AM_RAM // this is sufficient to pass the DMA test for now - AM_RANGE(0x00510000, 0x00510003) AM_READWRITE(buserror_r, buserror_w) // no "Alpha display" - AM_RANGE(0x00538000, 0x00538003) AM_READWRITE(buserror_r, buserror_w) // no "Graphics" - AM_RANGE(0x005c0000, 0x005c0003) AM_READWRITE(buserror_r, buserror_w) // no add-on FP coprocessor + AM_RANGE(0x00510000, 0x00510003) AM_READWRITE(buserror_r, buserror_w) // no "Alpha display" + AM_RANGE(0x00538000, 0x00538003) AM_READWRITE(buserror_r, buserror_w) // no "Graphics" + AM_RANGE(0x005c0000, 0x005c0003) AM_READWRITE(buserror_r, buserror_w) // no add-on FP coprocessor AM_RANGE(0x005f8000, 0x005f800f) AM_DEVREADWRITE8(PTM6840_TAG, ptm6840_device, read, write, 0x00ff00ff) ADDRESS_MAP_END // 9000/310 - has onboard video that the graphics card used in other 3xxes conflicts with static ADDRESS_MAP_START(hp9k310_map, AS_PROGRAM, 16, hp9k3xx_state) - AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_REGION("maincpu",0) AM_WRITENOP // writes to 1fffc are the LED + AM_RANGE(0x000000, 0x01ffff) AM_ROM AM_REGION("maincpu",0) AM_WRITENOP // writes to 1fffc are the LED - AM_RANGE(0x510000, 0x510003) AM_READWRITE(buserror16_r, buserror16_w) // no "Alpha display" - AM_RANGE(0x538000, 0x538003) AM_READWRITE(buserror16_r, buserror16_w) // no "Graphics" - AM_RANGE(0x5c0000, 0x5c0003) AM_READWRITE(buserror16_r, buserror16_w) // no add-on FP coprocessor + AM_RANGE(0x510000, 0x510003) AM_READWRITE(buserror16_r, buserror16_w) // no "Alpha display" + AM_RANGE(0x538000, 0x538003) AM_READWRITE(buserror16_r, buserror16_w) // no "Graphics" + AM_RANGE(0x5c0000, 0x5c0003) AM_READWRITE(buserror16_r, buserror16_w) // no add-on FP coprocessor AM_RANGE(0x5f8000, 0x5f800f) AM_DEVREADWRITE8(PTM6840_TAG, ptm6840_device, read, write, 0x00ff) - AM_RANGE(0x200000, 0x2fffff) AM_RAM AM_SHARE("vram16") // 98544 mono framebuffer - AM_RANGE(0x560000, 0x563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM + AM_RANGE(0x200000, 0x2fffff) AM_RAM AM_SHARE("vram16") // 98544 mono framebuffer + AM_RANGE(0x560000, 0x563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM AM_RANGE(0x700000, 0x7fffff) AM_READWRITE(buserror16_r, buserror16_w) AM_RANGE(0x800000, 0xffffff) AM_RAM @@ -161,8 +161,8 @@ ADDRESS_MAP_END // 9000/320 static ADDRESS_MAP_START(hp9k320_map, AS_PROGRAM, 32, hp9k3xx_state) - AM_RANGE(0x00200000, 0x002fffff) AM_RAM AM_SHARE("vram") // 98544 mono framebuffer - AM_RANGE(0x00560000, 0x00563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM + AM_RANGE(0x00200000, 0x002fffff) AM_RAM AM_SHARE("vram") // 98544 mono framebuffer + AM_RANGE(0x00560000, 0x00563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM AM_RANGE(0xffe00000, 0xffefffff) AM_READWRITE(buserror_r, buserror_w) AM_RANGE(0xfff00000, 0xffffffff) AM_RAM @@ -172,8 +172,8 @@ ADDRESS_MAP_END // 9000/330 and 9000/340 static ADDRESS_MAP_START(hp9k330_map, AS_PROGRAM, 32, hp9k3xx_state) - AM_RANGE(0x00200000, 0x002fffff) AM_RAM AM_SHARE("vram") // 98544 mono framebuffer - AM_RANGE(0x00560000, 0x00563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM + AM_RANGE(0x00200000, 0x002fffff) AM_RAM AM_SHARE("vram") // 98544 mono framebuffer + AM_RANGE(0x00560000, 0x00563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM AM_RANGE(0xffb00000, 0xffbfffff) AM_READWRITE(buserror_r, buserror_w) AM_RANGE(0xffc00000, 0xffffffff) AM_RAM @@ -183,8 +183,8 @@ ADDRESS_MAP_END // 9000/370 - 8 MB RAM standard static ADDRESS_MAP_START(hp9k370_map, AS_PROGRAM, 32, hp9k3xx_state) - AM_RANGE(0x00200000, 0x002fffff) AM_RAM AM_SHARE("vram") // 98544 mono framebuffer - AM_RANGE(0x00560000, 0x00563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM + AM_RANGE(0x00200000, 0x002fffff) AM_RAM AM_SHARE("vram") // 98544 mono framebuffer + AM_RANGE(0x00560000, 0x00563fff) AM_ROM AM_REGION("graphics", 0x0000) // 98544 mono ROM AM_RANGE(0xff700000, 0xff7fffff) AM_READWRITE(buserror_r, buserror_w) AM_RANGE(0xff800000, 0xffffffff) AM_RAM @@ -292,7 +292,7 @@ static MACHINE_CONFIG_START( hp9k310, hp9k3xx_state ) MCFG_CPU_PROGRAM_MAP(hp9k310_map) MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 0) - MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 + MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f) MCFG_SCREEN_ADD( "screen", RASTER) @@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( hp9k320, hp9k3xx_state ) MCFG_CPU_PROGRAM_MAP(hp9k320_map) MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 0) - MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 + MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f) MCFG_SCREEN_ADD( "screen", RASTER) @@ -324,7 +324,7 @@ static MACHINE_CONFIG_START( hp9k330, hp9k3xx_state ) MCFG_CPU_PROGRAM_MAP(hp9k330_map) MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 0) - MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 + MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f) MCFG_SCREEN_ADD( "screen", RASTER) @@ -340,7 +340,7 @@ static MACHINE_CONFIG_START( hp9k340, hp9k3xx_state ) MCFG_CPU_PROGRAM_MAP(hp9k330_map) MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 0) - MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 + MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f) MCFG_SCREEN_ADD( "screen", RASTER) @@ -356,7 +356,7 @@ static MACHINE_CONFIG_START( hp9k370, hp9k3xx_state ) MCFG_CPU_PROGRAM_MAP(hp9k370_map) MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 0) - MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 + MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f) MCFG_SCREEN_ADD( "screen", RASTER) @@ -368,11 +368,11 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( hp9k380, hp9k3xx_state ) /* basic machine hardware */ - MCFG_CPU_ADD(MAINCPU_TAG, M68040, 25000000) // 25 MHz? 33? + MCFG_CPU_ADD(MAINCPU_TAG, M68040, 25000000) // 25 MHz? 33? MCFG_CPU_PROGRAM_MAP(hp9k330_map) MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 0) - MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 + MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f) MCFG_SCREEN_ADD( "screen", RASTER) @@ -384,11 +384,11 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( hp9k382, hp9k3xx_state ) /* basic machine hardware */ - MCFG_CPU_ADD(MAINCPU_TAG, M68040, 25000000) // 25 MHz? 33? + MCFG_CPU_ADD(MAINCPU_TAG, M68040, 25000000) // 25 MHz? 33? MCFG_CPU_PROGRAM_MAP(hp9k382_map) MCFG_DEVICE_ADD(PTM6840_TAG, PTM6840, 0) - MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 + MCFG_PTM6840_INTERNAL_CLOCK(250000.0f) // from oscillator module next to the 6840 MCFG_PTM6840_EXTERNAL_CLOCKS(250000.0f, 250000.0f, 250000.0f) MCFG_SCREEN_ADD( "screen", RASTER) @@ -400,12 +400,12 @@ MACHINE_CONFIG_END ROM_START( hp9k310 ) ROM_REGION( 0x20000, MAINCPU_TAG, 0 ) - ROM_LOAD16_BYTE( "1818-3771.bin", 0x000001, 0x008000, CRC(b9e4e3ad) SHA1(ed6f1fad94a15d95362701dbe124b52877fc3ec4) ) - ROM_LOAD16_BYTE( "1818-3772.bin", 0x000000, 0x008000, CRC(a3665919) SHA1(ec1bc7e5b7990a1b09af947a06401e8ed3cb0516) ) + ROM_LOAD16_BYTE( "1818-3771.bin", 0x000001, 0x008000, CRC(b9e4e3ad) SHA1(ed6f1fad94a15d95362701dbe124b52877fc3ec4) ) + ROM_LOAD16_BYTE( "1818-3772.bin", 0x000000, 0x008000, CRC(a3665919) SHA1(ec1bc7e5b7990a1b09af947a06401e8ed3cb0516) ) ROM_REGION( 0x800, "mcu", 0 ) - ROM_LOAD( "1820-4784_1.bin", 0x000000, 0x000800, CRC(e929044a) SHA1(90849a10bdb8c6e38e73ce027c9c0ad8b3956b1b) ) - ROM_LOAD( "1820-4784_2.bin", 0x000000, 0x000800, CRC(8defcf50) SHA1(d3abfea468a43db7c2369500a3e390e77a8e22e6) ) + ROM_LOAD( "1820-4784_1.bin", 0x000000, 0x000800, CRC(e929044a) SHA1(90849a10bdb8c6e38e73ce027c9c0ad8b3956b1b) ) + ROM_LOAD( "1820-4784_2.bin", 0x000000, 0x000800, CRC(8defcf50) SHA1(d3abfea468a43db7c2369500a3e390e77a8e22e6) ) ROM_REGION( 0x4000, "graphics", ROMREGION_ERASEFF | ROMREGION_BE ) ROM_LOAD16_BYTE( "98544_1818-1999.bin", 0x000000, 0x002000, CRC(8c7d6480) SHA1(d2bcfd39452c38bc652df39f84c7041cfdf6bd51) ) @@ -413,10 +413,10 @@ ROM_END ROM_START( hp9k320 ) ROM_REGION( 0x20000, MAINCPU_TAG, 0 ) - ROM_LOAD16_BYTE( "5061-6538.bin", 0x000001, 0x004000, CRC(d6aafeb1) SHA1(88c6b0b2f504303cbbac0c496c26b85458ac5d63) ) - ROM_LOAD16_BYTE( "5061-6539.bin", 0x000000, 0x004000, CRC(a7ff104c) SHA1(c640fe68314654716bd41b04c6a7f4e560036c7e) ) - ROM_LOAD16_BYTE( "5061-6540.bin", 0x008001, 0x004000, CRC(4f6796d6) SHA1(fd254897ac1afb8628f40ea93213f60a082c8d36) ) - ROM_LOAD16_BYTE( "5061-6541.bin", 0x008000, 0x004000, CRC(39d32998) SHA1(6de1bda75187b0878c03c074942b807cf2924f0e) ) + ROM_LOAD16_BYTE( "5061-6538.bin", 0x000001, 0x004000, CRC(d6aafeb1) SHA1(88c6b0b2f504303cbbac0c496c26b85458ac5d63) ) + ROM_LOAD16_BYTE( "5061-6539.bin", 0x000000, 0x004000, CRC(a7ff104c) SHA1(c640fe68314654716bd41b04c6a7f4e560036c7e) ) + ROM_LOAD16_BYTE( "5061-6540.bin", 0x008001, 0x004000, CRC(4f6796d6) SHA1(fd254897ac1afb8628f40ea93213f60a082c8d36) ) + ROM_LOAD16_BYTE( "5061-6541.bin", 0x008000, 0x004000, CRC(39d32998) SHA1(6de1bda75187b0878c03c074942b807cf2924f0e) ) ROM_REGION( 0x4000, "graphics", ROMREGION_ERASEFF | ROMREGION_BE | ROMREGION_32BIT ) ROM_LOAD16_BYTE( "98544_1818-1999.bin", 0x000001, 0x002000, CRC(8c7d6480) SHA1(d2bcfd39452c38bc652df39f84c7041cfdf6bd51) ) @@ -424,8 +424,8 @@ ROM_END ROM_START( hp9k330 ) ROM_REGION( 0x20000, MAINCPU_TAG, 0 ) - ROM_LOAD16_BYTE( "1818-4416.bin", 0x000000, 0x010000, CRC(cd71e85e) SHA1(3e83a80682f733417fdc3720410e45a2cfdcf869) ) - ROM_LOAD16_BYTE( "1818-4417.bin", 0x000001, 0x010000, CRC(374d49db) SHA1(a12cbf6c151e2f421da4571000b5dffa3ef403b3) ) + ROM_LOAD16_BYTE( "1818-4416.bin", 0x000000, 0x010000, CRC(cd71e85e) SHA1(3e83a80682f733417fdc3720410e45a2cfdcf869) ) + ROM_LOAD16_BYTE( "1818-4417.bin", 0x000001, 0x010000, CRC(374d49db) SHA1(a12cbf6c151e2f421da4571000b5dffa3ef403b3) ) ROM_REGION( 0x4000, "graphics", ROMREGION_ERASEFF | ROMREGION_BE | ROMREGION_32BIT ) ROM_LOAD16_BYTE( "98544_1818-1999.bin", 0x000001, 0x002000, CRC(8c7d6480) SHA1(d2bcfd39452c38bc652df39f84c7041cfdf6bd51) ) @@ -433,8 +433,8 @@ ROM_END ROM_START( hp9k340 ) ROM_REGION( 0x20000, MAINCPU_TAG, 0 ) - ROM_LOAD16_BYTE( "1818-4416.bin", 0x000000, 0x010000, CRC(cd71e85e) SHA1(3e83a80682f733417fdc3720410e45a2cfdcf869) ) - ROM_LOAD16_BYTE( "1818-4417.bin", 0x000001, 0x010000, CRC(374d49db) SHA1(a12cbf6c151e2f421da4571000b5dffa3ef403b3) ) + ROM_LOAD16_BYTE( "1818-4416.bin", 0x000000, 0x010000, CRC(cd71e85e) SHA1(3e83a80682f733417fdc3720410e45a2cfdcf869) ) + ROM_LOAD16_BYTE( "1818-4417.bin", 0x000001, 0x010000, CRC(374d49db) SHA1(a12cbf6c151e2f421da4571000b5dffa3ef403b3) ) ROM_REGION( 0x4000, "graphics", ROMREGION_ERASEFF | ROMREGION_BE | ROMREGION_32BIT ) ROM_LOAD16_BYTE( "98544_1818-1999.bin", 0x000001, 0x002000, CRC(8c7d6480) SHA1(d2bcfd39452c38bc652df39f84c7041cfdf6bd51) ) diff --git a/src/mess/drivers/nes.c b/src/mess/drivers/nes.c index 9a5ff708c76..48904369ecf 100644 --- a/src/mess/drivers/nes.c +++ b/src/mess/drivers/nes.c @@ -214,7 +214,7 @@ MACHINE_START_MEMBER( nes_state, fds ) { m_ciram = auto_alloc_array(machine(), UINT8, 0x800); setup_disk(m_disk); - + // register saves save_item(NAME(m_last_frame_flip)); save_pointer(NAME(m_ciram), 0x800); diff --git a/src/mess/drivers/ngen.c b/src/mess/drivers/ngen.c index ab2d3249c0f..6ba901c161b 100644 --- a/src/mess/drivers/ngen.c +++ b/src/mess/drivers/ngen.c @@ -406,7 +406,7 @@ READ16_MEMBER(ngen_state::peripheral_r) // X-bus module select // The bootstrap ROM creates a table at 0:FC9h, with a count, followed by the module IDs of each -// expansion module. The base I/O address for the currently selected module is set by writing to +// expansion module. The base I/O address for the currently selected module is set by writing to // this register (bits 0-7 are ignored) // TODO: make expansion modules slot devices WRITE16_MEMBER(ngen_state::xbus_w) @@ -435,7 +435,7 @@ WRITE16_MEMBER(ngen_state::xbus_w) READ16_MEMBER(ngen_state::xbus_r) { UINT16 ret = 0xffff; - + switch(m_xbus_current) { case 0x00: @@ -647,8 +647,8 @@ WRITE_LINE_MEMBER( ngen_state::dack3_w ) { set_dma_channel(3, state); } READ8_MEMBER(ngen_state::dma_3_dack_r) { - UINT16 ret = 0xffff; - + UINT16 ret = 0xffff; + if((m_hdc_control & 0x04) && m_disk_rom) { ret = m_disk_rom->base()[m_disk_rom_ptr++] << 8; @@ -659,7 +659,7 @@ READ8_MEMBER(ngen_state::dma_3_dack_r) //m_dmac->dreq3_w(0); } } - m_dma_high_byte = ret & 0xff00; + m_dma_high_byte = ret & 0xff00; return ret; } @@ -737,16 +737,16 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ngen_io, AS_IO, 16, ngen_state ) AM_RANGE(0x0000, 0x0001) AM_READWRITE(xbus_r,xbus_w) - + // Floppy/Hard disk module -// AM_RANGE(0x0100, 0x0107) AM_DEVREADWRITE8("fdc",wd2797_t,read,write,0x00ff) // a guess for now -// AM_RANGE(0x0108, 0x0109) AM_WRITE8(fdc_control_w,0x00ff) -// AM_RANGE(0x010a, 0x010b) AM_WRITE8(hdc_control_w,0x00ff) -// AM_RANGE(0x010e, 0x010f) AM_WRITE8(disk_addr_ext,0x00ff) // X-Bus extended address register -// AM_RANGE(0x0110, 0x0117) AM_DEVREADWRITE8("fdc_timer",pit8253_device,read,write,0x00ff) +// AM_RANGE(0x0100, 0x0107) AM_DEVREADWRITE8("fdc",wd2797_t,read,write,0x00ff) // a guess for now +// AM_RANGE(0x0108, 0x0109) AM_WRITE8(fdc_control_w,0x00ff) +// AM_RANGE(0x010a, 0x010b) AM_WRITE8(hdc_control_w,0x00ff) +// AM_RANGE(0x010e, 0x010f) AM_WRITE8(disk_addr_ext,0x00ff) // X-Bus extended address register +// AM_RANGE(0x0110, 0x0117) AM_DEVREADWRITE8("fdc_timer",pit8253_device,read,write,0x00ff) // 0x0120-0x012f - WD1010 Winchester disk controller (unemulated) -// AM_RANGE(0x0130, 0x0137) AM_DEVREADWRITE8("hdc_timer",pit8253_device,read,write,0x00ff) - +// AM_RANGE(0x0130, 0x0137) AM_DEVREADWRITE8("hdc_timer",pit8253_device,read,write,0x00ff) + ADDRESS_MAP_END static ADDRESS_MAP_START( ngen386_mem, AS_PROGRAM, 32, ngen_state ) @@ -851,7 +851,7 @@ static MACHINE_CONFIG_START( ngen, ngen_state ) // keyboard UART (patent says i8251 is used for keyboard communications, it is located on the video board) MCFG_DEVICE_ADD("videouart", I8251, 0) // main clock unknown, Rx/Tx clocks are 19.53kHz -// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w)) +// MCFG_I8251_TXEMPTY_HANDLER(DEVWRITELINE("pic",pic8259_device,ir4_w)) MCFG_I8251_TXD_HANDLER(DEVWRITELINE("keyboard", rs232_port_device, write_txd)) MCFG_RS232_PORT_ADD("keyboard", keyboard, "ngen") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("videouart", i8251_device, write_rxd)) @@ -865,12 +865,12 @@ static MACHINE_CONFIG_START( ngen, ngen_state ) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu",i80186_cpu_device,drq1_w)) MCFG_WD_FDC_FORCE_READY MCFG_DEVICE_ADD("fdc_timer", PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL_20MHz / 20) + MCFG_PIT8253_CLK0(XTAL_20MHz / 20) MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w)) // clocked on FDC data register access MCFG_PIT8253_CLK1(XTAL_20MHz / 20) MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w)) // 1MHz MCFG_PIT8253_CLK2(XTAL_20MHz / 10) - MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w)) + MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pic",pic8259_device,ir7_w)) // TODO: WD1010 HDC (not implemented), use WD2010 for now MCFG_DEVICE_ADD("hdc", WD2010, XTAL_20MHz / 4) MCFG_WD2010_IN_BCS_CB(READ8(ngen_state,hd_buffer_r)) diff --git a/src/mess/drivers/pasogo.c b/src/mess/drivers/pasogo.c index 99f83dc1abf..b59011319c5 100644 --- a/src/mess/drivers/pasogo.c +++ b/src/mess/drivers/pasogo.c @@ -681,7 +681,7 @@ void pasogo_state::machine_reset() astring region_tag; m_maincpu_rom = memregion("maincpu"); m_cart_rom = memregion(region_tag.cpy(m_cart->tag()).cat(GENERIC_ROM_REGION_TAG)); - if (!m_cart_rom) // this should never happen, since we make carts mandatory! + if (!m_cart_rom) // this should never happen, since we make carts mandatory! m_cart_rom = memregion("maincpu"); membank("bank27")->set_base(m_cart_rom->base()); diff --git a/src/mess/drivers/splitsec.c b/src/mess/drivers/splitsec.c index 719b67eb474..06b28f9163e 100644 --- a/src/mess/drivers/splitsec.c +++ b/src/mess/drivers/splitsec.c @@ -4,7 +4,7 @@ Parker Brothers Split Second * TMS1400NLL MP7314-N2 (die labeled MP7314) - + This is an electronic handheld reflex gaming device, it's straightforward to use. The included mini-games are: 1, 2, 3: Mad Maze* @@ -12,7 +12,7 @@ 6: Auto Cross 7: Stomp 8: Speedball - + *: higher number indicates higher difficulty @@ -167,7 +167,7 @@ WRITE16_MEMBER(splitsec_state::write_r) { // R8: speaker out m_speaker->level_w(data >> 8 & 1); - + // R9,R10: input mux // R0-R7: led columns m_r = data; diff --git a/src/mess/drivers/tispeak.c b/src/mess/drivers/tispeak.c index 9848aebbc80..cf42755f006 100644 --- a/src/mess/drivers/tispeak.c +++ b/src/mess/drivers/tispeak.c @@ -693,7 +693,7 @@ COMP( 1978, snspell, 0, 0, snspell, snspell, tispeak_state, snspell, COMP( 1980, snspella, snspell, 0, snspell, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (US set 2)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) COMP( 1978, snspelluk, snspell, 0, snspell, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (UK set 1)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) COMP( 1981, snspelluka, snspell, 0, snspell, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (UK set 2)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) // different voice actor -COMP( 1979, snspelljp, snspell, 0, snspell, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (Japan)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) +COMP( 1979, snspelljp, snspell, 0, snspell, snspell, tispeak_state, snspell, "Texas Instruments", "Speak & Spell (Japan)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) COMP( 1980, ladictee, snspell, 0, snspell, snspell, tispeak_state, snspell, "Texas Instruments", "La Dictee Magique (France)", GAME_NOT_WORKING | GAME_IMPERFECT_SOUND ) // doesn't work due to missing CD2702 MCU dump, German version has CD2702 too COMP( 1980, snmath, 0, 0, snmath, snmath, driver_device, 0, "Texas Instruments", "Speak & Math (US prototype)", GAME_IMPERFECT_SOUND ) // also US set 1 |