Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-10 12:15:31 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

More preparation for the Naomi JVS specific settings.

Browse Source
This commit is contained in:
Angelo Salese 2009-04-22 11:07:57 +00:00
parent 176ec7a804
commit 568a369617
4 changed files with 113 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mame/drivers/naomi.c
View File

@ -2,8 +2,8 @@
Sega Naomi / Naomi 2 / Atomiswave
Driver by Samuele Zannoli, R. Belmont, and ElSemi,
David Haywood & Angelo Salese
Driver by Samuele Zannoli, R. Belmont, ElSemi,
David Haywood and Angelo Salese
Notes:
NAMCO Naomi games require a Namco specific BIOS
@ -864,7 +864,7 @@ static ADDRESS_MAP_START( naomi_map, ADDRESS_SPACE_PROGRAM, 64 )
AM_RANGE(0x0f000000, 0x0fffffff) AM_RAM AM_SHARE(5)// mirror
AM_RANGE(0x8c000000, 0x8cffffff) AM_RAM AM_SHARE(4) // RAM access through cache
AM_RANGE(0x8d000000, 0x8dffffff) AM_RAM AM_SHARE(5) // RAM access through cache
/* Area 4 */
AM_RANGE(0x10000000, 0x107fffff) AM_WRITE( ta_fifo_poly_w )

10
src/mame/includes/naomi.h
View File

@ -4,8 +4,18 @@ naomi.h -> NAOMI includes
*/
enum {
JVSBD_DEFAULT = 0,
JVSBD_ADSTICK,
JVSBD_LIGHTGUN,
JVSBD_MAHJONG,
JVSBD_KEYBOARD
};
extern DRIVER_INIT( naomi );
extern DRIVER_INIT( ggxxsla );
extern DRIVER_INIT( ggxxrl );
extern DRIVER_INIT( ggxx );
extern UINT64 *naomi_ram64;
extern int jvsboard_type;

174
src/mame/machine/dc.c
View File

