summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Fabio Priuli <etabeta78@users.noreply.github.com>2009-06-01 16:24:08 +0000
committer Fabio Priuli <etabeta78@users.noreply.github.com>2009-06-01 16:24:08 +0000
commitfef4e83b4d2f58e2ee87c1c305fbcab14d172cac (patch)
tree5bfef562c8b215b648a9f5046035fe60061ff9e0
parentbe7e2a6f37f4ebd0ccc271ef4a94b4283d920a0e (diff)
Converted RP5H01 to be a MAME device.
-rw-r--r--src/emu/machine/rp5h01.c256
-rw-r--r--src/emu/machine/rp5h01.h63
-rw-r--r--src/mame/drivers/playch10.c9
-rw-r--r--src/mame/machine/playch10.c49
4 files changed, 205 insertions, 172 deletions
diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c
index 255f9bb0977..3a31548a3f2 100644
--- a/src/emu/machine/rp5h01.c
+++ b/src/emu/machine/rp5h01.c
@@ -1,10 +1,19 @@
+/***************************************************************************
+
+ RP5H01
+
+
+ 2009-06 Converted to be a device
+
+***************************************************************************/
+
#include "driver.h"
#include "machine/rp5h01.h"
-/****************************************************************************/
-/* local copy of the interface pointer */
-static const struct RP5H01_interface *intf;
+/***************************************************************************
+ PARAMETERS
+***************************************************************************/
/* these also work as the address masks */
enum {
@@ -12,196 +21,201 @@ enum {
COUNTER_MODE_7_BITS = 0x7f
};
-typedef struct _RP5H01 {
+
+/***************************************************************************
+ TYPE DEFINITIONS
+***************************************************************************/
+
+typedef struct _rp5h01_state rp5h01_state;
+struct _rp5h01_state
+{
int counter;
int counter_mode; /* test pin */
int enabled; /* chip enable */
int old_reset; /* reset pin state (level-triggered) */
int old_clock; /* clock pin state (level-triggered) */
UINT8 *data;
-} RP5H01;
-
-static RP5H01 RP5H01_state[MAX_RP5H01];
-
-/****************************************************************************/
-
-int RP5H01_init( running_machine *machine, const struct RP5H01_interface *interface ) {
- int i;
-
- /* setup our local copy of the interface */
- intf = interface;
-
- if ( intf->num > MAX_RP5H01 ) {
- logerror( "Requested number of RP5H01's is bigger than the supported amount\n" );
- return -1;
- }
+};
- /* initialize the state */
- for( i = 0; i < intf->num; i++ ) {
- RP5H01_state[i].counter = 0;
- RP5H01_state[i].counter_mode = COUNTER_MODE_6_BITS;
- RP5H01_state[i].data = &( memory_region( machine, intf->region[i] )[ intf->offset[i] ] );
- RP5H01_state[i].enabled = 0;
- RP5H01_state[i].old_reset = -1;
- RP5H01_state[i].old_clock = -1;
- }
+/***************************************************************************
+ INLINE FUNCTIONS
+***************************************************************************/
- return 0;
+INLINE rp5h01_state *get_safe_token(const device_config *device)
+{
+ assert(device != NULL);
+ assert(device->token != NULL);
+ assert((device->type == RP5H01));
+ return (rp5h01_state *)device->token;
}
-/****************************************************************************/
+INLINE const rp5h01_interface *get_interface(const device_config *device)
+{
+ assert(device != NULL);
+ assert((device->type == RP5H01));
+ return (const rp5h01_interface *) device->static_config;
+}
-void RP5H01_enable_w( int which, int data ) {
- RP5H01 *chip;
+/***************************************************************************
+ IMPLEMENTATION
+***************************************************************************/
- if ( which >= intf->num ) {
- logerror( "RP5H01_enable: trying to access an unmapped chip\n" );
- return;
- }
+/*-------------------------------------------------
+ rp5h01_enable_w
+-------------------------------------------------*/
- /* get the chip */
- chip = &RP5H01_state[which];
+WRITE8_DEVICE_HANDLER( rp5h01_enable_w )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
/* process the /CE signal and enable/disable the IC */
- chip->enabled = ( data == 0 ) ? 1 : 0;
+ rp5h01->enabled = (data == 0) ? 1 : 0;
}
-void RP5H01_reset_w( int which, int data ) {
- RP5H01 *chip;
- int newstate = ( data == 0 ) ? 0 : 1;
-
- if ( which >= intf->num ) {
- logerror( "RP5H01_enable: trying to access an unmapped chip\n" );
- return;
- }
+/*-------------------------------------------------
+ rp5h01_reset_w
+-------------------------------------------------*/
- /* get the chip */
- chip = &RP5H01_state[which];
+WRITE8_DEVICE_HANDLER( rp5h01_reset_w )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
+ int newstate = (data == 0) ? 0 : 1;
/* if it's not enabled, ignore */
- if ( !chip->enabled )
+ if (!rp5h01->enabled)
return;
/* now look for a 0->1 transition */
- if ( chip->old_reset == 0 && newstate == 1 ) {
+ if (rp5h01->old_reset == 0 && newstate == 1)
+ {
/* reset the counter */
- chip->counter = 0;
+ rp5h01->counter = 0;
}
/* update the pin */
- chip->old_reset = newstate;
+ rp5h01->old_reset = newstate;
}
-void RP5H01_clock_w( int which, int data ) {
- RP5H01 *chip;
- int newstate = ( data == 0 ) ? 0 : 1;
-
- if ( which >= intf->num ) {
- logerror( "RP5H01_enable: trying to access an unmapped chip\n" );
- return;
- }
+/*-------------------------------------------------
+ rp5h01_clock_w
+-------------------------------------------------*/
- /* get the chip */
- chip = &RP5H01_state[which];
+WRITE8_DEVICE_HANDLER( rp5h01_clock_w )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
+ int newstate = (data == 0) ? 0 : 1;
/* if it's not enabled, ignore */
- if ( !chip->enabled )
+ if (!rp5h01->enabled)
return;
/* now look for a 1->0 transition */
- if ( chip->old_clock == 1 && newstate == 0 ) {
+ if (rp5h01->old_clock == 1 && newstate == 0)
+ {
/* increment the counter, and mask it with the mode */
- chip->counter++;
+ rp5h01->counter++;
}
/* update the pin */
- chip->old_clock = newstate;
+ rp5h01->old_clock = newstate;
}
-void RP5H01_test_w( int which, int data ) {
- RP5H01 *chip;
+/*-------------------------------------------------
+ rp5h01_test_w
+-------------------------------------------------*/
- if ( which >= intf->num ) {
- logerror( "RP5H01_enable: trying to access an unmapped chip\n" );
- return;
- }
-
- /* get the chip */
- chip = &RP5H01_state[which];
+WRITE8_DEVICE_HANDLER( rp5h01_test_w )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
/* if it's not enabled, ignore */
- if ( !chip->enabled )
+ if (!rp5h01->enabled)
return;
/* process the test signal and change the counter mode */
- chip->counter_mode = ( data == 0 ) ? COUNTER_MODE_6_BITS : COUNTER_MODE_7_BITS;
+ rp5h01->counter_mode = (data == 0) ? COUNTER_MODE_6_BITS : COUNTER_MODE_7_BITS;
}
-int RP5H01_counter_r( int which ) {
- RP5H01 *chip;
-
- if ( which >= intf->num ) {
- logerror( "RP5H01_enable: trying to access an unmapped chip\n" );
- return 0;
- }
+/*-------------------------------------------------
+ rp5h01_counter_r
+-------------------------------------------------*/
- /* get the chip */
- chip = &RP5H01_state[which];
+READ8_DEVICE_HANDLER( rp5h01_counter_r )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
/* if it's not enabled, ignore */
- if ( !chip->enabled )
+ if (!rp5h01->enabled)
return 0; /* ? (should be high impedance) */
/* return A5 */
- return ( chip->counter >> 5 ) & 1;
+ return (rp5h01->counter >> 5) & 1;
}
-int RP5H01_data_r( int which ) {
- RP5H01 *chip;
- int byte, bit;
+/*-------------------------------------------------
+ rp5h01_data_r
+-------------------------------------------------*/
- if ( which >= intf->num ) {
- logerror( "RP5H01_enable: trying to access an unmapped chip\n" );
- return 0;
- }
-
- /* get the chip */
- chip = &RP5H01_state[which];
+READ8_DEVICE_HANDLER( rp5h01_data_r )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
+ int byte, bit;
/* if it's not enabled, ignore */
- if ( !chip->enabled )
+ if (!rp5h01->enabled)
return 0; /* ? (should be high impedance) */
/* get the byte offset and bit offset */
- byte = ( chip->counter & chip->counter_mode) >> 3;
- bit = 7 - ( chip->counter & 7 );
+ byte = (rp5h01->counter & rp5h01->counter_mode) >> 3;
+ bit = 7 - (rp5h01->counter & 7);
/* return the data */
- return ( chip->data[byte] >> bit ) & 1;
+ return (rp5h01->data[byte] >> bit) & 1;
}
-/****************************************************************************/
+/*-------------------------------------------------
+ DEVICE_START( rp5h01 )
+-------------------------------------------------*/
-WRITE8_HANDLER( RP5H01_0_enable_w ) {
- RP5H01_enable_w( 0, data );
-}
+static DEVICE_START( rp5h01 )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
+ const rp5h01_interface *intf = get_interface(device);
-WRITE8_HANDLER( RP5H01_0_reset_w ) {
- RP5H01_reset_w( 0, data );
-}
+ rp5h01->data = &(memory_region(device->machine, intf->region)[intf->offset]);
-WRITE8_HANDLER( RP5H01_0_clock_w ) {
- RP5H01_clock_w( 0, data );
+ /* register for state saving */
+ state_save_register_global(device->machine, rp5h01->counter);
+ state_save_register_global(device->machine, rp5h01->counter_mode);
+ state_save_register_global(device->machine, rp5h01->enabled);
+ state_save_register_global(device->machine, rp5h01->old_reset);
+ state_save_register_global(device->machine, rp5h01->old_clock);
}
-WRITE8_HANDLER( RP5H01_0_test_w ) {
- RP5H01_test_w( 0, data );
-}
+/*-------------------------------------------------
+ DEVICE_RESET( rp5h01 )
+-------------------------------------------------*/
-READ8_HANDLER( RP5H01_0_counter_r ) {
- return RP5H01_counter_r( 0 );
-}
+static DEVICE_RESET( rp5h01 )
+{
+ rp5h01_state *rp5h01 = get_safe_token(device);
-READ8_HANDLER( RP5H01_0_data_r ) {
- return RP5H01_data_r( 0 );
+ rp5h01->counter = 0;
+ rp5h01->counter_mode = COUNTER_MODE_6_BITS;
+ rp5h01->enabled = 0;
+ rp5h01->old_reset = -1;
+ rp5h01->old_clock = -1;
}
+
+/*-------------------------------------------------
+ device definition
+-------------------------------------------------*/
+
+static const char *DEVTEMPLATE_SOURCE = __FILE__;
+
+#define DEVTEMPLATE_ID(p,s) p##rp5h01##s
+#define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_RESET
+#define DEVTEMPLATE_NAME "RP5H01"
+#define DEVTEMPLATE_FAMILY "RP5H01"
+#define DEVTEMPLATE_CLASS DEVICE_CLASS_PERIPHERAL
+#include "devtempl.h"
diff --git a/src/emu/machine/rp5h01.h b/src/emu/machine/rp5h01.h
index 453b96c2c57..8d89a601903 100644
--- a/src/emu/machine/rp5h01.h
+++ b/src/emu/machine/rp5h01.h
@@ -1,29 +1,50 @@
+/***************************************************************************
+
+ RP5H01
+
+
+***************************************************************************/
+
#ifndef __RP5H01_H__
#define __RP5H01_H__
-/* max simultaneous chips supported. change if you need more */
-#define MAX_RP5H01 1
+/***************************************************************************
+ MACROS / CONSTANTS
+***************************************************************************/
+
+#define RP5H01 DEVICE_GET_INFO_NAME(rp5h01)
+
+#define MDRV_RP5H01_ADD(_tag, _config) \
+ MDRV_DEVICE_ADD(_tag, RP5H01, 0) \
+ MDRV_DEVICE_CONFIG(_config)
-struct RP5H01_interface {
- int num; /* number of chips */
- const char *region[MAX_RP5H01]; /* memory region where data resides */
- int offset[MAX_RP5H01]; /* memory offset within the above region where data resides */
+#define MDRV_RP5H01_REMOVE(_tag) \
+ MDRV_DEVICE_REMOVE(_tag)
+
+
+/***************************************************************************
+ TYPE DEFINITIONS
+***************************************************************************/
+
+typedef struct _rp5h01_interface rp5h01_interface;
+struct _rp5h01_interface
+{
+ const char *region; /* memory region where data resides */
+ int offset; /* memory offset within the above region where data resides */
};
-int RP5H01_init( running_machine *machine, const struct RP5H01_interface *interface );
-void RP5H01_enable_w( int which, int data ); /* /CE */
-void RP5H01_reset_w( int which, int data ); /* RESET */
-void RP5H01_clock_w( int which, int data ); /* DATA CLOCK (active low) */
-void RP5H01_test_w( int which, int data ); /* TEST */
-int RP5H01_counter_r( int which ); /* COUNTER OUT */
-int RP5H01_data_r( int which ); /* DATA */
-
-/* direct-access stubs */
-WRITE8_HANDLER( RP5H01_0_enable_w );
-WRITE8_HANDLER( RP5H01_0_reset_w );
-WRITE8_HANDLER( RP5H01_0_clock_w );
-WRITE8_HANDLER( RP5H01_0_test_w );
-READ8_HANDLER( RP5H01_0_counter_r );
-READ8_HANDLER( RP5H01_0_data_r );
+/***************************************************************************
+ PROTOTYPES
+***************************************************************************/
+
+/* device interface */
+DEVICE_GET_INFO( rp5h01 );
+
+WRITE8_DEVICE_HANDLER( rp5h01_enable_w ); /* /CE */
+WRITE8_DEVICE_HANDLER( rp5h01_reset_w ); /* RESET */
+WRITE8_DEVICE_HANDLER( rp5h01_clock_w ); /* DATA CLOCK (active low) */
+WRITE8_DEVICE_HANDLER( rp5h01_test_w ); /* TEST */
+READ8_DEVICE_HANDLER( rp5h01_counter_r ); /* COUNTER OUT */
+READ8_DEVICE_HANDLER( rp5h01_data_r ); /* DATA */
#endif /* __RP5H01_H__ */
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 0a52c1e056c..93be86e16f0 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -684,6 +684,13 @@ static const nes_interface nes_config =
};
+/* RP5H01 interface */
+static const rp5h01_interface rp5h01_intf =
+{
+ "user1",
+ 0
+};
+
static MACHINE_DRIVER_START( playch10 )
// basic machine hardware
MDRV_CPU_ADD("maincpu", Z80, 8000000/2) // 4 MHz
@@ -727,6 +734,8 @@ static MACHINE_DRIVER_START( playch10 )
MDRV_SOUND_ADD("dac", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+
+ MDRV_RP5H01_ADD("rp5h01", rp5h01_intf)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( playchnv )
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 1f8fec97331..cd642fbb5ee 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -28,8 +28,8 @@ static int MMC2_bank[4], MMC2_bank_latch[2];
*************************************/
MACHINE_RESET( pc10 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
const device_config *ppu = devtag_get_device(machine, "ppu");
+ const device_config *rp5h01 = devtag_get_device(machine, "rp5h01");
/* initialize latches and flip-flops */
pc10_nmi_enable = pc10_dog_di = pc10_dispmask = pc10_sdcs = pc10_int_detect = 0;
@@ -46,10 +46,10 @@ MACHINE_RESET( pc10 )
MMC2_bank_latch[0] = MMC2_bank_latch[1] = 0xfe;
/* reset the security chip */
- RP5H01_enable_w( 0, 0 );
- RP5H01_0_reset_w( space, 0, 0 );
- RP5H01_0_reset_w( space, 0, 1 );
- RP5H01_enable_w( 0, 1 );
+ rp5h01_enable_w(rp5h01, 0, 0);
+ rp5h01_reset_w(rp5h01, 0, 0);
+ rp5h01_reset_w(rp5h01, 0, 1);
+ rp5h01_enable_w(rp5h01, 0, 1);
ppu2c0x_set_mirroring( ppu, mirroring );
}
@@ -138,36 +138,38 @@ WRITE8_HANDLER( pc10_CARTSEL_w )
*************************************/
READ8_HANDLER( pc10_prot_r )
{
+ const device_config *rp5h01 = devtag_get_device(space->machine, "rp5h01");
int data = 0xe7;
/* we only support a single cart connected at slot 0 */
- if ( cart_sel == 0 )
+ if (cart_sel == 0)
{
- RP5H01_0_enable_w( space, 0, 0 );
- data |= ( ( ~RP5H01_counter_r( 0 ) ) << 4 ) & 0x10; /* D4 */
- data |= ( ( RP5H01_data_r( 0 ) ) << 3 ) & 0x08; /* D3 */
- RP5H01_0_enable_w( space, 0, 1 );
+ rp5h01_enable_w(rp5h01, 0, 0);
+ data |= ((~rp5h01_counter_r(rp5h01, 0)) << 4) & 0x10; /* D4 */
+ data |= ((rp5h01_data_r(rp5h01, 0)) << 3) & 0x08; /* D3 */
+ rp5h01_enable_w(rp5h01, 0, 1);
}
return data;
}
WRITE8_HANDLER( pc10_prot_w )
{
+ const device_config *rp5h01 = devtag_get_device(space->machine, "rp5h01");
/* we only support a single cart connected at slot 0 */
- if ( cart_sel == 0 )
+ if (cart_sel == 0)
{
- RP5H01_0_enable_w( space, 0, 0 );
- RP5H01_0_test_w( space, 0, data & 0x10 ); /* D4 */
- RP5H01_0_clock_w( space, 0, data & 0x08 ); /* D3 */
- RP5H01_0_reset_w( space, 0, ~data & 0x01 ); /* D0 */
- RP5H01_0_enable_w( space, 0, 1 );
+ rp5h01_enable_w(rp5h01, 0, 0);
+ rp5h01_test_w(rp5h01, 0, data & 0x10); /* D4 */
+ rp5h01_clock_w(rp5h01, 0, data & 0x08); /* D3 */
+ rp5h01_reset_w(rp5h01, 0, ~data & 0x01); /* D0 */
+ rp5h01_enable_w(rp5h01, 0, 1);
/* this thing gets dense at some point */
/* it wants to jump and execute an opcode at $ffff, wich */
/* is the actual protection memory area */
/* setting the whole 0x2000 region every time is a waste */
/* so we just set $ffff with the current value */
- memory_region( space->machine, "maincpu" )[0xffff] = pc10_prot_r(space,0);
+ memory_region(space->machine, "maincpu")[0xffff] = pc10_prot_r(space, 0);
}
}
@@ -255,13 +257,6 @@ READ8_HANDLER( pc10_in1_r )
return ret;
}
-/* RP5H01 interface */
-static const struct RP5H01_interface rp5h01_interface =
-{
- 1,
- { "user1" },
- { 0 }
-};
/*************************************
*
@@ -270,12 +265,6 @@ static const struct RP5H01_interface rp5h01_interface =
*************************************/
DRIVER_INIT( playch10 )
{
- /* initialize the security chip */
- if ( RP5H01_init( machine, &rp5h01_interface ) )
- {
- fatalerror("rp5h01_interface initualization failed");
- }
-
/* set the controller to default */
pc10_gun_controller = 0;