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

Added DT_HAS_START to devtempl.h to explicitly specify the presence

Browse Source 
of a start routine (so that derived devices can say whether or not
they are overriding the parent). Also converted 6821pia to use 
devtempl.h.
This commit is contained in:
Aaron Giles 2009-05-31 22:25:55 +00:00
parent da25d13961
commit c061fc36c8
8 changed files with 94 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/emu/devtempl.h
View File

@ -65,15 +65,16 @@ static const char *DEVTEMPLATE_SOURCE = __FILE__;
/* flag bits for DEVTEMPLATE_FEATURES */ /* flag bits for DEVTEMPLATE_FEATURES */
#define DT_HAS_RESET 0x0001 #define DT_HAS_START 0x0001
#define DT_HAS_STOP 0x0002 #define DT_HAS_RESET 0x0002
#define DT_HAS_EXECUTE 0x0004 #define DT_HAS_STOP 0x0004
#define DT_HAS_NVRAM 0x0008 #define DT_HAS_EXECUTE 0x0008
#define DT_HAS_VALIDITY_CHECK 0x0010 #define DT_HAS_NVRAM 0x0010
#define DT_HAS_CUSTOM_CONFIG 0x0020 #define DT_HAS_VALIDITY_CHECK 0x0020
#define DT_HAS_ROM_REGION 0x0040 #define DT_HAS_CUSTOM_CONFIG 0x0040
#define DT_HAS_MACHINE_CONFIG 0x0080 #define DT_HAS_ROM_REGION 0x0080
#define DT_HAS_INLINE_CONFIG 0x0100 #define DT_HAS_MACHINE_CONFIG 0x0100
#define DT_HAS_INLINE_CONFIG 0x0200
/* verify core stuff is specified */ /* verify core stuff is specified */
@ -85,6 +86,10 @@ static const char *DEVTEMPLATE_SOURCE = __FILE__;
#error DEVTEMPLATE_FEATURES must be specified! #error DEVTEMPLATE_FEATURES must be specified!
#endif #endif
#if ((DEVTEMPLATE_FEATURES & DT_HAS_START) == 0)
#error Device start routine is required!
#endif
#ifndef DEVTEMPLATE_NAME #ifndef DEVTEMPLATE_NAME
#error DEVTEMPLATE_NAME must be specified! #error DEVTEMPLATE_NAME must be specified!
#endif #endif
@ -124,6 +129,7 @@ static const char *DEVTEMPLATE_SOURCE = __FILE__;
#endif #endif
/* declare callback functions */ /* declare callback functions */
static DEVICE_START( DEVTEMPLATE_ID(,) );
#if ((DEVTEMPLATE_FEATURES) & DT_HAS_RESET) #if ((DEVTEMPLATE_FEATURES) & DT_HAS_RESET)
static DEVICE_RESET( DEVTEMPLATE_ID(,) ); static DEVICE_RESET( DEVTEMPLATE_ID(,) );
#endif #endif
@ -164,7 +170,9 @@ DEVICE_GET_INFO( DEVTEMPLATE_ID(,) )
#endif #endif
/* --- the following bits of info are returned as pointers to data or functions --- */ /* --- the following bits of info are returned as pointers to data or functions --- */
#if ((DEVTEMPLATE_FEATURES) & DT_HAS_START)
case DEVINFO_FCT_START: info->start = DEVTEMPLATE_ID(device_start_,); break; case DEVINFO_FCT_START: info->start = DEVTEMPLATE_ID(device_start_,); break;
#endif
#if ((DEVTEMPLATE_FEATURES) & DT_HAS_RESET) #if ((DEVTEMPLATE_FEATURES) & DT_HAS_RESET)
case DEVINFO_FCT_RESET: info->reset = DEVTEMPLATE_ID(device_reset_,); break; case DEVINFO_FCT_RESET: info->reset = DEVTEMPLATE_ID(device_reset_,); break;
#endif #endif
@ -198,6 +206,9 @@ DEVICE_GET_INFO( DEVTEMPLATE_ID(,) )
#else #else
/* declare callback functions */ /* declare callback functions */
#if ((DEVTEMPLATE_DERIVED_FEATURES) & DT_HAS_START)
static DEVICE_START( DEVTEMPLATE_DERIVED_ID(,) );
#endif
#if ((DEVTEMPLATE_DERIVED_FEATURES) & DT_HAS_RESET) #if ((DEVTEMPLATE_DERIVED_FEATURES) & DT_HAS_RESET)
static DEVICE_RESET( DEVTEMPLATE_DERIVED_ID(,) ); static DEVICE_RESET( DEVTEMPLATE_DERIVED_ID(,) );
#endif #endif
@ -231,7 +242,9 @@ DEVICE_GET_INFO( DEVTEMPLATE_DERIVED_ID(,) )
#endif #endif
/* --- the following bits of info are returned as pointers to data or functions --- */ /* --- the following bits of info are returned as pointers to data or functions --- */
#if ((DEVTEMPLATE_DERIVED_FEATURES) & DT_HAS_START)
case DEVINFO_FCT_START: info->start = DEVTEMPLATE_ID(device_start_,); break; case DEVINFO_FCT_START: info->start = DEVTEMPLATE_ID(device_start_,); break;
#endif
#if ((DEVTEMPLATE_DERIVED_FEATURES) & DT_HAS_RESET) #if ((DEVTEMPLATE_DERIVED_FEATURES) & DT_HAS_RESET)
case DEVINFO_FCT_RESET: info->reset = DEVTEMPLATE_DERIVED_ID(device_reset_,); break; case DEVINFO_FCT_RESET: info->reset = DEVTEMPLATE_DERIVED_ID(device_reset_,); break;
#endif #endif