@ -10,6 +10,7 @@
#include "cpu/sh4/sh4.h"
#include "sound/aica.h"
#include "naomibd.h"
#include "naomi.h"
#define DEBUG_REGISTERS (1)
@ -130,6 +131,7 @@ static UINT32 g2bus_regs[0x100/4];
UINT8 maple0x86data1[0x80];
static UINT8 maple0x86data2[0x400];
static emu_timer *dc_rtc_timer;
extern int jvsboard_type;
static const UINT32 maple0x82answer[]=
{
@ -243,6 +245,89 @@ int level;
device_set_info_int(machine->cpu[0], CPUINFO_INT_SH4_IRLn_INPUT, 15-level);
}
static int jvsboard_init(int pos)
{
// four bytes for every available function
// first function
maple0x86data2[pos+10]=1;
maple0x86data2[pos+11]=2; // number of players
maple0x86data2[pos+12]=9+4; // switches per player (27 = mahjong)
maple0x86data2[pos+13]=0;
// second function
maple0x86data2[pos+14]=2;
maple0x86data2[pos+15]=2; // number of coin slots
maple0x86data2[pos+16]=0;
maple0x86data2[pos+17]=0;
// third function
maple0x86data2[pos+18]=3;
maple0x86data2[pos+19]=2; // analog channels
maple0x86data2[pos+20]=8; // bits per channel
maple0x86data2[pos+21]=0;
// no more functions
maple0x86data2[pos+22]=0;
maple0x86data2[pos+7]=13+2;
return 13;
}
static void jvsboard_indirect_read(running_machine *machine, int pos)
{
// report1,jvsbytes repeated for each function
// first function
maple0x86data2[pos+ 9]=1; // report
maple0x86data2[pos+10]=0; // bits TEST TILT1 TILT2 TILT3 ? ? ? ?
maple0x86data2[pos+11]=input_port_read(machine, "IN1"); // bits 1Pstart 1Pservice 1Pup 1Pdown 1Pleft 1Pright 1Ppush1 1Ppush2
maple0x86data2[pos+12]=input_port_read(machine, "IN2"); // bits 1Ppush3 1Ppush4 1Ppush5 1Ppush6 1Ppush7 1Ppush8 ...
maple0x86data2[pos+13]=input_port_read(machine, "IN3"); // bits 2Pstart 2Pservice 2Pup 2Pdown 2Pleft 2Pright 2Ppush1 2Ppush2
maple0x86data2[pos+14]=input_port_read(machine, "IN4"); // bits 2Ppush3 2Ppush4 2Ppush5 2Ppush6 2Ppush7 2Ppush8 ...
// second function
maple0x86data2[pos+15]=1; // report
maple0x86data2[pos+16]=(dc_coin_counts[0] >> 8) & 0xff; // 1CONDITION, 1SLOT COIN(bit13-8)
maple0x86data2[pos+17]=dc_coin_counts[0] & 0xff; // 1SLOT COIN(bit7-0)
maple0x86data2[pos+18]=(dc_coin_counts[1] >> 8) & 0xff; // 2CONDITION, 2SLOT COIN(bit13-8)
maple0x86data2[pos+19]=dc_coin_counts[1] & 0xff; // 2SLOT COIN(bit7-0)
// third function
maple0x86data2[pos+20]=1; // report
maple0x86data2[pos+21]=0xff; // channel 1 bits 7-0
maple0x86data2[pos+22]=0; // channel 1
maple0x86data2[pos+23]=0; // channel 2 bits 7-0
maple0x86data2[pos+24]=0xff; // channel 2
}
static int jvsboard_direct_read(running_machine *machine)
{
/* valid data check*/
maple0x86data2[0x11] = 0x00;
maple0x86data2[0x12] = 0x8e;
maple0x86data2[0x13] = 0x01;
maple0x86data2[0x14] = 0x00;
maple0x86data2[0x15] = 0xff;
maple0x86data2[0x16] = 0xe0;
maple0x86data2[0x19] = 0x01;
/* read the inputs */
maple0x86data2[0x1a]=1;
maple0x86data2[0x1b]=2; //number of players
maple0x86data2[0x1c]=input_port_read(machine, "IN1");
maple0x86data2[0x1d]=input_port_read(machine, "IN2");
maple0x86data2[0x1e]=input_port_read(machine, "IN3");
maple0x86data2[0x1f]=input_port_read(machine, "IN4");
maple0x86data2[0x20]=1;
maple0x86data2[0x21]=(dc_coin_counts[0] >> 8) & 0xff; //coin counter read-back hi byte
maple0x86data2[0x22]=dc_coin_counts[0] & 0xff; //coin counter read-back lo byte
maple0x86data2[0x23]=(dc_coin_counts[1] >> 8) & 0xff;
maple0x86data2[0x24]=dc_coin_counts[1] & 0xff;
maple0x86data2[0x25]=1;
maple0x86data2[0x26]=1;
maple0x86data2[0x27]=0;
maple0x86data2[0x28]=0;
maple0x86data2[0x29]=0;
maple0x86data2[0x2a]=0;
/*0x2b-0x2f rotary inputs */
//...
return 8+0x11+16;
}
READ64_HANDLER( dc_sysctrl_r )
{
int reg;
@ -548,57 +633,23 @@ WRITE64_HANDLER( dc_maple_w )
tocopy += 1;
break;
case 0x14:
// four bytes for every available function
// first function
maple0x86data2[pos+10]=1;
maple0x86data2[pos+11]=2; // number of players
maple0x86data2[pos+12]=9+4; // switches per player (27 = mahjong)
maple0x86data2[pos+13]=0;
// second function
maple0x86data2[pos+14]=2;
maple0x86data2[pos+15]=2; // number of coin slots
maple0x86data2[pos+16]=0;
maple0x86data2[pos+17]=0;
// third function
maple0x86data2[pos+18]=3;
maple0x86data2[pos+19]=2; // analog channels
maple0x86data2[pos+20]=8; // bits per channel
maple0x86data2[pos+21]=0;
// no more functions
maple0x86data2[pos+22]=0;
maple0x86data2[pos+7]=13+2;
tocopy += 13;
{
static int dma_bytes;
dma_bytes = jvsboard_init(pos);
tocopy += dma_bytes;
}
break;
case 0x21:
maple0x86data2[pos+10]=0; // bits 7-6 status bits 5-0 higer bits of coin count
maple0x86data2[pos+11]=0; // lower bits of coin count
maple0x86data2[pos+12]=0; // like previuos two but for second coin slot
maple0x86data2[pos+13]=0;
maple0x86data2[pos+10]=(dc_coin_counts[0] >> 8) & 0xff; // bits 7-6 status bits 5-0 higer bits of coin count
maple0x86data2[pos+11]=dc_coin_counts[0] & 0xff; // lower bits of coin count
maple0x86data2[pos+12]=(dc_coin_counts[1] >> 8) & 0xff; // like previuos two but for second coin slot
maple0x86data2[pos+13]=dc_coin_counts[1] & 0xff;
maple0x86data2[pos+7]=4+2;
tocopy += 4;
break;
case -1: // special case to read controls
case -2:
// report1,jvsbytes repeated for each function
// first function
maple0x86data2[pos+ 9]=1; // report
maple0x86data2[pos+10]=0; // bits TEST TILT1 TILT2 TILT3 ? ? ? ?
maple0x86data2[pos+11]=input_port_read(space->machine, "IN1"); // bits 1Pstart 1Pservice 1Pup 1Pdown 1Pleft 1Pright 1Ppush1 1Ppush2
maple0x86data2[pos+12]=input_port_read(space->machine, "IN2"); // bits 1Ppush3 1Ppush4 1Ppush5 1Ppush6 1Ppush7 1Ppush8 ...
maple0x86data2[pos+13]=input_port_read(space->machine, "IN3"); // bits 2Pstart 2Pservice 2Pup 2Pdown 2Pleft 2Pright 2Ppush1 2Ppush2
maple0x86data2[pos+14]=input_port_read(space->machine, "IN4"); // bits 2Ppush3 2Ppush4 2Ppush5 2Ppush6 2Ppush7 2Ppush8 ...
// second function
maple0x86data2[pos+15]=1; // report
maple0x86data2[pos+16]=(dc_coin_counts[0] >> 8) & 0xff; // 1CONDITION, 1SLOT COIN(bit13-8)
maple0x86data2[pos+17]=dc_coin_counts[0] & 0xff; // 1SLOT COIN(bit7-0)
maple0x86data2[pos+18]=(dc_coin_counts[1] >> 8) & 0xff; // 2CONDITION, 2SLOT COIN(bit13-8)
maple0x86data2[pos+19]=dc_coin_counts[1] & 0xff; // 2SLOT COIN(bit7-0)
// third function
maple0x86data2[pos+20]=1; // report
maple0x86data2[pos+21]=0xff; // channel 1 bits 7-0
maple0x86data2[pos+22]=0; // channel 1
maple0x86data2[pos+23]=0; // channel 2 bits 7-0
maple0x86data2[pos+24]=0xff; // channel 2
jvsboard_indirect_read(space->machine,pos);
if (jvs_command == -1)
{
// ?
@ -645,40 +696,11 @@ WRITE64_HANDLER( dc_maple_w )
a = input_port_read(space->machine, "IN0"); // put keys here
maple0x86data2[6] = maple0x86data2[6] | (a << 4);
tocopy = 8+0x11+16;
/* valid data check*/
maple0x86data2[0x11] = 0x00;
maple0x86data2[0x12] = 0x8e;
maple0x86data2[0x13] = 0x01;
maple0x86data2[0x14] = 0x00;
maple0x86data2[0x15] = 0xff;
maple0x86data2[0x16] = 0xe0;
maple0x86data2[0x19] = 0x01;
/* read the inputs */
maple0x86data2[0x1a]=1;
maple0x86data2[0x1b]=2; //number of players
maple0x86data2[0x1c]=input_port_read(space->machine, "IN1");
maple0x86data2[0x1d]=input_port_read(space->machine, "IN2");
maple0x86data2[0x1e]=input_port_read(space->machine, "IN3");
maple0x86data2[0x1f]=input_port_read(space->machine, "IN4");
maple0x86data2[0x20]=1;
maple0x86data2[0x21]=(dc_coin_counts[0] >> 8) & 0xff; //coin counter read-back hi byte
maple0x86data2[0x22]=dc_coin_counts[0] & 0xff; //coin counter read-back lo byte
maple0x86data2[0x23]=(dc_coin_counts[1] >> 8) & 0xff;
maple0x86data2[0x24]=dc_coin_counts[1] & 0xff;
maple0x86data2[0x25]=1;
maple0x86data2[0x26]=1;
maple0x86data2[0x27]=0;
maple0x86data2[0x28]=0;
maple0x86data2[0x29]=0;
maple0x86data2[0x2a]=0;
/*0x2b-0x2f rotary inputs */
//...
tocopy = jvsboard_direct_read(space->machine);
// command end flag
maple0x86data2[0x18]= (jvs_command == -1) ? 19 : 17;
maple0x86data2[0x15]= (jvs_command == -1) ? 24 : 16;
maple0x86data2[0x18] = (jvs_command == -1) ? 19 : 17;
maple0x86data2[0x15] = (jvs_command == -1) ? 24 : 16;
for (a=0;a < tocopy;a=a+4)
buff[1+a/4] = maple0x86data2[a] | (maple0x86data2[a+1] << 8) | (maple0x86data2[a+2] << 16) | (maple0x86data2[a+3] << 24);

2
src/mame/machine/naomi.c
View File

@ -8,6 +8,7 @@ Per-game specific JVS settings / idle loop skips for the MAME Naomi driver.
#include "includes/naomi.h"
UINT64 *naomi_ram64;
int jvsboard_type;
static READ64_HANDLER( naomi_bios_idle_skip_r )
{
@ -23,6 +24,7 @@ static READ64_HANDLER( naomi_bios_idle_skip_r )
DRIVER_INIT(naomi)
{
memory_install_read64_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xc2ad238, 0xc2ad23f, 0, 0, naomi_bios_idle_skip_r); // rev e bios
jvsboard_type = JVSBD_DEFAULT;
}
static READ64_HANDLER( naomigd_ggxxsla_idle_skip_r )