Subtle corrections, cleans and spacing... n/w

This commit is contained in:
RobertoFresca 2016-05-14 00:32:27 -03:00
parent cc088d53a6
commit c5f2a48006
9 changed files with 60 additions and 60 deletions

View File

@ -515,5 +515,5 @@ ROM_END
* Game Drivers * * Game Drivers *
*************************/ *************************/
/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
GAMEL( 19??, chance32, 0, chance32, chance32, driver_device, 0, ROT0, "PAL System Co, Ltd.", "Chance Thirty Two", 0, layout_chance32 ) GAMEL( 19??, chance32, 0, chance32, chance32, driver_device, 0, ROT0, "PAL System Co, Ltd.", "Chance Thirty Two", 0, layout_chance32 )

View File

@ -16,7 +16,7 @@
***************************************************************************************** *****************************************************************************************
You can find more about this game and the emulation evolution at You can find more about this game and the emulation evolution at
http://www.robertofresca.com.ar/ http://www.robertofresca.com/
***************************************************************************************** *****************************************************************************************

View File

@ -101,12 +101,12 @@
| | ULN2003A | +++RESNET+++ +++RESNET+++ |'----------'| | | | ULN2003A | +++RESNET+++ +++RESNET+++ |'----------'| |
| '----------' |||||||||||| |||||||||||| '------------' | | '----------' |||||||||||| |||||||||||| '------------' |
| | | |
| 7908-B SUCCESS CORP. | | 7908-B hole SUCCESS CORP. |
| .----------. .--. .----------. | | .----------. .--. .----------. |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
'---------' '-----------' '-----------------------------------------' '---------' '---------' '-----------' '-----------------------------------------' '---------'
2x6 edge conn 2x21 edge connector <-------- 2x28 JAMMA compatible edge connector -------->
AA = Texas Instruments RC4558P T835AJ34. AA = Texas Instruments RC4558P T835AJ34.

View File

