Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-14 18:08:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed loading for the unused flash ROM

Browse Source
This commit is contained in:
Angelo Salese 2013-03-07 18:37:16 +00:00
parent 76ac08a0b8
commit f5351dc600
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/video/stvvdp2.c
View File

@ -5455,9 +5455,9 @@ void saturn_state::stv_vdp2_draw_rotation_screen(bitmap_rgb32 &bitmap, const rec
if ( stv2_current_tilemap.window_control.enabled[0] || stv2_current_tilemap.window_control.enabled[1] ) if ( stv2_current_tilemap.window_control.enabled[0] || stv2_current_tilemap.window_control.enabled[1] )
{ {
//popmessage("Window control for RBG"); //popmessage("Window control for RBG");
stv_vdp2_apply_window_on_layer(mycliprect);
stv2_current_tilemap.window_control.enabled[0] = 0; stv2_current_tilemap.window_control.enabled[0] = 0;
stv2_current_tilemap.window_control.enabled[1] = 0; stv2_current_tilemap.window_control.enabled[1] = 0;
stv_vdp2_apply_window_on_layer(mycliprect);
} }
stv2_current_tilemap.fade_control = fade_control; stv2_current_tilemap.fade_control = fade_control;
@ -6341,7 +6341,7 @@ int saturn_state::stv_vdp2_apply_window_on_layer(rectangle &cliprect)
{ {
int s_x=0,e_x=0,s_y=0,e_y=0; int s_x=0,e_x=0,s_y=0,e_y=0;
if ( stv2_current_tilemap.window_control.enabled[0] && stv2_current_tilemap.window_control.area[0]) if ( stv2_current_tilemap.window_control.enabled[0] && (!stv2_current_tilemap.window_control.area[0]))
{ {
/* w0, transparent outside supported */ /* w0, transparent outside supported */
stv_vdp2_get_window0_coordinates(&s_x, &e_x, &s_y, &e_y); stv_vdp2_get_window0_coordinates(&s_x, &e_x, &s_y, &e_y);
@ -6353,7 +6353,7 @@ int saturn_state::stv_vdp2_apply_window_on_layer(rectangle &cliprect)
return 1; return 1;
} }
else if ( stv2_current_tilemap.window_control.enabled[1] && stv2_current_tilemap.window_control.area[1] ) else if ( stv2_current_tilemap.window_control.enabled[1] && (!stv2_current_tilemap.window_control.area[1]) )
{ {
/* w1, transparent outside supported */ /* w1, transparent outside supported */
stv_vdp2_get_window1_coordinates(&s_x, &e_x, &s_y, &e_y); stv_vdp2_get_window1_coordinates(&s_x, &e_x, &s_y, &e_y);

8
src/mame/drivers/funkball.c
View File

@ -50,7 +50,7 @@ VRender 2Beta Rev4
Notes: Notes:
Cyrix GXm233 - Main CPU; Cyrix GX Media running at 233MHz. Clock is generated by the Cyrix CX5520 Cyrix GXm233 - Main CPU; Cyrix GX Media running at 233MHz. Clock is generated by the Cyrix CX5520
and a 14.31818MHz xtal. That gives a 66.6MHz bus clock with a 3.5X multiplier for 233MHz and a 14.31818MHz xtal. That gives a 66.6MHz bus clock with a 3.5X multiplier for 233MHz
Cyrix CX5220 - CPU-support chipset (BGA IC) Cyrix CX5520 - CPU-support chipset (BGA IC)
FLASH.U29/30 - Intel Strata-Flash DA28F320J5 SSOP56 contained on a plug-in daughterboard; graphics ROMs FLASH.U29/30 - Intel Strata-Flash DA28F320J5 SSOP56 contained on a plug-in daughterboard; graphics ROMs
FLASH.U3 - Intel Strata-Flash DA28F320J5 SSOP56 contained on a plug-in daughterboard; main program FLASH.U3 - Intel Strata-Flash DA28F320J5 SSOP56 contained on a plug-in daughterboard; main program
KS0164 - Samsung Electronics KS0164 General Midi compliant 32-voice Wavetable Synthesizer chip KS0164 - Samsung Electronics KS0164 General Midi compliant 32-voice Wavetable Synthesizer chip
@ -489,7 +489,7 @@ READ8_MEMBER( funkball_state::flash_data_r )
return 0x89; // manufacturer code return 0x89; // manufacturer code
if(offset == 2 && (m_flash_addr == 0)) if(offset == 2 && (m_flash_addr == 0))
return 0x14; // device code, 32 MBit in both cases return (m_flash_cmd & 0x80) ? 0x15 : 0x14; // device code, 32 MBit in both cases
if(offset > 3) if(offset > 3)
printf("%02x FLASH DATA 0x90\n",offset); printf("%02x FLASH DATA 0x90\n",offset);
@ -499,7 +499,7 @@ READ8_MEMBER( funkball_state::flash_data_r )
if(m_flash_data_cmd == 0xff) if(m_flash_data_cmd == 0xff)
{ {
UINT8 *ROM = memregion(m_flash_cmd & 0x80 ? "prg_flash" : "data_flash")->base(); UINT8 *ROM = memregion(m_flash_cmd & 0x80 ? "data_flash" : "prg_flash")->base();
return ROM[offset + (m_flash_addr << 16)]; return ROM[offset + (m_flash_addr << 16)];
} }
@ -1178,7 +1178,7 @@ ROM_START( funkball )
ROM_LOAD( "512k-epr.u62", 0x010000, 0x010000, CRC(cced894a) SHA1(298c81716e375da4b7215f3e588a45ca3ea7e35c) ) ROM_LOAD( "512k-epr.u62", 0x010000, 0x010000, CRC(cced894a) SHA1(298c81716e375da4b7215f3e588a45ca3ea7e35c) )
ROM_REGION(0x8000000, "prg_flash", ROMREGION_ERASE00) ROM_REGION(0x8000000, "prg_flash", ROMREGION_ERASE00)
ROM_LOAD( "flash.u3", 0x0000000, 0x400000, CRC(fb376abc) SHA1(ea4c48bb6cd2055431a33f5c426e52c7af6997eb) ) ROM_LOAD16_WORD_SWAP( "flash.u3", 0x0000000, 0x400000, CRC(fb376abc) SHA1(ea4c48bb6cd2055431a33f5c426e52c7af6997eb) )
ROM_REGION(0x8000000, "data_flash", ROMREGION_ERASE00) ROM_REGION(0x8000000, "data_flash", ROMREGION_ERASE00)
ROM_LOAD( "flash.u29",0x0000000, 0x400000, CRC(7cf6ff4b) SHA1(4ccdd4864ad92cc218998f3923997119a1a9dd1d) ) ROM_LOAD( "flash.u29",0x0000000, 0x400000, CRC(7cf6ff4b) SHA1(4ccdd4864ad92cc218998f3923997119a1a9dd1d) )