Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-05 20:33:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup for jaguar (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2012-05-24 12:25:59 +00:00
parent 5821c6b519
commit 2e5b4730d4
4 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mame/audio/jaguar.c
View File

@ -143,7 +143,6 @@
****************************************************************************/
#include "emu.h"
#include "memconv.h"
#include "includes/jaguar.h"
#include "cpu/jaguar/jaguar.h"
#include "sound/dac.h"
@ -311,25 +310,6 @@ WRITE16_HANDLER( jaguar_jerry_regs_w )
/*************************************
*
* Jerry 32-bit register access
*
*************************************/
READ32_HANDLER( jaguar_jerry_regs32_r )
{
return read32be_with_16be_handler(jaguar_jerry_regs_r, space, offset, mem_mask);
}
WRITE32_HANDLER( jaguar_jerry_regs32_w )
{
write32be_with_16be_handler(jaguar_jerry_regs_w, space, offset, data, mem_mask);
}
/*************************************
*
* Speedier sound hack

22
src/mame/drivers/jaguar.c
View File

@ -1267,12 +1267,12 @@ static ADDRESS_MAP_START( r3000_map, AS_PROGRAM, 32, cojag_state )
AM_RANGE(0x04800000, 0x04bfffff) AM_ROMBANK("bank1")
AM_RANGE(0x04c00000, 0x04dfffff) AM_ROMBANK("bank2")
AM_RANGE(0x04e00000, 0x04e003ff) AM_DEVREADWRITE_LEGACY("ide", ide_controller32_r, ide_controller32_w)
AM_RANGE(0x04f00000, 0x04f003ff) AM_READWRITE_LEGACY(jaguar_tom_regs32_r, jaguar_tom_regs32_w)
AM_RANGE(0x04f00000, 0x04f003ff) AM_READWRITE16_LEGACY(jaguar_tom_regs_r, jaguar_tom_regs_w, 0xffffffff)
AM_RANGE(0x04f00400, 0x04f007ff) AM_RAM AM_BASE_LEGACY(&jaguar_gpu_clut) AM_SHARE("share2")
AM_RANGE(0x04f02100, 0x04f021ff) AM_READWRITE(gpuctrl_r, gpuctrl_w)
AM_RANGE(0x04f02200, 0x04f022ff) AM_READWRITE_LEGACY(jaguar_blitter_r, jaguar_blitter_w)
AM_RANGE(0x04f03000, 0x04f03fff) AM_MIRROR(0x00008000) AM_RAM AM_BASE_LEGACY(&jaguar_gpu_ram) AM_SHARE("share3")
AM_RANGE(0x04f10000, 0x04f103ff) AM_READWRITE_LEGACY(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0x04f10000, 0x04f103ff) AM_READWRITE16_LEGACY(jaguar_jerry_regs_r, jaguar_jerry_regs_w, 0xffffffff)
AM_RANGE(0x04f16000, 0x04f1600b) AM_READ_LEGACY(cojag_gun_input_r) // GPI02
AM_RANGE(0x04f17000, 0x04f17003) AM_READ_PORT("SYSTEM") // GPI03
AM_RANGE(0x04f17800, 0x04f17803) AM_WRITE(latch_w) // GPI04
@ -1301,12 +1301,12 @@ static ADDRESS_MAP_START( m68020_map, AS_PROGRAM, 32, cojag_state )
AM_RANGE(0xb70000, 0xb70003) AM_READWRITE(misc_control_r, misc_control_w)
AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank2")
AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE_LEGACY("ide", ide_controller32_r, ide_controller32_w)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE_LEGACY(jaguar_tom_regs32_r, jaguar_tom_regs32_w)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE16_LEGACY(jaguar_tom_regs_r, jaguar_tom_regs_w, 0xffffffff)
AM_RANGE(0xf00400, 0xf007ff) AM_RAM AM_BASE_LEGACY(&jaguar_gpu_clut) AM_SHARE("share2")
AM_RANGE(0xf02100, 0xf021ff) AM_READWRITE(gpuctrl_r, gpuctrl_w)
AM_RANGE(0xf02200, 0xf022ff) AM_READWRITE_LEGACY(jaguar_blitter_r, jaguar_blitter_w)
AM_RANGE(0xf03000, 0xf03fff) AM_MIRROR(0x008000) AM_RAM AM_BASE_LEGACY(&jaguar_gpu_ram) AM_SHARE("share3")
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE_LEGACY(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE16_LEGACY(jaguar_jerry_regs_r, jaguar_jerry_regs_w, 0xffffffff)
AM_RANGE(0xf16000, 0xf1600b) AM_READ_LEGACY(cojag_gun_input_r) // GPI02
AM_RANGE(0xf17000, 0xf17003) AM_READ_PORT("SYSTEM") // GPI03
// AM_RANGE(0xf17800, 0xf17803) AM_WRITE(latch_w) // GPI04
@ -1329,12 +1329,12 @@ static ADDRESS_MAP_START( gpu_map, AS_PROGRAM, 32, cojag_state )
AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK("bank8")
AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank9")
AM_RANGE(0xe00000, 0xe003ff) AM_DEVREADWRITE_LEGACY("ide", ide_controller32_r, ide_controller32_w)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE_LEGACY(jaguar_tom_regs32_r, jaguar_tom_regs32_w)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE16_LEGACY(jaguar_tom_regs_r, jaguar_tom_regs_w, 0xffffffff)
AM_RANGE(0xf00400, 0xf007ff) AM_RAM AM_SHARE("share2")
AM_RANGE(0xf02100, 0xf021ff) AM_READWRITE(gpuctrl_r, gpuctrl_w)
AM_RANGE(0xf02200, 0xf022ff) AM_READWRITE_LEGACY(jaguar_blitter_r, jaguar_blitter_w)
AM_RANGE(0xf03000, 0xf03fff) AM_RAM AM_SHARE("share3")
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE_LEGACY(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE16_LEGACY(jaguar_jerry_regs_r, jaguar_jerry_regs_w, 0xffffffff)
ADDRESS_MAP_END
@ -1349,7 +1349,7 @@ static ADDRESS_MAP_START( dsp_map, AS_PROGRAM, 32, cojag_state )
AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK("bank8")
AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank9")
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE_LEGACY(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE16_LEGACY(jaguar_jerry_regs_r, jaguar_jerry_regs_w, 0xffffffff)
AM_RANGE(0xf1a100, 0xf1a13f) AM_READWRITE(dspctrl_r, dspctrl_w)
AM_RANGE(0xf1a140, 0xf1a17f) AM_READWRITE_LEGACY(jaguar_serial_r, jaguar_serial_w)
AM_RANGE(0xf1b000, 0xf1cfff) AM_RAM AM_SHARE("share4")
@ -1363,12 +1363,12 @@ static ADDRESS_MAP_START( jag_gpu_map, AS_PROGRAM, 32, cojag_state )
AM_RANGE(0x000000, 0x1fffff) AM_RAM AM_BASE_LEGACY(&jaguar_shared_ram) AM_MIRROR(0x200000) AM_SHARE("share1") AM_REGION("maincpu", 0)
AM_RANGE(0x800000, 0xdfffff) AM_ROM AM_BASE_LEGACY(&cart_base) AM_SIZE_LEGACY(&cart_size) AM_SHARE("share15") AM_REGION("maincpu", 0x800000)
AM_RANGE(0xe00000, 0xe1ffff) AM_ROM AM_BASE_LEGACY(&rom_base) AM_SIZE_LEGACY(&rom_size) AM_SHARE("share16") AM_REGION("maincpu", 0xe00000)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE_LEGACY(jaguar_tom_regs32_r, jaguar_tom_regs32_w)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE16_LEGACY(jaguar_tom_regs_r, jaguar_tom_regs_w, 0xffffffff)
AM_RANGE(0xf00400, 0xf005ff) AM_BASE_LEGACY(&jaguar_gpu_clut) AM_MIRROR(0x000200) AM_RAM AM_SHARE("share2")
AM_RANGE(0xf02100, 0xf021ff) AM_MIRROR(0x008000) AM_READWRITE(gpuctrl_r, gpuctrl_w)
AM_RANGE(0xf02200, 0xf022ff) AM_MIRROR(0x008000) AM_READWRITE_LEGACY(jaguar_blitter_r, jaguar_blitter_w)
AM_RANGE(0xf03000, 0xf03fff) AM_BASE_LEGACY(&jaguar_gpu_ram) AM_MIRROR(0x008000) AM_RAM AM_SHARE("share3")
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE_LEGACY(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE16_LEGACY(jaguar_jerry_regs_r, jaguar_jerry_regs_w, 0xffffffff)
AM_RANGE(0xf14000, 0xf14003) AM_READWRITE(joystick_r, joystick_w)
AM_RANGE(0xf1a100, 0xf1a13f) AM_READWRITE(dspctrl_r, dspctrl_w)
AM_RANGE(0xf1a140, 0xf1a17f) AM_READWRITE_LEGACY(jaguar_serial_r, jaguar_serial_w)
@ -1381,12 +1381,12 @@ static ADDRESS_MAP_START( jag_dsp_map, AS_PROGRAM, 32, cojag_state )
AM_RANGE(0x000000, 0x1fffff) AM_MIRROR(0x200000) AM_RAM AM_SHARE("share1") AM_REGION("maincpu", 0)
AM_RANGE(0x800000, 0xdfffff) AM_ROM AM_SHARE("share15") AM_REGION("maincpu", 0x800000)
AM_RANGE(0xe00000, 0xe1ffff) AM_ROM AM_SHARE("share16") AM_REGION("maincpu", 0xe00000)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE_LEGACY(jaguar_tom_regs32_r, jaguar_tom_regs32_w)
AM_RANGE(0xf00000, 0xf003ff) AM_READWRITE16_LEGACY(jaguar_tom_regs_r, jaguar_tom_regs_w, 0xffffffff)
AM_RANGE(0xf00400, 0xf005ff) AM_MIRROR(0x000200) AM_RAM AM_SHARE("share2")
AM_RANGE(0xf02100, 0xf021ff) AM_MIRROR(0x008000) AM_READWRITE(gpuctrl_r, gpuctrl_w)
AM_RANGE(0xf02200, 0xf022ff) AM_MIRROR(0x008000) AM_READWRITE_LEGACY(jaguar_blitter_r, jaguar_blitter_w)
AM_RANGE(0xf03000, 0xf03fff) AM_MIRROR(0x008000) AM_RAM AM_SHARE("share3")
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE_LEGACY(jaguar_jerry_regs32_r, jaguar_jerry_regs32_w)
AM_RANGE(0xf10000, 0xf103ff) AM_READWRITE16_LEGACY(jaguar_jerry_regs_r, jaguar_jerry_regs_w, 0xffffffff)
AM_RANGE(0xf14000, 0xf14003) AM_READWRITE(joystick_r, joystick_w)
AM_RANGE(0xf1a100, 0xf1a13f) AM_READWRITE(dspctrl_r, dspctrl_w)
AM_RANGE(0xf1a140, 0xf1a17f) AM_READWRITE_LEGACY(jaguar_serial_r, jaguar_serial_w)

4
src/mame/includes/jaguar.h
View File

@ -37,8 +37,6 @@ void jaguar_external_int(device_t *device, int state);
READ16_HANDLER( jaguar_jerry_regs_r );
WRITE16_HANDLER( jaguar_jerry_regs_w );
READ32_HANDLER( jaguar_jerry_regs32_r );
WRITE32_HANDLER( jaguar_jerry_regs32_w );
READ32_HANDLER( jaguar_serial_r );
WRITE32_HANDLER( jaguar_serial_w );
@ -59,8 +57,6 @@ WRITE32_HANDLER( jaguar_blitter_w );
READ16_HANDLER( jaguar_tom_regs_r );
WRITE16_HANDLER( jaguar_tom_regs_w );
READ32_HANDLER( jaguar_tom_regs32_r );
WRITE32_HANDLER( jaguar_tom_regs32_w );
READ32_HANDLER( cojag_gun_input_r );

20
src/mame/video/jaguar.c
View File

@ -135,7 +135,6 @@
****************************************************************************/
#include "emu.h"
#include "memconv.h"
#include "machine/atarigen.h"
#include "cpu/mips/r3000.h"
#include "cpu/m68000/m68000.h"
@ -765,25 +764,6 @@ WRITE16_HANDLER( jaguar_tom_regs_w )
/*************************************
*
* 32-bit TOM register access
*
*************************************/
READ32_HANDLER( jaguar_tom_regs32_r )
{
return read32be_with_16be_handler(jaguar_tom_regs_r, space, offset, mem_mask);
}
WRITE32_HANDLER( jaguar_tom_regs32_w )
{
write32be_with_16be_handler(jaguar_tom_regs_w, space, offset, data, mem_mask);
}
/*************************************
*
* Gun input