@ -144,7 +144,7 @@
TODO: TODO:
- Proper handling of the 68070 (68k with 32 address lines instead of 24) - Proper handling of the 68070 (68k with 32 address lines instead of 24)
& handle the extra features properly (UART,DMA,Timers etc.) & handle the extra features properly (UART, DMA, timers, etc.)
- Proper emulation of the 66470 Video Chip (still many unhandled features) - Proper emulation of the 66470 Video Chip (still many unhandled features)
@ -425,7 +425,7 @@ void magicard_state::video_start()
UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{ {
int x,y; int x, y;
UINT32 count; UINT32 count;
bitmap.fill(m_palette->black_pen(), cliprect); //TODO bitmap.fill(m_palette->black_pen(), cliprect); //TODO
@ -433,35 +433,35 @@ UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb3
if(!(SCC_DE_VREG)) //display enable if(!(SCC_DE_VREG)) //display enable
return 0; return 0;
count = ((SCC_VSR_VREG)/2); count = ((SCC_VSR_VREG) / 2);
if(SCC_FG_VREG) //4bpp gfx if(SCC_FG_VREG) //4bpp gfx
{ {
for(y=0;y<300;y++) for(y = 0; y < 300; y++)
{ {
for(x=0;x<84;x++) for(x = 0; x < 84; x++)
{ {
UINT32 color; UINT32 color;
color = ((m_magicram[count]) & 0x000f)>>0; color = ((m_magicram[count]) & 0x000f) >> 0;
if(cliprect.contains((x*4)+3, y)) if(cliprect.contains((x * 4) + 3, y))
bitmap.pix32(y, (x*4)+3) = m_palette->pen(color); bitmap.pix32(y, (x * 4) + 3) = m_palette->pen(color);
color = ((m_magicram[count]) & 0x00f0)>>4; color = ((m_magicram[count]) & 0x00f0) >> 4;
if(cliprect.contains((x*4)+2, y)) if(cliprect.contains((x * 4) + 2, y))
bitmap.pix32(y, (x*4)+2) = m_palette->pen(color); bitmap.pix32(y, (x * 4) + 2) = m_palette->pen(color);
color = ((m_magicram[count]) & 0x0f00)>>8; color = ((m_magicram[count]) & 0x0f00) >> 8;
if(cliprect.contains((x*4)+1, y)) if(cliprect.contains((x * 4) + 1, y))
bitmap.pix32(y, (x*4)+1) = m_palette->pen(color); bitmap.pix32(y, (x * 4) + 1) = m_palette->pen(color);
color = ((m_magicram[count]) & 0xf000)>>12; color = ((m_magicram[count]) & 0xf000) >> 12;
if(cliprect.contains((x*4)+0, y)) if(cliprect.contains((x * 4) + 0, y))
bitmap.pix32(y, (x*4)+0) = m_palette->pen(color); bitmap.pix32(y, (x * 4) + 0) = m_palette->pen(color);
count++; count++;
} }
@ -469,21 +469,21 @@ UINT32 magicard_state::screen_update_magicard(screen_device &screen, bitmap_rgb3
} }
else //8bpp gfx else //8bpp gfx
{ {
for(y=0;y<300;y++) for(y = 0; y < 300; y++)
{ {
for(x=0;x<168;x++) for(x = 0; x < 168; x++)
{ {
UINT32 color; UINT32 color;
color = ((m_magicram[count]) & 0x00ff)>>0; color = ((m_magicram[count]) & 0x00ff) >> 0;
if(cliprect.contains((x*2)+1, y)) if(cliprect.contains((x * 2) + 1, y))
bitmap.pix32(y, (x*2)+1) = m_palette->pen(color); bitmap.pix32(y, (x * 2) + 1) = m_palette->pen(color);
color = ((m_magicram[count]) & 0xff00)>>8; color = ((m_magicram[count]) & 0xff00) >> 8;
if(cliprect.contains((x*2)+0, y)) if(cliprect.contains((x * 2) + 0, y))
bitmap.pix32(y, (x*2)+0) = m_palette->pen(color); bitmap.pix32(y, (x * 2) + 0) = m_palette->pen(color);
count++; count++;
} }
@ -512,7 +512,7 @@ READ16_MEMBER(magicard_state::philips_66470_r)
UINT8 vdisp; UINT8 vdisp;
vdisp = m_screen->vpos() < 256; vdisp = m_screen->vpos() < 256;
return (m_pcab_vregs[offset] & 0xff7f) | vdisp<<7; //TODO return (m_pcab_vregs[offset] & 0xff7f) | vdisp << 7; //TODO
} }
} }
@ -719,14 +719,14 @@ void magicard_state::machine_reset()
UINT16 *src = (UINT16*)memregion("maincpu" )->base(); UINT16 *src = (UINT16*)memregion("maincpu" )->base();
UINT16 *dst = m_magicram; UINT16 *dst = m_magicram;
memcpy (dst, src, 0x80000); memcpy (dst, src, 0x80000);
memcpy (dst+0x40000*1, src, 0x80000); memcpy (dst + 0x40000 * 1, src, 0x80000);
memcpy (dst+0x40000*2, src, 0x80000); memcpy (dst + 0x40000 * 2, src, 0x80000);
memcpy (dst+0x40000*3, src, 0x80000); memcpy (dst + 0x40000 * 3, src, 0x80000);
dst = m_magicramb; dst = m_magicramb;
memcpy (dst, src, 0x80000); memcpy (dst, src, 0x80000);
memcpy (dst+0x40000*1, src, 0x80000); memcpy (dst + 0x40000 * 1, src, 0x80000);
memcpy (dst+0x40000*2, src, 0x80000); memcpy (dst + 0x40000 * 2, src, 0x80000);
memcpy (dst+0x40000*3, src, 0x80000); memcpy (dst + 0x40000 * 3, src, 0x80000);
m_maincpu->reset(); m_maincpu->reset();
} }
@ -739,18 +739,18 @@ void magicard_state::machine_reset()
INTERRUPT_GEN_MEMBER(magicard_state::magicard_irq) INTERRUPT_GEN_MEMBER(magicard_state::magicard_irq)
{ {
if(machine().input().code_pressed(KEYCODE_Z)) //vblank? if(machine().input().code_pressed(KEYCODE_Z)) //vblank?
device.execute().set_input_line_and_vector(1, HOLD_LINE,0xe4/4); device.execute().set_input_line_and_vector(1, HOLD_LINE, 0xe4 / 4);
if(machine().input().code_pressed(KEYCODE_X)) //uart irq if(machine().input().code_pressed(KEYCODE_X)) //uart irq
device.execute().set_input_line_and_vector(1, HOLD_LINE,0xf0/4); device.execute().set_input_line_and_vector(1, HOLD_LINE, 0xf0 / 4);
} }
static ADDRESS_MAP_START( ramdac_map, AS_0, 8, magicard_state ) static ADDRESS_MAP_START( ramdac_map, AS_0, 8, magicard_state )
AM_RANGE(0x000, 0x3ff) AM_DEVREADWRITE("ramdac",ramdac_device,ramdac_pal_r,ramdac_rgb666_w) AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("ramdac", ramdac_device, ramdac_pal_r, ramdac_rgb666_w)
ADDRESS_MAP_END ADDRESS_MAP_END
static MACHINE_CONFIG_START( magicard, magicard_state ) static MACHINE_CONFIG_START( magicard, magicard_state )
MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A/2) /* SCC-68070 CCA84 datasheet */ MCFG_CPU_ADD("maincpu", SCC68070, CLOCK_A / 2) /* SCC-68070 CCA84 datasheet */
MCFG_CPU_PROGRAM_MAP(magicard_mem) MCFG_CPU_PROGRAM_MAP(magicard_mem)
MCFG_CPU_VBLANK_INT_DRIVER("screen", magicard_state, magicard_irq) /* no interrupts? (it erases the vectors..) */ MCFG_CPU_VBLANK_INT_DRIVER("screen", magicard_state, magicard_irq) /* no interrupts? (it erases the vectors..) */
@ -765,7 +765,7 @@ static MACHINE_CONFIG_START( magicard, magicard_state )
MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette") MCFG_RAMDAC_ADD("ramdac", ramdac_map, "palette")
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ymsnd", YM2413, CLOCK_A/12) MCFG_SOUND_ADD("ymsnd", YM2413, CLOCK_A / 12)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -890,7 +890,7 @@ ROM_END
* Driver Init * * Driver Init *
*************************/ *************************/
DRIVER_INIT_MEMBER(magicard_state,magicard) DRIVER_INIT_MEMBER(magicard_state, magicard)
{ {
//... //...
} }

View File

@ -20,7 +20,7 @@
This hardware was clearly designed for poker games. This hardware was clearly designed for poker games.
You can find a complete hardware & software analysis here: You can find a complete hardware & software analysis here:
http://www.robertofresca.com.ar/ http://www.robertofresca.com
Special Thanks to... Special Thanks to...
@ -522,7 +522,7 @@ TILE_GET_INFO_MEMBER(magicfly_state::get_magicfly_tile_info)
void magicfly_state::video_start() void magicfly_state::video_start()
{ {
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magicfly_state::get_magicfly_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29); m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magicfly_state::get_magicfly_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29);
} }
@ -551,9 +551,9 @@ TILE_GET_INFO_MEMBER(magicfly_state::get_7mezzo_tile_info)
SET_TILE_INFO_MEMBER(bank, code, color, 0); SET_TILE_INFO_MEMBER(bank, code, color, 0);
} }
VIDEO_START_MEMBER(magicfly_state,7mezzo) VIDEO_START_MEMBER(magicfly_state, 7mezzo)
{ {
m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magicfly_state::get_7mezzo_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29); m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(magicfly_state::get_7mezzo_tile_info), this), TILEMAP_SCAN_ROWS, 8, 8, 32, 29);
} }
@ -927,7 +927,7 @@ GFXDECODE_END
static MACHINE_CONFIG_START( magicfly, magicfly_state ) static MACHINE_CONFIG_START( magicfly, magicfly_state )
/* basic machine hardware */ /* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
MCFG_CPU_PROGRAM_MAP(magicfly_map) MCFG_CPU_PROGRAM_MAP(magicfly_map)
MCFG_CPU_VBLANK_INT_DRIVER("screen", magicfly_state, nmi_line_pulse) MCFG_CPU_VBLANK_INT_DRIVER("screen", magicfly_state, nmi_line_pulse)
@ -946,7 +946,7 @@ static MACHINE_CONFIG_START( magicfly, magicfly_state )
MCFG_PALETTE_ADD("palette", 32) MCFG_PALETTE_ADD("palette", 32)
MCFG_PALETTE_INIT_OWNER(magicfly_state, magicfly) MCFG_PALETTE_INIT_OWNER(magicfly_state, magicfly)
MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/16) /* guess */ MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK / 16) /* guess */
MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_CHAR_WIDTH(8)