156
src/emu/machine/6821pia.c
View File

@ -11,8 +11,8 @@
TYPE DEFINITIONS TYPE DEFINITIONS
***************************************************************************/ ***************************************************************************/
typedef struct _pia6821 pia6821; typedef struct _pia6821_state pia6821_state;
struct _pia6821 struct _pia6821_state
{ {
devcb_resolved_read8 in_a_func; devcb_resolved_read8 in_a_func;
devcb_resolved_read8 in_b_func; devcb_resolved_read8 in_b_func;
@ -106,11 +106,11 @@ struct _pia6821
INLINE FUNCTIONS INLINE FUNCTIONS
***************************************************************************/ ***************************************************************************/
INLINE pia6821 *get_token(const device_config *device) INLINE pia6821_state *get_token(const device_config *device)
{ {
assert(device != NULL); assert(device != NULL);
assert((device->type == PIA6821) || (device->type == PIA6822)); assert((device->type == PIA6821) || (device->type == PIA6822));
return (pia6821 *) device->token; return (pia6821_state *) device->token;
} }
@ -127,12 +127,12 @@ INLINE const pia6821_interface *get_interface(const device_config *device)
***************************************************************************/ ***************************************************************************/
/*------------------------------------------------- /*-------------------------------------------------
DEVICE_START( pia ) DEVICE_START( pia6821 )
-------------------------------------------------*/ -------------------------------------------------*/
static DEVICE_START( pia ) static DEVICE_START( pia6821 )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
const pia6821_interface *intf = get_interface(device); const pia6821_interface *intf = get_interface(device);
/* clear structure */ /* clear structure */
@ -188,12 +188,12 @@ static DEVICE_START( pia )
/*------------------------------------------------- /*-------------------------------------------------
DEVICE_RESET( pia ) DEVICE_RESET( pia6821 )
-------------------------------------------------*/ -------------------------------------------------*/
static DEVICE_RESET( pia ) static DEVICE_RESET( pia6821 )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* /*
* set default read values. * set default read values.
@ -253,7 +253,7 @@ static DEVICE_RESET( pia )
static void update_interrupts(const device_config *device) static void update_interrupts(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
int new_state; int new_state;
/* start with IRQ A */ /* start with IRQ A */
@ -282,7 +282,7 @@ static void update_interrupts(const device_config *device)
static UINT8 get_in_a_value(const device_config *device) static UINT8 get_in_a_value(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 port_a_data = 0; UINT8 port_a_data = 0;
UINT8 ret; UINT8 ret;
@ -323,7 +323,7 @@ static UINT8 get_in_a_value(const device_config *device)
static UINT8 get_in_b_value(const device_config *device) static UINT8 get_in_b_value(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret; UINT8 ret;
if (p->ddr_b == 0xff) if (p->ddr_b == 0xff)
@ -367,7 +367,7 @@ static UINT8 get_in_b_value(const device_config *device)
static UINT8 get_out_a_value(const device_config *device) static UINT8 get_out_a_value(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret; UINT8 ret;
if (p->ddr_a == 0xff) if (p->ddr_a == 0xff)
@ -387,7 +387,7 @@ static UINT8 get_out_a_value(const device_config *device)
static UINT8 get_out_b_value(const device_config *device) static UINT8 get_out_b_value(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* input pins are high-impedance - we just send them as zeros for backwards compatibility */ /* input pins are high-impedance - we just send them as zeros for backwards compatibility */
return p->out_b & p->ddr_b; return p->out_b & p->ddr_b;
@ -400,7 +400,7 @@ static UINT8 get_out_b_value(const device_config *device)
static void set_out_ca2(const device_config *device, int data) static void set_out_ca2(const device_config *device, int data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
if (data != p->out_ca2) if (data != p->out_ca2)
{ {
@ -426,7 +426,7 @@ static void set_out_ca2(const device_config *device, int data)
static void set_out_cb2(const device_config *device, int data) static void set_out_cb2(const device_config *device, int data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
int z = pia6821_get_output_cb2_z(device); int z = pia6821_get_output_cb2_z(device);
@ -455,7 +455,7 @@ static void set_out_cb2(const device_config *device, int data)
static UINT8 port_a_r(const device_config *device) static UINT8 port_a_r(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret = get_in_a_value(device); UINT8 ret = get_in_a_value(device);
@ -487,7 +487,7 @@ static UINT8 port_a_r(const device_config *device)
static UINT8 ddr_a_r(const device_config *device) static UINT8 ddr_a_r(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret = p->ddr_a; UINT8 ret = p->ddr_a;
@ -503,7 +503,7 @@ static UINT8 ddr_a_r(const device_config *device)
static UINT8 port_b_r(const device_config *device) static UINT8 port_b_r(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret = get_in_b_value(device); UINT8 ret = get_in_b_value(device);
@ -531,7 +531,7 @@ static UINT8 port_b_r(const device_config *device)
static UINT8 ddr_b_r(const device_config *device) static UINT8 ddr_b_r(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret = p->ddr_b; UINT8 ret = p->ddr_b;
@ -547,7 +547,7 @@ static UINT8 ddr_b_r(const device_config *device)
static UINT8 control_a_r(const device_config *device) static UINT8 control_a_r(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret; UINT8 ret;
/* update CA1 & CA2 if callback exists, these in turn may update IRQ's */ /* update CA1 & CA2 if callback exists, these in turn may update IRQ's */
@ -589,7 +589,7 @@ static UINT8 control_a_r(const device_config *device)
static UINT8 control_b_r(const device_config *device) static UINT8 control_b_r(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret; UINT8 ret;
/* update CB1 & CB2 if callback exists, these in turn may update IRQ's */ /* update CB1 & CB2 if callback exists, these in turn may update IRQ's */
@ -631,7 +631,7 @@ static UINT8 control_b_r(const device_config *device)
READ8_DEVICE_HANDLER( pia6821_r ) READ8_DEVICE_HANDLER( pia6821_r )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
UINT8 ret; UINT8 ret;
switch (offset & 0x03) switch (offset & 0x03)
@ -680,7 +680,7 @@ READ8_DEVICE_HANDLER( pia6821_alt_r )
UINT8 pia6821_get_port_b_z_mask(const device_config *device) UINT8 pia6821_get_port_b_z_mask(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return ~p->ddr_b; return ~p->ddr_b;
} }
@ -691,7 +691,7 @@ UINT8 pia6821_get_port_b_z_mask(const device_config *device)
static void send_to_out_a_func(const device_config *device, const char* message) static void send_to_out_a_func(const device_config *device, const char* message)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* input pins are pulled high */ /* input pins are pulled high */
UINT8 data = get_out_a_value(device); UINT8 data = get_out_a_value(device);
@ -716,7 +716,7 @@ static void send_to_out_a_func(const device_config *device, const char* message)
static void send_to_out_b_func(const device_config *device, const char* message) static void send_to_out_b_func(const device_config *device, const char* message)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* input pins are high-impedance - we just send them as zeros for backwards compatibility */ /* input pins are high-impedance - we just send them as zeros for backwards compatibility */
UINT8 data = get_out_b_value(device); UINT8 data = get_out_b_value(device);
@ -741,7 +741,7 @@ static void send_to_out_b_func(const device_config *device, const char* message)
static void port_a_w(const device_config *device, UINT8 data) static void port_a_w(const device_config *device, UINT8 data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* buffer the output value */ /* buffer the output value */
p->out_a = data; p->out_a = data;
@ -756,7 +756,7 @@ static void port_a_w(const device_config *device, UINT8 data)
static void ddr_a_w(const device_config *device, UINT8 data) static void ddr_a_w(const device_config *device, UINT8 data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
if (data == 0x00) if (data == 0x00)
LOG(("PIA #%s: DDR A write = %02X (input mode)\n", device->tag, data)); LOG(("PIA #%s: DDR A write = %02X (input mode)\n", device->tag, data));
@ -781,7 +781,7 @@ static void ddr_a_w(const device_config *device, UINT8 data)
static void port_b_w(const device_config *device, UINT8 data) static void port_b_w(const device_config *device, UINT8 data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* buffer the output value */ /* buffer the output value */
p->out_b = data; p->out_b = data;
@ -807,7 +807,7 @@ static void port_b_w(const device_config *device, UINT8 data)
static void ddr_b_w(const device_config *device, UINT8 data) static void ddr_b_w(const device_config *device, UINT8 data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
if (data == 0x00) if (data == 0x00)
LOG(("PIA #%s: DDR B write = %02X (input mode)\n", device->tag, data)); LOG(("PIA #%s: DDR B write = %02X (input mode)\n", device->tag, data));
@ -832,7 +832,7 @@ static void ddr_b_w(const device_config *device, UINT8 data)
static void control_a_w(const device_config *device, UINT8 data) static void control_a_w(const device_config *device, UINT8 data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* bit 7 and 6 are read only */ /* bit 7 and 6 are read only */
data &= 0x3f; data &= 0x3f;
@ -868,7 +868,7 @@ static void control_a_w(const device_config *device, UINT8 data)
static void control_b_w(const device_config *device, UINT8 data) static void control_b_w(const device_config *device, UINT8 data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
int temp; int temp;
/* bit 7 and 6 are read only */ /* bit 7 and 6 are read only */
@ -899,7 +899,7 @@ static void control_b_w(const device_config *device, UINT8 data)
WRITE8_DEVICE_HANDLER( pia6821_w ) WRITE8_DEVICE_HANDLER( pia6821_w )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
switch (offset & 0x03) switch (offset & 0x03)
{ {
@ -945,7 +945,7 @@ WRITE8_DEVICE_HANDLER( pia6821_alt_w )
void pia6821_set_port_a_z_mask(const device_config *device, UINT8 data) void pia6821_set_port_a_z_mask(const device_config *device, UINT8 data)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
p->port_a_z_mask = data; p->port_a_z_mask = data;
} }
@ -957,7 +957,7 @@ void pia6821_set_port_a_z_mask(const device_config *device, UINT8 data)
READ8_DEVICE_HANDLER( pia6821_porta_r ) READ8_DEVICE_HANDLER( pia6821_porta_r )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->in_a; return p->in_a;
} }
@ -969,7 +969,7 @@ READ8_DEVICE_HANDLER( pia6821_porta_r )
void pia6821_set_input_a(const device_config *device, UINT8 data, UINT8 z_mask) void pia6821_set_input_a(const device_config *device, UINT8 data, UINT8 z_mask)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
assert_always(p->in_a_func.read == NULL, "pia6821_porta_w() called when in_a_func implemented"); assert_always(p->in_a_func.read == NULL, "pia6821_porta_w() called when in_a_func implemented");
@ -997,7 +997,7 @@ WRITE8_DEVICE_HANDLER( pia6821_porta_w )
UINT8 pia6821_get_output_a(const device_config *device) UINT8 pia6821_get_output_a(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
p->out_a_needs_pulled = FALSE; p->out_a_needs_pulled = FALSE;
@ -1011,7 +1011,7 @@ UINT8 pia6821_get_output_a(const device_config *device)
READ8_DEVICE_HANDLER( pia6821_ca1_r ) READ8_DEVICE_HANDLER( pia6821_ca1_r )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->in_ca1; return p->in_ca1;
} }
@ -1023,7 +1023,7 @@ READ8_DEVICE_HANDLER( pia6821_ca1_r )
WRITE8_DEVICE_HANDLER( pia6821_ca1_w ) WRITE8_DEVICE_HANDLER( pia6821_ca1_w )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* limit the data to 0 or 1 */ /* limit the data to 0 or 1 */
data = data ? TRUE : FALSE; data = data ? TRUE : FALSE;
@ -1059,7 +1059,7 @@ WRITE8_DEVICE_HANDLER( pia6821_ca1_w )
READ8_DEVICE_HANDLER( pia6821_ca2_r ) READ8_DEVICE_HANDLER( pia6821_ca2_r )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->in_ca2; return p->in_ca2;
} }
@ -1071,7 +1071,7 @@ READ8_DEVICE_HANDLER( pia6821_ca2_r )
WRITE8_DEVICE_HANDLER( pia6821_ca2_w ) WRITE8_DEVICE_HANDLER( pia6821_ca2_w )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* limit the data to 0 or 1 */ /* limit the data to 0 or 1 */
data = data ? 1 : 0; data = data ? 1 : 0;
@ -1104,7 +1104,7 @@ WRITE8_DEVICE_HANDLER( pia6821_ca2_w )
int pia6821_get_output_ca2(const device_config *device) int pia6821_get_output_ca2(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
p->out_ca2_needs_pulled = FALSE; p->out_ca2_needs_pulled = FALSE;
@ -1120,7 +1120,7 @@ int pia6821_get_output_ca2(const device_config *device)
int pia6821_get_output_ca2_z(const device_config *device) int pia6821_get_output_ca2_z(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
p->out_ca2_needs_pulled = FALSE; p->out_ca2_needs_pulled = FALSE;
@ -1137,7 +1137,7 @@ int pia6821_get_output_ca2_z(const device_config *device)
READ8_DEVICE_HANDLER( pia6821_portb_r ) READ8_DEVICE_HANDLER( pia6821_portb_r )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->in_b; return p->in_b;
} }
@ -1149,7 +1149,7 @@ READ8_DEVICE_HANDLER( pia6821_portb_r )
WRITE8_DEVICE_HANDLER( pia6821_portb_w ) WRITE8_DEVICE_HANDLER( pia6821_portb_w )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
assert_always(p->in_b_func.read == NULL, "pia_set_input_b() called when in_b_func implemented"); assert_always(p->in_b_func.read == NULL, "pia_set_input_b() called when in_b_func implemented");
@ -1166,7 +1166,7 @@ WRITE8_DEVICE_HANDLER( pia6821_portb_w )
UINT8 pia6821_get_output_b(const device_config *device) UINT8 pia6821_get_output_b(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
p->out_b_needs_pulled = FALSE; p->out_b_needs_pulled = FALSE;
@ -1180,7 +1180,7 @@ UINT8 pia6821_get_output_b(const device_config *device)
READ8_DEVICE_HANDLER( pia6821_cb1_r ) READ8_DEVICE_HANDLER( pia6821_cb1_r )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->in_cb1; return p->in_cb1;
} }
@ -1192,7 +1192,7 @@ READ8_DEVICE_HANDLER( pia6821_cb1_r )
WRITE8_DEVICE_HANDLER( pia6821_cb1_w ) WRITE8_DEVICE_HANDLER( pia6821_cb1_w )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* limit the data to 0 or 1 */ /* limit the data to 0 or 1 */
data = data ? 1 : 0; data = data ? 1 : 0;
@ -1229,7 +1229,7 @@ WRITE8_DEVICE_HANDLER( pia6821_cb1_w )
READ8_DEVICE_HANDLER( pia6821_cb2_r ) READ8_DEVICE_HANDLER( pia6821_cb2_r )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->in_cb2; return p->in_cb2;
} }
@ -1241,7 +1241,7 @@ READ8_DEVICE_HANDLER( pia6821_cb2_r )
WRITE8_DEVICE_HANDLER( pia6821_cb2_w ) WRITE8_DEVICE_HANDLER( pia6821_cb2_w )
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
/* limit the data to 0 or 1 */ /* limit the data to 0 or 1 */
data = data ? 1 : 0; data = data ? 1 : 0;
@ -1274,7 +1274,7 @@ WRITE8_DEVICE_HANDLER( pia6821_cb2_w )
int pia6821_get_output_cb2(const device_config *device) int pia6821_get_output_cb2(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
p->out_cb2_needs_pulled = FALSE; p->out_cb2_needs_pulled = FALSE;
@ -1288,7 +1288,7 @@ int pia6821_get_output_cb2(const device_config *device)
int pia6821_get_output_cb2_z(const device_config *device) int pia6821_get_output_cb2_z(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return !C2_OUTPUT(p->ctl_b); return !C2_OUTPUT(p->ctl_b);
} }
@ -1300,7 +1300,7 @@ int pia6821_get_output_cb2_z(const device_config *device)
int pia6821_get_irq_a(const device_config *device) int pia6821_get_irq_a(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->irq_a_state; return p->irq_a_state;
} }
@ -1312,49 +1312,25 @@ int pia6821_get_irq_a(const device_config *device)
int pia6821_get_irq_b(const device_config *device) int pia6821_get_irq_b(const device_config *device)
{ {
pia6821 *p = get_token(device); pia6821_state *p = get_token(device);
return p->irq_b_state; return p->irq_b_state;
} }
/*------------------------------------------------- /*-------------------------------------------------
DEVICE_GET_INFO( pia6821 ) device definition
-------------------------------------------------*/ -------------------------------------------------*/
DEVICE_GET_INFO(pia6821) static const char *DEVTEMPLATE_SOURCE = __FILE__;
{
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
case DEVINFO_INT_TOKEN_BYTES: info->i = sizeof(pia6821); break;
case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = 0; break;
case DEVINFO_INT_CLASS: info->i = DEVICE_CLASS_PERIPHERAL; break;
/* --- the following bits of info are returned as pointers to data or functions --- */ #define DEVTEMPLATE_ID(p,s) p##pia6821##s
case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(pia); break; #define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_RESET
case DEVINFO_FCT_STOP: /* Nothing */ break; #define DEVTEMPLATE_NAME "6821 PIA"
case DEVINFO_FCT_RESET: info->reset = DEVICE_RESET_NAME(pia); break; #define DEVTEMPLATE_FAMILY "6821 PIA"
#include "devtempl.h"
/* --- the following bits of info are returned as NULL-terminated strings --- */ #define DEVTEMPLATE_DERIVED_ID(p,s) p##pia6822##s
case DEVINFO_STR_NAME: strcpy(info->s, "6821 PIA"); break; #define DEVTEMPLATE_DERIVED_FEATURES 0
case DEVINFO_STR_FAMILY: strcpy(info->s, "6821 PIA"); break; #define DEVTEMPLATE_DERIVED_NAME "6822 PIA"
case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; #include "devtempl.h"
case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
case DEVINFO_STR_CREDITS: /* Nothing */ break;
}
}
/*-------------------------------------------------
DEVICE_GET_INFO( pia6822 )
-------------------------------------------------*/
DEVICE_GET_INFO(pia6822)
{
switch (state)
{
case DEVINFO_STR_NAME: strcpy(info->s, "6822 PIA"); break;
default: DEVICE_GET_INFO_CALL(pia6821); break;
}
}

2
src/mame/audio/namco52.c
View File

@ -233,7 +233,7 @@ static DEVICE_START( namco_52xx )
static const char *DEVTEMPLATE_SOURCE = __FILE__; static const char *DEVTEMPLATE_SOURCE = __FILE__;
#define DEVTEMPLATE_ID(p,s) p##namco_52xx##s #define DEVTEMPLATE_ID(p,s) p##namco_52xx##s
#define DEVTEMPLATE_FEATURES DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG #define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
#define DEVTEMPLATE_NAME "Namco 52xx" #define DEVTEMPLATE_NAME "Namco 52xx"
#define DEVTEMPLATE_FAMILY "Namco I/O" #define DEVTEMPLATE_FAMILY "Namco I/O"
#include "devtempl.h" #include "devtempl.h"

2
src/mame/audio/namco54.c
View File

@ -189,7 +189,7 @@ static DEVICE_START( namco_54xx )
static const char *DEVTEMPLATE_SOURCE = __FILE__; static const char *DEVTEMPLATE_SOURCE = __FILE__;
#define DEVTEMPLATE_ID(p,s) p##namco_54xx##s #define DEVTEMPLATE_ID(p,s) p##namco_54xx##s
#define DEVTEMPLATE_FEATURES DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG | DT_HAS_INLINE_CONFIG #define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG | DT_HAS_INLINE_CONFIG
#define DEVTEMPLATE_NAME "Namco 54xx" #define DEVTEMPLATE_NAME "Namco 54xx"
#define DEVTEMPLATE_FAMILY "Namco I/O" #define DEVTEMPLATE_FAMILY "Namco I/O"
#include "devtempl.h" #include "devtempl.h"

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

@ -296,7 +296,7 @@ static DEVICE_RESET( namco_06xx )
static const char *DEVTEMPLATE_SOURCE = __FILE__; static const char *DEVTEMPLATE_SOURCE = __FILE__;
#define DEVTEMPLATE_ID(p,s) p##namco_06xx##s #define DEVTEMPLATE_ID(p,s) p##namco_06xx##s
#define DEVTEMPLATE_FEATURES DT_HAS_RESET | DT_HAS_INLINE_CONFIG #define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_RESET | DT_HAS_INLINE_CONFIG
#define DEVTEMPLATE_NAME "Namco 06xx" #define DEVTEMPLATE_NAME "Namco 06xx"
#define DEVTEMPLATE_FAMILY "Namco I/O" #define DEVTEMPLATE_FAMILY "Namco I/O"
#include "devtempl.h" #include "devtempl.h"

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

@ -297,7 +297,7 @@ static DEVICE_START( namco_50xx )
static const char *DEVTEMPLATE_SOURCE = __FILE__; static const char *DEVTEMPLATE_SOURCE = __FILE__;
#define DEVTEMPLATE_ID(p,s) p##namco_50xx##s #define DEVTEMPLATE_ID(p,s) p##namco_50xx##s
#define DEVTEMPLATE_FEATURES DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG #define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
#define DEVTEMPLATE_NAME "Namco 50xx" #define DEVTEMPLATE_NAME "Namco 50xx"
#define DEVTEMPLATE_FAMILY "Namco I/O" #define DEVTEMPLATE_FAMILY "Namco I/O"
#include "devtempl.h" #include "devtempl.h"

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

@ -435,7 +435,7 @@ static DEVICE_RESET( namco_51xx )
static const char *DEVTEMPLATE_SOURCE = __FILE__; static const char *DEVTEMPLATE_SOURCE = __FILE__;
#define DEVTEMPLATE_ID(p,s) p##namco_51xx##s #define DEVTEMPLATE_ID(p,s) p##namco_51xx##s
#define DEVTEMPLATE_FEATURES DT_HAS_RESET | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG #define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_RESET | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
#define DEVTEMPLATE_NAME "Namco 51xx" #define DEVTEMPLATE_NAME "Namco 51xx"
#define DEVTEMPLATE_FAMILY "Namco I/O" #define DEVTEMPLATE_FAMILY "Namco I/O"
#include "devtempl.h" #include "devtempl.h"

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

@ -199,7 +199,7 @@ static DEVICE_START( namco_53xx )
static const char *DEVTEMPLATE_SOURCE = __FILE__; static const char *DEVTEMPLATE_SOURCE = __FILE__;
#define DEVTEMPLATE_ID(p,s) p##namco_53xx##s #define DEVTEMPLATE_ID(p,s) p##namco_53xx##s
#define DEVTEMPLATE_FEATURES DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG #define DEVTEMPLATE_FEATURES DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
#define DEVTEMPLATE_NAME "Namco 53xx" #define DEVTEMPLATE_NAME "Namco 53xx"
#define DEVTEMPLATE_FAMILY "Namco I/O" #define DEVTEMPLATE_FAMILY "Namco I/O"
#include "devtempl.h" #include "devtempl.h"