From 0eed019da759dbc4cc239c580c0a8f0d213d6686 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 4 Jun 2009 15:33:42 +0000 Subject: Cleanups and version bump. --- src/emu/cpu/cpu.mak | 2 +- src/emu/devtempl.h | 84 ++++++++++++++++----------------- src/emu/info.c | 4 +- src/emu/machine/6840ptm.c | 80 +++++++++++++++---------------- src/emu/machine/adc083x.c | 24 +++++----- src/emu/machine/adc1213x.c | 26 +++++----- src/emu/machine/adc1213x.h | 2 +- src/emu/machine/mb3773.c | 8 ++-- src/emu/machine/mb3773.h | 2 +- src/emu/machine/pd4990a.c | 38 +++++++-------- src/emu/machine/rp5h01.c | 30 ++++++------ src/emu/machine/upd4701.c | 36 +++++++------- src/emu/machine/upd4701.h | 2 +- src/mame/audio/namco52.c | 4 +- src/mame/audio/namco54.c | 6 +-- src/mame/drivers/cps1.c | 16 +++---- src/mame/drivers/hvyunit.c | 10 ++-- src/mame/drivers/megadriv.c | 26 +++++----- src/mame/drivers/mpu4.c | 4 +- src/mame/drivers/mpu4drvr.c | 2 +- src/mame/drivers/nwk-tr.c | 2 +- src/mame/drivers/thedeep.c | 2 +- src/mame/drivers/zn.c | 2 +- src/mame/machine/namco06.c | 112 ++++++++++++++++++++++---------------------- src/mame/machine/namco50.c | 12 ++--- src/mame/machine/namco51.c | 102 ++++++++++++++++++++-------------------- src/mame/machine/namco53.c | 10 ++-- src/version.c | 2 +- 28 files changed, 325 insertions(+), 325 deletions(-) diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index 6bdf57c966d..0fbc85c7ee8 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -689,7 +689,7 @@ $(CPUOBJ)/lh5801/lh5801.o: $(CPUSRC)/lh5801/lh5801.c \ #------------------------------------------------- -# Manchester Small-Scale Experimental Machine +# Manchester Small-Scale Experimental Machine #------------------------------------------------- ifneq ($(filter SSEM,$(CPUS)),) diff --git a/src/emu/devtempl.h b/src/emu/devtempl.h index d60b3d97093..c95c2565b4f 100644 --- a/src/emu/devtempl.h +++ b/src/emu/devtempl.h @@ -9,57 +9,57 @@ **************************************************************************** - Typical usage is as follows: - + Typical usage is as follows: + static const char *DEVTEMPLATE_SOURCE = __FILE__; // for a primary device.... -#define DEVTEMPLATE_ID(p,s) p##devicenameprefix##s -#define DEVTEMPLATE_FEATURES DT_HAS_xxx | DT_HAS_yyy | ... -#define DEVTEMPLATE_NAME "Device Name String" -#define DEVTEMPLATE_FAMILY "Device Family String" -#define DEVTEMPLATE_CLASS DEVICE_CLASS_xxxx +#define DEVTEMPLATE_ID(p,s) p##devicenameprefix##s +#define DEVTEMPLATE_FEATURES DT_HAS_xxx | DT_HAS_yyy | ... +#define DEVTEMPLATE_NAME "Device Name String" +#define DEVTEMPLATE_FAMILY "Device Family String" +#define DEVTEMPLATE_CLASS DEVICE_CLASS_xxxx #include "devtempl.h" // for a derived device.... -#define DEVTEMPLATE_DERIVED_ID(p,s) p##derivednameprefix##s -#define DEVTEMPLATE_DERIVED_FEATURES DT_HAS_xxx | DT_HAS_yyy | ... -#define DEVTEMPLATE_NAME "Derived Name String" +#define DEVTEMPLATE_DERIVED_ID(p,s) p##derivednameprefix##s +#define DEVTEMPLATE_DERIVED_FEATURES DT_HAS_xxx | DT_HAS_yyy | ... +#define DEVTEMPLATE_NAME "Derived Name String" #include "devtempl.h" **************************************************************************** - Parameters are as follows: - - DEVTEMPLATE_ID(p,s) - required - macro to produce device function and - type names with a prefix of 'p' and a suffix of 's' - - DEVTEMPLATE_FEATURES - required - bitmask consisting of one of the - DT_HAS_* flags, indicating which standard-named callbacks or - pointers are specified by this device (everything else is assumed - to be NULL, which is the default) - - DEVTEMPLATE_NAME - required - a string describing the device - - DEVTEMPLATE_FAMILY - required - a string describing the device family - name - - DEVTEMPLATE_STATE - optional - the name of the device's state - structure; by default, this is assumed to be - DEVTEMPLATE_ID(,_state) - - DEVTEMPLATE_CLASS - optional - the device's class (default is - DEVICE_CLASS_PERIPHERAL) - - DEVTEMPLATE_VERSION - optional - the device's version string (default - is "1.0") - - DEVTEMPLATE_CREDITS - optional - the device's credit string (default - is "Copyright Nicola Salmoria and the MAME Team") - - DEVTEMPLATE_INLINE_CONFIG - optional - the name of the device's - inline configuration structure; by default, it is assumed the - device does not have any inline configuration + Parameters are as follows: + + DEVTEMPLATE_ID(p,s) - required - macro to produce device function and + type names with a prefix of 'p' and a suffix of 's' + + DEVTEMPLATE_FEATURES - required - bitmask consisting of one of the + DT_HAS_* flags, indicating which standard-named callbacks or + pointers are specified by this device (everything else is assumed + to be NULL, which is the default) + + DEVTEMPLATE_NAME - required - a string describing the device + + DEVTEMPLATE_FAMILY - required - a string describing the device family + name + + DEVTEMPLATE_STATE - optional - the name of the device's state + structure; by default, this is assumed to be + DEVTEMPLATE_ID(,_state) + + DEVTEMPLATE_CLASS - optional - the device's class (default is + DEVICE_CLASS_PERIPHERAL) + + DEVTEMPLATE_VERSION - optional - the device's version string (default + is "1.0") + + DEVTEMPLATE_CREDITS - optional - the device's credit string (default + is "Copyright Nicola Salmoria and the MAME Team") + + DEVTEMPLATE_INLINE_CONFIG - optional - the name of the device's + inline configuration structure; by default, it is assumed the + device does not have any inline configuration ***************************************************************************/ @@ -160,7 +160,7 @@ DEVICE_GET_INFO( DEVTEMPLATE_ID(,) ) case DEVINFO_INT_INLINE_CONFIG_BYTES: info->i = sizeof(DEVTEMPLATE_ID(,_config)); break; #endif case DEVINFO_INT_CLASS: info->i = DEVTEMPLATE_CLASS; break; - + /* --- the following bits of info are returned as pointers --- */ #if ((DEVTEMPLATE_FEATURES) & DT_HAS_ROM_REGION) case DEVINFO_PTR_ROM_REGION: info->romregion = DEVTEMPLATE_ID(rom_,); break; diff --git a/src/emu/info.c b/src/emu/info.c index 64d36172c48..1fb2e3a646a 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -100,8 +100,8 @@ static void print_game_configs(FILE *out, const game_driver *game, const input_p } /*------------------------------------------------- - print_game_adjusters - print the Analog - Adjusters for a game + print_game_adjusters - print the Analog + Adjusters for a game -------------------------------------------------*/ static void print_game_adjusters(FILE *out, const game_driver *game, const input_port_config *portlist) diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c index 6014e681de4..e86d9368ed8 100644 --- a/src/emu/machine/6840ptm.c +++ b/src/emu/machine/6840ptm.c @@ -72,7 +72,7 @@ static const char *const opmode[] = static void ptm6840_timeout(const device_config *device, int idx); /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ typedef struct _ptm6840_state ptm6840_state; @@ -107,7 +107,7 @@ struct _ptm6840_state /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ INLINE ptm6840_state *get_safe_token(const device_config *device) @@ -127,11 +127,11 @@ INLINE const ptm6840_interface *get_interface(const device_config *device) /*************************************************************************** - IMPLEMENTATION + IMPLEMENTATION ***************************************************************************/ /*------------------------------------------------- - ptm6840_get_status - Get enabled status + ptm6840_get_status - Get enabled status -------------------------------------------------*/ int ptm6840_get_status( const device_config *device, int clock ) @@ -141,7 +141,7 @@ int ptm6840_get_status( const device_config *device, int clock ) } /*------------------------------------------------- - ptm6840_get_irq - Get IRQ state + ptm6840_get_irq - Get IRQ state -------------------------------------------------*/ int ptm6840_get_irq( const device_config *device ) @@ -151,7 +151,7 @@ int ptm6840_get_irq( const device_config *device ) } /*------------------------------------------------- - subtract_from_counter - Subtract from Counter + subtract_from_counter - Subtract from Counter -------------------------------------------------*/ static void subtract_from_counter( const device_config *device, int counter, int count ) @@ -228,7 +228,7 @@ static void subtract_from_counter( const device_config *device, int counter, int } /*------------------------------------------------- - ptm_tick + ptm_tick -------------------------------------------------*/ static void ptm_tick( const device_config *device, int counter, int count ) @@ -252,7 +252,7 @@ static void ptm_tick( const device_config *device, int counter, int count ) } /*------------------------------------------------- - update_interrupts - Update Internal Interrupts + update_interrupts - Update Internal Interrupts -------------------------------------------------*/ INLINE void update_interrupts( const device_config *device ) @@ -278,7 +278,7 @@ INLINE void update_interrupts( const device_config *device ) } /*------------------------------------------------- - compute_counter - Compute Counter + compute_counter - Compute Counter -------------------------------------------------*/ static UINT16 compute_counter( const device_config *device, int counter ) @@ -321,7 +321,7 @@ static UINT16 compute_counter( const device_config *device, int counter ) } /*------------------------------------------------- - reload_count - Reload Counter + reload_count - Reload Counter -------------------------------------------------*/ static void reload_count( const device_config *device, int idx ) @@ -366,7 +366,7 @@ static void reload_count( const device_config *device, int idx ) PLOG(("MC6840 #%s: reload_count(%d): clock = %d count = %d\n", device->tag, idx, clock, count)); duration = attotime_mul(ATTOTIME_IN_HZ(clock), count); - if (idx == 2) + if (idx == 2) duration = attotime_mul(duration, ptm6840->t3_divisor); PLOG(("MC6840 #%s: reload_count(%d): output = %lf\n", device->tag, idx, attotime_to_double(duration))); @@ -389,7 +389,7 @@ static void reload_count( const device_config *device, int idx ) /*------------------------------------------------- - ptm6840_read - Read Timer + ptm6840_read - Read Timer -------------------------------------------------*/ READ8_DEVICE_HANDLER( ptm6840_read ) @@ -453,7 +453,7 @@ READ8_DEVICE_HANDLER( ptm6840_read ) } /*------------------------------------------------- - ptm6840_write - Write Timer + ptm6840_write - Write Timer -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( ptm6840_write ) @@ -546,7 +546,7 @@ WRITE8_DEVICE_HANDLER( ptm6840_write ) } /*------------------------------------------------- - ptm6840_timeout - Called if timer is mature + ptm6840_timeout - Called if timer is mature -------------------------------------------------*/ static void ptm6840_timeout( const device_config *device, int idx ) @@ -593,30 +593,30 @@ static void ptm6840_timeout( const device_config *device, int idx ) } /*------------------------------------------------- - TIMER_CALLBACKs for Timer 1, 2 & 3 + TIMER_CALLBACKs for Timer 1, 2 & 3 -------------------------------------------------*/ -static TIMER_CALLBACK( ptm6840_timer1_cb ) -{ +static TIMER_CALLBACK( ptm6840_timer1_cb ) +{ const device_config *device = (const device_config *)ptr; - ptm6840_timeout(device, 0); + ptm6840_timeout(device, 0); } static TIMER_CALLBACK( ptm6840_timer2_cb ) -{ +{ const device_config *device = (const device_config *)ptr; - ptm6840_timeout(device, 1); + ptm6840_timeout(device, 1); } static TIMER_CALLBACK( ptm6840_timer3_cb ) -{ +{ const device_config *device = (const device_config *)ptr; - ptm6840_timeout(device, 2); + ptm6840_timeout(device, 2); } /*------------------------------------------------- - ptm6840_set_gate - set gate status (0 or 1) + ptm6840_set_gate - set gate status (0 or 1) -------------------------------------------------*/ INLINE void ptm6840_set_gate( const device_config *device, int state, int idx ) @@ -632,26 +632,26 @@ INLINE void ptm6840_set_gate( const device_config *device, int state, int idx ) } /*------------------------------------------------- - WRITE8_DEVICE_HANDLERs for Gate 1, 2 & 3 + WRITE8_DEVICE_HANDLERs for Gate 1, 2 & 3 -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( ptm6840_set_g1 ) -{ +{ ptm6840_set_gate(device, data, 0); } WRITE8_DEVICE_HANDLER( ptm6840_set_g2 ) -{ +{ ptm6840_set_gate(device, data, 1); } WRITE8_DEVICE_HANDLER( ptm6840_set_g3 ) -{ +{ ptm6840_set_gate(device, data, 2); } /*------------------------------------------------- - ptm6840_set_clock - set clock status (0 or 1) + ptm6840_set_clock - set clock status (0 or 1) -------------------------------------------------*/ INLINE void ptm6840_set_clock( const device_config *device, int state, int idx ) @@ -668,27 +668,27 @@ INLINE void ptm6840_set_clock( const device_config *device, int state, int idx ) } /*------------------------------------------------- - WRITE8_DEVICE_HANDLERs for Clock 1, 2 & 3 + WRITE8_DEVICE_HANDLERs for Clock 1, 2 & 3 -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( ptm6840_set_c1 ) -{ - ptm6840_set_clock(device, data, 0); +{ + ptm6840_set_clock(device, data, 0); } WRITE8_DEVICE_HANDLER( ptm6840_set_c2 ) -{ - ptm6840_set_clock(device, data, 1); +{ + ptm6840_set_clock(device, data, 1); } WRITE8_DEVICE_HANDLER( ptm6840_set_c3 ) -{ - ptm6840_set_clock(device, data, 2); +{ + ptm6840_set_clock(device, data, 2); } /*------------------------------------------------- - ptm6840_get_count - get count value + ptm6840_get_count - get count value -------------------------------------------------*/ UINT16 ptm6840_get_count( const device_config *device, int counter ) @@ -697,7 +697,7 @@ UINT16 ptm6840_get_count( const device_config *device, int counter ) } /*------------------------------------------------------------ - ptm6840_set_ext_clock - set external clock frequency + ptm6840_set_ext_clock - set external clock frequency ------------------------------------------------------------*/ void ptm6840_set_ext_clock( const device_config *device, int counter, int clock ) @@ -739,7 +739,7 @@ void ptm6840_set_ext_clock( const device_config *device, int counter, int clock } /*------------------------------------------------------------ - ptm6840_get_ext_clock - get external clock frequency + ptm6840_get_ext_clock - get external clock frequency ------------------------------------------------------------*/ int ptm6840_get_ext_clock( const device_config *device, int counter ) @@ -750,7 +750,7 @@ int ptm6840_get_ext_clock( const device_config *device, int counter ) /*------------------------------------------------- - DEVICE_START( ptm6840 ) + DEVICE_START( ptm6840 ) -------------------------------------------------*/ static DEVICE_START( ptm6840 ) @@ -810,7 +810,7 @@ static DEVICE_START( ptm6840 ) } /*------------------------------------------------- - DEVICE_RESET( ptm6840 ) + DEVICE_RESET( ptm6840 ) -------------------------------------------------*/ static DEVICE_RESET( ptm6840 ) diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c index fdd3ccc07fd..36bdca53457 100644 --- a/src/emu/machine/adc083x.c +++ b/src/emu/machine/adc083x.c @@ -44,7 +44,7 @@ enum }; /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ typedef struct _adc0831_state adc0831_state; @@ -71,7 +71,7 @@ struct _adc0831_state /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ INLINE adc0831_state *get_safe_token(const device_config *device) @@ -91,11 +91,11 @@ INLINE const adc0831_interface *get_interface(const device_config *device) /*************************************************************************** - IMPLEMENTATION + IMPLEMENTATION ***************************************************************************/ /*------------------------------------------------- - adc083x_cs_write + adc083x_cs_write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc083x_cs_write ) @@ -138,7 +138,7 @@ WRITE8_DEVICE_HANDLER( adc083x_cs_write ) } /*------------------------------------------------- - adc083x_conversion + adc083x_conversion -------------------------------------------------*/ static UINT8 adc083x_conversion( const device_config *device ) @@ -219,7 +219,7 @@ static UINT8 adc083x_conversion( const device_config *device ) } /*------------------------------------------------- - adc083x_clk_write + adc083x_clk_write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc083x_clk_write ) @@ -359,7 +359,7 @@ WRITE8_DEVICE_HANDLER( adc083x_clk_write ) } /*------------------------------------------------- - adc083x_di_write + adc083x_di_write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc083x_di_write ) @@ -375,7 +375,7 @@ WRITE8_DEVICE_HANDLER( adc083x_di_write ) } /*------------------------------------------------- - adc083x_se_write + adc083x_se_write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc083x_se_write ) @@ -391,7 +391,7 @@ WRITE8_DEVICE_HANDLER( adc083x_se_write ) } /*------------------------------------------------- - adc083x_sars_read + adc083x_sars_read -------------------------------------------------*/ READ8_DEVICE_HANDLER( adc083x_sars_read ) @@ -403,7 +403,7 @@ READ8_DEVICE_HANDLER( adc083x_sars_read ) } /*------------------------------------------------- - adc083x_do_read + adc083x_do_read -------------------------------------------------*/ READ8_DEVICE_HANDLER( adc083x_do_read ) @@ -416,7 +416,7 @@ READ8_DEVICE_HANDLER( adc083x_do_read ) /*------------------------------------------------- - DEVICE_START( adc083x ) + DEVICE_START( adc083x ) -------------------------------------------------*/ static DEVICE_START( adc0831 ) @@ -467,7 +467,7 @@ static DEVICE_START( adc0831 ) /*------------------------------------------------- - DEVICE_RESET( adc083x ) + DEVICE_RESET( adc083x ) -------------------------------------------------*/ static DEVICE_RESET( adc0831 ) diff --git a/src/emu/machine/adc1213x.c b/src/emu/machine/adc1213x.c index f16262b2d07..cc4d4df521f 100644 --- a/src/emu/machine/adc1213x.c +++ b/src/emu/machine/adc1213x.c @@ -2,7 +2,7 @@ National Semiconductor ADC12130 / ADC12132 / ADC12138 - Self-calibrating 12-bit Plus Sign Serial I/O A/D Converters with MUX + Self-calibrating 12-bit Plus Sign Serial I/O A/D Converters with MUX and Sample/Hold TODO: @@ -17,7 +17,7 @@ /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ typedef struct _adc12138_state adc12138_state; @@ -51,7 +51,7 @@ struct _adc12138_state #define ADC1213X_ACQUISITION_TIME_34_CCLK 3 /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ INLINE adc12138_state *get_safe_token(const device_config *device) @@ -71,11 +71,11 @@ INLINE const adc12138_interface *get_interface(const device_config *device) /*************************************************************************** - IMPLEMENTATION + IMPLEMENTATION ***************************************************************************/ /*------------------------------------------------- - adc1213x_di_w + adc1213x_di_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc1213x_di_w ) @@ -85,7 +85,7 @@ WRITE8_DEVICE_HANDLER( adc1213x_di_w ) } /*------------------------------------------------- - adc1213x_convert + adc1213x_convert -------------------------------------------------*/ static void adc1213x_convert(const device_config *device, int channel, int bits16, int lsbfirst) @@ -176,7 +176,7 @@ static void adc1213x_convert(const device_config *device, int channel, int bits1 } /*------------------------------------------------- - adc1213x_cs_w + adc1213x_cs_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc1213x_cs_w ) @@ -254,7 +254,7 @@ WRITE8_DEVICE_HANDLER( adc1213x_cs_w ) } /*------------------------------------------------- - adc1213x_sclk_w + adc1213x_sclk_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc1213x_sclk_w ) @@ -276,7 +276,7 @@ WRITE8_DEVICE_HANDLER( adc1213x_sclk_w ) } /*------------------------------------------------- - adc1213x_conv_w + adc1213x_conv_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( adc1213x_conv_w ) @@ -286,7 +286,7 @@ WRITE8_DEVICE_HANDLER( adc1213x_conv_w ) } /*------------------------------------------------- - adc1213x_do_r + adc1213x_do_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( adc1213x_do_r ) @@ -298,7 +298,7 @@ READ8_DEVICE_HANDLER( adc1213x_do_r ) } /*------------------------------------------------- - adc1213x_eoc_r + adc1213x_eoc_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( adc1213x_eoc_r ) @@ -308,7 +308,7 @@ READ8_DEVICE_HANDLER( adc1213x_eoc_r ) } /*------------------------------------------------- - DEVICE_START( adc1213x ) + DEVICE_START( adc1213x ) -------------------------------------------------*/ static DEVICE_START( adc12138 ) @@ -336,7 +336,7 @@ static DEVICE_START( adc12138 ) /*------------------------------------------------- - DEVICE_RESET( adc1213x ) + DEVICE_RESET( adc1213x ) -------------------------------------------------*/ static DEVICE_RESET( adc12138 ) diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h index 51527395869..d90783b7c40 100644 --- a/src/emu/machine/adc1213x.h +++ b/src/emu/machine/adc1213x.h @@ -2,7 +2,7 @@ National Semiconductor ADC12130 / ADC12132 / ADC12138 - Self-calibrating 12-bit Plus Sign Serial I/O A/D Converters with MUX + Self-calibrating 12-bit Plus Sign Serial I/O A/D Converters with MUX and Sample/Hold ***************************************************************************/ diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c index 90096914cc9..2897e361f3b 100644 --- a/src/emu/machine/mb3773.c +++ b/src/emu/machine/mb3773.c @@ -1,6 +1,6 @@ /*************************************************************************** - Fujitsu MB3773 + Fujitsu MB3773 Power Supply Monitor with Watch Dog Timer (i.e. Reset IC) @@ -17,7 +17,7 @@ #include "mb3773.h" /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ typedef struct _mb3773_state mb3773_state; @@ -28,7 +28,7 @@ struct _mb3773_state }; /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ INLINE mb3773_state *get_safe_token(const device_config *device) @@ -40,7 +40,7 @@ INLINE mb3773_state *get_safe_token(const device_config *device) } /*************************************************************************** - IMPLEMENTATION + IMPLEMENTATION ***************************************************************************/ /*------------------------------------------------- diff --git a/src/emu/machine/mb3773.h b/src/emu/machine/mb3773.h index 2ff11645a2f..c4612b79fa6 100644 --- a/src/emu/machine/mb3773.h +++ b/src/emu/machine/mb3773.h @@ -1,6 +1,6 @@ /*************************************************************************** - Fujistu MB3773 + Fujistu MB3773 Power Supply Monitor with Watch Dog Timer (i.e. Reset IC) diff --git a/src/emu/machine/pd4990a.c b/src/emu/machine/pd4990a.c index bad9df698b4..c02cd915ebb 100644 --- a/src/emu/machine/pd4990a.c +++ b/src/emu/machine/pd4990a.c @@ -45,7 +45,7 @@ #define END_BIT 0x04 /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ typedef struct _upd4990a_state upd4990a_state; @@ -79,7 +79,7 @@ struct _upd4990a_state /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ INLINE upd4990a_state *get_safe_token(const device_config *device) @@ -97,11 +97,11 @@ INLINE UINT8 convert_to_bcd(int val) /*************************************************************************** - IMPLEMENTATION + IMPLEMENTATION ***************************************************************************/ /*------------------------------------------------- - upd4990a_increment_month + upd4990a_increment_month -------------------------------------------------*/ void upd4990a_increment_month( const device_config *device ) @@ -124,7 +124,7 @@ void upd4990a_increment_month( const device_config *device ) } /*------------------------------------------------- - upd4990a_increment_day + upd4990a_increment_day -------------------------------------------------*/ void upd4990a_increment_day( const device_config *device ) @@ -182,7 +182,7 @@ void upd4990a_increment_day( const device_config *device ) } /*------------------------------------------------- - upd4990a_addretrace + upd4990a_addretrace -------------------------------------------------*/ void upd4990a_addretrace( const device_config *device ) @@ -235,7 +235,7 @@ void upd4990a_addretrace( const device_config *device ) } /*------------------------------------------------- - upd4990a_testbit_r + upd4990a_testbit_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( upd4990a_testbit_r ) @@ -245,7 +245,7 @@ READ8_DEVICE_HANDLER( upd4990a_testbit_r ) } /*------------------------------------------------- - upd4990a_databit_r + upd4990a_databit_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( upd4990a_databit_r ) @@ -255,7 +255,7 @@ READ8_DEVICE_HANDLER( upd4990a_databit_r ) } /*------------------------------------------------- - upd4990a_readbit + upd4990a_readbit -------------------------------------------------*/ static void upd4990a_readbit( const device_config *device ) @@ -297,7 +297,7 @@ static void upd4990a_readbit( const device_config *device ) } /*------------------------------------------------- - upd4990a_resetbitstream + upd4990a_resetbitstream -------------------------------------------------*/ static void upd4990a_resetbitstream( const device_config *device ) @@ -310,7 +310,7 @@ static void upd4990a_resetbitstream( const device_config *device ) } /*------------------------------------------------- - upd4990a_writebit + upd4990a_writebit -------------------------------------------------*/ static void upd4990a_writebit( const device_config *device , UINT8 bit ) @@ -323,7 +323,7 @@ static void upd4990a_writebit( const device_config *device , UINT8 bit ) } /*------------------------------------------------- - upd4990a_nextbit + upd4990a_nextbit -------------------------------------------------*/ static void upd4990a_nextbit( const device_config *device ) @@ -343,7 +343,7 @@ static void upd4990a_nextbit( const device_config *device ) } /*------------------------------------------------- - upd4990a_getcommand + upd4990a_getcommand -------------------------------------------------*/ static UINT8 upd4990a_getcommand( const device_config *device ) @@ -358,7 +358,7 @@ static UINT8 upd4990a_getcommand( const device_config *device ) } /*------------------------------------------------- - upd4990a_update_date + upd4990a_update_date -------------------------------------------------*/ static void upd4990a_update_date( const device_config *device ) @@ -375,7 +375,7 @@ static void upd4990a_update_date( const device_config *device ) } /*------------------------------------------------- - upd4990a_process_command + upd4990a_process_command -------------------------------------------------*/ static void upd4990a_process_command( const device_config *device ) @@ -409,7 +409,7 @@ static void upd4990a_process_command( const device_config *device ) } /*------------------------------------------------- - upd4990a_serial_control + upd4990a_serial_control -------------------------------------------------*/ static void upd4990a_serial_control( const device_config *device, UINT8 data ) @@ -432,7 +432,7 @@ static void upd4990a_serial_control( const device_config *device, UINT8 data ) } /*------------------------------------------------- - upd4990a_control_16_w + upd4990a_control_16_w -------------------------------------------------*/ WRITE16_DEVICE_HANDLER( upd4990a_control_16_w ) @@ -442,7 +442,7 @@ WRITE16_DEVICE_HANDLER( upd4990a_control_16_w ) /*------------------------------------------------- - DEVICE_START( upd4990a ) + DEVICE_START( upd4990a ) -------------------------------------------------*/ static DEVICE_START( upd4990a ) @@ -498,7 +498,7 @@ static DEVICE_START( upd4990a ) /*------------------------------------------------- - DEVICE_RESET( upd4990a ) + DEVICE_RESET( upd4990a ) -------------------------------------------------*/ static DEVICE_RESET( upd4990a ) diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c index bf5c9eaa4c5..4f979fdd0b3 100644 --- a/src/emu/machine/rp5h01.c +++ b/src/emu/machine/rp5h01.c @@ -12,7 +12,7 @@ /*************************************************************************** - PARAMETERS + PARAMETERS ***************************************************************************/ /* these also work as the address masks */ @@ -23,7 +23,7 @@ enum { /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ typedef struct _rp5h01_state rp5h01_state; @@ -38,7 +38,7 @@ struct _rp5h01_state }; /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ INLINE rp5h01_state *get_safe_token(const device_config *device) @@ -57,11 +57,11 @@ INLINE const rp5h01_interface *get_interface(const device_config *device) } /*************************************************************************** - IMPLEMENTATION + IMPLEMENTATION ***************************************************************************/ /*------------------------------------------------- - rp5h01_enable_w + rp5h01_enable_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( rp5h01_enable_w ) @@ -73,7 +73,7 @@ WRITE8_DEVICE_HANDLER( rp5h01_enable_w ) } /*------------------------------------------------- - rp5h01_reset_w + rp5h01_reset_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( rp5h01_reset_w ) @@ -86,7 +86,7 @@ WRITE8_DEVICE_HANDLER( rp5h01_reset_w ) return; /* now look for a 0->1 transition */ - if (rp5h01->old_reset == 0 && newstate == 1) + if (rp5h01->old_reset == 0 && newstate == 1) { /* reset the counter */ rp5h01->counter = 0; @@ -97,7 +97,7 @@ WRITE8_DEVICE_HANDLER( rp5h01_reset_w ) } /*------------------------------------------------- - rp5h01_clock_w + rp5h01_clock_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( rp5h01_clock_w ) @@ -110,7 +110,7 @@ WRITE8_DEVICE_HANDLER( rp5h01_clock_w ) return; /* now look for a 1->0 transition */ - if (rp5h01->old_clock == 1 && newstate == 0) + if (rp5h01->old_clock == 1 && newstate == 0) { /* increment the counter, and mask it with the mode */ rp5h01->counter++; @@ -121,7 +121,7 @@ WRITE8_DEVICE_HANDLER( rp5h01_clock_w ) } /*------------------------------------------------- - rp5h01_test_w + rp5h01_test_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( rp5h01_test_w ) @@ -137,7 +137,7 @@ WRITE8_DEVICE_HANDLER( rp5h01_test_w ) } /*------------------------------------------------- - rp5h01_counter_r + rp5h01_counter_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( rp5h01_counter_r ) @@ -153,7 +153,7 @@ READ8_DEVICE_HANDLER( rp5h01_counter_r ) } /*------------------------------------------------- - rp5h01_data_r + rp5h01_data_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( rp5h01_data_r ) @@ -174,7 +174,7 @@ READ8_DEVICE_HANDLER( rp5h01_data_r ) } /*------------------------------------------------- - DEVICE_START( rp5h01 ) + DEVICE_START( rp5h01 ) -------------------------------------------------*/ static DEVICE_START( rp5h01 ) @@ -193,7 +193,7 @@ static DEVICE_START( rp5h01 ) } /*------------------------------------------------- - DEVICE_RESET( rp5h01 ) + DEVICE_RESET( rp5h01 ) -------------------------------------------------*/ static DEVICE_RESET( rp5h01 ) @@ -208,7 +208,7 @@ static DEVICE_RESET( rp5h01 ) } /*------------------------------------------------- - device definition + device definition -------------------------------------------------*/ static const char *DEVTEMPLATE_SOURCE = __FILE__; diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c index b5ca1ad940b..416017ce19c 100644 --- a/src/emu/machine/upd4701.c +++ b/src/emu/machine/upd4701.c @@ -1,6 +1,6 @@ /*************************************************************************** - NEC uPD4701 + NEC uPD4701 Incremental Encoder Control @@ -12,7 +12,7 @@ #include "upd4701.h" /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ typedef struct _upd4701_state upd4701_state; @@ -34,7 +34,7 @@ struct _upd4701_state int cf; }; -/* x,y increments can be 12bit (see MASK_COUNTER), hence we need a couple of +/* x,y increments can be 12bit (see MASK_COUNTER), hence we need a couple of 16bit handlers in the following */ #define MASK_SWITCHES ( 7 ) @@ -42,7 +42,7 @@ struct _upd4701_state /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ INLINE upd4701_state *get_safe_token(const device_config *device) @@ -55,11 +55,11 @@ INLINE upd4701_state *get_safe_token(const device_config *device) /*************************************************************************** - IMPLEMENTATION + IMPLEMENTATION ***************************************************************************/ /*------------------------------------------------- - upd4701_ul_w + upd4701_ul_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( upd4701_ul_w ) @@ -69,7 +69,7 @@ WRITE8_DEVICE_HANDLER( upd4701_ul_w ) } /*------------------------------------------------- - upd4701_xy_w + upd4701_xy_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( upd4701_xy_w ) @@ -79,7 +79,7 @@ WRITE8_DEVICE_HANDLER( upd4701_xy_w ) } /*------------------------------------------------- - upd4701_cs_w + upd4701_cs_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( upd4701_cs_w ) @@ -107,7 +107,7 @@ WRITE8_DEVICE_HANDLER( upd4701_cs_w ) } /*------------------------------------------------- - upd4701_resetx_w + upd4701_resetx_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( upd4701_resetx_w ) @@ -126,7 +126,7 @@ WRITE8_DEVICE_HANDLER( upd4701_resetx_w ) } /*------------------------------------------------- - upd4701_resety_w + upd4701_resety_w -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( upd4701_resety_w ) @@ -145,7 +145,7 @@ WRITE8_DEVICE_HANDLER( upd4701_resety_w ) } /*------------------------------------------------- - upd4701_x_add + upd4701_x_add -------------------------------------------------*/ WRITE16_DEVICE_HANDLER( upd4701_x_add ) @@ -164,7 +164,7 @@ WRITE16_DEVICE_HANDLER( upd4701_x_add ) } /*------------------------------------------------- - upd4701_y_add + upd4701_y_add -------------------------------------------------*/ WRITE16_DEVICE_HANDLER( upd4701_y_add ) @@ -183,7 +183,7 @@ WRITE16_DEVICE_HANDLER( upd4701_y_add ) } /*------------------------------------------------- - upd4701_switches_set + upd4701_switches_set -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( upd4701_switches_set ) @@ -193,7 +193,7 @@ WRITE8_DEVICE_HANDLER( upd4701_switches_set ) } /*------------------------------------------------- - upd4701_d_r + upd4701_d_r -------------------------------------------------*/ READ16_DEVICE_HANDLER( upd4701_d_r ) @@ -228,7 +228,7 @@ READ16_DEVICE_HANDLER( upd4701_d_r ) } /*------------------------------------------------- - upd4701_sf_r + upd4701_sf_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( upd4701_sf_r ) @@ -244,7 +244,7 @@ READ8_DEVICE_HANDLER( upd4701_sf_r ) } /*------------------------------------------------- - upd4701_cf_r + upd4701_cf_r -------------------------------------------------*/ READ8_DEVICE_HANDLER( upd4701_cf_r ) @@ -254,7 +254,7 @@ READ8_DEVICE_HANDLER( upd4701_cf_r ) } /*------------------------------------------------- - DEVICE_START( upd4701 ) + DEVICE_START( upd4701 ) -------------------------------------------------*/ static DEVICE_START( upd4701 ) @@ -279,7 +279,7 @@ static DEVICE_START( upd4701 ) } /*------------------------------------------------- - DEVICE_RESET( upd4701 ) + DEVICE_RESET( upd4701 ) -------------------------------------------------*/ static DEVICE_RESET( upd4701 ) diff --git a/src/emu/machine/upd4701.h b/src/emu/machine/upd4701.h index b2aac3b4221..e6e166d6131 100644 --- a/src/emu/machine/upd4701.h +++ b/src/emu/machine/upd4701.h @@ -1,6 +1,6 @@ /*************************************************************************** - NEC uPD4701 + NEC uPD4701 Incremental Encoder Control diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c index 1d1a0a03f80..97e1cb4dc54 100644 --- a/src/mame/audio/namco52.c +++ b/src/mame/audio/namco52.c @@ -2,8 +2,8 @@ Namco 52XX - This instance of the Fujitsu MB8843 MCU is programmed to act as a - sample player. It is used by just two games: Bosconian and Pole + This instance of the Fujitsu MB8843 MCU is programmed to act as a + sample player. It is used by just two games: Bosconian and Pole Position. A0-A15 = address to read from sample ROMs diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c index 7bafa94499f..6c471f2000a 100644 --- a/src/mame/audio/namco54.c +++ b/src/mame/audio/namco54.c @@ -3,7 +3,7 @@ Namco 54XX This custom chip is a Fujitsu MB8844 MCU programmed to act as a noise - generator. It is used for explosions, the shoot sound in Bosconian, + generator. It is used for explosions, the shoot sound in Bosconian, and the tire screech sound in Pole Position. CMD = command from main CPU @@ -28,8 +28,8 @@ GND|14 15|R2 (CMD2) +------+ - [1] The RNG that drives the type A output is output on pin 21, and - the one that drives the type B output is output on pin 22, but those + [1] The RNG that drives the type A output is output on pin 21, and + the one that drives the type B output is output on pin 22, but those pins are not connected on the board. diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index fa9aaeb5737..acef8ede8a4 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -5471,14 +5471,14 @@ ROM_END | 8 ROM10 ROM9 | | DIP8 0 ROM12 ROM11 | | 0 | - | DIP8 0 | + | DIP8 0 | |------------------------------------------------------ - + *1 = 12.000 Mhz *2 = 3.579545 Mhz - *3 = 16.000 Mhz - -*/ + *3 = 16.000 Mhz + +*/ ROM_START( sf2ebbl ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "12.bin", 0x00000, 0x40000, CRC(a258b4d5) SHA1(3433b6493794c98bb35c1b27cc65bb5f13d52e9b) ) @@ -5509,14 +5509,14 @@ ROM_START( sf2ebbl ) ROM_CONTINUE( 0x400005, 0x10000 ) ROMX_LOAD( "08.bin", 0x400003, 0x10000, CRC(81c9550f) SHA1(2d75e329148caadfff35c8f2f91b352f14dbe08a) , ROM_SKIP(7) ) ROM_CONTINUE( 0x400007, 0x10000 ) - + ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "03.bin", 0x00000, 0x08000, CRC(a4823a1b) SHA1(7b6bf59dfd578bfbbdb64c27988796783442d659) ) ROM_CONTINUE( 0x10000, 0x08000 ) ROM_REGION( 0x20000, "user1", 0 ) /* unknown (bootleg priority?) */ - ROM_LOAD( "04.bin", 0x00000, 0x10000, CRC(13ea1c44) SHA1(5b05fe4c3920e33d94fac5f59e09ff14b3e427fe) ) - + ROM_LOAD( "04.bin", 0x00000, 0x10000, CRC(13ea1c44) SHA1(5b05fe4c3920e33d94fac5f59e09ff14b3e427fe) ) + ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ ROM_LOAD( "02.bin", 0x00000, 0x20000, CRC(7f162009) SHA1(346bf42992b4c36c593e21901e22c87ae4a7d86d) ) ROM_LOAD( "01.bin", 0x20000, 0x20000, CRC(beade53f) SHA1(277c397dc12752719ec6b47d2224750bd1c07f79) ) diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index ec777596c56..6442975f7f3 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -460,10 +460,10 @@ static INPUT_PORTS_START( hvyunit ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /*copied from DJ Boy, WRONG -HEAVY UNIT +HEAVY UNIT Manufacturer: Taito Year: 1988 - Genre: Shooter -Orientation: Horizontal +Orientation: Horizontal Conversion Class: JAMMA DIP Switch Settings: SW#1 @@ -476,13 +476,13 @@ CABINET TYPE TABLE OFF VIDEO SCREEN NORMAL OFF FLIP ON -------------------------------------------------------------------- -TEST MODE NORMAL OFF +TEST MODE NORMAL OFF TEST ON -------------------------------------------------------------------- COIN/CREDIT COIN #1 1C/1P OFF OFF 1C/2P ON OFF - 2C/1P OFF ON + 2C/1P OFF ON 2C/3P ON ON COIN #2 1C/1P OFF OFF @@ -505,7 +505,7 @@ DIFFICULTY NORMAL OFF OFF -------------------------------------------------------------------- CONTINUE YES OFF NO ON --------------------------------------------------------------------- +-------------------------------------------------------------------- BONUS NO OFF YES ON -------------------------------------------------------------------- diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 64f4b62987d..b95bd8d365c 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -1637,7 +1637,7 @@ INPUT_PORTS_START( aladbl ) PORT_DIPSETTING( 0x05, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x06, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x07, DEF_STR( 1C_7C ) ) -// PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* to avoid it being changed and corrupting Coinage settings */ +// PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* to avoid it being changed and corrupting Coinage settings */ PORT_DIPNAME( 0x30, 0x00, DEF_STR( Difficulty ) ) /* code at 0x1b2680 */ PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) /* "PRACTICE" */ PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) /* "NORMAL" */ @@ -1683,14 +1683,14 @@ static UINT8 megadrive_io_read_data_port_6button(running_machine *machine, int p if (io_stage[portnum] == 2) { /* here we read B, C & the additional buttons */ - retdata = (megadrive_io_data_regs[portnum] & helper) | - (((input_port_read_safe(machine, pad3names[portnum], 0) & 0x30) | + retdata = (megadrive_io_data_regs[portnum] & helper) | + (((input_port_read_safe(machine, pad3names[portnum], 0) & 0x30) | (input_port_read_safe(machine, pad6names[portnum], 0) & 0x0f)) & ~helper); } else { /* here we read B, C & the directional buttons */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | ((input_port_read_safe(machine, pad3names[portnum], 0) & 0x3f) & ~helper); } } @@ -1699,20 +1699,20 @@ static UINT8 megadrive_io_read_data_port_6button(running_machine *machine, int p if (io_stage[portnum] == 1) { /* here we read ((Start & A) >> 2) | 0x00 */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | (((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) & ~helper); } else if (io_stage[portnum]==2) { /* here we read ((Start & A) >> 2) | 0x0f */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | 0x0f) & ~helper); } else { /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (megadrive_io_data_regs[portnum] & helper) | - ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | + retdata = (megadrive_io_data_regs[portnum] & helper) | + ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | (input_port_read_safe(machine, pad3names[portnum], 0) & 0x02)) & ~helper); } } @@ -1732,14 +1732,14 @@ static UINT8 megadrive_io_read_data_port_3button(running_machine *machine, int p if (megadrive_io_data_regs[portnum]&0x40) { /* here we read B, C & the directional buttons */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | ((input_port_read_safe(machine, pad3names[portnum], 0) & 0x3f) & ~helper); } else { /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (megadrive_io_data_regs[portnum] & helper) | - ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | + retdata = (megadrive_io_data_regs[portnum] & helper) | + ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | (input_port_read_safe(machine, pad3names[portnum], 0) & 0x02)) & ~helper); } @@ -1754,7 +1754,7 @@ UINT8 megatech_bios_port_cc_dc_r(running_machine *machine, int offset, int ctrl) if (ctrl == 0x55) { /* A keys */ - retdata = ((input_port_read(machine, "PAD1") & 0x40) >> 2) | + retdata = ((input_port_read(machine, "PAD1") & 0x40) >> 2) | ((input_port_read(machine, "PAD2") & 0x40) >> 4) | 0xeb; } else @@ -5925,7 +5925,7 @@ VIDEO_EOF(megadriv) megadrive_imode_odd_frame^=1; // cputag_set_input_line(machine, "genesis_snd_z80", 0, CLEAR_LINE); // if the z80 interrupt hasn't happened by now, clear it.. - if (input_port_read_safe(machine, "RESET", 0x00) & 0x01) + if (input_port_read_safe(machine, "RESET", 0x00) & 0x01) cputag_set_input_line(machine, "maincpu", INPUT_LINE_RESET, PULSE_LINE); /* diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 18c9ad19ffd..ae0c2c156bd 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -537,8 +537,8 @@ static const ptm6840_interface ptm_ic2_intf = { MPU4_MASTER_CLOCK / 4, { 0, 0, 0 }, - { DEVCB_HANDLER(ic2_o1_callback), - DEVCB_HANDLER(ic2_o2_callback), + { DEVCB_HANDLER(ic2_o1_callback), + DEVCB_HANDLER(ic2_o2_callback), DEVCB_HANDLER(ic2_o3_callback) }, DEVCB_LINE(cpu0_irq_m6840) }; diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 0a030c7d63b..783a861a9cf 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -404,7 +404,7 @@ static const ptm6840_interface ptm_vid_intf = { VIDEO_MASTER_CLOCK / 10, /* 68k E clock */ { 0, 0, 0 }, - { DEVCB_HANDLER(vid_o1_callback), + { DEVCB_HANDLER(vid_o1_callback), DEVCB_HANDLER(vid_o2_callback), DEVCB_HANDLER(vid_o3_callback) }, DEVCB_LINE(cpu1_ptm_irq) diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 4fd9679f35e..69d9c182949 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -1010,7 +1010,7 @@ static const sharc_config sharc_cfg = }; -static double adc12138_input_callback( const device_config *device, UINT8 input ) +static double adc12138_input_callback( const device_config *device, UINT8 input ) { int value = 0; switch (input) diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index ba562ee265d..08891d77872 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -361,7 +361,7 @@ static MACHINE_DRIVER_START( thedeep ) /* IRQ by YM2203, NMI by when sound latch written by main cpu */ /* CPU3 is a i8751 running at 8Mhz (8mhz xtal)*/ - + MDRV_MACHINE_RESET(thedeep) /* video hardware */ diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index c773e7a5aec..d81f3b8cf89 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -1133,7 +1133,7 @@ static UINT8 *taitofx1_eeprom2 = NULL; static WRITE32_HANDLER( bank_coh1000t_w ) { - const device_config *mb3773 = devtag_get_device(space->machine, "mb3773"); + const device_config *mb3773 = devtag_get_device(space->machine, "mb3773"); mb3773_set_ck(mb3773, 0, (data & 0x20) >> 5); verboselog( space->machine, 1, "bank_coh1000t_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); memory_set_bankptr(space->machine, 1, memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) ); diff --git a/src/mame/machine/namco06.c b/src/mame/machine/namco06.c index c01b40da846..afc7956cccd 100644 --- a/src/mame/machine/namco06.c +++ b/src/mame/machine/namco06.c @@ -1,18 +1,18 @@ /*************************************************************************** - Namco 06XX - - This chip is used as an interface to up to 4 other custom chips. - It signals IRQs to the custom MCUs when writes happen, and generates - NMIs to the controlling CPU to drive reads based on a clock. + Namco 06XX - SD0-SD7 are data I/O lines connecting to the controlling CPU - SEL selects either control (1) or data (0), usually connected to - an address line of the controlling CPU - /NMI is an NMI signal line for the controlling CPU + This chip is used as an interface to up to 4 other custom chips. + It signals IRQs to the custom MCUs when writes happen, and generates + NMIs to the controlling CPU to drive reads based on a clock. - ID0-ID7 are data I/O lines connecting to the other custom chips - /IO1-/IO4 are IRQ signal lines for each custom chip + SD0-SD7 are data I/O lines connecting to the controlling CPU + SEL selects either control (1) or data (0), usually connected to + an address line of the controlling CPU + /NMI is an NMI signal line for the controlling CPU + + ID0-ID7 are data I/O lines connecting to the other custom chips + /IO1-/IO4 are IRQ signal lines for each custom chip +------+ [1]|1 28|Vcc @@ -31,51 +31,51 @@ GND|14 15|SEL +------+ - [1] on polepos, galaga, xevious, and bosco: connected to K3 of the 51xx - on bosco and xevious, connected to R8 of the 50xx - - - 06XX interface: - --------------- - Galaga 51XX ---- ---- 54XX - Bosconian (CPU board) 51XX ---- 50XX 54XX - Bosconian (Video board) 50XX 52XX ---- ---- - Xevious 51XX ---- 50XX 54XX - Dig Dug 51XX 53XX ---- ---- - Pole Position / PP II 51XX 53XX 52XX 54XX - - - Galaga writes: - control = 10(000), data = FF at startup - control = 71(011), read 3, control = 10 - control = A1(101), write 4, control = 10 - control = A8(101), write 12, control = 10 - - Xevious writes: - control = 10 at startup - control = A1(101), write 6, control = 10 - control = 71(011), read 3, control = 10 - control = 64(011), write 1, control = 10 - control = 74(011), read 4, control = 10 - control = 68(011), write 7, control = 10 - - Dig Dug writes: - control = 10(000), data = 10 at startup - control = A1(101), write 3, control = 10 - control = 71(011), read 3, control = 10 - control = D2(110), read 2, control = 10 - - Bosco writes: - control = 10(000), data = FF at startup - control = C8(110), write 17, control = 10 - control = 61(011), write 1, control = 10 - control = 71(011), read 3, control = 10 - control = 94(100), read 4, control = 10 - control = 64(011), write 1, control = 10 - control = 84(100), write 5, control = 10 - - - control = 34(001), write 1, control = 10 + [1] on polepos, galaga, xevious, and bosco: connected to K3 of the 51xx + on bosco and xevious, connected to R8 of the 50xx + + + 06XX interface: + --------------- + Galaga 51XX ---- ---- 54XX + Bosconian (CPU board) 51XX ---- 50XX 54XX + Bosconian (Video board) 50XX 52XX ---- ---- + Xevious 51XX ---- 50XX 54XX + Dig Dug 51XX 53XX ---- ---- + Pole Position / PP II 51XX 53XX 52XX 54XX + + + Galaga writes: + control = 10(000), data = FF at startup + control = 71(011), read 3, control = 10 + control = A1(101), write 4, control = 10 + control = A8(101), write 12, control = 10 + + Xevious writes: + control = 10 at startup + control = A1(101), write 6, control = 10 + control = 71(011), read 3, control = 10 + control = 64(011), write 1, control = 10 + control = 74(011), read 4, control = 10 + control = 68(011), write 7, control = 10 + + Dig Dug writes: + control = 10(000), data = 10 at startup + control = A1(101), write 3, control = 10 + control = 71(011), read 3, control = 10 + control = D2(110), read 2, control = 10 + + Bosco writes: + control = 10(000), data = FF at startup + control = C8(110), write 17, control = 10 + control = 61(011), write 1, control = 10 + control = 71(011), read 3, control = 10 + control = 94(100), read 4, control = 10 + control = 64(011), write 1, control = 10 + control = 84(100), write 5, control = 10 + + + control = 34(001), write 1, control = 10 ***************************************************************************/ diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c index 19cc4f9afb1..8e63012fb93 100644 --- a/src/mame/machine/namco50.c +++ b/src/mame/machine/namco50.c @@ -2,13 +2,13 @@ Namco 50XX - This custom chip is a Fujitsu MB8842 MCU programmed to act as a - protection device. It keeps track of the players scores, and checks if - a high score has been obtained or bonus lives should be awarded. The - main CPU has a range of commands to increment/decrement the score by + This custom chip is a Fujitsu MB8842 MCU programmed to act as a + protection device. It keeps track of the players scores, and checks if + a high score has been obtained or bonus lives should be awarded. The + main CPU has a range of commands to increment/decrement the score by various fixed amounts. - The device is used to its full potential only by Bosconian; Xevious + The device is used to its full potential only by Bosconian; Xevious uses it too, but only to do a protection check on startup. CMD = command from main CPU @@ -30,7 +30,7 @@ (ANS6) O6|10 19|R6 (n.c.) (ANS7) O7|11 18|R5 (n.c.) (CMD0) R7|12 17|R4 (n.c.) - (CMD1) R0|13 16|R3 (CMD3) + (CMD1) R0|13 16|R3 (CMD3) GND|14 15|R2 (CMD2) +------+ diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c index 40e2d90b770..c8e576f6d9a 100644 --- a/src/mame/machine/namco51.c +++ b/src/mame/machine/namco51.c @@ -1,56 +1,56 @@ /*************************************************************************** - Namco 51XX - - This custom chip is a Fujitsu MB8843 MCU programmed to act as an I/O - device with built-in coin management. It is also apparently used as a - protection device. It keeps track of the players scores, and checks - if a high score has been obtained or bonus lives should be awarded. - The main CPU has a range of commands to increment/decrement the score - by various fixed amounts. - - The device is used to its full potential only by Bosconian; Xevious - uses it too, but only to do a protection check on startup. - - CMD = command from main CPU - ANS = answer to main CPU - - The chip reads/writes the I/O ports when the /IRQ is pulled down. - Pin 21 determines whether a read or write should happen (1=R, 0=W). - - +------+ - EX|1 42|Vcc - X|2 41|K3 - /RESET|3 40|K2 - /IRQ|4 39|K1 - SO|5 38|K0 - SI|6 37|R15 - /SC /TO|7 36|R14 - /TC|8 35|R13 - P0|9 34|R12 - P1|10 33|R11 - P2|11 32|R10 - P3|12 31|R9 - O0|13 30|R8 - O1|14 29|R7 - O2|15 28|R6 - O3|16 27|R5 - O4|17 26|R4 - O5|18 25|R3 - O6|19 24|R2 - O7|20 23|R1 - GND|21 22|R0 - +------+ - - commands: - 00: nop - 01 + 4 arguments: set coinage (xevious, possibly because of a bug, is different) - 02: go in "credit" mode and enable start buttons - 03: disable joystick remapping - 04: enable joystick remapping - 05: go in "switch" mode - 06: nop - 07: nop + Namco 51XX + + This custom chip is a Fujitsu MB8843 MCU programmed to act as an I/O + device with built-in coin management. It is also apparently used as a + protection device. It keeps track of the players scores, and checks + if a high score has been obtained or bonus lives should be awarded. + The main CPU has a range of commands to increment/decrement the score + by various fixed amounts. + + The device is used to its full potential only by Bosconian; Xevious + uses it too, but only to do a protection check on startup. + + CMD = command from main CPU + ANS = answer to main CPU + + The chip reads/writes the I/O ports when the /IRQ is pulled down. + Pin 21 determines whether a read or write should happen (1=R, 0=W). + + +------+ + EX|1 42|Vcc + X|2 41|K3 + /RESET|3 40|K2 + /IRQ|4 39|K1 + SO|5 38|K0 + SI|6 37|R15 + /SC /TO|7 36|R14 + /TC|8 35|R13 + P0|9 34|R12 + P1|10 33|R11 + P2|11 32|R10 + P3|12 31|R9 + O0|13 30|R8 + O1|14 29|R7 + O2|15 28|R6 + O3|16 27|R5 + O4|17 26|R4 + O5|18 25|R3 + O6|19 24|R2 + O7|20 23|R1 + GND|21 22|R0 + +------+ + + commands: + 00: nop + 01 + 4 arguments: set coinage (xevious, possibly because of a bug, is different) + 02: go in "credit" mode and enable start buttons + 03: disable joystick remapping + 04: enable joystick remapping + 05: go in "switch" mode + 06: nop + 07: nop ***************************************************************************/ diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c index bb71a86ad33..f4dcd8b201d 100644 --- a/src/mame/machine/namco53.c +++ b/src/mame/machine/namco53.c @@ -2,9 +2,9 @@ Namco 53XX - This instance of the Fujitsu MB8843 MCU is programmed to act as an I/O + This instance of the Fujitsu MB8843 MCU is programmed to act as an I/O device. It is used by just two games: Dig Dug and Pole Position. - + MOD0-MOD2 = input mode CS0-CS3 = chip select lines used to select 1 of 4 input sources OUT0-OUT7 = 8-bit final output data @@ -39,7 +39,7 @@ MOD selects one of 8 modes in which the input data is interpreted. - Pole Position is hard-wired to use mode 0, which reads 4 steering + Pole Position is hard-wired to use mode 0, which reads 4 steering inputs and 4 DIP switches (only 1 of each is used). The steering inputs are clocked on P0 and direction on P1, 1 bit per analog input. The DIP switches are connected to P2 and P3. @@ -47,8 +47,8 @@ Dig Dug can control which mode to use via the MOD bit latches. It sets these values to mode 7 when running. - Unknowns: - SO is connected to IOSEL on Pole Position + Unknowns: + SO is connected to IOSEL on Pole Position ***************************************************************************/ diff --git a/src/version.c b/src/version.c index 6e9282ae6e5..f812631637a 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.131u3 ("__DATE__")"; +const char build_version[] = "0.131u4 ("__DATE__")"; -- cgit v1.2.3