View File

@ -1046,7 +1046,7 @@ ROM_END
* Driver Init * * Driver Init *
*************************/ *************************/
DRIVER_INIT_MEMBER(majorpkr_state,majorpkr) DRIVER_INIT_MEMBER(majorpkr_state, majorpkr)
{ {
UINT8 * ROM = (UINT8 *)memregion("maincpu")->base(); UINT8 * ROM = (UINT8 *)memregion("maincpu")->base();
m_rom_bank->configure_entries(0, 4, &ROM[0xe000], 0x800); m_rom_bank->configure_entries(0, 4, &ROM[0xe000], 0x800);
@ -1057,5 +1057,5 @@ DRIVER_INIT_MEMBER(majorpkr_state,majorpkr)
* Game Drivers * * Game Drivers *
*************************/ *************************/
/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS LAYOUT */ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT */
GAMEL( 1994, majorpkr, 0, majorpkr, majorpkr, majorpkr_state, majorpkr, ROT0, "PAL System", "Major Poker (v2.0)", 0, layout_majorpkr ) GAMEL( 1994, majorpkr, 0, majorpkr, majorpkr, majorpkr_state, majorpkr, ROT0, "PAL System", "Major Poker (v2.0)", 0, layout_majorpkr )

View File

@ -215,7 +215,7 @@ static MACHINE_CONFIG_START( manohman, _manohman_state )
// sound hardware // sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SAA1099_ADD("saa", MASTER_CLOCK /* guess */) MCFG_SAA1099_ADD("saa", MASTER_CLOCK) // guess
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END MACHINE_CONFIG_END
@ -235,5 +235,5 @@ ROM_END
* Game Drivers * * Game Drivers *
*********************************************/ *********************************************/
/* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS... */ /* YEAR NAME PARENT MACHINE INPUT STATE INIT ROT COMPANY FULLNAME FLAGS... */
GAME( 199?, manohman, 0, manohman, manohman, driver_device, 0, ROT0, "Merkur", "Mann, oh-Mann", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_REQUIRES_ARTWORK ) GAME( 199?, manohman, 0, manohman, manohman, driver_device, 0, ROT0, "Merkur", "Mann, oh-Mann", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_REQUIRES_ARTWORK )

View File

@ -501,7 +501,7 @@ GFXDECODE_END
static MACHINE_CONFIG_START( miniboy7, miniboy7_state ) static MACHINE_CONFIG_START( miniboy7, miniboy7_state )
/* basic machine hardware */ /* basic machine hardware */
MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK/16) /* guess */ MCFG_CPU_ADD("maincpu", M6502, MASTER_CLOCK / 16) /* guess */
MCFG_CPU_PROGRAM_MAP(miniboy7_map) MCFG_CPU_PROGRAM_MAP(miniboy7_map)
MCFG_NVRAM_ADD_0FILL("nvram") MCFG_NVRAM_ADD_0FILL("nvram")
@ -526,7 +526,7 @@ static MACHINE_CONFIG_START( miniboy7, miniboy7_state )
MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_ADD("palette", 256)
MCFG_PALETTE_INIT_OWNER(miniboy7_state, miniboy7) MCFG_PALETTE_INIT_OWNER(miniboy7_state, miniboy7)
MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK/12) /* guess */ MCFG_MC6845_ADD("crtc", MC6845, "screen", MASTER_CLOCK / 12) /* guess */
MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_SHOW_BORDER_AREA(false)
MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_CHAR_WIDTH(8)
MCFG_MC6845_UPDATE_ROW_CB(miniboy7_state, crtc_update_row) MCFG_MC6845_UPDATE_ROW_CB(miniboy7_state, crtc_update_row)
@ -534,7 +534,7 @@ static MACHINE_CONFIG_START( miniboy7, miniboy7_state )
/* sound hardware */ /* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK/8) /* guess */ MCFG_SOUND_ADD("ay8910", AY8910, MASTER_CLOCK / 8) /* guess */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(miniboy7_state, ay_pa_w)) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(miniboy7_state, ay_pa_w))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(miniboy7_state, ay_pb_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(miniboy7_state, ay_pb_w))