From f34453af7f71c31a48d26db9d78aa04a5575ef9a Mon Sep 17 00:00:00 2001 From: MistyDreams <105502489+MistyDreams@users.noreply.github.com> Date: Tue, 17 Jan 2023 13:17:04 +0000 Subject: [PATCH] Updates (#1525) * convert cpp comments and add alexkidd1 fighter encrypted sets as working * make the core c89 compatable like it should be --- Makefile | 2 +- src/artwork.c | 10 +- src/artwork.h | 2 +- src/common.c | 62 +-- src/common.h | 2 +- src/cpu/v60/am.c | 22 +- src/cpu/v60/am1.c | 10 +- src/cpu/v60/am2.c | 12 +- src/cpu/v60/am3.c | 8 +- src/cpu/v60/op12.c | 156 +++--- src/cpu/v60/op2.c | 4 +- src/cpu/v60/op3.c | 76 +-- src/cpu/v60/op4.c | 4 +- src/cpu/v60/op5.c | 8 +- src/cpu/v60/op7a.c | 108 ++--- src/cpu/v60/optable.c | 2 +- src/cpu/v60/v60.c | 20 +- src/driver.c | 4 +- src/drivers/8080bw_drivers.c | 18 +- src/drivers/aerofgt.c | 2 +- src/drivers/armedf.c | 6 +- src/drivers/asterix.c | 2 +- src/drivers/atarifb.c | 12 +- src/drivers/atarig42.c | 16 +- src/drivers/batman.c | 12 +- src/drivers/bbusters.c | 2 +- src/drivers/canyon.c | 8 +- src/drivers/circus.c | 2 +- src/drivers/contra.c | 4 +- src/drivers/cps1.c | 32 +- src/drivers/cps2.c | 278 +++++------ src/drivers/crospang.c | 6 +- src/drivers/ddragon.c | 8 +- src/drivers/deco_mlc.c | 2 +- src/drivers/djboy.c | 2 +- src/drivers/dkong.c | 30 +- src/drivers/dynax.c | 2 +- src/drivers/fantland.c | 32 +- src/drivers/firetrk.c | 4 +- src/drivers/foodf.c | 32 +- src/drivers/galaga.c | 38 +- src/drivers/gaplus.c | 34 +- src/drivers/geebee.c | 24 +- src/drivers/goal92.c | 2 +- src/drivers/gottlieb.c | 10 +- src/drivers/leprechn.c | 4 +- src/drivers/mappy.c | 44 +- src/drivers/mario.c | 2 +- src/drivers/mcr2.c | 6 +- src/drivers/meadows.c | 8 +- src/drivers/midyunit.c | 2 +- src/drivers/model1.c | 54 +-- src/drivers/neogeo.c | 38 +- src/drivers/omegrace.c | 2 +- src/drivers/outrun.c | 116 ++--- src/drivers/paradise.c | 24 +- src/drivers/pitnrun.c | 4 +- src/drivers/playmark.c | 62 +-- src/drivers/polepos.c | 30 +- src/drivers/redclash.c | 4 +- src/drivers/sbrkout.c | 8 +- src/drivers/segac2.c | 144 +++--- src/drivers/segasyse.c | 6 +- src/drivers/sf1.c | 2 +- src/drivers/sharrier.c | 8 +- src/drivers/skydiver.c | 22 +- src/drivers/slapfght.c | 4 +- src/drivers/suna8.c | 556 ++++++++++----------- src/drivers/system16.c | 851 +++++++++++++++++---------------- src/drivers/system18.c | 150 +++--- src/drivers/taito_f3.c | 8 +- src/drivers/thief.c | 10 +- src/drivers/toaplan2.c | 42 +- src/drivers/toypop.c | 58 +-- src/drivers/trackfld.c | 80 ++-- src/drivers/triplhnt.c | 6 +- src/drivers/tumblep.c | 283 ++++++----- src/drivers/vicdual.c | 12 +- src/drivers/xmen.c | 8 +- src/includes/system16.h | 2 +- src/info.c | 2 +- src/inptport.c | 4 +- src/machine/bonzeadv.c | 2 +- src/machine/cps2crypt.c | 146 +++--- src/machine/irem_cpu.c | 254 +++++----- src/machine/model1_machine.c | 54 +-- src/machine/namcoio_machine.c | 208 ++++---- src/machine/neocrypt.c | 176 +++---- src/machine/system16_machine.c | 52 +- src/machine/tnzs_machine.c | 6 +- src/machine/xevious_machine.c | 4 +- src/mame.c | 2 +- src/mame2003/core_options.c | 2 +- src/mame2003/mame2003.c | 6 +- src/mame2003/video.c | 8 +- src/ost_samples.c | 252 +++++----- src/palette.c | 14 +- src/sndhrdw/8080bw_sndhrdw.c | 34 +- src/sndhrdw/ataridis_sndhrdw.c | 500 +++++++++---------- src/sndhrdw/cinemat_sndhrdw.c | 2 +- src/sndhrdw/dcs.c | 2 +- src/sndhrdw/irem.c | 8 +- src/sndhrdw/triplhnt.c | 142 +++--- src/sound/disc_dev.c | 96 ++-- src/sound/disc_flt.c | 34 +- src/sound/disc_mth.c | 50 +- src/sound/disc_wav.c | 76 +-- src/sound/discrete.h | 82 ++-- src/sound/fm.c | 4 +- src/sound/fmopl.c | 6 +- src/sound/namco.c | 6 +- src/sound/namco52.c | 2 +- src/sound/namco54.c | 32 +- src/sound/namcona.c | 18 +- src/sound/samples.c | 10 +- src/sound/ymf271.c | 8 +- src/sound/ymf278b.c | 2 +- src/usrintrf.c | 6 +- src/vidhrdw/8080bw_vidhrdw.c | 56 +-- src/vidhrdw/bankp_vidhrdw.c | 4 +- src/vidhrdw/bosco_vidhrdw.c | 2 +- src/vidhrdw/digdug_vidhrdw.c | 4 +- src/vidhrdw/dkong_vidhrdw.c | 28 +- src/vidhrdw/gaelco2_vidhrdw.c | 4 +- src/vidhrdw/galaga_vidhrdw.c | 6 +- src/vidhrdw/gaplus_vidhrdw.c | 2 +- src/vidhrdw/geebee_vidhrdw.c | 2 +- src/vidhrdw/ladybug_vidhrdw.c | 4 +- src/vidhrdw/m90_vidhrdw.c | 4 +- src/vidhrdw/mappy_vidhrdw.c | 8 +- src/vidhrdw/mario_vidhrdw.c | 22 +- src/vidhrdw/model1_vidhrdw.c | 84 ++-- src/vidhrdw/polepos_vidhrdw.c | 2 +- src/vidhrdw/res_net.h | 68 +-- src/vidhrdw/resnet.c | 20 +- src/vidhrdw/suna8_vidhrdw.c | 12 +- src/vidhrdw/suprnova_vidhrdw.c | 142 +++--- src/vidhrdw/sys16spr.c | 72 +-- src/vidhrdw/system16_vidhrdw.c | 118 ++--- src/vidhrdw/taito_f3_vidhrdw.c | 4 +- src/vidhrdw/toypop_vidhrdw.c | 16 +- src/vidhrdw/triplhnt_vidhrdw.c | 4 +- src/vidhrdw/tryout_vidhrdw.c | 12 +- src/vidhrdw/tumblep_vidhrdw.c | 16 +- src/vidhrdw/xmen_vidhrdw.c | 6 +- 145 files changed, 3417 insertions(+), 3409 deletions(-) diff --git a/Makefile b/Makefile index 21129613f..73be7d704 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ endif ifeq ($(platform), unix) TARGET = $(TARGET_NAME)_libretro.so fpic = -fPIC - CFLAGS += $(fpic) + CFLAGS += $(fpic) -std=c89 LDFLAGS += $(fpic) -shared -Wl,--version-script=link.T # Linux Portable diff --git a/src/artwork.c b/src/artwork.c index 82dfcd414..9c4c3d873 100644 --- a/src/artwork.c +++ b/src/artwork.c @@ -2295,10 +2295,10 @@ static int artwork_load(const struct GameDriver *driver, int width, int height, /* A negative values will use the default opacity for the overlay. */ opacity = options.overlay_opacity; if (opacity != 0 && list) { - if (opacity < 0) { // Default overlay opacity + if (opacity < 0) { /* Default overlay opacity */ if (!generate_overlay(list, width, height)) return 0; - } else { // Opacity is > 0 + } else { /* Opacity is > 0 */ struct overlay_piece *newlist; /* Count elements in list */ int count = 0; @@ -2312,8 +2312,8 @@ static int artwork_load(const struct GameDriver *driver, int width, int height, /* Modify opacity as set to user defined value */ tmp = newlist; while (tmp->type != OVERLAY_TYPE_END) { - tmp->color = tmp->color & ~(0xff << 24); // Clear - tmp->color = tmp->color | (((opacity) & 0xff) << 24); // Set + tmp->color = tmp->color & ~(0xff << 24); /* Clear */ + tmp->color = tmp->color | (((opacity) & 0xff) << 24); /* Set */ tmp++; } if (!generate_overlay(newlist, width, height)) @@ -3367,7 +3367,7 @@ static int generate_overlay(const struct overlay_piece *list, int width, int hei piece->layer = LAYER_OVERLAY; piece->priority = priority++; piece->blendflags = list->type & OVERLAY_FLAG_MASK; - piece->tag = list->tag; // Handle someone using a different tag, for example, cocktail mode + piece->tag = list->tag; /* Handle someone using a different tag, for example, cocktail mode */ /* switch off the type */ switch (list->type & ~OVERLAY_FLAG_MASK) diff --git a/src/artwork.h b/src/artwork.h index efd95de74..18b388304 100644 --- a/src/artwork.h +++ b/src/artwork.h @@ -148,7 +148,7 @@ struct artwork_callbacks struct overlay_piece { - char *tag; // Usually set to OVERLAY_TAG + char *tag; /* Usually set to OVERLAY_TAG */ UINT8 type; rgb_t color; float left, top, right, bottom; diff --git a/src/common.c b/src/common.c index 1fdb5d6ad..8ab523919 100644 --- a/src/common.c +++ b/src/common.c @@ -13,7 +13,7 @@ #include #include "libretro-deps/libFLAC/include/FLAC/all.h" #include "log.h" -//#define LOG_LOAD +/*#define LOG_LOAD */ char *chd_error_text[] = @@ -45,9 +45,9 @@ char *chd_error_text[] = Constants ***************************************************************************/ -// VERY IMPORTANT: osd_alloc_bitmap must allocate also a "safety area" 16 pixels wide all -// around the bitmap. This is required because, for performance reasons, some graphic -// routines don't clip at boundaries of the bitmap. +/* VERY IMPORTANT: osd_alloc_bitmap must allocate also a "safety area" 16 pixels wide all */ +/* around the bitmap. This is required because, for performance reasons, some graphic */ +/* routines don't clip at boundaries of the bitmap. */ #define BITMAP_SAFETY 16 #define MAX_MALLOCS 4096 @@ -237,13 +237,13 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co return NULL; if (memcmp(&buf[0], "RIFF", 4) == 0) - f_type = 1; // WAV + f_type = 1; /* WAV */ else if (memcmp(&buf[0], "fLaC", 4) == 0) - f_type = 2; // FLAC + f_type = 2; /* FLAC */ else - return NULL; // No idea what file this is. + return NULL; /* No idea what file this is. */ - // Load WAV file. + /* Load WAV file. */ if(f_type == 1) { /* get the total size */ offset += mame_fread(f, &filesize, 4); @@ -316,7 +316,7 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co return NULL; } - // For small samples, lets force them to pre load into memory. + /* For small samples, lets force them to pre load into memory. */ if(length <= GAME_SAMPLE_LARGE) b_data = 1; @@ -339,18 +339,18 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co result->resolution = bits; if(b_data == 1) { - // read the data in + /* read the data in */ if (bits == 8) { mame_fread(f, result->data, length); - // convert 8-bit data to signed samples + /* convert 8-bit data to signed samples */ for (temp32 = 0; temp32 < length; temp32++) result->data[temp32] ^= 0x80; } else { - // 16-bit data is fine as-is + /* 16-bit data is fine as-is */ mame_fread_lsbfirst(f, result->data, length); } @@ -361,7 +361,7 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co return result; } - else if(f_type == 2) { // Load FLAC file. + else if(f_type == 2) { /* Load FLAC file. */ int f_length; flac_reader flac_file; FLAC__StreamDecoder *decoder; @@ -370,7 +370,7 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co f_length = mame_ftell(f); mame_fseek(f, 0, 0); - // For small samples, lets force them to pre load into memory. + /* For small samples, lets force them to pre load into memory. */ if (f_length <= GAME_SAMPLE_LARGE) b_data = 1; @@ -378,10 +378,10 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co flac_file.position = 0; flac_file.decoded_size = 0; - // Allocate space for the data. + /* Allocate space for the data. */ flac_file.rawdata = malloc(f_length); - // Read the sample data in. + /* Read the sample data in. */ mame_fread(f, flac_file.rawdata, f_length); decoder = FLAC__stream_decoder_new(); @@ -391,12 +391,12 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co } if(FLAC__stream_decoder_init_stream(decoder, my_read_callback, - NULL, //my_seek_callback, // or NULL - NULL, //my_tell_callback, // or NULL - NULL, //my_length_callback, // or NULL - NULL, //my_eof_callback, // or NULL + NULL, /*my_seek_callback, // or NULL */ + NULL, /*my_tell_callback, // or NULL */ + NULL, /*my_length_callback, // or NULL */ + NULL, /*my_eof_callback, // or NULL */ my_write_callback, - my_metadata_callback, //my_metadata_callback, // or NULL + my_metadata_callback, /*my_metadata_callback, // or NULL */ my_error_callback, (void*)&flac_file) != FLAC__STREAM_DECODER_INIT_STATUS_OK) return NULL; @@ -407,14 +407,14 @@ static struct GameSample *read_wav_sample(mame_file *f, const char *gamename, co return NULL; } - // only Mono supported + /* only Mono supported */ if (flac_file.channels != 1) { free(flac_file.rawdata); FLAC__stream_decoder_delete(decoder); return NULL; } - // only support 16 bit. + /* only support 16 bit. */ if (flac_file.bits_per_sample != 16) { free(flac_file.rawdata); FLAC__stream_decoder_delete(decoder); @@ -472,7 +472,7 @@ void readsample(struct GameSample *SampleInfo, int channel, struct GameSamples * mame_file *f; struct GameSample *SampleFile; - // Try opening the file. + /* Try opening the file. */ f = mame_fopen(SampleInfo->gamename,SampleInfo->filename,SampleInfo->filetype,0); if (f != 0) { @@ -483,10 +483,10 @@ void readsample(struct GameSample *SampleInfo, int channel, struct GameSamples * strcpy(gamename, SampleInfo->gamename); strcpy(filename, SampleInfo->filename); - // Free up some memory. + /* Free up some memory. */ free(SamplesData->sample[channel]); - // Reload or load a sample into memory. + /* Reload or load a sample into memory. */ SamplesData->sample[channel] = read_wav_sample(f, gamename, filename, filetype, load); mame_fclose(f); @@ -535,7 +535,7 @@ struct GameSamples *readsamples(const char **samplenames,const char *basename) if (samplenames[i+skipfirst][0]) { - // Try opening FLAC samples first. + /* Try opening FLAC samples first. */ if ((f = mame_fopen(basename,samplenames[i+skipfirst],FILETYPE_SAMPLE_FLAC,0)) == 0) { if (skipfirst) { @@ -543,7 +543,7 @@ struct GameSamples *readsamples(const char **samplenames,const char *basename) f_skip = 1; } - // Fall back to WAV if it exists. + /* Fall back to WAV if it exists. */ if (!f) { f_type = 1; @@ -557,17 +557,17 @@ struct GameSamples *readsamples(const char **samplenames,const char *basename) } } - // Get sample info. Small sample files will pre load into memory at this point. + /* Get sample info. Small sample files will pre load into memory at this point. */ if (f != 0) { - // Open FLAC. + /* Open FLAC. */ if(f_type == 0) { if (f_skip == 1) samples->sample[i] = read_wav_sample(f, samplenames[0]+1, samplenames[i+skipfirst], FILETYPE_SAMPLE_FLAC, 0); else samples->sample[i] = read_wav_sample(f, basename, samplenames[i+skipfirst], FILETYPE_SAMPLE_FLAC, 0); } - else { // Open WAV. + else { /* Open WAV. */ if (f_skip == 1) samples->sample[i] = read_wav_sample(f, samplenames[0]+1, samplenames[i+skipfirst], FILETYPE_SAMPLE, 0); else diff --git a/src/common.h b/src/common.h index 99987a9a4..aca5dbfa8 100644 --- a/src/common.h +++ b/src/common.h @@ -103,7 +103,7 @@ struct GameSamples struct GameSample *sample[1]; /* extendable */ }; -#define GAME_SAMPLE_LARGE 10000000 // 10MB +#define GAME_SAMPLE_LARGE 10000000 /* 10MB */ /*************************************************************************** diff --git a/src/cpu/v60/am.c b/src/cpu/v60/am.c index 0ce474a94..d5b8d32a4 100644 --- a/src/cpu/v60/am.c +++ b/src/cpu/v60/am.c @@ -1,21 +1,21 @@ -// NOTE for bit string/field addressing -// ************************************ -// modDim must be passed as 10 for bit string instructions, -// and as 11 for bit field instructions +/* NOTE for bit string/field addressing */ +/* ************************************ */ +/* modDim must be passed as 10 for bit string instructions, */ +/* and as 11 for bit field instructions */ -// Output variables for ReadAMAddress() +/* Output variables for ReadAMAddress() */ static UINT8 amFlag; static UINT32 amOut; static UINT32 bamOffset; -// Appo temp var +/* Appo temp var */ static UINT32 amLength1,amLength2; -// Global vars used by AM functions +/* Global vars used by AM functions */ static UINT32 modAdd; static UINT8 modM; static UINT8 modVal; @@ -25,10 +25,10 @@ static UINT16 modWriteValH; static UINT32 modWriteValW; static UINT8 modDim; -// Addressing mode functions and tables -#include "am1.c" // ReadAM -#include "am2.c" // ReadAMAddress -#include "am3.c" // WriteAM +/* Addressing mode functions and tables */ +#include "am1.c" /* ReadAM */ +#include "am2.c" /* ReadAMAddress */ +#include "am3.c" /* WriteAM */ /* Input: diff --git a/src/cpu/v60/am1.c b/src/cpu/v60/am1.c index a47a83076..77df15009 100644 --- a/src/cpu/v60/am1.c +++ b/src/cpu/v60/am1.c @@ -1,6 +1,6 @@ -// AM1 Functions (for ReadAM) -// ************************** +/* AM1 Functions (for ReadAM) */ +/* ************************** */ static UINT32 am1Register(void) { @@ -1071,7 +1071,7 @@ static UINT32 am1Immediate(void) break; } - // It should not be here! Written to avoid warning + /* It should not be here! Written to avoid warning */ assert(0); return 1; } @@ -1085,8 +1085,8 @@ static UINT32 am1ImmediateQuick(void) -// AM1 Tables (for ReadAM) -// *********************** +/* AM1 Tables (for ReadAM) */ +/* *********************** */ static UINT32 am1Error1(void) { diff --git a/src/cpu/v60/am2.c b/src/cpu/v60/am2.c index bab17f502..bc278a180 100644 --- a/src/cpu/v60/am2.c +++ b/src/cpu/v60/am2.c @@ -1,6 +1,6 @@ -// AM2 Functions (for ReadAMAddress) -// ********************************* +/* AM2 Functions (for ReadAMAddress) */ +/* ********************************* */ static UINT32 am2Register(void) { @@ -940,19 +940,19 @@ static UINT32 bam2DirectAddressDeferredIndexed(void) static UINT32 am2Immediate(void) { - // Fuck off LDPR + /* Fuck off LDPR */ return am1Immediate(); } static UINT32 am2ImmediateQuick(void) { - // fuck off LDPR + /* fuck off LDPR */ return am1ImmediateQuick(); } -// AM2 Tables (for ReadAMAddress) -// ****************************** +/* AM2 Tables (for ReadAMAddress) */ +/* ****************************** */ static UINT32 am2Error1(void) { diff --git a/src/cpu/v60/am3.c b/src/cpu/v60/am3.c index 6b68bfdb3..819c4986e 100644 --- a/src/cpu/v60/am3.c +++ b/src/cpu/v60/am3.c @@ -1,6 +1,6 @@ -// AM3 Functions (for ReadAM) -// ************************** +/* AM3 Functions (for ReadAM) */ +/* ************************** */ static UINT32 am3Register(void) { @@ -730,8 +730,8 @@ static UINT32 am3ImmediateQuick(void) -// AM3 Tables (for ReadAMAddress) -// ****************************** +/* AM3 Tables (for ReadAMAddress) */ +/* ****************************** */ static UINT32 am3Error1(void) { diff --git a/src/cpu/v60/op12.c b/src/cpu/v60/op12.c index 3c0de60bc..b9ca48b88 100644 --- a/src/cpu/v60/op12.c +++ b/src/cpu/v60/op12.c @@ -78,13 +78,13 @@ static UINT8 f12Flag1, f12Flag2; static UINT8 if12; -// Decode the first operand of the instruction and prepare -// writing to the second operand. +/* Decode the first operand of the instruction and prepare */ +/* writing to the second operand. */ static void F12DecodeFirstOperand(UINT32 (*DecodeOp1)(void), UINT8 dim1) { if12 = OpRead8(PC + 1); - // Check if F1 or F2 + /* Check if F1 or F2 */ if (if12 & 0x80) { modDim = dim1; @@ -96,7 +96,7 @@ static void F12DecodeFirstOperand(UINT32 (*DecodeOp1)(void), UINT8 dim1) } else { - // Check D flag + /* Check D flag */ if (if12 & 0x20) { modDim = dim1; @@ -140,7 +140,7 @@ static void F12WriteSecondOperand(UINT8 dim2) { modDim = dim2; - // Check if F1 or F2 + /* Check if F1 or F2 */ if (if12 & 0x80) { modM = if12 & 0x20; @@ -150,7 +150,7 @@ static void F12WriteSecondOperand(UINT8 dim2) } else { - // Check D flag + /* Check D flag */ if (if12 & 0x20) { switch (dim2) @@ -180,12 +180,12 @@ static void F12WriteSecondOperand(UINT8 dim2) -// Decode both format 1/2 operands +/* Decode both format 1/2 operands */ static void F12DecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*DecodeOp2)(void), UINT8 dim2) { UINT8 _if12 = OpRead8(PC + 1); - // Check if F1 or F2 + /* Check if F1 or F2 */ if (_if12 & 0x80) { modDim = dim1; @@ -204,7 +204,7 @@ static void F12DecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*De } else { - // Check D flag + /* Check D flag */ if (_if12 & 0x20) { if (DecodeOp2==ReadAMAddress) @@ -423,7 +423,7 @@ static UINT32 opCHKAR(void) { F12DecodeOperands(ReadAM,0,ReadAM,0); - // No MMU and memory permissions yet @@@ + /* No MMU and memory permissions yet @@@ */ _Z = 1; _CY = 0; _S = 0; @@ -435,7 +435,7 @@ static UINT32 opCHKAW(void) { F12DecodeOperands(ReadAM,0,ReadAM,0); - // No MMU and memory permissions yet @@@ + /* No MMU and memory permissions yet @@@ */ _Z = 1; _CY = 0; _S = 0; @@ -447,7 +447,7 @@ static UINT32 opCHKAE(void) { F12DecodeOperands(ReadAM,0,ReadAM,0); - // No MMU and memory permissions yet @@@ + /* No MMU and memory permissions yet @@@ */ _Z = 1; _CY = 0; _S = 0; @@ -805,14 +805,14 @@ static UINT32 opLDTASK(void) v60ReloadStack(); - // 31 registers supported, _not_ 32 + /* 31 registers supported, _not_ 32 */ for(i=0; i<31; i++) if(f12Op1 & (1<= bitsize + /* @@@ Undefined what happens to CY when count >= bitsize */ SHIFTLEFT_CY(appb, count, 8); - // do the actual shift... + /* do the actual shift... */ if (count >= 8) appb = 0; else appb <<= count; - // and set zero and sign + /* and set zero and sign */ SetSZPF_Byte(appb); } else @@ -1802,7 +1802,7 @@ static UINT32 opSHAB(void) SetSZPF_Byte(appb); } -// mame_printf_debug("SHAB: %x _CY: %d _Z: %d _OV: %d _S: %d\n", appb, _CY, _Z, _OV, _S); +/* mame_printf_debug("SHAB: %x _CY: %d _Z: %d _OV: %d _S: %d\n", appb, _CY, _Z, _OV, _S); */ F12STOREOP2BYTE(); F12END(); @@ -1819,7 +1819,7 @@ static UINT32 opSHAH(void) count=(INT8)(f12Op1&0xFF); - // Special case: destination unchanged, flags set + /* Special case: destination unchanged, flags set */ if (count == 0) { _CY = _OV = 0; @@ -1829,16 +1829,16 @@ static UINT32 opSHAH(void) { SHIFTLEFT_OV(apph, count, 16); - // @@@ Undefined what happens to CY when count >= bitsize + /* @@@ Undefined what happens to CY when count >= bitsize */ SHIFTLEFT_CY(apph, count, 16); - // do the actual shift... + /* do the actual shift... */ if (count >= 16) apph = 0; else apph <<= count; - // and set zero and sign + /* and set zero and sign */ SetSZPF_Word(apph); } else @@ -1856,7 +1856,7 @@ static UINT32 opSHAH(void) SetSZPF_Word(apph); } -// mame_printf_debug("SHAH: %x >> %d = %x _CY: %d _Z: %d _OV: %d _S: %d\n", oldval, count, apph, _CY, _Z, _OV, _S); +/* mame_printf_debug("SHAH: %x >> %d = %x _CY: %d _Z: %d _OV: %d _S: %d\n", oldval, count, apph, _CY, _Z, _OV, _S); */ F12STOREOP2HALF(); F12END(); @@ -1873,7 +1873,7 @@ static UINT32 opSHAW(void) count=(INT8)(f12Op1&0xFF); - // Special case: destination unchanged, flags set + /* Special case: destination unchanged, flags set */ if (count == 0) { _CY = _OV = 0; @@ -1883,16 +1883,16 @@ static UINT32 opSHAW(void) { SHIFTLEFT_OV(appw, count, 32); - // @@@ Undefined what happens to CY when count >= bitsize + /* @@@ Undefined what happens to CY when count >= bitsize */ SHIFTLEFT_CY(appw, count, 32); - // do the actual shift... + /* do the actual shift... */ if (count >= 32) appw = 0; else appw <<= count; - // and set zero and sign + /* and set zero and sign */ SetSZPF_Long(appw); } else @@ -1910,7 +1910,7 @@ static UINT32 opSHAW(void) SetSZPF_Long(appw); } -// mame_printf_debug("SHAW: %x >> %d = %x _CY: %d _Z: %d _OV: %d _S: %d\n", oldval, count, appw, _CY, _Z, _OV, _S); +/* mame_printf_debug("SHAW: %x >> %d = %x _CY: %d _Z: %d _OV: %d _S: %d\n", oldval, count, appw, _CY, _Z, _OV, _S); */ F12STOREOP2WORD(); F12END(); @@ -1930,36 +1930,36 @@ static UINT32 opSHLB(void) /* TRUSTED */ count=(INT8)(f12Op1&0xFF); if (count>0) { - // left shift flags: - // carry gets the last bit shifted out, - // overflow is always CLEARed + /* left shift flags: */ + /* carry gets the last bit shifted out, */ + /* overflow is always CLEARed */ - _OV = 0; // default to no overflow + _OV = 0; /* default to no overflow */ - // now handle carry + /* now handle carry */ tmp = appb & 0xff; tmp <<= count; - SetCFB(tmp); // set carry properly + SetCFB(tmp); /* set carry properly */ - // do the actual shift... + /* do the actual shift... */ appb <<= count; - // and set zero and sign + /* and set zero and sign */ SetSZPF_Byte(appb); } else { if (count == 0) { - // special case: clear carry and overflow, do nothing else + /* special case: clear carry and overflow, do nothing else */ _CY = _OV = 0; - SetSZPF_Byte(appb); // doc. is unclear if this is true... + SetSZPF_Byte(appb); /* doc. is unclear if this is true... */ } else { - // right shift flags: - // carry = last bit shifted out - // overflow always cleared + /* right shift flags: */ + /* carry = last bit shifted out */ + /* overflow always cleared */ tmp = appb & 0xff; tmp >>= ((-count)-1); _CY = (UINT8)(tmp & 0x1); @@ -1970,7 +1970,7 @@ static UINT32 opSHLB(void) /* TRUSTED */ } } -// mame_printf_debug("SHLB: %x _CY: %d _Z: %d _OV: %d _S: %d\n", appb, _CY, _Z, _OV, _S); +/* mame_printf_debug("SHLB: %x _CY: %d _Z: %d _OV: %d _S: %d\n", appb, _CY, _Z, _OV, _S); */ F12STOREOP2BYTE(); F12END(); @@ -1987,39 +1987,39 @@ static UINT32 opSHLH(void) /* TRUSTED */ F12LOADOP2HALF(); count=(INT8)(f12Op1&0xFF); -// mame_printf_debug("apph: %x count: %d ", apph, count); +/* mame_printf_debug("apph: %x count: %d ", apph, count); */ if (count>0) { - // left shift flags: - // carry gets the last bit shifted out, - // overflow is always CLEARed + /* left shift flags: */ + /* carry gets the last bit shifted out, */ + /* overflow is always CLEARed */ _OV = 0; - // now handle carry + /* now handle carry */ tmp = apph & 0xffff; tmp <<= count; - SetCFW(tmp); // set carry properly + SetCFW(tmp); /* set carry properly */ - // do the actual shift... + /* do the actual shift... */ apph <<= count; - // and set zero and sign + /* and set zero and sign */ SetSZPF_Word(apph); } else { if (count == 0) { - // special case: clear carry and overflow, do nothing else + /* special case: clear carry and overflow, do nothing else */ _CY = _OV = 0; - SetSZPF_Word(apph); // doc. is unclear if this is true... + SetSZPF_Word(apph); /* doc. is unclear if this is true... */ } else { - // right shift flags: - // carry = last bit shifted out - // overflow always cleared + /* right shift flags: */ + /* carry = last bit shifted out */ + /* overflow always cleared */ tmp = apph & 0xffff; tmp >>= ((-count)-1); _CY = (UINT8)(tmp & 0x1); @@ -2030,7 +2030,7 @@ static UINT32 opSHLH(void) /* TRUSTED */ } } -// mame_printf_debug("SHLH: %x _CY: %d _Z: %d _OV: %d _S: %d\n", apph, _CY, _Z, _OV, _S); +/* mame_printf_debug("SHLH: %x _CY: %d _Z: %d _OV: %d _S: %d\n", apph, _CY, _Z, _OV, _S); */ F12STOREOP2HALF(); F12END(); @@ -2049,36 +2049,36 @@ static UINT32 opSHLW(void) /* TRUSTED */ count=(INT8)(f12Op1&0xFF); if (count>0) { - // left shift flags: - // carry gets the last bit shifted out, - // overflow is always CLEARed + /* left shift flags: */ + /* carry gets the last bit shifted out, */ + /* overflow is always CLEARed */ _OV = 0; - // now handle carry + /* now handle carry */ tmp = appw & 0xffffffff; tmp <<= count; - SetCFL(tmp); // set carry properly + SetCFL(tmp); /* set carry properly */ - // do the actual shift... + /* do the actual shift... */ appw <<= count; - // and set zero and sign + /* and set zero and sign */ SetSZPF_Long(appw); } else { if (count == 0) { - // special case: clear carry and overflow, do nothing else + /* special case: clear carry and overflow, do nothing else */ _CY = _OV = 0; - SetSZPF_Long(appw); // doc. is unclear if this is true... + SetSZPF_Long(appw); /* doc. is unclear if this is true... */ } else { - // right shift flags: - // carry = last bit shifted out - // overflow always cleared + /* right shift flags: */ + /* carry = last bit shifted out */ + /* overflow always cleared */ tmp = (UINT64)(appw & 0xffffffff); tmp >>= ((-count)-1); _CY = (UINT8)(tmp & 0x1); @@ -2089,7 +2089,7 @@ static UINT32 opSHLW(void) /* TRUSTED */ } } -// mame_printf_debug("SHLW: %x _CY: %d _Z: %d _OV: %d _S: %d\n", appw, _CY, _Z, _OV, _S); +/* mame_printf_debug("SHLW: %x _CY: %d _Z: %d _OV: %d _S: %d\n", appw, _CY, _Z, _OV, _S); */ F12STOREOP2WORD(); F12END(); diff --git a/src/cpu/v60/op2.c b/src/cpu/v60/op2.c index ba0d51e0b..02b2b36fb 100644 --- a/src/cpu/v60/op2.c +++ b/src/cpu/v60/op2.c @@ -55,7 +55,7 @@ static UINT32 opCVTWS(void) F2DecodeFirstOperand(ReadAM,2); - // Convert to float + /* Convert to float */ val = (float)(INT32)f2Op1; modWriteValW = f2u(val); @@ -74,7 +74,7 @@ static UINT32 opCVTSW(void) F2DecodeFirstOperand(ReadAM,2); - // Convert to UINT32 + /* Convert to UINT32 */ val = u2f(f2Op1); modWriteValW = (INT32)val; diff --git a/src/cpu/v60/op3.c b/src/cpu/v60/op3.c index 79c12fa0d..a8bd20a5d 100644 --- a/src/cpu/v60/op3.c +++ b/src/cpu/v60/op3.c @@ -141,13 +141,13 @@ static UINT32 opJMP(void) /* TRUSTED */ modAdd=PC+1; modDim=0; - // Read the address of the operand + /* Read the address of the operand */ ReadAMAddress(); - // It cannot be a register!! + /* It cannot be a register!! */ assert(amFlag==0); - // Jump there + /* Jump there */ PC=amOut; ChangePC(PC); @@ -159,17 +159,17 @@ static UINT32 opJSR(void) /* TRUSTED */ modAdd=PC + 1; modDim=0; - // Read the address of the operand + /* Read the address of the operand */ amLength1=ReadAMAddress(); - // It cannot be a register!! + /* It cannot be a register!! */ assert(amFlag==0); - // Save NextPC into the stack + /* Save NextPC into the stack */ SP -= 4; MemWrite32(SP, PC + amLength1 + 1); - // Jump there + /* Jump there */ PC=amOut; ChangePC(PC); @@ -181,17 +181,17 @@ static UINT32 opPREPARE(void) /* somewhat TRUSTED */ modAdd=PC+1; modDim=2; - // Read the operand + /* Read the operand */ amLength1=ReadAM(); - // step 1: save frame pointer on the stack + /* step 1: save frame pointer on the stack */ SP -= 4; MemWrite32(SP, FP); - // step 2: FP = new SP + /* step 2: FP = new SP */ FP = SP; - // step 3: SP -= operand + /* step 3: SP -= operand */ SP -= amOut; return amLength1 + 1; @@ -202,19 +202,19 @@ static UINT32 opRET(void) /* TRUSTED */ modAdd=PC + 1; modDim=2; - // Read the operand + /* Read the operand */ ReadAM(); - // Read return address from stack + /* Read return address from stack */ PC=MemRead32(SP); SP+=4; ChangePC(PC); - // Restore AP from stack + /* Restore AP from stack */ AP=MemRead32(SP); SP+=4; - // Skip stack frame + /* Skip stack frame */ SP += amOut; return 0; @@ -227,10 +227,10 @@ static UINT32 opTRAP(void) modAdd=PC + 1; modDim=0; - // Read the operand + /* Read the operand */ amLength1=ReadAM(); - // Normalize the flags + /* Normalize the flags */ NORMALIZEFLAGS(); switch ((amOut >> 4) & 0xF) @@ -285,7 +285,7 @@ static UINT32 opTRAP(void) oldPSW = v60_update_psw_for_exception(0, 0); - // Issue the software trap with interrupts + /* Issue the software trap with interrupts */ SP -= 4; MemWrite32(SP, EXCEPTION_CODE_AND_SIZE(0x3000 + 0x100 * (amOut&0xF), 4)); @@ -307,10 +307,10 @@ static UINT32 opRETIU(void) /* TRUSTED */ modAdd=PC + 1; modDim=1; - // Read the operand + /* Read the operand */ ReadAM(); - // Restore PC and PSW from stack + /* Restore PC and PSW from stack */ PC = MemRead32(SP); SP += 4; ChangePC(PC); @@ -318,7 +318,7 @@ static UINT32 opRETIU(void) /* TRUSTED */ newPSW = MemRead32(SP); SP += 4; - // Destroy stack frame + /* Destroy stack frame */ SP += amOut; v60WritePSW(newPSW); @@ -333,10 +333,10 @@ static UINT32 opRETIS(void) modAdd=PC + 1; modDim=1; - // Read the operand + /* Read the operand */ ReadAM(); - // Restore PC and PSW from stack + /* Restore PC and PSW from stack */ PC = MemRead32(SP); SP += 4; ChangePC(PC); @@ -344,7 +344,7 @@ static UINT32 opRETIS(void) newPSW = MemRead32(SP); SP += 4; - // Destroy stack frame + /* Destroy stack frame */ SP += amOut; v60WritePSW(newPSW); @@ -386,14 +386,14 @@ static UINT32 opSTTASK(void) adr += 4; } - // 31 registers supported, _not_ 32 + /* 31 registers supported, _not_ 32 */ for(i=0; i<31; i++) if(amOut & (1<> 4)) { - // @@@ FPU exception + /* @@@ FPU exception */ log_cb(RETRO_LOG_DEBUG, "Hit TRAPFL! PC=%x", PC); } diff --git a/src/cpu/v60/op7a.c b/src/cpu/v60/op7a.c index 664243ae1..96f9102d3 100644 --- a/src/cpu/v60/op7a.c +++ b/src/cpu/v60/op7a.c @@ -49,7 +49,7 @@ static UINT32 f7bBamOffset1, f7bBamOffset2; static void F7aDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*DecodeOp2)(void), UINT8 dim2) { UINT8 appb; - // Decode first operand + /* Decode first operand */ modDim=dim1; modM=subOp&0x40; modAdd=PC+2; @@ -57,14 +57,14 @@ static void F7aDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*De f7aFlag1=amFlag; f7aOp1=amOut; - // Decode length + /* Decode length */ appb=OpRead8(PC+2+amLength1); if (appb&0x80) f7aLenOp1=v60.reg[appb&0x1F]; else f7aLenOp1=appb; - // Decode second operand + /* Decode second operand */ modDim=dim2; modM=subOp&0x20; modAdd=PC+3+amLength1; @@ -72,7 +72,7 @@ static void F7aDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*De f7aFlag2=amFlag; f7aOp2=amOut; - // Decode length + /* Decode length */ appb=OpRead8(PC+3+amLength1+amLength2); if (appb&0x80) f7aLenOp2=v60.reg[appb&0x1F]; @@ -83,7 +83,7 @@ static void F7aDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*De static void F7bDecodeFirstOperand(UINT32 (*DecodeOp1)(void), UINT8 dim1) { UINT8 appb; - // Decode first operand + /* Decode first operand */ modDim=dim1; modM=subOp&0x40; modAdd=PC+2; @@ -91,7 +91,7 @@ static void F7bDecodeFirstOperand(UINT32 (*DecodeOp1)(void), UINT8 dim1) f7bFlag1=amFlag; f7bOp1=amOut; - // Decode ext + /* Decode ext */ appb=OpRead8(PC+2+amLength1); if (appb&0x80) f7bLen=v60.reg[appb&0x1F]; @@ -111,11 +111,11 @@ static void F7bWriteSecondOperand(UINT8 dim2) static void F7bDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*DecodeOp2)(void), UINT8 dim2) { - // Decode first operand + /* Decode first operand */ F7bDecodeFirstOperand(DecodeOp1,dim1); f7bBamOffset1 = bamOffset; - // Decode second operand + /* Decode second operand */ modDim=dim2; modM=subOp&0x20; modAdd=PC+3+amLength1; @@ -128,7 +128,7 @@ static void F7bDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*De static void F7cDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*DecodeOp2)(void), UINT8 dim2) { UINT8 appb; - // Decode first operand + /* Decode first operand */ modDim=dim1; modM=subOp&0x40; modAdd=PC+2; @@ -136,7 +136,7 @@ static void F7cDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*De f7cFlag1=amFlag; f7cOp1=amOut; - // Decode second operand + /* Decode second operand */ modDim=dim2; modM=subOp&0x20; modAdd=PC+2+amLength1; @@ -144,7 +144,7 @@ static void F7cDecodeOperands(UINT32 (*DecodeOp1)(void), UINT8 dim1, UINT32 (*De f7cFlag2=amFlag; f7cOp2=amOut; - // Decode ext + /* Decode ext */ appb=OpRead8(PC+2+amLength1+amLength2); if (appb&0x80) f7cLen=v60.reg[appb&0x1F]; @@ -184,7 +184,7 @@ static UINT32 opCMPSTRB(UINT8 bFill, UINT8 bStop) F7aDecodeOperands(ReadAMAddress,0,ReadAMAddress,0); - // Filling + /* Filling */ if (bFill) { if (f7aLenOp1 < f7aLenOp2) @@ -250,7 +250,7 @@ static UINT32 opCMPSTRH(UINT8 bFill, UINT8 bStop) F7aDecodeOperands(ReadAMAddress,0,ReadAMAddress,0); - // Filling + /* Filling */ if (bFill) { if (f7aLenOp1 < f7aLenOp2) @@ -316,10 +316,10 @@ static UINT32 opMOVSTRUB(UINT8 bFill, UINT8 bStop) /* TRUSTED (0,0) (1,0) */ UINT32 i,dest; UINT8 c1; -// if (bStop) -// { -// int a=1; -// } +/* if (bStop) */ +/* { */ +/* int a=1; */ +/* } */ F7aDecodeOperands(ReadAMAddress,0,ReadAMAddress,0); @@ -386,8 +386,8 @@ static UINT32 opMOVSTRUH(UINT8 bFill, UINT8 bStop) /* TRUSTED (0,0) (1,0) */ UINT32 i,dest; UINT16 c1; -// if (bStop) -// { int a=1; } +/* if (bStop) */ +/* { int a=1; } */ F7aDecodeOperands(ReadAMAddress,1,ReadAMAddress,1); @@ -420,13 +420,13 @@ static UINT32 opMOVSTRDH(UINT8 bFill, UINT8 bStop) UINT32 i,dest; UINT16 c1; -// if (bFill | bStop) -// { int a=1; } +/* if (bFill | bStop) */ +/* { int a=1; } */ F7aDecodeOperands(ReadAMAddress,1,ReadAMAddress,1); -// if (f7aLenOp1 != f7aLenOp2) -// { int a=1; } +/* if (f7aLenOp1 != f7aLenOp2) */ +/* { int a=1; } */ dest=(f7aLenOp1 < f7aLenOp2 ? f7aLenOp1 : f7aLenOp2); @@ -469,7 +469,7 @@ static UINT32 opSEARCHUB(UINT8 bSearch) R28=f7bOp1+i; R27=i; - // This is the opposite as stated in V60 manual... + /* This is the opposite as stated in V60 manual... */ if (i!=f7bLen) _Z=0; else @@ -520,7 +520,7 @@ static UINT32 opSEARCHDB(UINT8 bSearch) R28=f7bOp1+i; R27=i; - // This is the opposite as stated in V60 manual... + /* This is the opposite as stated in V60 manual... */ if ((UINT32)i!=f7bLen) _Z=0; else @@ -635,37 +635,37 @@ static UINT32 opSCHBS(UINT32 bSearch1) F7bDecodeFirstOperand(BitReadAMAddress,10); - // Read first UINT8 + /* Read first UINT8 */ f7bOp1 += bamOffset/8; data = MemRead8(f7bOp1); offset = bamOffset&7; - // Scan bitstring + /* Scan bitstring */ for (i=0;i> 4) * 10 + (UINT32)(f7cOp1 & 0xF); dst = ((appb & 0xF0) >> 4) * 10 + (appb & 0xF); - // Note that this APPB must be SIGNED! + /* Note that this APPB must be SIGNED! */ appb = (INT32)dst - (INT32)src - (_CY?1:0); if (appb < 0) @@ -889,9 +889,9 @@ static UINT32 opSUBDC(void) else _CY = 0; - // compute z flag: - // cleared if result non-zero or carry generated - // unchanged otherwise + /* compute z flag: */ + /* cleared if result non-zero or carry generated */ + /* unchanged otherwise */ if (appb != 0 || _CY) _Z = 0; @@ -918,7 +918,7 @@ static UINT32 opSUBRDC(void) src = (UINT32)(f7cOp1 >> 4) * 10 + (UINT32)(f7cOp1 & 0xF); dst = ((appb & 0xF0) >> 4) * 10 + (appb & 0xF); - // Note that this APPB must be SIGNED! + /* Note that this APPB must be SIGNED! */ appb = (INT32)src - (INT32)dst - (_CY?1:0); if (appb < 0) @@ -929,9 +929,9 @@ static UINT32 opSUBRDC(void) else _CY = 0; - // compute z flag: - // cleared if result non-zero or carry generated - // unchanged otherwise + /* compute z flag: */ + /* cleared if result non-zero or carry generated */ + /* unchanged otherwise */ if (appb != 0 || _CY) _Z = 0; @@ -951,7 +951,7 @@ static UINT32 opCVTDPZ(void) apph |= (f7cLen); apph |= (f7cLen<<8); - // Z flag is unchanged if src is zero, cleared otherwise + /* Z flag is unchanged if src is zero, cleared otherwise */ if (f7cOp1 != 0) _Z = 0; F7CSTOREOP2HALF(); @@ -965,13 +965,13 @@ static UINT32 opCVTDZP(void) if ((f7cOp1 & 0xF0) != (f7cLen & 0xF0) || ((f7cOp1 >> 8) & 0xF0) != (f7cLen & 0xF0)) { - // Decimal exception + /* Decimal exception */ logerror("CVTD.ZP Decimal exception #1!\n"); } if ((f7cOp1 & 0xF) > 9 || ((f7cOp1 >> 8) & 0xF) > 9) { - // Decimal exception + /* Decimal exception */ logerror("CVTD.ZP Decimal exception #2!\n"); } diff --git a/src/cpu/v60/optable.c b/src/cpu/v60/optable.c index fe83df556..157368d21 100644 --- a/src/cpu/v60/optable.c +++ b/src/cpu/v60/optable.c @@ -1,5 +1,5 @@ static UINT32 (*OpCodeTable[256])(void) = -//static UINT32 (*const OpCodeTable[256])(void) = +/*static UINT32 (*const OpCodeTable[256])(void) = */ { /* 0x00 */ opHALT, /* 0x01 */ opLDTASK, diff --git a/src/cpu/v60/v60.c b/src/cpu/v60/v60.c index 339fc66a9..0e76148aa 100644 --- a/src/cpu/v60/v60.c +++ b/src/cpu/v60/v60.c @@ -278,17 +278,17 @@ UINT32 v60_update_psw_for_exception(int is_interrupt, int target_level) UINT32 oldPSW = v60ReadPSW(); UINT32 newPSW = oldPSW; - // Change to interrupt context - newPSW &= ~(3 << 24); // PSW.EL = 0 - newPSW |= target_level << 24; // set target level - newPSW &= ~(1 << 18); // PSW.IE = 0 - newPSW &= ~(1 << 16); // PSW.TE = 0 - newPSW &= ~(1 << 27); // PSW.TP = 0 - newPSW &= ~(1 << 17); // PSW.AE = 0 - newPSW &= ~(1 << 29); // PSW.EM = 0 + /* Change to interrupt context */ + newPSW &= ~(3 << 24); /* PSW.EL = 0 */ + newPSW |= target_level << 24; /* set target level */ + newPSW &= ~(1 << 18); /* PSW.IE = 0 */ + newPSW &= ~(1 << 16); /* PSW.TE = 0 */ + newPSW &= ~(1 << 27); /* PSW.TP = 0 */ + newPSW &= ~(1 << 17); /* PSW.AE = 0 */ + newPSW &= ~(1 << 29); /* PSW.EM = 0 */ if (is_interrupt) - newPSW |= (1 << 28);// PSW.IS = 1 - newPSW |= (1 << 31); // PSW.ASA = 1 + newPSW |= (1 << 28);/* PSW.IS = 1 */ + newPSW |= (1 << 31); /* PSW.ASA = 1 */ v60WritePSW(newPSW); return oldPSW; diff --git a/src/driver.c b/src/driver.c index 6f3d83c6c..d6f4e2177 100644 --- a/src/driver.c +++ b/src/driver.c @@ -569,7 +569,7 @@ const struct GameDriver *test_drivers[] = DRIVER( polepos2 ) /* (c) 1983 */ DRIVER( poleps2a ) /* (c) 1983 + Atari license */ DRIVER( poleps2b ) /* bootleg */ -// DRIVER( poleps2c ) /* bootleg */ +/* DRIVER( poleps2c ) bootleg */ /* no custom I/O in the following, HD63701 (or compatible) microcontroller instead */ DRIVER( pacland ) /* (c) 1984 */ DRIVER( pacland2 ) /* (c) 1984 */ @@ -2845,7 +2845,7 @@ DokiDoki Penguin Land *not confirmed DRIVER( aburner ) /* (c) 1987 */ DRIVER( aburner2 ) /* (c) 1987 */ DRIVER( afightera ) /* (c) 1986 (Unprotected) */ - DRIVER( alexkida ) /* (c) 1986 */ + DRIVER( alexkidd1 ) /* (c) 1986 */ DRIVER( aliensyn ) /* (c) 1987 */ DRIVER( altbeas2 ) /* (c) 1988 */ DRIVER( altbeast ) /* (c) 1988 */ diff --git a/src/drivers/8080bw_drivers.c b/src/drivers/8080bw_drivers.c index d9efe196f..fff2b277a 100644 --- a/src/drivers/8080bw_drivers.c +++ b/src/drivers/8080bw_drivers.c @@ -1886,8 +1886,8 @@ PORT_END static PORT_WRITE_START( indianbt_writeport ) { 0x02, 0x02, c8080bw_shift_amount_w }, { 0x04, 0x04, c8080bw_shift_data_w }, - { 0x06, 0x06, IOWP_NOP }, // For sound - //{ 0x07, 0x07, indianbt_sh_port7_w }, // For music (not implemented) + { 0x06, 0x06, IOWP_NOP }, /* For sound */ + /*{ 0x07, 0x07, indianbt_sh_port7_w }, // For music (not implemented) */ PORT_END static MACHINE_DRIVER_START( indianbt ) @@ -3382,7 +3382,7 @@ static PORT_WRITE_START( astropal_writeport ) PORT_END INPUT_PORTS_START( astropal ) - PORT_START // IN0 + PORT_START /* IN0 */ PORT_DIPNAME( 0x03, 0x00, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x00, "2" ) PORT_DIPSETTING( 0x01, "3" ) @@ -3390,7 +3390,7 @@ INPUT_PORTS_START( astropal ) PORT_DIPSETTING( 0x03, "5" ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START // IN1 + PORT_START /* IN1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) @@ -3400,9 +3400,9 @@ INPUT_PORTS_START( astropal ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT | IPF_2WAY ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN2 - Never read + PORT_START /* IN2 - Never read */ - PORT_START // IN3 + PORT_START /* IN3 */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -4311,7 +4311,7 @@ ROM_END ROM_START( galactic ) ROM_REGION( 0x10000, REGION_CPU1, 0 ) - ROM_LOAD( "galactic_1.bin", 0x0000, 0x0800, CRC(b5098f1e) SHA1(9d1d045d8abeafd4716d3052fe93e52c6b347049) ) // sldh + ROM_LOAD( "galactic_1.bin", 0x0000, 0x0800, CRC(b5098f1e) SHA1(9d1d045d8abeafd4716d3052fe93e52c6b347049) ) /* sldh */ ROM_LOAD( "galactic_2.bin", 0x0800, 0x0800, CRC(f97410ee) SHA1(47f1f296c905fa13f6c521edc12c10f1f0e42400) ) ROM_LOAD( "galactic_3.bin", 0x1000, 0x0800, CRC(c1175feb) SHA1(83bf955ed3a52e1ce8c688d89725d8dee1bcc866) ) ROM_LOAD( "galactic_4.bin", 0x1800, 0x0800, CRC(b4451d7c) SHA1(62a18e8e927ef00a7f6cb933cdc5aeae9f074dc0) ) @@ -4322,7 +4322,7 @@ ROM_END ROM_START( spacmiss ) ROM_REGION( 0x10000, REGION_CPU1, 0 ) - ROM_LOAD( "spacmiss_1.bin", 0x0000, 0x0800, CRC(e212dc88) SHA1(bc56052bf43d18081f777b936b2be792e91ba842) ) // sldh + ROM_LOAD( "spacmiss_1.bin", 0x0000, 0x0800, CRC(e212dc88) SHA1(bc56052bf43d18081f777b936b2be792e91ba842) ) /* sldh */ ROM_LOAD( "galactic_2.bin", 0x0800, 0x0800, CRC(f97410ee) SHA1(47f1f296c905fa13f6c521edc12c10f1f0e42400) ) ROM_LOAD( "galactic_3.bin", 0x1000, 0x0800, CRC(c1175feb) SHA1(83bf955ed3a52e1ce8c688d89725d8dee1bcc866) ) ROM_LOAD( "galactic_4.bin", 0x1800, 0x0800, CRC(b4451d7c) SHA1(62a18e8e927ef00a7f6cb933cdc5aeae9f074dc0) ) @@ -4331,7 +4331,7 @@ ROM_START( spacmiss ) ROM_LOAD( "galactic_7.bin", 0x5000, 0x0800, CRC(02619e18) SHA1(4c59f17fbc96ca08090f08c41ca9fc72c074e9c0) ) ROM_REGION( 0x0800, REGION_USER1, 0 ) - ROM_LOAD( "spacmiss_8.bin", 0x0000, 0x0800, CRC(942e5261) SHA1(e8af51d644eab4e7b31c14dc66bb036ad8940c42) ) // ? + ROM_LOAD( "spacmiss_8.bin", 0x0000, 0x0800, CRC(942e5261) SHA1(e8af51d644eab4e7b31c14dc66bb036ad8940c42) ) /* ? */ ROM_END diff --git a/src/drivers/aerofgt.c b/src/drivers/aerofgt.c index ff18829e6..6edfbe8ef 100644 --- a/src/drivers/aerofgt.c +++ b/src/drivers/aerofgt.c @@ -684,7 +684,7 @@ INPUT_PORTS_START( turbofrc ) PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER2 ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )//START1 ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )/*START1 ) */ PORT_START PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) ) /* Coins 1, 2 & 3 */ diff --git a/src/drivers/armedf.c b/src/drivers/armedf.c index 675051335..6e9408bf1 100644 --- a/src/drivers/armedf.c +++ b/src/drivers/armedf.c @@ -220,15 +220,15 @@ static WRITE16_HANDLER( terraf_io_w ) terraf_text_videoram[i]=0x20; } tilemap_mark_all_tiles_dirty( armedf_tx_tilemap ); - //logerror("vreg WIPE TX\n"); + /*logerror("vreg WIPE TX\n"); */ } - //logerror("VReg = %04x\n", armedf_vreg); + /*logerror("VReg = %04x\n", armedf_vreg); */ } static WRITE16_HANDLER( legion_command_c ) { COMBINE_DATA(&legion_cmd[offset]); - //logerror("Legion CMD %04x=%04x", offset, data); + /*logerror("Legion CMD %04x=%04x", offset, data); */ } static WRITE16_HANDLER( sound_command_w ) diff --git a/src/drivers/asterix.c b/src/drivers/asterix.c index 0a1e5b157..9d5d52c7e 100644 --- a/src/drivers/asterix.c +++ b/src/drivers/asterix.c @@ -112,7 +112,7 @@ static WRITE16_HANDLER( control2_w ) /* bit 5 is select tile bank */ K054157_set_tile_bank((data & 0x20) >> 5); - // TODO: looks like 0xffff is used from time to time for chip selection/reset something, not unlike Jackal + /* TODO: looks like 0xffff is used from time to time for chip selection/reset something, not unlike Jackal */ if((data & 0xff) != 0xff) { coin_counter_w(0, data & 0x08); diff --git a/src/drivers/atarifb.c b/src/drivers/atarifb.c index 84de1f2b8..dd07194f4 100644 --- a/src/drivers/atarifb.c +++ b/src/drivers/atarifb.c @@ -576,10 +576,10 @@ static struct GfxDecodeInfo soccer_gfxdecodeinfo[] = const struct discrete_555_astbl_desc atarifbWhistl555 = { DISC_555_OUT_CAP | DISC_555_OUT_AC, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2.0 /3.0, // normally 2/3 of v555 - 5.0 / 3.0 // normally 1/3 of v555 + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2.0 /3.0, /* normally 2/3 of v555 */ + 5.0 / 3.0 /* normally 1/3 of v555 */ }; const struct discrete_lfsr_desc atarifb_lfsr = @@ -631,7 +631,7 @@ static DISCRETE_SOUND_START(atarifb_sound_interface) /************************************************/ /* Hit is a trigger fed directly to the amp */ /************************************************/ - DISCRETE_FILTER2(ATARIFB_HIT_SND, 1, ATARIFB_HIT_EN, 10.0, 5, DISC_FILTER_HIGHPASS) // remove DC + DISCRETE_FILTER2(ATARIFB_HIT_SND, 1, ATARIFB_HIT_EN, 10.0, 5, DISC_FILTER_HIGHPASS) /* remove DC */ /************************************************/ /* Crowd effect is variable amplitude, filtered */ @@ -693,7 +693,7 @@ static DISCRETE_SOUND_START(abaseb_sound_interface) /************************************************/ /* Hit is a trigger fed directly to the amp */ /************************************************/ - DISCRETE_FILTER2(ABASEB_HIT_SND, 1, ABASEB_HIT_EN, 10.0, 5, DISC_FILTER_HIGHPASS) // remove DC + DISCRETE_FILTER2(ABASEB_HIT_SND, 1, ABASEB_HIT_EN, 10.0, 5, DISC_FILTER_HIGHPASS) /* remove DC */ /************************************************/ /* Crowd effect is variable amplitude, filtered */ diff --git a/src/drivers/atarig42.c b/src/drivers/atarig42.c index 13ca853fe..fcc8927b0 100644 --- a/src/drivers/atarig42.c +++ b/src/drivers/atarig42.c @@ -463,10 +463,10 @@ INPUT_PORTS_END INPUT_PORTS_START( dangerex ) PORT_START /* e00000 */ PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED ) // Toggle 0 - D4 - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) // Toggle 1 - D5 - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // Step SW - D6 - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // Freeze - D7 + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED ) /* Toggle 0 - D4 */ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) /* Toggle 1 - D5 */ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) /* Step SW - D6 */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) /* Freeze - D7 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 | IPF_PLAYER1 ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER1 ) @@ -478,10 +478,10 @@ INPUT_PORTS_START( dangerex ) PORT_START /* e00002 */ PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED ) // Test Yellow - D4 - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) // Test Blue - D5 - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // Test Blue - D6 - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // Test Blue - D7 + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNUSED ) /* Test Yellow - D4 */ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) /* Test Blue - D5 */ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) /* Test Blue - D6 */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) /* Test Blue - D7 */ PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 | IPF_PLAYER2 ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER2 ) diff --git a/src/drivers/batman.c b/src/drivers/batman.c index 7044a6307..8dd8b28f0 100644 --- a/src/drivers/batman.c +++ b/src/drivers/batman.c @@ -218,15 +218,15 @@ MEMORY_END INPUT_PORTS_START( marblmd2 ) PORT_START /* 600000 input_port_0_word_r */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER3 ) // also acts as START3 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER3 ) /* also acts as START3 */ PORT_BIT( 0x00fe, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER1 ) // also acts as START1 + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER1 ) /* also acts as START1 */ PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START /* 600002 input_port_1_word_r */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) // acts as a 'freeze' input, probably not connected + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* acts as a 'freeze' input, probably not connected */ PORT_BIT( 0x00fe, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER2 ) // also acts as START2 + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER2 ) /* also acts as START2 */ PORT_BIT( 0xfe00, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START /* 600010 input_port_2_word_r */ @@ -253,7 +253,7 @@ INPUT_PORTS_START( marblmd2 ) PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x0010, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPNAME( 0x0020, 0x0020, "Number of Players (Test Mode)" ) // this one controls 'number of players' in Control Test + PORT_DIPNAME( 0x0020, 0x0020, "Number of Players (Test Mode)" ) /* this one controls 'number of players' in Control Test */ PORT_DIPSETTING( 0x0000, "2" ) PORT_DIPSETTING( 0x0020, "3" ) PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unknown ) ) @@ -520,7 +520,7 @@ ROM_START( marblmd2 ) ROM_LOAD( "mo0h.12p", 0x40000, 0x20000, CRC(e47d92b0) SHA1(7953e8342450c02408e4d90f132144d55de2f491) ) ROM_LOAD( "mo1h.14p", 0x60000, 0x20000, CRC(317a03fb) SHA1(23a7cfe7c5601c858e8b346de31441788c7a8e97) ) - // loading based on batman, there are 2 unpopulated positions on the PCB + /* loading based on batman, there are 2 unpopulated positions on the PCB */ ROM_REGION( 0x200000, REGION_SOUND1, 0 ) /* 1MB for ADPCM */ ROM_LOAD( "sound.19e", 0x80000, 0x20000, CRC(e916bef7) SHA1(e07ddc8a3e1656d7307b767e692cf4a575ca47a3) ) ROM_LOAD( "sound.12e", 0xe0000, 0x20000, CRC(bab2f8e5) SHA1(bbe2d693d40e5eeba315fe7b6380a2030b66f23e) ) diff --git a/src/drivers/bbusters.c b/src/drivers/bbusters.c index 0692fbe10..86e0e2673 100644 --- a/src/drivers/bbusters.c +++ b/src/drivers/bbusters.c @@ -448,7 +448,7 @@ INPUT_PORTS_START( bbusters ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN5 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN6 ) - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) // See notes + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) /* See notes */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START /* Dip switch bank 1 */ diff --git a/src/drivers/canyon.c b/src/drivers/canyon.c index 3f5829410..8e17252d8 100644 --- a/src/drivers/canyon.c +++ b/src/drivers/canyon.c @@ -286,10 +286,10 @@ static struct GfxDecodeInfo gfxdecodeinfo[] = const struct discrete_555_astbl_desc canyonWhistl555 = { DISC_555_OUT_CAP | DISC_555_OUT_AC, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2.0 /3.0, // normally 2/3 of v555 - 5.0 / 3.0 // normally 1/3 of v555 + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2.0 /3.0, /* normally 2/3 of v555 */ + 5.0 / 3.0 /* normally 1/3 of v555 */ }; const struct discrete_lfsr_desc canyon_lfsr={ diff --git a/src/drivers/circus.c b/src/drivers/circus.c index 69c81691d..a627d7b8d 100644 --- a/src/drivers/circus.c +++ b/src/drivers/circus.c @@ -70,7 +70,7 @@ static READ_HANDLER( ripcord_IN2_r ) /* real machine, though a little ugly and likely just because of */ /* limited ability to do overlays back in 1977. */ /* For the authentic look, uncomment the definition below. */ -//#define USE_AUTHENTIC_OVERLAY 1 +/*#define USE_AUTHENTIC_OVERLAY 1 */ OVERLAY_START( circus_overlay ) #ifdef USE_AUTHENTIC_OVERLAY OVERLAY_RECT( 0, 20, 248, 36, OVERLAY_BLUE ) diff --git a/src/drivers/contra.c b/src/drivers/contra.c index 55327d5c3..938ce09e0 100644 --- a/src/drivers/contra.c +++ b/src/drivers/contra.c @@ -99,12 +99,12 @@ WRITE_HANDLER(contra_k007452_w) if (offset == 1) { - // Starts multiplication process + /* Starts multiplication process */ multiply_result = math_regs[0] * math_regs[1]; } else if (offset == 5) { - // Starts division process + /* Starts division process */ UINT16 dividend = (math_regs[4]<<8) + math_regs[5]; UINT16 divisor = (math_regs[2]<<8) + math_regs[3]; if (!divisor) { diff --git a/src/drivers/cps1.c b/src/drivers/cps1.c index 1ca545e62..c5a02abb2 100644 --- a/src/drivers/cps1.c +++ b/src/drivers/cps1.c @@ -380,7 +380,7 @@ static MEMORY_WRITE_START( sound_writemem ) { 0xf001, 0xf001, YM2151_data_port_0_w }, { 0xf002, 0xf002, OKIM6295_data_0_w }, { 0xf004, 0xf004, cps1_snd_bankswitch_w }, -/* { 0xf006, 0xf006, MWA_NOP }, // ???? Unknown ???? /*/ +/* { 0xf006, 0xf006, MWA_NOP },*/ /* ???? Unknown ???? */ MEMORY_END MEMORY_READ_START( qsound_readmem ) @@ -1351,19 +1351,19 @@ INPUT_PORTS_START( ffightae ) PORT_START /* DSWB */ PORT_DIPNAME( 0x07, 0x04, "Difficulty Level 1" ) - PORT_DIPSETTING( 0x07, "Easiest" ) // "01" - PORT_DIPSETTING( 0x06, "Easier" ) // "02" - PORT_DIPSETTING( 0x05, "Easy" ) // "03" - PORT_DIPSETTING( 0x04, "Normal" ) // "04" - PORT_DIPSETTING( 0x03, "Medium" ) // "05" - PORT_DIPSETTING( 0x02, "Hard" ) // "06" - PORT_DIPSETTING( 0x01, "Harder" ) // "07" - PORT_DIPSETTING( 0x00, "Hardest" ) // "08" + PORT_DIPSETTING( 0x07, "Easiest" ) /* "01" */ + PORT_DIPSETTING( 0x06, "Easier" ) /* "02" */ + PORT_DIPSETTING( 0x05, "Easy" ) /* "03" */ + PORT_DIPSETTING( 0x04, "Normal" ) /* "04" */ + PORT_DIPSETTING( 0x03, "Medium" ) /* "05" */ + PORT_DIPSETTING( 0x02, "Hard" ) /* "06" */ + PORT_DIPSETTING( 0x01, "Harder" ) /* "07" */ + PORT_DIPSETTING( 0x00, "Hardest" ) /* "08" */ PORT_DIPNAME( 0x18, 0x10, "Difficulty Level 2" ) - PORT_DIPSETTING( 0x18, "Easy" ) // "01" - PORT_DIPSETTING( 0x10, "Normal" ) // "02" - PORT_DIPSETTING( 0x08, "Hard" ) // "03" - PORT_DIPSETTING( 0x00, "Hardest" ) // "04" + PORT_DIPSETTING( 0x18, "Easy" ) /* "01" */ + PORT_DIPSETTING( 0x10, "Normal" ) /* "02" */ + PORT_DIPSETTING( 0x08, "Hard" ) /* "03" */ + PORT_DIPSETTING( 0x00, "Hardest" ) /* "04" */ PORT_DIPNAME( 0x60, 0x60, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x60, "100k" ) PORT_DIPSETTING( 0x40, "200k" ) @@ -7725,10 +7725,10 @@ ROM_START( wofch ) ROMX_LOAD( "tk2-3m.5a", 0x000002, 0x80000, CRC(45227027) SHA1(b21afc593f0d4d8909dfa621d659cbb40507d1b2) , ROM_GROUPWORD | ROM_SKIP(6) ) ROMX_LOAD( "tk2-2m.4a", 0x000004, 0x80000, CRC(c5ca2460) SHA1(cbe14867f7b94b638ca80db7c8e0c60881183469) , ROM_GROUPWORD | ROM_SKIP(6) ) ROMX_LOAD( "tk2-4m.6a", 0x000006, 0x80000, CRC(e349551c) SHA1(1d977bdf256accf750ad9930ec4a0a19bbf86964) , ROM_GROUPWORD | ROM_SKIP(6) ) - ROMX_LOAD( "tk2=ch=_05.7a", 0x200000, 0x80000, CRC(e4a44d53) SHA1(b747679f4d63e5e62d9fd81b3120fba0401fadfb) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_05.7a - ROMX_LOAD( "tk2=ch=_06.8a", 0x200002, 0x80000, CRC(58066ba8) SHA1(c93af968e21094d020e4b2002e0c6fc0d746af0b) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_06.8a + ROMX_LOAD( "tk2=ch=_05.7a", 0x200000, 0x80000, CRC(e4a44d53) SHA1(b747679f4d63e5e62d9fd81b3120fba0401fadfb) , ROM_GROUPWORD | ROM_SKIP(6) ) /* == tk2_05.7a */ + ROMX_LOAD( "tk2=ch=_06.8a", 0x200002, 0x80000, CRC(58066ba8) SHA1(c93af968e21094d020e4b2002e0c6fc0d746af0b) , ROM_GROUPWORD | ROM_SKIP(6) ) /* == tk2_06.8a */ ROMX_LOAD( "tk2=ch=_07.9a", 0x200004, 0x80000, CRC(cc9006c9) SHA1(cfcbec3a67052268a7739538aa28a6391fe5400e) , ROM_GROUPWORD | ROM_SKIP(6) ) /* 1 byte different from wofj, pcb verified */ - ROMX_LOAD( "tk2=ch=_08.10a", 0x200006, 0x80000, CRC(d4a19a02) SHA1(ff396b1d33d9b4842140f2c6d085fe05748e3244) , ROM_GROUPWORD | ROM_SKIP(6) ) // == tk2_08.10a + ROMX_LOAD( "tk2=ch=_08.10a", 0x200006, 0x80000, CRC(d4a19a02) SHA1(ff396b1d33d9b4842140f2c6d085fe05748e3244) , ROM_GROUPWORD | ROM_SKIP(6) ) /* == tk2_08.10a */ ROM_REGION( 0x8000, REGION_GFX2, 0 ) ROM_COPY( REGION_GFX1, 0x000000, 0x000000, 0x8000 ) /* stars */ diff --git a/src/drivers/cps2.c b/src/drivers/cps2.c index ac08f54ec..831c28dad 100644 --- a/src/drivers/cps2.c +++ b/src/drivers/cps2.c @@ -875,7 +875,7 @@ static MACHINE_DRIVER_START( cps2 ) MDRV_CPU_ADD(M68000, 11800000) MDRV_CPU_CONFIG(cps2_encryption) MDRV_CPU_MEMORY(cps2_readmem,cps2_writemem) - MDRV_CPU_VBLANK_INT(cps2_interrupt,262) /* 262 // ??? interrupts per frame /*/ + MDRV_CPU_VBLANK_INT(cps2_interrupt,262) /* 262 ??? interrupts per frame*/ MDRV_CPU_ADD(Z80, 8000000) MDRV_CPU_MEMORY(qsound_readmem,qsound_writemem) @@ -883,7 +883,7 @@ static MACHINE_DRIVER_START( cps2 ) MDRV_FRAMES_PER_SECOND(59.633333) MDRV_VBLANK_DURATION(0) -/* MDRV_INTERLEAVE(262) // 262 scanlines, for raster effects /*/ +/* MDRV_INTERLEAVE(262) 262 scanlines, for raster effects */ MDRV_NVRAM_HANDLER(cps2) @@ -960,7 +960,7 @@ ROM_START( 1944j ) ROM_END ROM_START( 19xx ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xe.03b", 0x000000, 0x080000, CRC(9bf9d9b1) SHA1(df32f2e6b3ebafd892368430d786a58e3614ef80) ) ROM_LOAD16_WORD_SWAP( "19xe.04b", 0x080000, 0x080000, CRC(9aa46476) SHA1(dd677b87620198c22738e9f54105998a761298de) ) ROM_LOAD16_WORD_SWAP( "19xe.05b", 0x100000, 0x080000, CRC(a04a2c5e) SHA1(aff5a324daa4641bfdef486824127010e4b803f7) ) @@ -977,11 +977,11 @@ ROM_START( 19xx ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -990,7 +990,7 @@ ROM_START( 19xx ) ROM_END ROM_START( 19xxu ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xu.03", 0x000000, 0x80000, CRC(05955268) SHA1(d3b6b416f1f9eb1c1cbca6647630d1155647082d) ) ROM_LOAD16_WORD_SWAP( "19xu.04", 0x080000, 0x80000, CRC(3111ab7f) SHA1(8bbce20ae7ba47949f4939b2f35014fb6decd283) ) ROM_LOAD16_WORD_SWAP( "19xu.05", 0x100000, 0x80000, CRC(38df4a63) SHA1(1303f7ab6296f1454907a24d64878bdbd1ef88a7) ) @@ -1007,11 +1007,11 @@ ROM_START( 19xxu ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -1020,7 +1020,7 @@ ROM_START( 19xxu ) ROM_END ROM_START( 19xxj ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xj-03b.6a", 0x000000, 0x80000, CRC(bcad93dd) SHA1(9b08cfdf278fc0cf60827518c4fecb99f224578b) ) ROM_LOAD16_WORD_SWAP( "19xj-04b.7a", 0x080000, 0x80000, CRC(931882a1) SHA1(940a4fe52c1eb208071ab9d0a0c256eb39620091) ) ROM_LOAD16_WORD_SWAP( "19xj-05b.8a", 0x100000, 0x80000, CRC(e7eeddc4) SHA1(40c79bc454d5fb8e5004db3df4fdcb10fae6c1e9) ) @@ -1049,11 +1049,11 @@ ROM_START( 19xxj ) ROM_LOAD64_WORD( "19x-95.10p", 0x0c00006, 0x080000, CRC(2b86fa67) SHA1(96a3cb8b203738fff33e2ca6340fdef928a816b9) ) ROM_LOAD64_WORD( "19x-96.11p", 0x0e00006, 0x080000, CRC(ae6eb692) SHA1(4b564a375a08872aea534635ec526cce62dcdadd) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x-01.1a", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x-51.6a", 0x000000, 0x080000, CRC(e9cd7780) SHA1(23c3d3968c2aec01ca25338b687be14407580b32) ) ROM_LOAD16_WORD_SWAP( "19x-52.7a", 0x080000, 0x080000, CRC(b27b91a8) SHA1(1fd424c118fabcdb70ea025804552e99b8f8348a) ) ROM_LOAD16_WORD_SWAP( "19x-53.8a", 0x100000, 0x080000, CRC(2e563ee2) SHA1(ed91404f27e36ff7c4bf4c297e81c4ebeb125db7) ) @@ -1068,7 +1068,7 @@ ROM_START( 19xxj ) ROM_END ROM_START( 19xxjr1 ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xj.03a", 0x000000, 0x80000, CRC(ed08bdd1) SHA1(4b49f988faf4a6a99d3596bb12e4685862a20a3e) ) ROM_LOAD16_WORD_SWAP( "19xj.04a", 0x080000, 0x80000, CRC(fb8e3f29) SHA1(513b85bfe5b86692faa4d20b755fe261a7f95bfc) ) ROM_LOAD16_WORD_SWAP( "19xj.05a", 0x100000, 0x80000, CRC(aa508ac4) SHA1(c906f4a92872f4ecda662146690acbe5165ae79e) ) @@ -1085,11 +1085,11 @@ ROM_START( 19xxjr1 ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -1098,7 +1098,7 @@ ROM_START( 19xxjr1 ) ROM_END ROM_START( 19xxjr2 ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xj.03", 0x000000, 0x80000, CRC(26a381ed) SHA1(9a6bd9a8c152096f653c0b5a161dd08314fdb5e7) ) ROM_LOAD16_WORD_SWAP( "19xj.04", 0x080000, 0x80000, CRC(30100cca) SHA1(3fc964e6daffa5dd7b9f72c8ace3a4b9d515e9ce) ) ROM_LOAD16_WORD_SWAP( "19xj.05", 0x100000, 0x80000, CRC(de67e938) SHA1(5f977c07c6ffa816ccfa2c7bab8a77b64c232610) ) @@ -1115,11 +1115,11 @@ ROM_START( 19xxjr2 ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -1128,12 +1128,12 @@ ROM_START( 19xxjr2 ) ROM_END ROM_START( 19xxa ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code - ROM_LOAD16_WORD_SWAP( "09xa.03b", 0x000000, 0x80000, CRC(2e994897) SHA1(8dee5d84fd01f416fa6dfef76be0dfff90f45595) ) // Yes it's actually 09xa, that's not a typo - ROM_LOAD16_WORD_SWAP( "09xa.04b", 0x080000, 0x80000, CRC(6364d001) SHA1(a6f3f0015c9a3c27bc2109d557b88d0773a83465) ) // Yes it's actually 09xa, that's not a typo - ROM_LOAD16_WORD_SWAP( "09xa.05b", 0x100000, 0x80000, CRC(00c1949b) SHA1(4120a57d06638c637b74442b200e46d9b13fa431) ) // Yes it's actually 09xa, that's not a typo - ROM_LOAD16_WORD_SWAP( "09xa.06b", 0x180000, 0x80000, CRC(363c1f6e) SHA1(2e358e345f1d5963836b0ac8c6a1b455638bd19d) ) // Yes it's actually 09xa, that's not a typo - ROM_LOAD16_WORD_SWAP( "19xa.07", 0x200000, 0x80000, CRC(61c0296c) SHA1(9e225beccffd14bb53a32f8c0f2aef7f331dae30) ) // This one was different, it actually was 19xa + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ + ROM_LOAD16_WORD_SWAP( "09xa.03b", 0x000000, 0x80000, CRC(2e994897) SHA1(8dee5d84fd01f416fa6dfef76be0dfff90f45595) ) /* Yes it's actually 09xa, that's not a typo */ + ROM_LOAD16_WORD_SWAP( "09xa.04b", 0x080000, 0x80000, CRC(6364d001) SHA1(a6f3f0015c9a3c27bc2109d557b88d0773a83465) ) /* Yes it's actually 09xa, that's not a typo */ + ROM_LOAD16_WORD_SWAP( "09xa.05b", 0x100000, 0x80000, CRC(00c1949b) SHA1(4120a57d06638c637b74442b200e46d9b13fa431) ) /* Yes it's actually 09xa, that's not a typo */ + ROM_LOAD16_WORD_SWAP( "09xa.06b", 0x180000, 0x80000, CRC(363c1f6e) SHA1(2e358e345f1d5963836b0ac8c6a1b455638bd19d) ) /* Yes it's actually 09xa, that's not a typo */ + ROM_LOAD16_WORD_SWAP( "19xa.07", 0x200000, 0x80000, CRC(61c0296c) SHA1(9e225beccffd14bb53a32f8c0f2aef7f331dae30) ) /* This one was different, it actually was 19xa */ ROM_REGION( 0x1000000, REGION_GFX1, 0 ) ROM_LOAD64_WORD( "19x.13m", 0x0000000, 0x080000, CRC(427aeb18) SHA1(901029b5423e4bda85f592735036c06b7d426680) ) @@ -1145,11 +1145,11 @@ ROM_START( 19xxa ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -1158,7 +1158,7 @@ ROM_START( 19xxa ) ROM_END ROM_START( 19xxar1 ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xa.03", 0x000000, 0x80000, CRC(0c20fd50) SHA1(3aeb698ac67e6c8d0224e68d9258ef45f735432a) ) ROM_LOAD16_WORD_SWAP( "19xa.04", 0x080000, 0x80000, CRC(1fc37508) SHA1(f4b858b5dc6243c5cd432d1a72d828831c8eca6f) ) ROM_LOAD16_WORD_SWAP( "19xa.05", 0x100000, 0x80000, CRC(6c9cc4ed) SHA1(2b01ffe0bba41640ffc0c13dfdacf3cf0e3e131d) ) @@ -1175,11 +1175,11 @@ ROM_START( 19xxar1 ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -1188,7 +1188,7 @@ ROM_START( 19xxar1 ) ROM_END ROM_START( 19xxh ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xh.03a", 0x000000, 0x80000, CRC(357be2ac) SHA1(660641d8cd2f7b574809badf99924f0a31a0cccd) ) ROM_LOAD16_WORD_SWAP( "19xh.04a", 0x080000, 0x80000, CRC(bb13ea3b) SHA1(3ae0fa09ae031e2a0f1ea8645a9baced44289383) ) ROM_LOAD16_WORD_SWAP( "19xh.05a", 0x100000, 0x80000, CRC(cbd76601) SHA1(a6b64e5f4b35a120dc463a6c9e98e2ec8e739e59) ) @@ -1205,11 +1205,11 @@ ROM_START( 19xxh ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -1218,7 +1218,7 @@ ROM_START( 19xxh ) ROM_END ROM_START( 19xxb ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "19xb.03a", 0x000000, 0x80000, CRC(341bdf4a) SHA1(e7deccd034f2a2664507dbb7fed9757c2424dbf7) ) ROM_LOAD16_WORD_SWAP( "19xb.04a", 0x080000, 0x80000, CRC(dff8069e) SHA1(3b31d1f66680cee1da3f3d3fd822739e99f48ccd) ) ROM_LOAD16_WORD_SWAP( "19xb.05a", 0x100000, 0x80000, CRC(a47a92a8) SHA1(20254ec70029ec027793d4fbd9a7067c2a756315) ) @@ -1235,11 +1235,11 @@ ROM_START( 19xxb ) ROM_LOAD64_WORD( "19x.18m", 0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) ) ROM_LOAD64_WORD( "19x.20m", 0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "19x.01", 0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD16_WORD_SWAP( "19x.11m", 0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) ) ROM_LOAD16_WORD_SWAP( "19x.12m", 0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) ) @@ -3585,61 +3585,61 @@ ROM_START( mvsch ) ROM_END ROM_START( mpang ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "mpne.03c", 0x000000, 0x80000, CRC(fe16fc9f) SHA1(be22bf8a0abd53d2e7ebc12d3d0020bf799a25e9) ) ROM_LOAD16_WORD_SWAP( "mpne.04c", 0x080000, 0x80000, CRC(2cc5ec22) SHA1(c188349c26a64bad325cfa218849ed1e94303087) ) ROM_REGION( 0x1000000, REGION_GFX1, 0 ) - ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM - - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) /* ROM on a SIMM */ + + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "mpn.01", 0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples - ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM - ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) /* ROM on a SIMM */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) /* ROM on a SIMM */ ROM_REGION( 0x20, REGION_USER5, 0 ) ROM_LOAD( "mpang.key", 0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) ) ROM_END ROM_START( mpangr1 ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "mpne.03b", 0x000000, 0x80000, CRC(6ef0f9b2) SHA1(fd1c76e151466fe27b02a6d07683fdd9c6a4816d) ) ROM_LOAD16_WORD_SWAP( "mpne.04b", 0x080000, 0x80000, CRC(30a468bb) SHA1(f2f8f600a079ff050c9a0c12e1a6368943bdc536) ) ROM_REGION( 0x1000000, REGION_GFX1, 0 ) - ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM - - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) /* ROM on a SIMM */ + + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "mpn.01", 0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples - ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM - ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) /* ROM on a SIMM */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) /* ROM on a SIMM */ ROM_REGION( 0x20, REGION_USER5, 0 ) ROM_LOAD( "mpang.key", 0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) ) ROM_END ROM_START( mpangu ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "mpnu.03", 0x000000, 0x80000, CRC(6e7ed03c) SHA1(3562362d9573252d4d19dbfd0ec7e47e9eaa5f46) ) /* USA version, but has no "u" in label code */ ROM_LOAD16_WORD_SWAP( "mpnu.04", 0x080000, 0x80000, CRC(de079131) SHA1(95da2a03cb642963aabfebd8337003961ca4db71) ) @@ -3650,11 +3650,11 @@ ROM_START( mpangu ) ROM_LOAD64_WORD( "mpn.17m", 0x800004, 0x200000, CRC(cfcd73d2) SHA1(3415c063ac3632159df0fa74899bde8c90f4a2a1) ) ROM_LOAD64_WORD( "mpn.19m", 0x800006, 0x200000, CRC(2db1ffbc) SHA1(ca58c9359c2c629896c40e78c14907f562e2cdad) ) - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "mpn.01", 0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ ROM_LOAD( "mpn.q1", 0x000000, 0x100000, CRC(d21c1f5a) SHA1(94cfcf01e656c0fb690e6204964ac70fbc89064d) ) /* This version uses roms chips */ ROM_LOAD( "mpn.q2", 0x100000, 0x100000, CRC(d22090b1) SHA1(0ba65c0efb46af3cfb8ea3fe5087186248c57420) ) ROM_LOAD( "mpn.q3", 0x200000, 0x100000, CRC(60aa5ef2) SHA1(03fa994d7f5b43e05e8417a8769e07c22548a27a) ) @@ -3665,54 +3665,54 @@ ROM_START( mpangu ) ROM_END ROM_START( mpangj ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "mpnj.03a", 0x000000, 0x80000, CRC(bf597b1c) SHA1(0412e826eec7a9f3e70c84b64c9fbcecf7e0c56a) ) ROM_LOAD16_WORD_SWAP( "mpnj.04a", 0x080000, 0x80000, CRC(f4a3ab0f) SHA1(2e54bbc95304827fcd24dab35e4895f4e6566be0) ) ROM_REGION( 0x1000000, REGION_GFX1, 0 ) - ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM - - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) /* ROM on a SIMM */ + + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "mpn.01", 0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples - ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM - ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) /* ROM on a SIMM */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) /* ROM on a SIMM */ ROM_REGION( 0x20, REGION_USER5, 0 ) ROM_LOAD( "mpang.key", 0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) ) ROM_END ROM_START( mpanga ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "mpn_03a.6a", 0x000000, 0x80000, CRC(b05ebc34) SHA1(b30784dcc1aaf0f37930c125331dfa41240c5859) ) ROM_LOAD16_WORD_SWAP( "mpn_04a.7a", 0x080000, 0x80000, CRC(8e4814b4) SHA1(f86e0b7986de115b76c579e6ffd4e77da2360a01) ) ROM_REGION( 0x1000000, REGION_GFX1, 0 ) - ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM - - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_LOAD64_BYTE( "mpn-simm.01c", 0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01d", 0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01a", 0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.01b", 0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03c", 0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03d", 0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03a", 0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "mpn-simm.03b", 0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) /* ROM on a SIMM */ + + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "mpn.01", 0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples - ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM - ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05a", 0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) /* ROM on a SIMM */ + ROM_LOAD16_WORD_SWAP( "mpn-simm.05b", 0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) /* ROM on a SIMM */ ROM_REGION( 0x20, REGION_USER5, 0 ) ROM_LOAD( "mpang.key", 0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) ) @@ -3779,87 +3779,87 @@ ROM_START( progearj ) ROM_END ROM_START( pzloop2 ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "pl2e.03", 0x000000, 0x80000, CRC(3b1285b2) SHA1(f90f98fb15068306a57109ad954845be0a99e8ab) ) ROM_LOAD16_WORD_SWAP( "pl2e.04", 0x080000, 0x80000, CRC(40a2d647) SHA1(d1c5fa87b368efe0d2cc3f614d0165bd95748b81) ) ROM_LOAD16_WORD_SWAP( "pl2e.05", 0x100000, 0x80000, CRC(0f11d818) SHA1(ca2d5ea892aebfa1a2a825fb45c57b7923936917) ) ROM_LOAD16_WORD_SWAP( "pl2e.06", 0x180000, 0x80000, CRC(86fbbdf4) SHA1(325ba5dc54f3d82f39e1299d5f27de7227a458b2) ) ROM_REGION( 0x1000000, REGION_GFX1, 0 ) - ROM_LOAD64_BYTE( "pl2-simm.01c", 0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01d", 0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01a", 0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01b", 0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03c", 0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03d", 0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03a", 0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03b", 0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) // ROM on a SIMM - - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_LOAD64_BYTE( "pl2-simm.01c", 0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01d", 0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01a", 0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01b", 0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03c", 0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03d", 0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03a", 0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03b", 0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) /* ROM on a SIMM */ + + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "pl2.01", 0x00000, 0x08000, CRC(35697569) SHA1(13718923cffb9ec53cef9e22d8875370b5f3dd74) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples - ROM_LOAD16_WORD_SWAP( "pl2-simm.05a", 0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a SIMM - ROM_LOAD16_WORD_SWAP( "pl2-simm.05b", 0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a SIMM + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ + ROM_LOAD16_WORD_SWAP( "pl2-simm.05a", 0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) /* ROM on a SIMM */ + ROM_LOAD16_WORD_SWAP( "pl2-simm.05b", 0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) /* ROM on a SIMM */ ROM_REGION( 0x20, REGION_USER5, 0 ) ROM_LOAD( "pzloop2.key", 0x000000, 0x000014, CRC(ae13be78) SHA1(5c715f0ef1e0664027faa6c2a7f0f878462cb7ae) ) ROM_END ROM_START( pzloop2j ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code - ROM_LOAD16_WORD_SWAP( "pl2j.03c", 0x000000, 0x80000, CRC(3b76b806) SHA1(743808ccd470da075ca2f4a8872b22feb7e993ef) ) // 'c' handwritten over 'a' label - ROM_LOAD16_WORD_SWAP( "pl2j.04c", 0x080000, 0x80000, CRC(8878a42a) SHA1(178efe9be9ab7f209489f35d653cb5fef4e9565b) ) // ^^ - ROM_LOAD16_WORD_SWAP( "pl2j.05c", 0x100000, 0x80000, CRC(51081ea4) SHA1(175dc70ba0b6a158d23e7271dd65f28e7beea746) ) // ^^ - ROM_LOAD16_WORD_SWAP( "pl2j.06c", 0x180000, 0x80000, CRC(51c68494) SHA1(c3b2055af11138f5280fe89e248536069a22ddca) ) // ^^ + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ + ROM_LOAD16_WORD_SWAP( "pl2j.03c", 0x000000, 0x80000, CRC(3b76b806) SHA1(743808ccd470da075ca2f4a8872b22feb7e993ef) ) /* 'c' handwritten over 'a' label */ + ROM_LOAD16_WORD_SWAP( "pl2j.04c", 0x080000, 0x80000, CRC(8878a42a) SHA1(178efe9be9ab7f209489f35d653cb5fef4e9565b) ) /* ^^ */ + ROM_LOAD16_WORD_SWAP( "pl2j.05c", 0x100000, 0x80000, CRC(51081ea4) SHA1(175dc70ba0b6a158d23e7271dd65f28e7beea746) ) /* ^^ */ + ROM_LOAD16_WORD_SWAP( "pl2j.06c", 0x180000, 0x80000, CRC(51c68494) SHA1(c3b2055af11138f5280fe89e248536069a22ddca) ) /* ^^ */ ROM_REGION( 0x1000000, REGION_GFX1, 0 ) - ROM_LOAD64_BYTE( "pl2-simm.01c", 0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01d", 0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01a", 0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01b", 0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03c", 0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03d", 0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03a", 0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03b", 0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) // ROM on a SIMM - - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_LOAD64_BYTE( "pl2-simm.01c", 0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01d", 0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01a", 0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01b", 0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03c", 0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03d", 0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03a", 0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03b", 0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) /* ROM on a SIMM */ + + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "pl2.01", 0x00000, 0x08000, CRC(35697569) SHA1(13718923cffb9ec53cef9e22d8875370b5f3dd74) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples - ROM_LOAD16_WORD_SWAP( "pl2-simm.05a", 0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a SIMM - ROM_LOAD16_WORD_SWAP( "pl2-simm.05b", 0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a SIMM + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ + ROM_LOAD16_WORD_SWAP( "pl2-simm.05a", 0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) /* ROM on a SIMM */ + ROM_LOAD16_WORD_SWAP( "pl2-simm.05b", 0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) /* ROM on a SIMM */ ROM_REGION( 0x20, REGION_USER5, 0 ) ROM_LOAD( "pzloop2.key", 0x000000, 0x000014, CRC(ae13be78) SHA1(5c715f0ef1e0664027faa6c2a7f0f878462cb7ae) ) ROM_END ROM_START( pzloop2jr1 ) - ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) // 68000 code + ROM_REGION( CODE_SIZE, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "pl2j.03a", 0x000000, 0x80000, CRC(0a751bd0) SHA1(a5a0b60387aacdafdf46ecd1acd764c9cb086b90) ) ROM_LOAD16_WORD_SWAP( "pl2j.04a", 0x080000, 0x80000, CRC(c3f72afe) SHA1(597a302e4bba50193c53f239e715962fcc4e3e5e) ) ROM_LOAD16_WORD_SWAP( "pl2j.05a", 0x100000, 0x80000, CRC(6ea9dbfc) SHA1(c3065e02516755e8b94a741dd2ab960c96d0ff8c) ) ROM_LOAD16_WORD_SWAP( "pl2j.06a", 0x180000, 0x80000, CRC(0f14848d) SHA1(94a3ee00d65cd9a310b3a330e2c37467b5863c64) ) ROM_REGION( 0x1000000, REGION_GFX1, 0 ) - ROM_LOAD64_BYTE( "pl2-simm.01c", 0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01d", 0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01a", 0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.01b", 0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03c", 0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03d", 0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03a", 0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) // ROM on a SIMM - ROM_LOAD64_BYTE( "pl2-simm.03b", 0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) // ROM on a SIMM - - ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) // 64k for the audio CPU (+banks) + ROM_LOAD64_BYTE( "pl2-simm.01c", 0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01d", 0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01a", 0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.01b", 0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03c", 0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03d", 0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03a", 0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) /* ROM on a SIMM */ + ROM_LOAD64_BYTE( "pl2-simm.03b", 0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) /* ROM on a SIMM */ + + ROM_REGION( QSOUND_SIZE, REGION_CPU2, 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "pl2.01", 0x00000, 0x08000, CRC(35697569) SHA1(13718923cffb9ec53cef9e22d8875370b5f3dd74) ) ROM_CONTINUE( 0x10000, 0x18000 ) - ROM_REGION( 0x400000, REGION_SOUND1, 0 ) // QSound samples - ROM_LOAD16_WORD_SWAP( "pl2-simm.05a", 0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a SIMM - ROM_LOAD16_WORD_SWAP( "pl2-simm.05b", 0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a SIMM + ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* QSound samples */ + ROM_LOAD16_WORD_SWAP( "pl2-simm.05a", 0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) /* ROM on a SIMM */ + ROM_LOAD16_WORD_SWAP( "pl2-simm.05b", 0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) /* ROM on a SIMM */ ROM_REGION( 0x20, REGION_USER5, 0 ) ROM_LOAD( "pzloop2.key", 0x000000, 0x000014, CRC(ae13be78) SHA1(5c715f0ef1e0664027faa6c2a7f0f878462cb7ae) ) diff --git a/src/drivers/crospang.c b/src/drivers/crospang.c index 5a7f0d257..346df9b3e 100644 --- a/src/drivers/crospang.c +++ b/src/drivers/crospang.c @@ -192,8 +192,8 @@ static struct GfxLayout layout_16x16x4 = static struct GfxDecodeInfo gfxdecodeinfo[] = { - { REGION_GFX1, 0, &layout_16x16x4a, 0, 0x10 }, // [0] Sprites - { REGION_GFX2, 0, &layout_16x16x4, 0, 0x30 }, // [1] Tiles + { REGION_GFX1, 0, &layout_16x16x4a, 0, 0x10 }, /* [0] Sprites */ + { REGION_GFX2, 0, &layout_16x16x4, 0, 0x30 }, /* [1] Tiles */ { -1 } }; @@ -259,7 +259,7 @@ ROM_START( crospang ) ROM_LOAD( "s1.bin", 0x00000, 0x10000, CRC(d61a224c) SHA1(5cd1b2d136ad58ab550c7ba135558d6c8a4cd8f6) ) ROM_REGION( 0x20000, REGION_SOUND1, 0 ) /* samples */ - ROM_LOAD( "s2.bin", 0x00000, 0x20000, CRC(9f9ecd22) SHA1(631ffe14018ba39658c435b8ecb23b19a14569ee) ) // sample rom contains oksan? + ROM_LOAD( "s2.bin", 0x00000, 0x20000, CRC(9f9ecd22) SHA1(631ffe14018ba39658c435b8ecb23b19a14569ee) ) /* sample rom contains oksan? */ ROM_REGION( 0x200000, REGION_GFX1, 0 ) /* sprites */ ROM_LOAD( "rom6.bin", 0x000000, 0x80000, CRC(9c633082) SHA1(18b8591b695ee429c9c9855d8cbba6249a4bd809) ) diff --git a/src/drivers/ddragon.c b/src/drivers/ddragon.c index f2bd26fa4..24046c0d9 100644 --- a/src/drivers/ddragon.c +++ b/src/drivers/ddragon.c @@ -123,7 +123,7 @@ static MACHINE_INIT( ddragon ) state_save_register_int("ddragon", 0, "ddragon_scrolly_hi", &ddragon_scrolly_hi); state_save_register_UINT8("ddragon", 0, "m_ddragon_sub_port", &m_ddragon_sub_port, 1); state_save_register_func_postload(ddragon_restore_state); -//msm5205 soundcore needs savestates added +/*msm5205 soundcore needs savestates added */ } @@ -225,7 +225,7 @@ static READ_HANDLER( darktowr_bank_r ) /* MCU is mapped into main cpu memory as a bank */ if (darktowr_bank==4) { - // log_cb(RETRO_LOG_DEBUG, LOGPRE "BankRead %05x %08x\n",activecpu_get_pc(),offset); + /* log_cb(RETRO_LOG_DEBUG, LOGPRE "BankRead %05x %08x\n",activecpu_get_pc(),offset); */ /* Horrible hack - the alternate TStrike set is mismatched against the MCU, so just hack around the protection here. (The hacks are 'right' as I have @@ -326,7 +326,7 @@ static READ_HANDLER( ddragon_hd63701_internal_registers_r ) static WRITE_HANDLER( ddragon_hd63701_internal_registers_w ) { -// Port 6 +/* Port 6 */ if (offset == 0x17) { if ((data & 0x1) == 0) @@ -736,7 +736,7 @@ INPUT_PORTS_START( tstrike ) COMMON_INPUT_DIP1 - PORT_START //DSW1 + PORT_START /*DSW1 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) diff --git a/src/drivers/deco_mlc.c b/src/drivers/deco_mlc.c index 006e4e54e..de30dd058 100644 --- a/src/drivers/deco_mlc.c +++ b/src/drivers/deco_mlc.c @@ -720,7 +720,7 @@ static WRITE32_HANDLER( mirror_hack_w ) return; } - //printf ("%8.8x, write\n", offset*4); + /*printf ("%8.8x, write\n", offset*4); */ } static DRIVER_INIT( avengrgs ) diff --git a/src/drivers/djboy.c b/src/drivers/djboy.c index 5cb13f141..12cbd6d37 100644 --- a/src/drivers/djboy.c +++ b/src/drivers/djboy.c @@ -1068,7 +1068,7 @@ ROM_START( djboyj ) ROM_LOAD( "bs001.1f", 0x080000, 0x80000, CRC(fdf36e6b) SHA1(a8762458dfd5201304247c113ceb85e96e33d423) ) ROM_LOAD( "bs002.1d", 0x100000, 0x80000, CRC(c52fee7f) SHA1(bd33117f7a57899fd4ec0a77413107edd9c44629) ) ROM_LOAD( "bs003.1k", 0x180000, 0x80000, CRC(ed89acb4) SHA1(611af362606b73cd2cf501678b463db52dcf69c4) ) - ROM_LOAD( "bsxx.1b", 0x1f0000, 0x10000, CRC(22c8aa08) SHA1(5521c9d73b4ee82a2de1992d6edc7ef62788ad72) ) // replaces last 0x200 tiles + ROM_LOAD( "bsxx.1b", 0x1f0000, 0x10000, CRC(22c8aa08) SHA1(5521c9d73b4ee82a2de1992d6edc7ef62788ad72) ) /* replaces last 0x200 tiles */ ROM_REGION( 0x100000, REGION_GFX2, 0 ) /* background */ ROM_LOAD( "bs004.1s", 0x000000, 0x80000, CRC(2f1392c3) SHA1(1bc3030b3612766a02133eef0b4d20013c0495a4) ) diff --git a/src/drivers/dkong.c b/src/drivers/dkong.c index 43b94c1d2..7ebffc445 100644 --- a/src/drivers/dkong.c +++ b/src/drivers/dkong.c @@ -409,7 +409,7 @@ static MEMORY_READ_START( hunchbkd_readmem ) { 0x1400, 0x1400, input_port_0_r }, /* IN0 */ { 0x1480, 0x1480, input_port_1_r }, /* IN1 */ { 0x1500, 0x1500, input_port_2_r }, /* IN2/DSW2 */ -/* { 0x1507, 0x1507, herbiedk_iack_r }, // Clear Int /*/ +/* { 0x1507, 0x1507, herbiedk_iack_r }, Clear Int */ { 0x1580, 0x1580, input_port_3_r }, /* DSW1 */ { 0x1600, 0x1bff, MRA_RAM }, /* video RAM */ { 0x1c00, 0x1fff, MRA_RAM }, @@ -1021,9 +1021,9 @@ INPUT_PORTS_START( dkrdemo ) PORT_DIPSETTING( 0x03, "9" ) PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x00, "10000" ) - PORT_DIPSETTING( 0x04, "15000" ) // and each additional 150k - PORT_DIPSETTING( 0x08, "25000" ) // and each additional 250k - PORT_DIPSETTING( 0x0c, "35000" ) // and each additional 350k + PORT_DIPSETTING( 0x04, "15000" ) /* and each additional 150k */ + PORT_DIPSETTING( 0x08, "25000" ) /* and each additional 250k */ + PORT_DIPSETTING( 0x0c, "35000" ) /* and each additional 350k */ PORT_DIPNAME( 0x30, 0x00, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x30, "Free Play" ) PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) @@ -1968,15 +1968,15 @@ MACHINE_DRIVER_END Game driver(s) ***************************************************************************/ -// A newer revision based on ROM labels, legitimate looking code changes, although in MAME it has some misplaced sprites flicking in the top left part of the screen near the score as the enemies appear -// Does this glitch happen on the PCB? +/* A newer revision based on ROM labels, legitimate looking code changes, although in MAME it has some misplaced sprites flicking in the top left part of the screen near the score as the enemies appear */ +/* Does this glitch happen on the PCB? */ ROM_START( radarscp ) ROM_REGION( 0x10000, REGION_CPU1, 0 ) ROM_LOAD( "trs2c5fd", 0x0000, 0x1000, CRC(80bbcbb3) SHA1(3af0ac3a267cdc819ccf5a279a78cdb16ee0360b) ) - ROM_LOAD( "trs2c5gd", 0x1000, 0x1000, CRC(afa8c49f) SHA1(25880e9dcf2dc8862f7f3c38687f01dfe2424293) ) // == trs2c5gc + ROM_LOAD( "trs2c5gd", 0x1000, 0x1000, CRC(afa8c49f) SHA1(25880e9dcf2dc8862f7f3c38687f01dfe2424293) ) /* == trs2c5gc */ ROM_LOAD( "trs2c5hd", 0x2000, 0x1000, CRC(e3ad4239) SHA1(f28469bc3388b4fdc14e2a095d8e117af6643b46) ) ROM_LOAD( "trs2c5kd", 0x3000, 0x1000, CRC(260a3ec4) SHA1(d5e7941a56457cd222cb018ab17a8eee2a9134b9) ) - //empty socket on position 5L on pcb labeled "Test", 0x4000, 0x1000 + /*empty socket on position 5L on pcb labeled "Test", 0x4000, 0x1000 */ ROM_REGION( 0x1800, REGION_CPU2, 0 ) /* sound */ ROM_LOAD( "trs2s3i", 0x0000, 0x0800, CRC(78034f14) SHA1(548b44ac69f39df6687da1c0f60968009b1e0767) ) @@ -2003,14 +2003,14 @@ ROM_START( radarscp ) ROM_LOAD( "rs2-v.1hc", 0x0200, 0x0100, CRC(1b828315) SHA1(00c9f8c5ae86b68d38c66f9071b5f1ef421c1005) ) /* character color codes on a per-column basis */ ROM_END -// unclear which boardset this comes from, probably a TRS-02 based on ROM labels; there existed a 5 pcb stack with TRS-03 (no voice) sound board on top, and a 4 board as well as a 2 board pcb stack +/* unclear which boardset this comes from, probably a TRS-02 based on ROM labels; there existed a 5 pcb stack with TRS-03 (no voice) sound board on top, and a 4 board as well as a 2 board pcb stack */ ROM_START( radarscpc ) ROM_REGION( 0x10000, REGION_CPU1, 0 ) ROM_LOAD( "trs2c5fc", 0x0000, 0x1000, CRC(40949e0d) SHA1(94717b9d027600e25b863e89900df41325875961) ) ROM_LOAD( "trs2c5gc", 0x1000, 0x1000, CRC(afa8c49f) SHA1(25880e9dcf2dc8862f7f3c38687f01dfe2424293) ) ROM_LOAD( "trs2c5hc", 0x2000, 0x1000, CRC(51b8263d) SHA1(09687f2c40cf09ffc2aeddde4a4fa32800847f01) ) ROM_LOAD( "trs2c5kc", 0x3000, 0x1000, CRC(1f0101f7) SHA1(b9f988847fdefa64dfeae06c2244215cb0d64dbe) ) - //empty socket on position 5L on pcb labeled "Test", 0x4000, 0x1000 + /*empty socket on position 5L on pcb labeled "Test", 0x4000, 0x1000 */ ROM_REGION( 0x1800, REGION_CPU2, 0 ) /* sound */ ROM_LOAD( "trs2s3i", 0x0000, 0x0800, CRC(78034f14) SHA1(548b44ac69f39df6687da1c0f60968009b1e0767) ) @@ -2037,7 +2037,7 @@ ROM_START( radarscpc ) ROM_LOAD( "rs2-v.1hc", 0x0200, 0x0100, CRC(1b828315) SHA1(00c9f8c5ae86b68d38c66f9071b5f1ef421c1005) ) /* character color codes on a per-column basis */ ROM_END -// TRS01 5-pcb stack with TRS01 "Voice" pcb on top containing the sound cpu and the m58817 speech chip and the m58819 speech serial rom emulator chip +/* TRS01 5-pcb stack with TRS01 "Voice" pcb on top containing the sound cpu and the m58817 speech chip and the m58819 speech serial rom emulator chip */ ROM_START( radarscp1 ) ROM_REGION( 0x10000, REGION_CPU1, 0 ) @@ -2045,15 +2045,15 @@ ROM_START( radarscp1 ) ROM_LOAD( "trs01_5g", 0x1000, 0x1000, CRC(afa8c49f) SHA1(25880e9dcf2dc8862f7f3c38687f01dfe2424293) ) ROM_LOAD( "trs01_5h", 0x2000, 0x1000, CRC(51b8263d) SHA1(09687f2c40cf09ffc2aeddde4a4fa32800847f01) ) ROM_LOAD( "trs01_5k", 0x3000, 0x1000, CRC(1f0101f7) SHA1(b9f988847fdefa64dfeae06c2244215cb0d64dbe) ) - //empty socket on position 5L on pcb labeled "Test", 0x4000, 0x1000 + /*empty socket on position 5L on pcb labeled "Test", 0x4000, 0x1000 */ ROM_REGION( 0x1800, REGION_CPU2, 0 ) /* sound */ - ROM_LOAD( "trs-s__5a.5a", 0x0000, 0x0800, CRC(5166554c) SHA1(00bf501ca448929f6187598da6fdbc1ea488745a) ) // 5A on the 'voice' board on top of the 5-pcb stack; eprom label is "TRS-S ['S' overstrikes a '1'] // 5A [stamped '8' or 'a' in red ink]" + ROM_LOAD( "trs-s__5a.5a", 0x0000, 0x0800, CRC(5166554c) SHA1(00bf501ca448929f6187598da6fdbc1ea488745a) ) /* 5A on the 'voice' board on top of the 5-pcb stack; eprom label is "TRS-S ['S' overstrikes a '1'] // 5A [stamped '8' or 'a' in red ink]" */ ROM_RELOAD( 0x0800, 0x0800 ) ROM_FILL( 0x1000, 0x0800, 0xFF ) ROM_REGION( 0x0800, REGION_USER2, 0 ) /* speech rom */ - ROM_LOAD( "trs-s__4h.4h", 0x0000, 0x0800, CRC(d1f1b48c) SHA1(ee5584368d2e9f7bde271f5004585b53f5ff5c3f) ) // 4H on the 'voice' board on top of the 5-pcb stack; eprom label is "TRS-S ['S' overstrikes a '1'] // 4H [stamped '8' or 'a' in red ink]" + ROM_LOAD( "trs-s__4h.4h", 0x0000, 0x0800, CRC(d1f1b48c) SHA1(ee5584368d2e9f7bde271f5004585b53f5ff5c3f) ) /* 4H on the 'voice' board on top of the 5-pcb stack; eprom label is "TRS-S ['S' overstrikes a '1'] // 4H [stamped '8' or 'a' in red ink]" */ ROM_REGION( 0x1000, REGION_GFX1, 0 ) ROM_LOAD( "trs01v3f", 0x0000, 0x0800, CRC(f095330e) SHA1(dd3de744f28ff108630d3336bd246d3323fa34af) ) @@ -2541,7 +2541,7 @@ ROM_START( pestplce ) ROM_REGION( 0x0300, REGION_PROMS, ROMREGION_INVERT ) ROM_LOAD( "n82s129a.bin", 0x0000, 0x0100, CRC(0330f35f) SHA1(5bd50cdd738b258dd3cfcd0e1dd8d37c927edc4b) ) ROM_LOAD( "n82s129b.bin", 0x0100, 0x0100, CRC(ba88311b) SHA1(b4388ebd3984bdb966d850cfb7d34c3ebce230b7) ) -// ROM_LOAD( "sn74s288n.bin", 0x0200, 0x0020, CRC(a5a6f2ca) SHA1(5507fb6f5c8845c4421c2996e9f76c818d987623) ) +/* ROM_LOAD( "sn74s288n.bin", 0x0200, 0x0020, CRC(a5a6f2ca) SHA1(5507fb6f5c8845c4421c2996e9f76c818d987623) ) */ ROM_END ROM_START( dkong3 ) diff --git a/src/drivers/dynax.c b/src/drivers/dynax.c index f64dc8f00..e3134c1cc 100644 --- a/src/drivers/dynax.c +++ b/src/drivers/dynax.c @@ -2583,7 +2583,7 @@ ROM_START( inca ) /* blitter data will be decrypted here*/ ROM_REGION( 0x400, REGION_PROMS, ROMREGION_DISPOSE ) /* Color PROMs */ - ROM_LOAD( "n82s147n.2", 0x000, 0x200, CRC(268bd9d3) SHA1(1f77d9dc58ab29f013ee21d7ec521b90be72610d) ) // FIXED BITS (0xxxxxxx) + ROM_LOAD( "n82s147n.2", 0x000, 0x200, CRC(268bd9d3) SHA1(1f77d9dc58ab29f013ee21d7ec521b90be72610d) ) /* FIXED BITS (0xxxxxxx) */ ROM_LOAD( "n82s147n.1", 0x200, 0x200, CRC(618dbeb3) SHA1(10c8a558430fd1c2cabf9133d3e4f0a5f80eab83) ) ROM_END diff --git a/src/drivers/fantland.c b/src/drivers/fantland.c index 1d0ccb018..56d988743 100644 --- a/src/drivers/fantland.c +++ b/src/drivers/fantland.c @@ -214,9 +214,9 @@ static MEMORY_READ_START( wheelrun_readmem ) { 0x30000, 0x3ffff, MRA_ROM }, { 0x70000, 0x7ffff, MRA_ROM }, { 0x52000, 0x521ff, MRA_RAM }, -// { 0x53000, 0x53000, input_port_0_r }, +/* { 0x53000, 0x53000, input_port_0_r }, */ { 0x53000, 0x53000, wheelrun_dial_0_r }, -// { 0x53001, 0x53001, input_port_1_r }, +/* { 0x53001, 0x53001, input_port_1_r }, */ { 0x53001, 0x53001, wheelrun_dial_1_r }, { 0x53002, 0x53002, input_port_2_r }, { 0x53003, 0x53003, input_port_3_r }, @@ -371,7 +371,7 @@ static MEMORY_READ_START( wheelrun_sound_readmem ) { 0x0000, 0x7fff, MRA_ROM }, { 0x8000, 0x87ff, MRA_RAM }, { 0xa000, 0xa000, YM3526_status_port_0_r }, - { 0xd000, 0xd000, soundlatch_r }, // during NMI + { 0xd000, 0xd000, soundlatch_r }, /* during NMI */ MEMORY_END static MEMORY_WRITE_START( wheelrun_sound_writemem ) @@ -379,8 +379,8 @@ static MEMORY_WRITE_START( wheelrun_sound_writemem ) { 0x8000, 0x87ff, MWA_RAM }, { 0xa000, 0xa000, YM3526_control_port_0_w }, { 0xa001, 0xa001, YM3526_write_port_0_w }, - { 0xb000, 0xb000, SN76496_0_w }, // on a car crash / hit - { 0xc000, 0xc000, SN76496_1_w }, // "" + { 0xb000, 0xb000, SN76496_0_w }, /* on a car crash / hit */ + { 0xc000, 0xc000, SN76496_1_w }, /* "" */ MEMORY_END /*************************************************************************** @@ -713,7 +713,7 @@ INPUT_PORTS_START( wheelrun ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) //PORT_CUSTOM(wheelrun_wheel_r, 0) + PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) /*PORT_CUSTOM(wheelrun_wheel_r, 0) */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START /* IN1 - 53001 */ @@ -721,7 +721,7 @@ INPUT_PORTS_START( wheelrun ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) //PORT_CUSTOM(wheelrun_wheel_r, 1 ) + PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) /*PORT_CUSTOM(wheelrun_wheel_r, 1 ) */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -978,14 +978,14 @@ static struct SN76496interface wheelrun_sn76496_interface = static MACHINE_DRIVER_START( wheelrun ) /* basic machine hardware */ - MDRV_CPU_ADD(I86, 9000000 ) // D701080C-8 (V20) + MDRV_CPU_ADD(I86, 9000000 ) /* D701080C-8 (V20) */ MDRV_CPU_MEMORY(wheelrun_readmem, wheelrun_writemem) MDRV_CPU_VBLANK_INT(fantland_irq,1) /* audio CPU */ - MDRV_CPU_ADD(Z80, 9000000) // Z8400BB1 (Z80B) + MDRV_CPU_ADD(Z80, 9000000) /* Z8400BB1 (Z80B) */ MDRV_CPU_MEMORY(wheelrun_sound_readmem, wheelrun_sound_writemem) - // IRQ by YM3526, NMI when soundlatch is written + /* IRQ by YM3526, NMI when soundlatch is written */ MDRV_FRAMES_PER_SECOND(60) MDRV_VBLANK_DURATION(DEFAULT_60HZ_VBLANK_DURATION) @@ -1287,15 +1287,15 @@ Hardware info by f205v ***************************************************************************/ ROM_START( wheelrun ) - ROM_REGION( 0x100000, REGION_CPU1, 0 ) // V20 + ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* V20 */ ROM_LOAD( "4.4", 0x30000, 0x10000, CRC(359303df) SHA1(583b70f65b775e99856ffda61334be3b85046ed1) ) ROM_LOAD( "3.3", 0x70000, 0x10000, CRC(c28d0b31) SHA1(add8c4ffe529755c101b72a3b0530e796948876b) ) ROM_COPY( REGION_CPU1, 0x70000, 0xf0000, 0x10000 ) - ROM_REGION( 0x100000, REGION_CPU2, 0 ) // Z80 - ROM_LOAD( "1.1", 0x00000, 0x10000, CRC(67b5f31f) SHA1(5553b132077686221fb7a21a0246fd55cb443332) ) // 1xxxxxxxxxxxxxxx = 0xFF + ROM_REGION( 0x100000, REGION_CPU2, 0 ) /* Z80 */ + ROM_LOAD( "1.1", 0x00000, 0x10000, CRC(67b5f31f) SHA1(5553b132077686221fb7a21a0246fd55cb443332) ) /* 1xxxxxxxxxxxxxxx = 0xFF */ - ROM_REGION( 0xc0000, REGION_GFX1,0 ) // gfx + ROM_REGION( 0xc0000, REGION_GFX1,0 ) /* gfx */ ROMX_LOAD( "7.7", 0x00000, 0x10000, CRC(e0e5ff64) SHA1(e2ed5ea5b75ed627a9d305864196160267cad438), ROM_SKIP(2) ) ROMX_LOAD( "11.11", 0x00001, 0x10000, CRC(ce9718fb) SHA1(ade47deedd5d0c927fdf8626aa1b0fac470f03a0), ROM_SKIP(2) ) ROMX_LOAD( "15.15", 0x00002, 0x10000, CRC(f6665f31) SHA1(e308a049697622bcda9d3c630e061d30c2b70687), ROM_SKIP(2) ) @@ -1308,9 +1308,9 @@ ROM_START( wheelrun ) ROMX_LOAD( "13.13", 0x60001, 0x10000, CRC(8b0aae8d) SHA1(413821fdbf599004b57f3588360ccf881547e104), ROM_SKIP(2) ) ROMX_LOAD( "17.17", 0x60002, 0x10000, CRC(be8ab48d) SHA1(1520d70eb9c65f84deddc2d7c8de7ae2cbb1ec09), ROM_SKIP(2) ) - ROMX_LOAD( "10.10", 0x90000, 0x10000, CRC(c5bdd367) SHA1(c432762d23b8799643fd5f1775a44d31582e7290), ROM_SKIP(2) ) // 1111xxxxxxxxxxxx = 0x00 + ROMX_LOAD( "10.10", 0x90000, 0x10000, CRC(c5bdd367) SHA1(c432762d23b8799643fd5f1775a44d31582e7290), ROM_SKIP(2) ) /* 1111xxxxxxxxxxxx = 0x00 */ ROMX_LOAD( "14.14", 0x90001, 0x10000, CRC(e592302f) SHA1(d4f668d259ec649e3126db27d990a2e5fa9cad8d), ROM_SKIP(2) ) - ROMX_LOAD( "18.18", 0x90002, 0x10000, CRC(6bd42d8e) SHA1(0745428a54da85707d4435f20cc2094576a95e5b), ROM_SKIP(2) ) // 1111xxxxxxxxxxxx = 0x00 + ROMX_LOAD( "18.18", 0x90002, 0x10000, CRC(6bd42d8e) SHA1(0745428a54da85707d4435f20cc2094576a95e5b), ROM_SKIP(2) ) /* 1111xxxxxxxxxxxx = 0x00 */ ROM_END GAME( 1987, borntofi, 0, borntofi, borntofi, 0, ROT0, "International Games", "Born To Fight" ) diff --git a/src/drivers/firetrk.c b/src/drivers/firetrk.c index 68aa250cd..a7f66520f 100644 --- a/src/drivers/firetrk.c +++ b/src/drivers/firetrk.c @@ -40,8 +40,8 @@ OVERLAY_END static DRIVER_INIT( firetrk ) { firetrk_game = 1; - // Note that fire truck does not have an overlay - // on the real machine. It was purely B&W. + /* Note that fire truck does not have an overlay */ + /* on the real machine. It was purely B&W. */ } static DRIVER_INIT( superbug ) diff --git a/src/drivers/foodf.c b/src/drivers/foodf.c index fe3ce4e31..8d58bc9a2 100644 --- a/src/drivers/foodf.c +++ b/src/drivers/foodf.c @@ -191,64 +191,64 @@ static READ16_HANDLER( analog_r ) * Live Center - rev 5 - by mahoneyt944 & grant2258 * ****************************************************/ - static UINT8 currentx = 0x80; // upright + static UINT8 currentx = 0x80; /* upright */ static UINT8 currenty = 0x7F; - static UINT8 currentx2 = 0x80; // cocktail + static UINT8 currentx2 = 0x80; /* cocktail */ static UINT8 currenty2 = 0x7F; - static UINT8 delay = 0; // debounce counter - static UINT8 t = 0; // debounce count to reach - UINT8 center = 0; // reset center checks + static UINT8 delay = 0; /* debounce counter */ + static UINT8 t = 0; /* debounce count to reach */ + UINT8 center = 0; /* reset center checks */ UINT8 center2 = 0; - // live center dip switch set -> On + /* live center dip switch set -> On */ if (readinputport(6) == 0x01) { - // user set debounce delay from dip menu + /* user set debounce delay from dip menu */ if (readinputport(7) == 0xFF) t = 0; else t = readinputport(7); if (delay > t) delay = 0; - // check for centers + /* check for centers */ if (readinputport(0) == 0x7F && readinputport(2) == 0x7F) center = 1; if (readinputport(1) == 0x7F && readinputport(3) == 0x7F) center2 = 1; - if (delay == t) // debounce protection + if (delay == t) /* debounce protection */ { delay = 0; if (center == 0) - { // update upright stopping positions + { /* update upright stopping positions */ currentx = position_update(readinputport(0)); currenty = position_update(readinputport(2)); } if (center2 == 0) - { // update cocktail stopping positions + { /* update cocktail stopping positions */ currentx2 = position_update(readinputport(1)); currenty2 = position_update(readinputport(3)); } } else delay++; - // return upright x stopping position + /* return upright x stopping position */ if (whichport == 0) { if (center) return currentx; } - // return upright y stopping position + /* return upright y stopping position */ else if (whichport == 2) { if (center) return currenty; } - // return cocktail x stopping position + /* return cocktail x stopping position */ else if (whichport == 1) { if (center2) return currentx2; } - // return cocktail y stopping position + /* return cocktail y stopping position */ else if (whichport == 3) { if (center2) return currenty2; } } - // return actual input + /* return actual input */ return readinputport(whichport); } diff --git a/src/drivers/galaga.c b/src/drivers/galaga.c index e367ba5fe..a2a7d3b77 100644 --- a/src/drivers/galaga.c +++ b/src/drivers/galaga.c @@ -741,14 +741,14 @@ static WRITE_HANDLER( bosco_latch_w ) } -static READ_HANDLER( in0_l ) { return readinputport(0); } // fire and start buttons -static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } // coins -static READ_HANDLER( in1_l ) { return readinputport(1); } // P1 joystick -static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } // P2 joystick -static READ_HANDLER( dipA_l ) { return readinputport(2); } // dips A -static READ_HANDLER( dipA_h ) { return readinputport(2) >> 4; } // dips A -static READ_HANDLER( dipB_l ) { return readinputport(3); } // dips B -static READ_HANDLER( dipB_h ) { return readinputport(3) >> 4; } // dips B +static READ_HANDLER( in0_l ) { return readinputport(0); } /* fire and start buttons */ +static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } /* coins */ +static READ_HANDLER( in1_l ) { return readinputport(1); } /* P1 joystick */ +static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } /* P2 joystick */ +static READ_HANDLER( dipA_l ) { return readinputport(2); } /* dips A */ +static READ_HANDLER( dipA_h ) { return readinputport(2) >> 4; } /* dips A */ +static READ_HANDLER( dipB_l ) { return readinputport(3); } /* dips B */ +static READ_HANDLER( dipB_h ) { return readinputport(3) >> 4; } /* dips B */ static WRITE_HANDLER( out_0 ) { set_led_status(1,data & 1); @@ -1012,7 +1012,7 @@ MEMORY_END static MEMORY_READ_START( readmem4_dzigzag ) { 0x0000, 0x0fff, MRA_ROM }, { 0x1000, 0x107f, MRA_RAM }, - { 0x4000, 0x4007, MRA_RAM }, // dip switches? bits 0 & 1 used + { 0x4000, 0x4007, MRA_RAM }, /* dip switches? bits 0 & 1 used */ MEMORY_END static MEMORY_WRITE_START( writemem4_dzigzag ) @@ -1877,7 +1877,7 @@ static const char *galaga_sample_names[] = "*galaga", "bang.wav", "bang.wav", -// "init.wav", +/* "init.wav", */ 0 /* end of array */ }; @@ -2517,10 +2517,10 @@ ROM_START( gatsbee ) ROM_LOAD( "4.4e", 0x3000, 0x1000, CRC(bf9f613b) SHA1(41c852fc77f0f35bf48a5b81a19234ed99871c89) ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* 64k for the second CPU */ - ROM_LOAD( "gg1-5", 0x0000, 0x1000, CRC(3102fccd) SHA1(d29b68d6aab3217fa2106b3507b9273ff3f927bf) ) // 5.4j + ROM_LOAD( "gg1-5", 0x0000, 0x1000, CRC(3102fccd) SHA1(d29b68d6aab3217fa2106b3507b9273ff3f927bf) ) /* 5.4j */ ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* 64k for the third CPU */ - ROM_LOAD( "gg1-7", 0x0000, 0x1000, CRC(8995088d) SHA1(d6cb439de0718826d1a0363c9d77de8740b18ecf) ) // 7.4k + ROM_LOAD( "gg1-7", 0x0000, 0x1000, CRC(8995088d) SHA1(d6cb439de0718826d1a0363c9d77de8740b18ecf) ) /* 7.4k */ ROM_REGION( 0x10000, REGION_CPU4, 0 ) /* 64k for a Z80 which emulates the custom I/O chip (not used) */ ROM_LOAD( "gallag.6", 0x0000, 0x1000, CRC(001b70bc) SHA1(b465eee91e75257b7b049d49c0064ab5fd66c576) ) @@ -2601,7 +2601,7 @@ ROM_START( xevious ) ROM_LOAD( "xvi_16.4n", 0x4000, 0x1000, CRC(605ca889) SHA1(3bf380ef76c03822a042ecc73b5edd4543c268ce) ) /* sprite set #3, planes 0/1 */ ROM_LOAD( "xvi_18.4r", 0x5000, 0x2000, CRC(02417d19) SHA1(b5f830dd2cf25cf154308d2e640f0ecdcda5d8cd) ) /* sprite set #1, plane 2, set #2, plane 2 */ /* 0x7000-0x8fff will be unpacked from 0x5000-0x6fff */ - ROM_FILL( 0x9000, 0x1000, 0x00 ) // empty space to decode sprite set #3 as 3 bits per pixel + ROM_FILL( 0x9000, 0x1000, 0x00 ) /* empty space to decode sprite set #3 as 3 bits per pixel */ ROM_REGION( 0x4000, REGION_GFX4, 0 ) /* background tilemaps */ ROM_LOAD( "xvi_9.2a", 0x0000, 0x1000, CRC(57ed9879) SHA1(3106d1aacff06cf78371bd19967141072b32b7d7) ) @@ -2646,7 +2646,7 @@ ROM_START( xeviousa ) ROM_LOAD( "xvi_16.4n", 0x4000, 0x1000, CRC(605ca889) SHA1(3bf380ef76c03822a042ecc73b5edd4543c268ce) ) /* sprite set #3, planes 0/1 */ ROM_LOAD( "xvi_18.4r", 0x5000, 0x2000, CRC(02417d19) SHA1(b5f830dd2cf25cf154308d2e640f0ecdcda5d8cd) ) /* sprite set #1, plane 2, set #2, plane 2 */ /* 0x7000-0x8fff will be unpacked from 0x5000-0x6fff */ - ROM_FILL( 0x9000, 0x1000, 0x00 ) // empty space to decode sprite set #3 as 3 bits per pixel + ROM_FILL( 0x9000, 0x1000, 0x00 ) /* empty space to decode sprite set #3 as 3 bits per pixel */ ROM_REGION( 0x4000, REGION_GFX4, 0 ) /* background tilemaps */ ROM_LOAD( "xvi_9.2a", 0x0000, 0x1000, CRC(57ed9879) SHA1(3106d1aacff06cf78371bd19967141072b32b7d7) ) @@ -2691,7 +2691,7 @@ ROM_START( xeviousb ) ROM_LOAD( "xvi_16.4n", 0x4000, 0x1000, CRC(605ca889) SHA1(3bf380ef76c03822a042ecc73b5edd4543c268ce) ) /* sprite set #3, planes 0/1 */ ROM_LOAD( "xvi_18.4r", 0x5000, 0x2000, CRC(02417d19) SHA1(b5f830dd2cf25cf154308d2e640f0ecdcda5d8cd) ) /* sprite set #1, plane 2, set #2, plane 2 */ /* 0x7000-0x8fff will be unpacked from 0x5000-0x6fff */ - ROM_FILL( 0x9000, 0x1000, 0x00 ) // empty space to decode sprite set #3 as 3 bits per pixel + ROM_FILL( 0x9000, 0x1000, 0x00 ) /* empty space to decode sprite set #3 as 3 bits per pixel */ ROM_REGION( 0x4000, REGION_GFX4, 0 ) /* background tilemaps */ ROM_LOAD( "xvi_9.2a", 0x0000, 0x1000, CRC(57ed9879) SHA1(3106d1aacff06cf78371bd19967141072b32b7d7) ) @@ -2739,7 +2739,7 @@ ROM_START( xeviousc ) ROM_LOAD( "xvi_16.4n", 0x4000, 0x1000, CRC(605ca889) SHA1(3bf380ef76c03822a042ecc73b5edd4543c268ce) ) /* sprite set #3, planes 0/1 */ ROM_LOAD( "xvi_18.4r", 0x5000, 0x2000, CRC(02417d19) SHA1(b5f830dd2cf25cf154308d2e640f0ecdcda5d8cd) ) /* sprite set #1, plane 2, set #2, plane 2 */ /* 0x7000-0x8fff will be unpacked from 0x5000-0x6fff */ - ROM_FILL( 0x9000, 0x1000, 0x00 ) // empty space to decode sprite set #3 as 3 bits per pixel + ROM_FILL( 0x9000, 0x1000, 0x00 ) /* empty space to decode sprite set #3 as 3 bits per pixel */ ROM_REGION( 0x4000, REGION_GFX4, 0 ) /* background tilemaps */ ROM_LOAD( "xvi_9.2a", 0x0000, 0x1000, CRC(57ed9879) SHA1(3106d1aacff06cf78371bd19967141072b32b7d7) ) @@ -2787,7 +2787,7 @@ ROM_START( xevios ) ROM_LOAD( "xvi_16.4n", 0x4000, 0x1000, CRC(605ca889) SHA1(3bf380ef76c03822a042ecc73b5edd4543c268ce) ) /* sprite set #3, planes 0/1 */ ROM_LOAD( "16.8d", 0x5000, 0x2000, CRC(44262c04) SHA1(4291f83193d11064c2ba6a9af27951b93bb945c3) ) /* sprite set #1, plane 2, set #2, plane 2 */ /* 0x7000-0x8fff will be unpacked from 0x5000-0x6fff */ - ROM_FILL( 0x9000, 0x1000, 0x00 ) // empty space to decode sprite set #3 as 3 bits per pixel + ROM_FILL( 0x9000, 0x1000, 0x00 ) /* empty space to decode sprite set #3 as 3 bits per pixel */ ROM_REGION( 0x4000, REGION_GFX4, 0 ) /* background tilemaps */ ROM_LOAD( "10.1d", 0x0000, 0x1000, CRC(10baeebb) SHA1(c544c9e0bb7a1ef93b3f2c2c1397f659d5334373) ) @@ -2841,7 +2841,7 @@ ROM_START( battles ) ROM_LOAD( "xvi_16.4n", 0x4000, 0x1000, CRC(605ca889) SHA1(3bf380ef76c03822a042ecc73b5edd4543c268ce) ) /* sprite set #3, planes 0/1 */ ROM_LOAD( "xvi_18.4r", 0x5000, 0x2000, CRC(02417d19) SHA1(b5f830dd2cf25cf154308d2e640f0ecdcda5d8cd) ) /* sprite set #1, plane 2, set #2, plane 2 */ /* 0x7000-0x8fff will be unpacked from 0x5000-0x6fff */ - ROM_FILL( 0x9000, 0x1000, 0x00 ) // empty space to decode sprite set #3 as 3 bits per pixel + ROM_FILL( 0x9000, 0x1000, 0x00 ) /* empty space to decode sprite set #3 as 3 bits per pixel */ ROM_REGION( 0x4000, REGION_GFX4, 0 ) /* background tilemaps */ ROM_LOAD( "xvi_9.2a", 0x0000, 0x1000, CRC(57ed9879) SHA1(3106d1aacff06cf78371bd19967141072b32b7d7) ) @@ -2889,7 +2889,7 @@ ROM_START( sxevious ) ROM_LOAD( "xvi_16.4n", 0x4000, 0x1000, CRC(605ca889) SHA1(3bf380ef76c03822a042ecc73b5edd4543c268ce) ) /* sprite set #3, planes 0/1 */ ROM_LOAD( "xvi_18.4r", 0x5000, 0x2000, CRC(02417d19) SHA1(b5f830dd2cf25cf154308d2e640f0ecdcda5d8cd) ) /* sprite set #1, plane 2, set #2, plane 2 */ /* 0x7000-0x8fff will be unpacked from 0x5000-0x6fff */ - ROM_FILL( 0x9000, 0x1000, 0x00 ) // empty space to decode sprite set #3 as 3 bits per pixel + ROM_FILL( 0x9000, 0x1000, 0x00 ) /* empty space to decode sprite set #3 as 3 bits per pixel */ ROM_REGION( 0x4000, REGION_GFX4, 0 ) /* background tilemaps */ ROM_LOAD( "xvi_9.2a", 0x0000, 0x1000, CRC(57ed9879) SHA1(3106d1aacff06cf78371bd19967141072b32b7d7) ) diff --git a/src/drivers/gaplus.c b/src/drivers/gaplus.c index 8143d628d..3e4ab4849 100644 --- a/src/drivers/gaplus.c +++ b/src/drivers/gaplus.c @@ -179,14 +179,14 @@ VIDEO_EOF( gaplus ); /* update starfields */ ***************************************************************************/ -static READ_HANDLER( in0_l ) { return readinputport(0); } // P1 joystick -static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } // P2 joystick -static READ_HANDLER( in1_l ) { return readinputport(1); } // fire and start buttons -static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } // coins -static READ_HANDLER( dipA_l ) { return readinputport(2); } // dips A -static READ_HANDLER( dipA_h ) { return readinputport(2) >> 4; } // dips A -static READ_HANDLER( dipB_l ) { return readinputport(3); } // dips B -static READ_HANDLER( dipB_h ) { return readinputport(3) >> 4; } // dips B +static READ_HANDLER( in0_l ) { return readinputport(0); } /* P1 joystick */ +static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } /* P2 joystick */ +static READ_HANDLER( in1_l ) { return readinputport(1); } /* fire and start buttons */ +static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } /* coins */ +static READ_HANDLER( dipA_l ) { return readinputport(2); } /* dips A */ +static READ_HANDLER( dipA_h ) { return readinputport(2) >> 4; } /* dips A */ +static READ_HANDLER( dipB_l ) { return readinputport(3); } /* dips B */ +static READ_HANDLER( dipB_h ) { return readinputport(3) >> 4; } /* dips B */ static WRITE_HANDLER( out_lamps0 ) { set_led_status(0,data & 1); @@ -318,8 +318,8 @@ static MACHINE_INIT( gaplus ) static INTERRUPT_GEN( gaplus_interrupt_1 ) { - irq0_line_assert(); // this also checks if irq is enabled - IMPORTANT! - // so don't replace with cpu_set_irq_line(0, 0, ASSERT_LINE); + irq0_line_assert(); /* this also checks if irq is enabled - IMPORTANT! */ + /* so don't replace with cpu_set_irq_line(0, 0, ASSERT_LINE); */ namcoio_set_irq_line(0,PULSE_LINE); namcoio_set_irq_line(1,PULSE_LINE); @@ -535,7 +535,7 @@ INPUT_PORTS_START( gapluso ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x04, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) // doesn't seem to be used + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* doesn't seem to be used */ INPUT_PORTS_END /* identical to gaplus, but different bonus life settings */ @@ -821,7 +821,7 @@ ROM_START( gaplus ) ROM_LOAD( "gp2-12.11r", 0x4000, 0x2000, CRC(7316a1f1) SHA1(368e4541a5151e906a189712bc05192c2ceec8ae) ) /* objects */ ROM_LOAD( "gp2-9.11m", 0x6000, 0x2000, CRC(e6a9ae67) SHA1(99c1e67c3b216aa1b63f199e21c73cdedde80e1b) ) /* objects */ /* 0x8000-0x9fff will be unpacked from 0x6000-0x7fff */ - ROM_FILL( 0xa000, 0x2000, 0x00 ) // optional ROM, not used + ROM_FILL( 0xa000, 0x2000, 0x00 ) /* optional ROM, not used */ ROM_REGION( 0x0800, REGION_PROMS, 0 ) ROM_LOAD( "gp2-3.1p", 0x0000, 0x0100, CRC(a5091352) SHA1(dcd6dfbfbd5281ba0c7b7c189d6fde23617ed3e3) ) /* red palette ROM (4 bits) */ @@ -859,7 +859,7 @@ ROM_START( gapluso ) ROM_LOAD( "gp2-12.11r", 0x4000, 0x2000, CRC(7316a1f1) SHA1(368e4541a5151e906a189712bc05192c2ceec8ae) ) /* objects */ ROM_LOAD( "gp2-9.11m", 0x6000, 0x2000, CRC(e6a9ae67) SHA1(99c1e67c3b216aa1b63f199e21c73cdedde80e1b) ) /* objects */ /* 0x8000-0x9fff will be unpacked from 0x6000-0x7fff */ - ROM_FILL( 0xa000, 0x2000, 0x00 ) // optional ROM, not used + ROM_FILL( 0xa000, 0x2000, 0x00 ) /* optional ROM, not used */ ROM_REGION( 0x0800, REGION_PROMS, 0 ) ROM_LOAD( "gp2-3.1p", 0x0000, 0x0100, CRC(a5091352) SHA1(dcd6dfbfbd5281ba0c7b7c189d6fde23617ed3e3) ) /* red palette ROM (4 bits) */ @@ -897,7 +897,7 @@ ROM_START( gaplusa ) ROM_LOAD( "gp2-12.11r", 0x4000, 0x2000, CRC(7316a1f1) SHA1(368e4541a5151e906a189712bc05192c2ceec8ae) ) /* objects */ ROM_LOAD( "gp2-9.11m", 0x6000, 0x2000, CRC(e6a9ae67) SHA1(99c1e67c3b216aa1b63f199e21c73cdedde80e1b) ) /* objects */ /* 0x8000-0x9fff will be unpacked from 0x6000-0x7fff */ - ROM_FILL( 0xa000, 0x2000, 0x00 ) // optional ROM, not used + ROM_FILL( 0xa000, 0x2000, 0x00 ) /* optional ROM, not used */ ROM_REGION( 0x0800, REGION_PROMS, 0 ) ROM_LOAD( "gp2-3.1p", 0x0000, 0x0100, CRC(a5091352) SHA1(dcd6dfbfbd5281ba0c7b7c189d6fde23617ed3e3) ) /* red palette ROM (4 bits) */ @@ -935,7 +935,7 @@ ROM_START( galaga3 ) ROM_LOAD( "gp2-12.11r", 0x4000, 0x2000, CRC(7316a1f1) SHA1(368e4541a5151e906a189712bc05192c2ceec8ae) ) /* objects */ ROM_LOAD( "gp2-9.11m", 0x6000, 0x2000, CRC(e6a9ae67) SHA1(99c1e67c3b216aa1b63f199e21c73cdedde80e1b) ) /* objects */ /* 0x8000-0x9fff will be unpacked from 0x6000-0x7fff */ - ROM_FILL( 0xa000, 0x2000, 0x00 ) // optional ROM, not used + ROM_FILL( 0xa000, 0x2000, 0x00 ) /* optional ROM, not used */ ROM_REGION( 0x0800, REGION_PROMS, 0 ) ROM_LOAD( "gp2-3.1p", 0x0000, 0x0100, CRC(a5091352) SHA1(dcd6dfbfbd5281ba0c7b7c189d6fde23617ed3e3) ) /* red palette ROM (4 bits) */ @@ -973,7 +973,7 @@ ROM_START( galaga3a ) ROM_LOAD( "gp2-12.11r", 0x4000, 0x2000, CRC(7316a1f1) SHA1(368e4541a5151e906a189712bc05192c2ceec8ae) ) /* objects */ ROM_LOAD( "gp2-9.11m", 0x6000, 0x2000, CRC(e6a9ae67) SHA1(99c1e67c3b216aa1b63f199e21c73cdedde80e1b) ) /* objects */ /* 0x8000-0x9fff will be unpacked from 0x6000-0x7fff */ - ROM_FILL( 0xa000, 0x2000, 0x00 ) // optional ROM, not used + ROM_FILL( 0xa000, 0x2000, 0x00 ) /* optional ROM, not used */ ROM_REGION( 0x0800, REGION_PROMS, 0 ) ROM_LOAD( "gp2-3.1p", 0x0000, 0x0100, CRC(a5091352) SHA1(dcd6dfbfbd5281ba0c7b7c189d6fde23617ed3e3) ) /* red palette ROM (4 bits) */ @@ -1011,7 +1011,7 @@ ROM_START( galaga3m ) ROM_LOAD( "gp2-12.11r", 0x4000, 0x2000, CRC(7316a1f1) SHA1(368e4541a5151e906a189712bc05192c2ceec8ae) ) /* objects */ ROM_LOAD( "gp2-9.11m", 0x6000, 0x2000, CRC(e6a9ae67) SHA1(99c1e67c3b216aa1b63f199e21c73cdedde80e1b) ) /* objects */ /* 0x8000-0x9fff will be unpacked from 0x6000-0x7fff */ - ROM_FILL( 0xa000, 0x2000, 0x00 ) // optional ROM, not used + ROM_FILL( 0xa000, 0x2000, 0x00 ) /* optional ROM, not used */ ROM_REGION( 0x0800, REGION_PROMS, 0 ) ROM_LOAD( "gp2-3.1p", 0x0000, 0x0100, CRC(a5091352) SHA1(dcd6dfbfbd5281ba0c7b7c189d6fde23617ed3e3) ) /* red palette ROM (4 bits) */ diff --git a/src/drivers/geebee.c b/src/drivers/geebee.c index dc00570ac..79752be85 100644 --- a/src/drivers/geebee.c +++ b/src/drivers/geebee.c @@ -125,14 +125,14 @@ extern void geebee_sh_update(void); /* centre, but is white at the bottom. */ /* We handle both overlays, depending on dip switch (restart required). */ OVERLAY_START( geebee_overlay ) - // Common to both upright and cocktail + /* Common to both upright and cocktail */ OVERLAY_RECT( 4*8, 4*8, 5*8, 24*8, OVERLAY_ORANGE ) OVERLAY_TRI( 4*8, 25*8, 5*8, 24*8, OVERLAY_GREEN ) OVERLAY_TRI( 5*8, 24*8, 4*8, 25*8, OVERLAY_ORANGE ) OVERLAY_TRI( 5*8, 4*8, 4*8, 3*8, OVERLAY_GREEN ) OVERLAY_TRI( 4*8, 3*8, 5*8, 4*8, OVERLAY_ORANGE ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 1*8, 3*8, 2*8, 25*8, OVERLAY_PURPLE ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 2*8, 3*8, 4*8, 25*8, OVERLAY_RED ) @@ -203,7 +203,7 @@ OVERLAY_START( geebee_overlay ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 7*8+4, 18*8, 9*8, 19*8, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 10*8, 18*8, 11*8+4, 19*8, OVERLAY_YELLOW ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 1*8, 0*8, 2*8, 28*8, OVERLAY_PURPLE ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 2*8, 0*8, 4*8, 28*8, OVERLAY_RED ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 30*8, 0*8, 32*8, 28*8, OVERLAY_RED ) @@ -231,7 +231,7 @@ OVERLAY_END /* limiting what an overlay can do on such setups. */ /* We handle both overlays, depending on dip switch (restart required). */ OVERLAY_START( navalone_overlay ) - // Common to both upright and cocktail + /* Common to both upright and cocktail */ OVERLAY_RECT( 0*8, 0*8, 1*8, 28*8, OVERLAY_CYAN ) OVERLAY_RECT( 3*8, 3*8-1, 4*8, 3*8, OVERLAY_GREEN ) OVERLAY_RECT( 3*8, 25*8, 4*8, 25*8+1, OVERLAY_GREEN ) @@ -244,7 +244,7 @@ OVERLAY_START( navalone_overlay ) OVERLAY_RECT( 3*8, 25*8+1, 6*8, 28*8, OVERLAY_BLUE ) OVERLAY_RECT( 33*8, 0*8, 36*8, 28*8, OVERLAY_CYAN ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 1*8, 0*8, 3*8, 28*8, OVERLAY_CYAN ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 3*8, 3*8, 4*8, 25*8, OVERLAY_YELLOW ) @@ -315,7 +315,7 @@ OVERLAY_START( navalone_overlay ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 29*8+1, 0*8, 33*8, 28*8, OVERLAY_BLUE ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 12*8, 12*8, 16*8, 16*8, OVERLAY_YELLOW ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 1*8, 0*8, 3*8, 28*8, OVERLAY_BLUE ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 3*8, 3*8, 4*8, 25*8, OVERLAY_BLUE ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 5*8, 4*8-1, 12*8, 24*8+1, OVERLAY_GREEN ) @@ -323,8 +323,8 @@ OVERLAY_START( navalone_overlay ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 12*8, 4*8-1, 22*8, 5*8, OVERLAY_GREEN ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 12*8, 23*8, 22*8, 24*8+1, OVERLAY_GREEN ) - // A larger area of yellow is used to cover both upside down and upright - // and also the name and logo on game start + /* A larger area of yellow is used to cover both upside down and upright */ + /* and also the name and logo on game start */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 12*8, 5*8, 22*8, 23*8, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 31*8, 0*8, 33*8, 28*8, OVERLAY_BLUE ) @@ -350,7 +350,7 @@ OVERLAY_END /* limiting what an overlay can do on such setups. */ /* We handle both overlays, depending on dip switch (restart required). */ OVERLAY_START( kaitei_overlay ) - // Common to both upright and cocktail + /* Common to both upright and cocktail */ OVERLAY_RECT( 0*8, 0*8, 1*8, 28*8, OVERLAY_GREEN ) OVERLAY_RECT( 33*8, 0*8, 34*8, 28*8, OVERLAY_GREEN ) OVERLAY_RECT( 30*8, 0*8, 31*8-5, 5*8, OVERLAY_BROWN ) @@ -360,7 +360,7 @@ OVERLAY_START( kaitei_overlay ) OVERLAY_RECT( 30*8, 19*8, 31*8-5, 21*8, OVERLAY_BROWN ) OVERLAY_RECT( 30*8, 23*8, 31*8-5, 28*8, OVERLAY_BROWN ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 4*8-3, 0*8, 4*8, 5*8, OVERLAY_BROWN ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 4*8-3, 7*8, 4*8, 9*8, OVERLAY_BROWN ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 4*8-3, 11*8, 4*8, 12*8, OVERLAY_BROWN ) @@ -381,7 +381,7 @@ OVERLAY_START( kaitei_overlay ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 30*8, 17*8, 30*8+3, 19*8, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 30*8, 21*8, 30*8+3, 23*8, OVERLAY_YELLOW ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 2*8, 0*8, 3*8, 28*8, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 9*8, 0*8, 10*8-2, 28*8, OVERLAY_BROWN ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 10*8-2, 0*8, 30*8, 28*8, OVERLAY_BLUE ) @@ -396,7 +396,7 @@ OVERLAY_END /* I have created a simple one for it here. It works in both upright */ /* and cocktail mode. */ OVERLAY_START( sos_overlay ) - // Common to both upright and cocktail + /* Common to both upright and cocktail */ OVERLAY_RECT( 0*8, 0*8, 1*8, 28*8, OVERLAY_GREEN ) OVERLAY_RECT( 33*8, 0*8, 34*8, 28*8, OVERLAY_GREEN ) OVERLAY_RECT( 1*8, 0*8, 33*8, 28*8, OVERLAY_LT_BLUE ) diff --git a/src/drivers/goal92.c b/src/drivers/goal92.c index 95ddb4e4a..b0d426762 100644 --- a/src/drivers/goal92.c +++ b/src/drivers/goal92.c @@ -360,7 +360,7 @@ static MACHINE_DRIVER_START( goal92 ) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_TYPE_RASTER) MDRV_SCREEN_SIZE(40*8, 32*8) - MDRV_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) // black border at bottom is a game bug... + MDRV_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) /* black border at bottom is a game bug... */ MDRV_GFXDECODE(goal92_gfxdecodeinfo) MDRV_PALETTE_LENGTH(128*16) diff --git a/src/drivers/gottlieb.c b/src/drivers/gottlieb.c index 481e9f452..d7882040e 100644 --- a/src/drivers/gottlieb.c +++ b/src/drivers/gottlieb.c @@ -737,10 +737,10 @@ INPUT_PORTS_START( tylz ) PORT_START /* ? */ PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) - PORT_BITX(0x02, IP_ACTIVE_HIGH, IPT_SERVICE, "Select in Service Mode", KEYCODE_F1, IP_JOY_NONE ) // cycle through test options, hold to do test + PORT_BITX(0x02, IP_ACTIVE_HIGH, IPT_SERVICE, "Select in Service Mode", KEYCODE_F1, IP_JOY_NONE ) /* cycle through test options, hold to do test */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_DIPNAME( 0x10, 0x10, "1" ) // probably nothing else here + PORT_DIPNAME( 0x10, 0x10, "1" ) /* probably nothing else here */ PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) @@ -1308,7 +1308,7 @@ INPUT_PORTS_START( wizwarz ) PORT_START /* ? */ PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) - PORT_BITX(0x02, IP_ACTIVE_HIGH, IPT_SERVICE, "Select in Service Mode", KEYCODE_F1, IP_JOY_NONE ) // cycle through test options, hold to do test + PORT_BITX(0x02, IP_ACTIVE_HIGH, IPT_SERVICE, "Select in Service Mode", KEYCODE_F1, IP_JOY_NONE ) /* cycle through test options, hold to do test */ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED ) @@ -1387,7 +1387,7 @@ INPUT_PORTS_START( kngtmare ) PORT_DIPNAME( 0x11, 0x11, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x11, DEF_STR( 1C_1C ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) +/* PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) */ PORT_DIPSETTING( 0x01, DEF_STR( 1C_2C ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) @@ -2259,7 +2259,7 @@ GAMEC(1982, myqbert, qbert, qbert, qbert, 0, ROT270, "Gottlieb" GAMEC(1982, qberttst, qbert, qbert, qbert, 0, ROT270, "Gottlieb", "Q*bert (early test version)", &qbert_ctrl, NULL ) GAME( 1982, insector, 0, gottlieb, insector, 0, ROT0, "Gottlieb", "Insector (prototype)" ) GAMEX(1982, tylz, 0, gottlieb, tylz, 0, ROT0, "Mylstar", "Tylz (prototype)", GAME_IMPERFECT_SOUND ) -GAME( 1984, argusg, 0, krull, argusg, 0, ROT0, "Gottlieb", "Argus (Gottlieb, prototype)" ) // aka Guardian / Protector? +GAME( 1984, argusg, 0, krull, argusg, 0, ROT0, "Gottlieb", "Argus (Gottlieb, prototype)" ) /* aka Guardian / Protector? */ GAME( 1983, mplanets, 0, gottlieb, mplanets, 0, ROT270, "Gottlieb", "Mad Planets" ) GAME( 1983, mplanuk, mplanets, gottlieb, mplanets, 0, ROT270, "Gottlieb (Taitel license)", "Mad Planets (UK)" ) GAME( 1983, krull, 0, krull, krull, 0, ROT270, "Gottlieb", "Krull" ) diff --git a/src/drivers/leprechn.c b/src/drivers/leprechn.c index 9ae91c1f1..278aa730d 100644 --- a/src/drivers/leprechn.c +++ b/src/drivers/leprechn.c @@ -147,9 +147,9 @@ INPUT_PORTS_START( leprechn ) INPUT_PORTS_END INPUT_PORTS_START( piratetr ) - // All of these ports are read indirectly through a VIA mapped at 0x2800 + /* All of these ports are read indirectly through a VIA mapped at 0x2800 */ PORT_START /* Input Port 0 */ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) // This is called "Slam" in the game + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_TILT ) /* This is called "Slam" in the game */ PORT_BITX(0x08, IP_ACTIVE_LOW, IPT_SERVICE, DEF_STR( Service_Mode ), KEYCODE_F2, IP_JOY_NONE ) PORT_BITX(0x10, IP_ACTIVE_LOW, 0, "Advance", KEYCODE_F1, IP_JOY_NONE ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) diff --git a/src/drivers/mappy.c b/src/drivers/mappy.c index bf18af222..4ad68f00d 100644 --- a/src/drivers/mappy.c +++ b/src/drivers/mappy.c @@ -472,17 +472,17 @@ WRITE_HANDLER( superpac_flipscreen_w ); ***************************************************************************/ static int mux; -static READ_HANDLER( in0_l ) { return readinputport(0); } // P1 joystick -static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } // P2 joystick -static READ_HANDLER( in1_l ) { return readinputport(1); } // fire and start buttons -static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } // coins -static READ_HANDLER( in2 ) { return readinputport(2); } // test, cocktail, optional buttons -static READ_HANDLER( dipA_l ) { return readinputport(3); } // dips A -static READ_HANDLER( dipA_h ) { return readinputport(3) >> 4; } // dips A -static READ_HANDLER( dipB_mux ) { return readinputport(4) >> (4*mux); } // dips B -static READ_HANDLER( dipB_muxi ) // dips B +static READ_HANDLER( in0_l ) { return readinputport(0); } /* P1 joystick */ +static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } /* P2 joystick */ +static READ_HANDLER( in1_l ) { return readinputport(1); } /* fire and start buttons */ +static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } /* coins */ +static READ_HANDLER( in2 ) { return readinputport(2); } /* test, cocktail, optional buttons */ +static READ_HANDLER( dipA_l ) { return readinputport(3); } /* dips A */ +static READ_HANDLER( dipA_h ) { return readinputport(3) >> 4; } /* dips A */ +static READ_HANDLER( dipB_mux ) { return readinputport(4) >> (4*mux); } /* dips B */ +static READ_HANDLER( dipB_muxi ) /* dips B */ { - // bits are interleaved in Phozon + /* bits are interleaved in Phozon */ return BITSWAP8(readinputport(4),6,4,2,0,7,5,3,1) >> (4*mux); } static WRITE_HANDLER( out_mux ) { mux = data & 1; } @@ -729,8 +729,8 @@ static MACHINE_INIT( mappy ) static INTERRUPT_GEN( mappy_interrupt_1 ) { - irq0_line_assert(); // this also checks if irq is enabled - IMPORTANT! - // so don't replace with cpu_set_irq_line(0, 0, ASSERT_LINE); + irq0_line_assert(); /* this also checks if irq is enabled - IMPORTANT! */ + /* so don't replace with cpu_set_irq_line(0, 0, ASSERT_LINE); */ namcoio_set_irq_line(0,PULSE_LINE); namcoio_set_irq_line(1,PULSE_LINE); @@ -1066,7 +1066,7 @@ INPUT_PORTS_START( grobda ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x04, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) /* service mode again */ PORT_START /* 56XX #1 pins 22-29 */ PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) @@ -1159,11 +1159,11 @@ INPUT_PORTS_START( phozon ) PORT_DIPSETTING( 0x04, "Rank 5" ) PORT_DIPSETTING( 0x02, "Rank 6" ) PORT_DIPSETTING( 0x00, "Rank 7" ) - // when level select is on, press P1 start during the game and move joystick to select level to jump to + /* when level select is on, press P1 start during the game and move joystick to select level to jump to */ PORT_DIPNAME( 0x10, 0x10, "Level Select" ) PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - // when stop mode is on, press P1 start to pause the game + /* when stop mode is on, press P1 start to pause the game */ PORT_DIPNAME( 0x20, 0x20, "Stop Mode" ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1185,7 +1185,7 @@ INPUT_PORTS_START( phozon ) PORT_DIPSETTING( 0x08, "20k 80k" ) PORT_DIPSETTING( 0x18, "30k 60k" ) PORT_DIPSETTING( 0x1c, "30k 100k" ) -// PORT_DIPSETTING( 0x14, "30k 100k" ) // repeated +/* PORT_DIPSETTING( 0x14, "30k 100k" ) // repeated */ PORT_DIPSETTING( 0x0c, "30k 120k and every 120k" ) PORT_DIPSETTING( 0x04, "30k" ) PORT_DIPSETTING( 0x00, "None" ) @@ -1330,7 +1330,7 @@ INPUT_PORTS_START( todruaga ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x04, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) /* service mode again */ PORT_START /* 56XX #1 pins 22-29 */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) @@ -1408,7 +1408,7 @@ INPUT_PORTS_START( digdug2 ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x04, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) /* service mode again */ PORT_START /* 56XX #1 pins 22-29 */ PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) @@ -1487,7 +1487,7 @@ INPUT_PORTS_START( motos ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Cabinet ) ) PORT_DIPSETTING( 0x04, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) /* service mode again */ PORT_START /* 56XX #1 pins 22-29 */ PORT_SERVICE( 0x01, IP_ACTIVE_LOW ) @@ -1641,7 +1641,7 @@ static MACHINE_DRIVER_START( superpac ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 18432000/12) /* 1.536 MHz */ MDRV_CPU_MEMORY(readmem_superpac_cpu1,writemem_superpac_cpu1) - MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) // also update the custom I/O chips + MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) /* also update the custom I/O chips */ MDRV_CPU_ADD(M6809, 18432000/12) /* 1.536 MHz */ MDRV_CPU_MEMORY(readmem_superpac_cpu2,writemem_superpac_cpu2) @@ -1684,7 +1684,7 @@ static MACHINE_DRIVER_START( phozon ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 1536000) /* MAIN CPU */ MDRV_CPU_MEMORY(readmem_phozon_cpu1,writemem_phozon_cpu1) - MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) // also update the custom I/O chips + MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) /* also update the custom I/O chips */ MDRV_CPU_ADD(M6809, 1536000) /* SOUND CPU */ MDRV_CPU_MEMORY(readmem_phozon_cpu2,writemem_phozon_cpu2) @@ -1722,7 +1722,7 @@ static MACHINE_DRIVER_START( mappy ) /* basic machine hardware */ MDRV_CPU_ADD(M6809, 18432000/12) /* 1.536 MHz */ MDRV_CPU_MEMORY(readmem_mappy_cpu1,writemem_mappy_cpu1) - MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) // also update the custom I/O chips + MDRV_CPU_VBLANK_INT(mappy_interrupt_1,1) /* also update the custom I/O chips */ MDRV_CPU_ADD(M6809, 18432000/12) /* 1.536 MHz */ MDRV_CPU_MEMORY(readmem_mappy_cpu2,writemem_mappy_cpu2) diff --git a/src/drivers/mario.c b/src/drivers/mario.c index 86c276d85..aec7f18a3 100644 --- a/src/drivers/mario.c +++ b/src/drivers/mario.c @@ -166,7 +166,7 @@ static MEMORY_WRITE_START( writemem ) { 0x7f00, 0x7f07, mario_sh3_w }, /* Misc discrete samples */ { 0x7e00, 0x7e00, mario_sh_tuneselect_w }, { 0x7000, 0x73ff, MWA_NOP }, /* ??? */ -/* { 0x7e85, 0x7e85, MWA_RAM }, // Sets alternative 1 and 0 /*/ +/* { 0x7e85, 0x7e85, MWA_RAM }, Sets alternative 1 and 0 */ { 0xf000, 0xffff, MWA_ROM }, MEMORY_END diff --git a/src/drivers/mcr2.c b/src/drivers/mcr2.c index 2d80d1e5e..c48363a5e 100644 --- a/src/drivers/mcr2.c +++ b/src/drivers/mcr2.c @@ -339,8 +339,8 @@ INPUT_PORTS_START( tronfp ) PORT_START /* IN0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) -// PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) -// PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) +/* PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 ) */ +/* PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) */ PORT_BIT_IMPULSE( 0x04, IP_ACTIVE_LOW, IPT_START1, 1 ) PORT_BIT_IMPULSE( 0x08, IP_ACTIVE_LOW, IPT_START2, 1 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) @@ -374,7 +374,7 @@ INPUT_PORTS_START( tronfp ) PORT_DIPNAME( 0x08, 0x08, "freeplay" ) PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) -// PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) +/* PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED ) */ PORT_START /* IN4 */ PORT_ANALOG( 0xff, 0x00, IPT_DIAL | IPF_REVERSE | IPF_COCKTAIL, 50, 10, 0, 0 ) diff --git a/src/drivers/meadows.c b/src/drivers/meadows.c index 70070d429..b60f8f2b6 100644 --- a/src/drivers/meadows.c +++ b/src/drivers/meadows.c @@ -343,13 +343,13 @@ static INTERRUPT_GEN( sound_interrupt ) /* so that overlays are not so contrasted */ #define OVERLAY_RED MAKE_ARGB(0x04,0xff,0x20,0x20) #define OVERLAY_GREEN MAKE_ARGB(0x04,0x20,0xff,0x20) -// Original blue is too dark so is replaced with crayola blue -// https://en.wikipedia.org/wiki/Shades_of_blue#Blue_(Crayola) -//#define OVERLAY_BLUE MAKE_ARGB(0x04,0x20,0x20,0xff) +/* Original blue is too dark so is replaced with crayola blue */ +/* https://en.wikipedia.org/wiki/Shades_of_blue#Blue_(Crayola) */ +/*#define OVERLAY_BLUE MAKE_ARGB(0x04,0x20,0x20,0xff) */ #define OVERLAY_BLUE MAKE_ARGB(0x04,0x1f,0x75,0xfe) #define OVERLAY_YELLOW MAKE_ARGB(0x04,0xff,0xff,0x20) #define OVERLAY_CYAN MAKE_ARGB(0x04,0x20,0xff,0xff) -// https://en.wikipedia.org/wiki/Shades_of_blue#Light_blue +/* https://en.wikipedia.org/wiki/Shades_of_blue#Light_blue */ #define OVERLAY_LT_BLUE MAKE_ARGB(0x04,0xad,0xd8,0xe6) #define OVERLAY_ORANGE MAKE_ARGB(0x04,0xff,0xa5,0x00) #define OVERLAY_PURPLE MAKE_ARGB(0x04,0xff,0x00,0xff) diff --git a/src/drivers/midyunit.c b/src/drivers/midyunit.c index 4c04db90f..8e8f26f6b 100644 --- a/src/drivers/midyunit.c +++ b/src/drivers/midyunit.c @@ -992,7 +992,7 @@ static MACHINE_DRIVER_START( smashtv ) MDRV_IMPORT_FROM(yunit_cvsd_6bit) MDRV_VBLANK_DURATION(COMPUTED_VBLANK(256, 288, MKLA5_FPS)) MDRV_VISIBLE_AREA(0, 399, 0, 254) - // MDRV_VISIBLE_AREA(0, 409, 0, 255) + /* MDRV_VISIBLE_AREA(0, 409, 0, 255) */ MACHINE_DRIVER_END diff --git a/src/drivers/model1.c b/src/drivers/model1.c index b035574d7..f84daf010 100644 --- a/src/drivers/model1.c +++ b/src/drivers/model1.c @@ -56,13 +56,13 @@ static WRITE16_HANDLER( bank_w ) { if(ACCESSING_LSB) { switch(data & 0xf) { - case 0x1: // 100000-1fffff data roms banking + case 0x1: /* 100000-1fffff data roms banking */ cpu_setbank(1, memory_region(REGION_CPU1) + 0x1000000 + 0x100000*((data >> 4) & 0xf)); logerror("BANK %x\n", 0x1000000 + 0x100000*((data >> 4) & 0xf)); break; - case 0x2: // 200000-2fffff data roms banking (unused, all known games have only one bank) + case 0x2: /* 200000-2fffff data roms banking (unused, all known games have only one bank) */ break; - case 0xf: // f00000-ffffff program roms banking (unused, all known games have only one bank) + case 0xf: /* f00000-ffffff program roms banking (unused, all known games have only one bank) */ break; } } @@ -73,8 +73,8 @@ static int last_irq; static void irq_raise(int level) { - // logerror("irq: raising %d\n", level); - // irq_status |= (1 << level); + /* logerror("irq: raising %d\n", level); */ + /* irq_status |= (1 << level); */ last_irq = level; cpu_set_irq_line(0, 0, HOLD_LINE); } @@ -83,19 +83,19 @@ static int irq_callback(int irqline) { return last_irq; } -// vf -// 1 = fe3ed4 -// 3 = fe3f5c -// other = fe3ec8 / fe3ebc +/* vf */ +/* 1 = fe3ed4 */ +/* 3 = fe3f5c */ +/* other = fe3ec8 / fe3ebc */ -// vr -// 1 = fe02bc -// other = f302a4 / fe02b0 +/* vr */ +/* 1 = fe02bc */ +/* other = f302a4 / fe02b0 */ -// swa -// 1 = ff504 -// 3 = ff54c -// other = ff568/ff574 +/* swa */ +/* 1 = ff504 */ +/* 3 = ff54c */ +/* other = ff568/ff574 */ static void irq_init(void) { @@ -115,7 +115,7 @@ static INTERRUPT_GEN(model1_interrupt) { irq_raise(model1_sound_irq); - // if the FIFO has something in it, signal the 68k too + /* if the FIFO has something in it, signal the 68k too */ if (fifo_rptr != fifo_wptr) { cpu_set_irq_line(1, 2, HOLD_LINE); @@ -137,7 +137,7 @@ static MACHINE_INIT(model1) model1_sound_irq = 3; } - // init the sound FIFO + /* init the sound FIFO */ fifo_rptr = fifo_wptr = 0; memset(to_68k, 0, sizeof(to_68k)); } @@ -206,7 +206,7 @@ static WRITE16_HANDLER(mr2_w) logerror("MW fca[r22], %04x%04x (%x)\n", mr2[0x1eca/2+1], mr2[0x1eca/2], activecpu_get_pc()); #endif - // wingwar scene position, pc=e1ce -> d735 + /* wingwar scene position, pc=e1ce -> d735 */ if(offset/2 == 0x1f08/4) logerror("MW 8[r10], %f (%x)\n", *(float *)(mr2+0x1f08/2), activecpu_get_pc()); if(offset/2 == 0x1f0c/4) @@ -222,7 +222,7 @@ static READ16_HANDLER( snd_68k_ready_r ) if ((sr & 0x0700) > 0x0100) { cpu_spinuntil_time(TIME_IN_USEC(40)); - return 0; // not ready yet, interrupts disabled + return 0; /* not ready yet, interrupts disabled */ } return 0xff; @@ -234,9 +234,9 @@ static WRITE16_HANDLER( snd_latch_to_68k_w ) fifo_wptr++; if (fifo_wptr >= FIFO_SIZE) fifo_wptr = 0; - // signal the 68000 that there's data waiting + /* signal the 68000 that there's data waiting */ cpu_set_irq_line(1, 2, HOLD_LINE); - // give the 68k time to reply + /* give the 68k time to reply */ cpu_spinuntil_time(TIME_IN_USEC(40)); } @@ -272,10 +272,10 @@ static MEMORY_WRITE16_START( model1_writemem ) { 0x610000, 0x61ffff, md1_w, &model1_display_list1 }, { 0x680000, 0x680003, model1_listctl_w }, { 0x700000, 0x70ffff, sys24_tile_w }, - { 0x720000, 0x720001, MWA16_NOP },// Unknown, always 0 - { 0x740000, 0x740001, MWA16_NOP },// Horizontal synchronization register - { 0x760000, 0x760001, MWA16_NOP },// Vertical synchronization register - { 0x770000, 0x770001, MWA16_NOP },// Video synchronization switch + { 0x720000, 0x720001, MWA16_NOP },/* Unknown, always 0 */ + { 0x740000, 0x740001, MWA16_NOP },/* Horizontal synchronization register */ + { 0x760000, 0x760001, MWA16_NOP },/* Vertical synchronization register */ + { 0x770000, 0x770001, MWA16_NOP },/* Video synchronization switch */ { 0x780000, 0x7fffff, sys24_char_w }, { 0x900000, 0x903fff, p_w, &paletteram16 }, { 0x910000, 0x91bfff, MWA16_RAM, &model1_color_xlat }, @@ -286,7 +286,7 @@ static MEMORY_WRITE16_START( model1_writemem ) { 0xd20000, 0xd20003, model1_tgp_copro_ram_w }, { 0xd80000, 0xd80003, model1_tgp_copro_w }, { 0xd80010, 0xd80013, model1_tgp_copro_w }, /* Mirror */ - { 0xe00000, 0xe00001, MWA16_NOP }, // Watchdog? IRQ ack? Always 0x20, usually on irq + { 0xe00000, 0xe00001, MWA16_NOP }, /* Watchdog? IRQ ack? Always 0x20, usually on irq */ { 0xe00004, 0xe00005, bank_w }, { 0xe0000c, 0xe0000f, MWA16_NOP }, { 0xfc0000, 0xffffff, MWA16_ROM }, diff --git a/src/drivers/neogeo.c b/src/drivers/neogeo.c index d416b7d26..bfe50aa16 100644 --- a/src/drivers/neogeo.c +++ b/src/drivers/neogeo.c @@ -658,7 +658,7 @@ static WRITE16_HANDLER( neo_irq2pos_16_w ) if (irq2control & IRQ2CTRL_LOAD_RELATIVE) { -/* int line = (irq2pos_value + 3) / 0x180; // ridhero gives 0x17d /*/ +/* int line = (irq2pos_value + 3) / 0x180;*/ /* ridhero gives 0x17d */ int line = (irq2pos_value + 0x3b) / 0x180; /* turfmast goes as low as 0x145 */ irq2start = current_rasterline + line; @@ -730,7 +730,7 @@ static MEMORY_WRITE16_START( neogeo_writemem ) { 0x3c0006, 0x3c0007, neo_control_16_w }, /* IRQ2 control */ { 0x3c0008, 0x3c000b, neo_irq2pos_16_w }, /* IRQ2 position */ { 0x3c000c, 0x3c000d, neo_irqack_w }, /* IRQ acknowledge */ -/* { 0x3c000e, 0x3c000f }, // Unknown, see control_r /*/ +/* { 0x3c000e, 0x3c000f },*/ /* Unknown, see control_r /*/ { 0x400000, 0x401fff, neogeo_paletteram16_w }, /* COLOR RAM BANK1*/ { 0x6a0000, 0x6a1fff, MWA16_RAM }, /* COLOR RAM BANK0 (used only in startup tests?)*/ @@ -2859,8 +2859,8 @@ ROM_START( androdun ) ROM_LOAD16_BYTE( "049-c1.bin", 0x000000, 0x100000, CRC(7ace6db3) SHA1(c41cc9de8c0788dcc49ca494fd3bb3124062d9dd) ) /* Plane 0,1 */ ROM_LOAD16_BYTE( "049-c2.bin", 0x000001, 0x100000, CRC(b17024f7) SHA1(fcf7efae48fcdccaf5255c145de414fb246128f0) ) /* Plane 2,3 */ /* these just contain junk, probably shouldn't be here */ -/* ROM_LOAD16_BYTE( "049-c3.bin", 0x200000, 0x100000, CRC(2e0f3f9a) SHA1(8ee3442be92835922762420e8d0ff86dc14b3d69) ) // Plane 0,1 /*/ -/* ROM_LOAD16_BYTE( "049-c4.bin", 0x200001, 0x100000, CRC(4a19fb92) SHA1(171219f0b38a04bfcee5b823c043a8181dfc87f8) ) // Plane 2,3 /*/ +/* ROM_LOAD16_BYTE( "049-c3.bin", 0x200000, 0x100000, CRC(2e0f3f9a) SHA1(8ee3442be92835922762420e8d0ff86dc14b3d69) ) */ /* Plane 0,1 /*/ +/* ROM_LOAD16_BYTE( "049-c4.bin", 0x200001, 0x100000, CRC(4a19fb92) SHA1(171219f0b38a04bfcee5b823c043a8181dfc87f8) ) */ /* Plane 2,3 /*/ ROM_END ROM_START( ncommand ) @@ -6284,7 +6284,7 @@ ROM_START( kf2k3pcb ) /* Encrypted Set, Decrypted C - JAMMA board */ ROM_LOAD( "sfix.sfx", 0x000000, 0x20000, CRC(354029fc) SHA1(4ae4bf23b4c2acff875775d4cbff5583893ce2a1) ) ROM_REGION16_BE( 0x80000, REGION_USER1, 0 ) - ROM_LOAD16_WORD_SWAP( "271-bios.bin", 0x00000, 0x080000, CRC(148dd727) SHA1(2cf592a16c7157de02a989675d47965f2b3a44dd) ) // encrypted + ROM_LOAD16_WORD_SWAP( "271-bios.bin", 0x00000, 0x080000, CRC(148dd727) SHA1(2cf592a16c7157de02a989675d47965f2b3a44dd) ) /* encrypted */ NEO_BIOS_AUDIO_ENCRYPTED_512K( "271-m1.bin", CRC(d6bcf2bc) SHA1(df78bc95990eb8e8f3638dde6e1876354df7fe84) ) @@ -6310,7 +6310,7 @@ ROM_START( kof2003 ) /* Encrypted Code + Sound + GFX Roms */ ROM_REGION( 0x900000, REGION_CPU1, 0 ) ROM_LOAD32_WORD_SWAP( "271-p1c.bin", 0x000000, 0x400000, CRC(530ecc14) SHA1(812cf7e9902af3f5e9e330b7c05c2171b139ad2b) ) ROM_LOAD32_WORD_SWAP( "271-p2c.bin", 0x000002, 0x400000, CRC(fd568da9) SHA1(46364906a1e81dc251117e91a1a7b43af1373ada) ) - ROM_LOAD16_WORD_SWAP( "271-p3c.bin", 0x800000, 0x100000, CRC(aec5b4a9) SHA1(74087f785590eda5898ce146029818f86ced42b6) ) // Encrypted + ROM_LOAD16_WORD_SWAP( "271-p3c.bin", 0x800000, 0x100000, CRC(aec5b4a9) SHA1(74087f785590eda5898ce146029818f86ced42b6) ) /* Encrypted */ /* The Encrypted Boards do _not_ have an s1 rom, data for it comes from the Cx ROMs */ ROM_REGION( 0x80000, REGION_GFX1, 0 ) /* larger char set */ @@ -6339,7 +6339,7 @@ ROM_START( kof2003 ) /* Encrypted Code + Sound + GFX Roms */ ROM_LOAD16_BYTE( "271-c8c.bin", 0x3000001, 0x800000, CRC(20ec4fdc) SHA1(deb5f7ec5a090e419b9d1a6a74877bee081198e2) ) ROM_END -ROM_START( kof2003d ) // Decrypted C Roms +ROM_START( kof2003d ) /* Decrypted C Roms */ ROM_REGION( 0x900000, REGION_CPU1, 0 ) ROM_LOAD32_WORD_SWAP( "271-p1.bin", 0x000000, 0x400000, CRC(b9da070c) ) ROM_LOAD32_WORD_SWAP( "271-p2.bin", 0x000002, 0x400000, CRC(da3118c4) ) @@ -7155,7 +7155,7 @@ ROM_START( kf2k5uni ) ROM_END -// 447 : Hypernoid by M.Priewe. +/* 447 : Hypernoid by M.Priewe. */ ROM_START( hypernoid ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) ROM_LOAD16_WORD_SWAP( "447.p1", 0x000000, 0x100000, CRC(e024fa76) SHA1(6ef393ad80ec80e30929f07c95305d97fca3ad22) ) @@ -7567,7 +7567,7 @@ DRIVER_INIT( svcplus ) { svcplus_px_decrypt(); svcboot_cx_decrypt(); -// svcplus_sx_decrypt(); +/* svcplus_sx_decrypt(); */ neogeo_bootleg_sx_decrypt(1); svcplus_px_hack(); init_neogeo(); @@ -7584,7 +7584,7 @@ DRIVER_INIT( svcplusa ) DRIVER_INIT( svcsplus ) { svcsplus_px_decrypt(); -// svcsplus_sx_decrypt(); +/* svcsplus_sx_decrypt(); */ neogeo_bootleg_sx_decrypt(2); svcboot_cx_decrypt(); svcsplus_px_hack(); @@ -7671,7 +7671,7 @@ DRIVER_INIT( kof2003d ) install_mem_read16_handler( 0, 0x2ffff0, 0x2fffff, mv0_bankswitch_r ); install_mem_write16_handler( 0, 0x2ffff0, 0x2fffff, mv0_bankswitch_w ); - install_mem_read16_handler( 0, 0xc00000, 0xc3ffff, MRA16_BANK3 ); // 256k bios + install_mem_read16_handler( 0, 0xc00000, 0xc3ffff, MRA16_BANK3 ); /* 256k bios */ init_neogeo(); } @@ -7688,7 +7688,7 @@ DRIVER_INIT( kf2k3pcb ) /* Jamama, Single Board */ neogeo_fix_bank_type = 2; init_neogeo(); install_pvc_protection(); - install_mem_read16_handler( 0, 0xc00000, 0xc7ffff, MRA16_BANK3 ); // 512k bios + install_mem_read16_handler( 0, 0xc00000, 0xc7ffff, MRA16_BANK3 ); /* 512k bios */ } @@ -7947,7 +7947,7 @@ GAMEB( 2002, kf2k2mp, kof2002, neogeo, neogeo, neogeo, kf2k2mp, ROT0, "bootl GAMEB( 2002, kf2k2mp2, kof2002, neogeo, neogeo, neogeo, kof2km2, ROT0, "bootleg", "The King of Fighters 2002 Magic Plus II (bootleg)" , &neogeo_ctrl, NULL ) GAMEB( 2004, kof2k4se, kof2002, neogeo, neogeo, neogeo, kof2k4se, ROT0, "bootleg", "The King of Fighters Special Edition 2004 (The King of Fighters 2002 bootleg)", &neogeo_ctrl, NULL ) /* Hack / Bootleg of kof2002 */ GAMEB( 2003, kof10th, kof2002, neogeo, neogeo, neogeo, kof10th, ROT0, "bootleg", "The King of Fighters 10th Anniversary", &neogeo_ctrl, NULL ) -GAMEB( 2005, kf10thep, kof2002, neogeo, neogeo, neogeo, kf10thep, ROT0, "bootleg", "The King of Fighters 10th Anniversary Extra Plus (The King of Fighters 2002 bootleg)", &neogeo_ctrl, NULL ) // fake SNK copyright +GAMEB( 2005, kf10thep, kof2002, neogeo, neogeo, neogeo, kf10thep, ROT0, "bootleg", "The King of Fighters 10th Anniversary Extra Plus (The King of Fighters 2002 bootleg)", &neogeo_ctrl, NULL ) /* fake SNK copyright */ GAMEB( 2004, kf2k5uni, kof2002, neogeo, neogeo, neogeo, kf2k5uni, ROT0, "bootleg", "The King of Fighters 10th Anniversary 2005 Unique (The King of Fighters 2002 bootleg)", &neogeo_ctrl, NULL ) /* Evoga */ @@ -7999,20 +7999,20 @@ GAMEB( 1998, shocktr2, neogeo, neogeo, neogeo, neogeo, neogeo, ROT0, "Sauru GAMEB( 1996, ironclad, neogeo, neogeo, neogeo, neogeo, neogeo, ROT0, "Saurus", "Choutetsu Brikin'ger - Ironclad (Prototype)", &neogeo_ctrl, NULL ) /* SNK Playmore */ -GAME ( 2003, svcpcb, 0, neogeo, svcpcb, svcpcb, ROT0, "Playmore", "SvC Chaos - SNK vs Capcom (JAMMA PCB)" ) // not a clone of neogeo because it's NOT a neogeo cart. +GAME ( 2003, svcpcb, 0, neogeo, svcpcb, svcpcb, ROT0, "Playmore", "SvC Chaos - SNK vs Capcom (JAMMA PCB)" ) /* not a clone of neogeo because it's NOT a neogeo cart. */ GAMEB( 2003, svc, neogeo, neogeo, neogeo, neogeo, svc, ROT0, "Playmore", "SvC Chaos - SNK vs Capcom (MVS)", &neogeo_ctrl, NULL ) GAMEB( 2003, svcboot, svc, neogeo, neogeo, neogeo, svcboot, ROT0, "bootleg", "SvC Chaos - SNK vs Capcom (Bootleg)", &neogeo_ctrl, NULL ) GAMEB( 2003, svcplus, svc, neogeo, neogeo, neogeo, svcplus, ROT0, "bootleg", "SvC Chaos - SNK vs Capcom Plus (set 1, bootleg)", &neogeo_ctrl, NULL ) GAMEB( 2003, svcplusa, svc, neogeo, neogeo, neogeo, svcplusa, ROT0, "bootleg", "SvC Chaos - SNK vs Capcom Plus (set 2, bootleg)", &neogeo_ctrl, NULL ) GAMEB( 2003, svcsplus, svc, neogeo, neogeo, neogeo, svcsplus, ROT0, "bootleg", "SvC Chaos - SNK vs Capcom Super Plus (bootleg)", &neogeo_ctrl, NULL ) GAMEB( 2003, mslug5, neogeo, neogeo, neogeo, neogeo, mslug5, ROT0, "SNK Playmore", "Metal Slug 5", &neogeo_ctrl, NULL ) -GAME ( 2003, kf2k3pcb, 0, neogeo, neogeo, kf2k3pcb, ROT0, "SNK Playmore", "The King of Fighters 2003 (Japan, JAMMA PCB)" ) // not a clone of neogeo because it's NOT a neogeo cart. +GAME ( 2003, kf2k3pcb, 0, neogeo, neogeo, kf2k3pcb, ROT0, "SNK Playmore", "The King of Fighters 2003 (Japan, JAMMA PCB)" ) /* not a clone of neogeo because it's NOT a neogeo cart. */ GAMEB( 2003, kof2003, neogeo, neogeo, neogeo, neogeo, kof2003, ROT0, "SNK Playmore", "The King of Fighters 2003 (World / US, MVS)", &neogeo_ctrl, NULL ) GAMEB( 2003, kof2003d, kof2003, neogeo, neogeo, neogeo, kof2003d, ROT0, "bootleg", "The King of Fighters 2003 (Decrypted)", &neogeo_ctrl, NULL ) -GAMEB( 2003, kf2k3bl, kof2003, neogeo, neogeo, neogeo, kf2k3bl, ROT0, "bootleg", "The King of Fighters 2003 (bootleg set 1)", &neogeo_ctrl, NULL ) // zooming is wrong because its a bootleg of the pcb version on a cart (unless it was a bootleg pcb with the new bios?) -GAMEB( 2003, kf2k3bla, kof2003, neogeo, neogeo, neogeo, kf2k3pl, ROT0, "bootleg", "The King of Fighters 2003 (bootleg set 2)", &neogeo_ctrl, NULL ) // zooming is wrong because its a bootleg of the pcb version on a cart -GAMEB( 2003, kf2k3pl, kof2003, neogeo, neogeo, neogeo, kf2k3pl, ROT0, "bootleg", "The King of Fighters 2004 Plus / Hero (The King of Fighters 2003 bootleg)", &neogeo_ctrl, NULL ) // zooming is wrong because its a bootleg of the pcb version on a cart -GAMEB( 2003, kf2k3upl, kof2003, neogeo, neogeo, neogeo, kf2k3upl, ROT0, "bootleg", "The King of Fighters 2004 Ultra Plus (The King of Fighters 2003 bootleg)", &neogeo_ctrl, NULL ) // zooming is wrong because its a bootleg of the pcb version on a cart +GAMEB( 2003, kf2k3bl, kof2003, neogeo, neogeo, neogeo, kf2k3bl, ROT0, "bootleg", "The King of Fighters 2003 (bootleg set 1)", &neogeo_ctrl, NULL ) /* zooming is wrong because its a bootleg of the pcb version on a cart (unless it was a bootleg pcb with the new bios?) */ +GAMEB( 2003, kf2k3bla, kof2003, neogeo, neogeo, neogeo, kf2k3pl, ROT0, "bootleg", "The King of Fighters 2003 (bootleg set 2)", &neogeo_ctrl, NULL ) /* zooming is wrong because its a bootleg of the pcb version on a cart */ +GAMEB( 2003, kf2k3pl, kof2003, neogeo, neogeo, neogeo, kf2k3pl, ROT0, "bootleg", "The King of Fighters 2004 Plus / Hero (The King of Fighters 2003 bootleg)", &neogeo_ctrl, NULL ) /* zooming is wrong because its a bootleg of the pcb version on a cart */ +GAMEB( 2003, kf2k3upl, kof2003, neogeo, neogeo, neogeo, kf2k3upl, ROT0, "bootleg", "The King of Fighters 2004 Ultra Plus (The King of Fighters 2003 bootleg)", &neogeo_ctrl, NULL ) /* zooming is wrong because its a bootleg of the pcb version on a cart */ /* Sunsoft */ GAMEB( 1995, galaxyfg, neogeo, neogeo, raster, neogeo, neogeo, ROT0, "Sunsoft", "Galaxy Fight - Universal Warriors", &neogeo_ctrl, NULL ) diff --git a/src/drivers/omegrace.c b/src/drivers/omegrace.c index 511aeb653..2f550ee0e 100644 --- a/src/drivers/omegrace.c +++ b/src/drivers/omegrace.c @@ -277,7 +277,7 @@ static READ_HANDLER( omegrace_vg_status_r ) UINT8 encode_spinner(UINT8 data) { data &= 0x3f; - return data ^ (data >> 1) ^ 0x3f; // Inverted 6-bit Gray code + return data ^ (data >> 1) ^ 0x3f; /* Inverted 6-bit Gray code */ } diff --git a/src/drivers/outrun.c b/src/drivers/outrun.c index b6891db53..afb117df4 100644 --- a/src/drivers/outrun.c +++ b/src/drivers/outrun.c @@ -84,10 +84,10 @@ static READ16_HANDLER( ho_io_y_r ){ switch(data & 3) { - case 3: return 0xffff; // both - case 2: return 0x00ff; // brake - case 1: return 0xff00; // accel - case 0: return 0x0000; // neither + case 3: return 0xffff; /* both */ + case 2: return 0x00ff; /* brake */ + case 1: return 0xff00; /* accel */ + case 0: return 0x0000; /* neither */ } return 0x0000; } @@ -95,7 +95,7 @@ static READ16_HANDLER( ho_io_y_r ){ static READ16_HANDLER( ho_io_y_r ){ return (input_port_1_r( offset ) << 8) + input_port_5_r( offset ); } #endif -// outrun: generate_gr_screen(0x200,0x800,0,0,3,0x8000); +/* outrun: generate_gr_screen(0x200,0x800,0,0,3,0x8000); */ static void generate_gr_screen( int w,int bitmap_width,int skip, int start_color,int end_color, int source_size ) @@ -113,7 +113,7 @@ static void generate_gr_screen( memset(gr,0,256*bitmap_width); if (w!=sys16_gr_bitmap_width){ - if (skip>0) // needs mirrored RHS + if (skip>0) /* needs mirrored RHS */ grr=gr; else { center_offset= bitmap_width-w; @@ -121,7 +121,7 @@ static void generate_gr_screen( } } - for (i=0; i<256; i++){ // build gr_bitmap + for (i=0; i<256; i++){ /* build gr_bitmap */ UINT8 last_bit; UINT8 color_data[4]; color_data[0]=start_color; @@ -133,7 +133,7 @@ static void generate_gr_screen( for (j=0; j1){ // color flipped to 0,advance color[0] + if (bit!=last_bit && bit==0 && i>1){ /* color flipped to 0,advance color[0] */ if (color_data[0]+end_color <= end_color){ color_data[0]+=end_color; } @@ -148,7 +148,7 @@ static void generate_gr_screen( buf++; } - if (grr!=NULL){ // need mirrored RHS + if (grr!=NULL){ /* need mirrored RHS */ const UINT8 *temp = gr-1-skip; for (j=0; j> 5) & 1); return; - //cpunum_set_input_line(2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); + /*cpunum_set_input_line(2, INPUT_LINE_RESET, (data & 1) ? CLEAR_LINE : ASSERT_LINE); */ } } @@ -763,7 +763,7 @@ static void outrun_reset(void) static MEMORY_READ16_START( outrun_readmem ) { 0x000000, 0x05ffff, MRA16_ROM }, - { 0x060900, 0x060907, sound_shared_ram_r }, //??? + { 0x060900, 0x060907, sound_shared_ram_r }, /*??? */ { 0x060000, 0x067fff, SYS16_MRA16_EXTRAM2 }, { 0x100000, 0x10ffff, SYS16_MRA16_TILERAM }, @@ -773,8 +773,8 @@ static MEMORY_READ16_START( outrun_readmem ) { 0x120000, 0x121fff, SYS16_MRA16_PALETTERAM }, { 0x140010, 0x140011, or_io_service_r }, - { 0x140014, 0x140015, input_port_3_word_r }, // dip1 - { 0x140016, 0x140017, input_port_4_word_r }, // dip2 + { 0x140014, 0x140015, input_port_3_word_r }, /* dip1 */ + { 0x140016, 0x140017, input_port_4_word_r }, /* dip2 */ { 0x140030, 0x140031, outrun_analog_r }, { 0x200000, 0x23ffff, SYS16_CPU3ROM16_r }, @@ -784,7 +784,7 @@ MEMORY_END static MEMORY_WRITE16_START( outrun_writemem ) { 0x000000, 0x05ffff, MWA16_ROM }, - { 0x060900, 0x060907, sound_shared_ram_w }, //??? + { 0x060900, 0x060907, sound_shared_ram_w }, /*??? */ { 0x060000, 0x067fff, SYS16_MWA16_EXTRAM2, &sys16_extraram2 }, { 0x100000, 0x10ffff, SYS16_MWA16_TILERAM, &sys16_tileram }, { 0x110000, 0x110fff, SYS16_MWA16_TEXTRAM, &sys16_textram }, @@ -801,16 +801,16 @@ MEMORY_END static MEMORY_READ16_START( outrun_readmem2 ) { 0x000000, 0x03ffff, MRA16_ROM }, { 0x060000, 0x067fff, shared_ram_r }, - { 0x080000, 0x09ffff, SYS16_MRA16_EXTRAM }, // gr + { 0x080000, 0x09ffff, SYS16_MRA16_EXTRAM }, /* gr */ MEMORY_END static MEMORY_WRITE16_START( outrun_writemem2 ) { 0x000000, 0x03ffff, MWA16_ROM }, { 0x060000, 0x067fff, shared_ram_w }, - { 0x080000, 0x09ffff, SYS16_MWA16_EXTRAM, &sys16_extraram }, // gr + { 0x080000, 0x09ffff, SYS16_MWA16_EXTRAM, &sys16_extraram }, /* gr */ MEMORY_END -// Outrun +/* Outrun */ static MEMORY_READ_START( outrun_sound_readmem ) { 0x0000, 0x7fff, MRA_ROM }, @@ -847,8 +847,8 @@ static MEMORY_READ16_START( toutrun_readmem ) { 0x130000, 0x130fff, segaic16_spriteram_r }, { 0x140010, 0x140011, or_io_service_r }, - { 0x140014, 0x140015, input_port_3_word_r }, // dip1 - { 0x140016, 0x140017, input_port_4_word_r }, // dip2 + { 0x140014, 0x140015, input_port_3_word_r }, /* dip1 */ + { 0x140016, 0x140017, input_port_4_word_r }, /* dip2 */ { 0x140030, 0x140031, outrun_analog_r }, { 0x200000, 0x23ffff, SYS16_CPU3ROM16_r }, @@ -861,15 +861,15 @@ MEMORY_END static MEMORY_WRITE16_START( toutrun_writemem ) { 0x000000, 0x05ffff, MWA16_ROM }, - { 0x060000, 0x067fff, SYS16_MWA16_EXTRAM2, &sys16_extraram2 },//workram + { 0x060000, 0x067fff, SYS16_MWA16_EXTRAM2, &sys16_extraram2 },/*workram */ { 0x100000, 0x10ffff, segaic16_tileram_0_w, &segaic16_tileram_0, }, { 0x110000, 0x110fff, segaic16_textram_0_w, &segaic16_textram_0 }, { 0x130000, 0x130fff, SYS16_MWA16_SPRITERAM, &segaic16_spriteram_0 }, { 0x120000, 0x121fff, segaic16_paletteram_w, &paletteram16 }, { 0x140004, 0x140005, outrun_ctrl1_w_new }, { 0x140020, 0x140021, outrun_ctrl2_w }, - { 0x140030, 0x140031, outrun_analog_select_w },//segaic16_sprites_draw_0_w - { 0x140070, 0x140071, segaic16_sprites_draw_0_w },//segaic16_sprites_draw_0_w + { 0x140030, 0x140031, outrun_analog_select_w },/*segaic16_sprites_draw_0_w */ + { 0x140070, 0x140071, segaic16_sprites_draw_0_w },/*segaic16_sprites_draw_0_w */ { 0x200000, 0x25ffff, MWA16_ROM }, { 0x260000, 0x267fff, shared_ram_w, &shared_ram }, @@ -882,13 +882,13 @@ MEMORY_END static MEMORY_READ16_START( toutrun_readmem2 ) { 0x000000, 0x03ffff, MRA16_ROM }, { 0x060000, 0x067fff, shared_ram_r }, - { 0x080000, 0x080fff, segaic16_roadram_r },//MWA16_RAM, &segaic16_roadram_0 + { 0x080000, 0x080fff, segaic16_roadram_r },/*MWA16_RAM, &segaic16_roadram_0 */ { 0x090000, 0x09ffff, segaic16_road_control_0_r }, MEMORY_END static MEMORY_WRITE16_START( toutrun_writemem2 ) { 0x000000, 0x03ffff, MWA16_ROM }, - { 0x060000, 0x067fff, shared_ram_w },//MWA16_RAM, &segaic16_roadram_0 + { 0x060000, 0x067fff, shared_ram_w },/*MWA16_RAM, &segaic16_roadram_0 */ { 0x080000, 0x080fff, MWA16_RAM, &segaic16_roadram_0 }, { 0x090000, 0x09ffff, segaic16_road_control_0_w }, MEMORY_END @@ -918,7 +918,7 @@ static MACHINE_INIT( outrun ){ sys16_sprxoffset = -0xbd; ctrl1 = 0x20; -// *forced sound cmd (eww) +/* *forced sound cmd (eww) */ if (!strcmp(Machine->gamedrv->name,"outrun")) sys16_patch_code( 0x55ed, 0x00); if (!strcmp(Machine->gamedrv->name,"outruna")) sys16_patch_code( 0x5661, 0x00); if (!strcmp(Machine->gamedrv->name,"outrunb")) sys16_patch_code( 0x5661, 0x00); @@ -951,7 +951,7 @@ static MACHINE_INIT( outrun ){ static MACHINE_INIT( toutrun ){ ctrl1 = 0x20; segaic16_tilemap_reset(0); -// *forced sound cmd (eww) +/* *forced sound cmd (eww) */ if (!strcmp(Machine->gamedrv->name,"outrun")) sys16_patch_code( 0x55ed, 0x00); if (!strcmp(Machine->gamedrv->name,"outruna")) sys16_patch_code( 0x5661, 0x00); if (!strcmp(Machine->gamedrv->name,"outrunb")) sys16_patch_code( 0x5661, 0x00); @@ -994,10 +994,10 @@ static DRIVER_INIT( outrunb ) UINT8 even = word>>8; UINT8 odd = word&0xff; - // even byte + /* even byte */ if((even&0x28) == 0x20 || (even&0x28) == 0x08) even^=0x28; - // odd byte + /* odd byte */ if((odd&0xc0) == 0x80 || (odd&0xc0) == 0x40) odd^=0xc0; RAM[i/2] = (even<<8)+odd; @@ -1016,10 +1016,10 @@ static DRIVER_INIT( outrunb ) UINT8 even = word>>8; UINT8 odd = word&0xff; - // even byte + /* even byte */ if((even&0xc0) == 0x80 || (even&0xc0) == 0x40) even^=0xc0; - // odd byte + /* odd byte */ if((odd&0x0c) == 0x08 || (odd&0x0c) == 0x04) odd^=0x0c; RAM[i/2] = (even<<8)+odd; @@ -1064,7 +1064,7 @@ static DRIVER_INIT( outrunb ) INPUT_PORTS_START( outrun ) PORT_START /* Steering */ PORT_ANALOG( 0xff, 0x80, IPT_AD_STICK_X | IPF_CENTER, 100, 3, 0x48, 0xb8 ) -// PORT_ANALOG( 0xff, 0x7f, IPT_PADDLE , 70, 3, 0x48, 0xb8 ) +/* PORT_ANALOG( 0xff, 0x7f, IPT_PADDLE , 70, 3, 0x48, 0xb8 ) */ #ifdef HANGON_DIGITAL_CONTROLS @@ -1086,7 +1086,7 @@ PORT_START PORT_BITX(0x02, IP_ACTIVE_LOW, IPT_SERVICE, DEF_STR( Service_Mode ), KEYCODE_F2, IP_JOY_NONE ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) -// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) +/* PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) */ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -1098,7 +1098,7 @@ PORT_START /* DSW1 */ PORT_DIPSETTING( 0x02, "Up Cockpit" ) PORT_DIPSETTING( 0x01, "Mini Up" ) PORT_DIPSETTING( 0x03, "Moving" ) -// PORT_DIPSETTING( 0x00, "No Use" ) +/* PORT_DIPSETTING( 0x00, "No Use" ) */ PORT_DIPNAME( 0x04, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1130,7 +1130,7 @@ INPUT_PORTS_END INPUT_PORTS_START( toutrun ) PORT_START /* Steering */ PORT_ANALOG( 0xff, 0x80, IPT_AD_STICK_X | IPF_CENTER, 100, 3, 0x48, 0xb8 ) -// PORT_ANALOG( 0xff, 0x7f, IPT_PADDLE , 70, 3, 0x48, 0xb8 ) +/* PORT_ANALOG( 0xff, 0x7f, IPT_PADDLE , 70, 3, 0x48, 0xb8 ) */ #ifdef HANGON_DIGITAL_CONTROLS @@ -1152,8 +1152,8 @@ PORT_START PORT_BITX(0x02, IP_ACTIVE_LOW, IPT_SERVICE, DEF_STR( Service_Mode ), KEYCODE_F2, IP_JOY_NONE ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) -// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 ) // Turbo +/* PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) */ + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON5 ) /* Turbo */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -1240,7 +1240,7 @@ static MACHINE_DRIVER_START( outrun ) MDRV_SOUND_ADD(YM2151, sys16_ym2151_interface) MDRV_SOUND_ADD(SEGAPCM, sys16_segapcm_interface_15k) - // Lets add our Out Run music sample packs. + /* Lets add our Out Run music sample packs. */ MDRV_INSTALL_OST_SUPPORT(OST_SUPPORT_OUTRUN) MACHINE_DRIVER_END @@ -1326,7 +1326,7 @@ static MACHINE_DRIVER_START( toutrun_new ) MDRV_PALETTE_LENGTH(4096*3) /* initilize system16 variables prior to driver_init and video_start */ - //machine_init_sys16_onetime(); + /*machine_init_sys16_onetime(); */ MDRV_VIDEO_START(outrun) MDRV_VIDEO_UPDATE(outrun) @@ -1356,9 +1356,9 @@ static MEMORY_READ16_START( shangon_readmem ) { 0xc68000, 0xc68fff, shared_ram_r }, { 0xc7c000, 0xc7ffff, shared_ram2_r }, { 0xe00002, 0xe00003, sys16_coinctrl_r }, - { 0xe01000, 0xe01001, input_port_2_word_r }, // service - { 0xe0100c, 0xe0100d, input_port_4_word_r }, // dip2 - { 0xe0100a, 0xe0100b, input_port_3_word_r }, // dip1 + { 0xe01000, 0xe01001, input_port_2_word_r }, /* service */ + { 0xe0100c, 0xe0100d, input_port_4_word_r }, /* dip2 */ + { 0xe0100a, 0xe0100b, input_port_3_word_r }, /* dip1 */ { 0xe030f8, 0xe030f9, ho_io_x_r }, { 0xe030fa, 0xe030fb, ho_io_y_r }, MEMORY_END diff --git a/src/drivers/paradise.c b/src/drivers/paradise.c index c09eaf968..0d198c889 100644 --- a/src/drivers/paradise.c +++ b/src/drivers/paradise.c @@ -508,8 +508,8 @@ INPUT_PORTS_START( penky ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT | IPF_PLAYER1) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT | IPF_PLAYER1) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER1) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // alias for button1? - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // alias for button1? + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* alias for button1? */ + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* alias for button1? */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 ) PORT_START /* port $2023 */ @@ -518,8 +518,8 @@ INPUT_PORTS_START( penky ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT | IPF_PLAYER2) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT | IPF_PLAYER2) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER2) - PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) // alias for button1? - PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) // alias for button1? + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* alias for button1? */ + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* alias for button1? */ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START2 ) PORT_START /* port $2024 */ @@ -594,19 +594,19 @@ static struct GfxDecodeInfo paradise_gfxdecodeinfo[] = static struct GfxDecodeInfo torus_gfxdecodeinfo[] = { - { REGION_GFX1, 0, &torus_layout_16x16x8, 0x100, 1 }, // [0] Sprites - { REGION_GFX2, 0, &layout_8x8x4, 0x400, 16 }, // [1] Background - { REGION_GFX3, 0, &layout_8x8x8, 0x300, 1 }, // [2] Midground - { REGION_GFX4, 0, &layout_8x8x8, 0x000, 1 }, // [3] Foreground + { REGION_GFX1, 0, &torus_layout_16x16x8, 0x100, 1 }, /* [0] Sprites */ + { REGION_GFX2, 0, &layout_8x8x4, 0x400, 16 }, /* [1] Background */ + { REGION_GFX3, 0, &layout_8x8x8, 0x300, 1 }, /* [2] Midground */ + { REGION_GFX4, 0, &layout_8x8x8, 0x000, 1 }, /* [3] Foreground */ { -1 } }; static struct GfxDecodeInfo madball_gfxdecodeinfo[] = { - { REGION_GFX1, 0, &torus_layout_16x16x8, 0x500, 1 }, // [0] Sprites - { REGION_GFX2, 0, &layout_8x8x4, 0x400, 16 }, // [1] Background - { REGION_GFX3, 0, &layout_8x8x8, 0x300, 1 }, // [2] Midground - { REGION_GFX4, 0, &layout_8x8x8, 0x000, 1 }, // [3] Foreground + { REGION_GFX1, 0, &torus_layout_16x16x8, 0x500, 1 }, /* [0] Sprites */ + { REGION_GFX2, 0, &layout_8x8x4, 0x400, 16 }, /* [1] Background */ + { REGION_GFX3, 0, &layout_8x8x8, 0x300, 1 }, /* [2] Midground */ + { REGION_GFX4, 0, &layout_8x8x8, 0x000, 1 }, /* [3] Foreground */ { -1 } }; diff --git a/src/drivers/pitnrun.c b/src/drivers/pitnrun.c index d20a44890..75e8f698f 100644 --- a/src/drivers/pitnrun.c +++ b/src/drivers/pitnrun.c @@ -418,7 +418,7 @@ ROM_START( jumpkun ) ROM_LOAD( "snd2.2732", 0x01000, 0x01000, CRC(ec5e4489) SHA1(fc94fe798a1925e8e3dd15161648e9a960969fc4) ) ROM_REGION( 0x0800, REGION_CPU3, 0 ) - // not populated + /* not populated */ ROM_REGION( 0x6000, REGION_GFX1, 0 ) ROM_LOAD( "obj1.1k.2764", 0x00000, 0x02000, CRC(8929abfd) SHA1(978994af5816c20a8cd520263d04d1cc1e4df576) ) @@ -434,7 +434,7 @@ ROM_START( jumpkun ) ROM_LOAD( "bsc1.3p.2764", 0x01000, 0x01000, CRC(39ca2c37) SHA1(b8c71f443a0faf54df03ac5aca46ddd34c42d3a0) ) ROM_REGION( 0x2000, REGION_USER1, 0 ) - // not populated + /* not populated */ ROM_REGION( 0x0060, REGION_PROMS, 0 ) ROM_LOAD( "8h.82s123.bin", 0x0000, 0x0020, CRC(e54a6fe6) SHA1(c51da2cbf54b7abff7b0cdf0d6846c375b71edcd) ) diff --git a/src/drivers/playmark.c b/src/drivers/playmark.c index 22959962d..c66d2b2a9 100644 --- a/src/drivers/playmark.c +++ b/src/drivers/playmark.c @@ -46,7 +46,7 @@ static data8_t playmark_oki_command; extern data16_t *bigtwin_bgvideoram; -//extern size_t bigtwin_bgvideoram_size; +/*extern size_t bigtwin_bgvideoram_size; */ extern data16_t *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3; extern data16_t *wbeachvl_rowscroll; @@ -169,7 +169,7 @@ static READ_HANDLER( playmark_snd_command_r ) if ((playmark_oki_control & 0x38) == 0x30) { data = playmark_snd_command; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "PortB reading %02x from the 68K\n",data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "PortB reading %02x from the 68K\n",data); */ } else if ((playmark_oki_control & 0x38) == 0x28) { data = (OKIM6295_status_0_r(0) & 0x0f); @@ -238,7 +238,7 @@ static WRITE_HANDLER( playmark_snd_control_w ) static WRITE_HANDLER( hrdtimes_snd_control_w ) { - // This port controls communications to and from the 68K and the OKI device. See playmark_snd_control_w above. OKI banking is also handled here. + /* This port controls communications to and from the 68K and the OKI device. See playmark_snd_control_w above. OKI banking is also handled here. */ static int old_bank = 0; @@ -256,7 +256,7 @@ static WRITE_HANDLER( hrdtimes_snd_control_w ) if ((data & 0x38) == 0x18) { -// logerror("Writing %02x to OKI1, PortC=%02x, Code=%02x\n",playmark_oki_command,playmark_oki_control,playmark_snd_command); +/* logerror("Writing %02x to OKI1, PortC=%02x, Code=%02x\n",playmark_oki_command,playmark_oki_control,playmark_snd_command); */ OKIM6295_data_0_w(0, playmark_oki_command); } } @@ -325,8 +325,8 @@ static MEMORY_WRITE16_START( wbeachvl_writemem ) { 0x510000, 0x51000b, wbeachvl_scroll_w }, { 0x51000c, 0x51000d, MWA16_NOP }, /* 2 and 3 */ { 0x710016, 0x710017, wbeachvl_coin_eeprom_w }, -// disabled sound calls for now -// { 0x71001e, 0x71001f, playmark_snd_command_w }, +/* disabled sound calls for now */ +/* { 0x71001e, 0x71001f, playmark_snd_command_w }, */ { 0x780000, 0x780fff, paletteram16_RRRRRGGGGGBBBBBx_word_w, &paletteram16 }, { 0xff0000, 0xffffff, MWA16_RAM }, MEMORY_END @@ -336,14 +336,14 @@ static data16_t *hrdtimes_rom; /* trampoline */ static MEMORY_READ16_START( hrdtimes_readmem ) { 0x000000, 0x07ffff, MRA16_ROM }, { 0x080000, 0x0bffff, MRA16_RAM }, - { 0x0c0000, 0x0fffff, MRA16_ROM }, //AM_REGION(REGION_CPU1, 0x0c0000) + { 0x0c0000, 0x0fffff, MRA16_ROM }, /*AM_REGION(REGION_CPU1, 0x0c0000) */ { 0x100000, 0x103fff, MRA16_RAM }, { 0x104000, 0x107fff, MRA16_RAM }, { 0x108000, 0x10ffff, MRA16_RAM }, - { 0x10c000, 0x10ffff, MRA16_RAM }, // Unused + { 0x10c000, 0x10ffff, MRA16_RAM }, /* Unused */ { 0x200000, 0x200fff, MRA16_RAM }, { 0x280000, 0x2807ff, MRA16_RAM }, - { 0x280800, 0x280fff, MRA16_RAM }, // unused + { 0x280800, 0x280fff, MRA16_RAM }, /* unused */ { 0x300010, 0x300011, input_port_0_word_r }, { 0x300012, 0x300013, input_port_1_word_r }, { 0x300014, 0x300015, input_port_2_word_r }, @@ -354,18 +354,18 @@ MEMORY_END static MEMORY_WRITE16_START( hrdtimes_writemem ) { 0x000000, 0x07ffff, MWA16_ROM }, { 0x080000, 0x0bffff, MWA16_RAM }, - { 0x0c0000, 0x0fffff, MWA16_ROM, &hrdtimes_rom }, // correct.?? //AM_REGION(REGION_CPU1, 0x0c0000) + { 0x0c0000, 0x0fffff, MWA16_ROM, &hrdtimes_rom }, /* correct.?? AM_REGION(REGION_CPU1, 0x0c0000) */ { 0x100000, 0x103fff, hrdtimes_bgvideoram_w, &wbeachvl_videoram3 }, { 0x104000, 0x107fff, hrdtimes_fgvideoram_w, &wbeachvl_videoram2 }, { 0x108000, 0x10ffff, hrdtimes_txvideoram_w, &wbeachvl_videoram1 }, - { 0x10c000, 0x10ffff, MWA16_RAM }, // Unused + { 0x10c000, 0x10ffff, MWA16_RAM }, /* Unused */ { 0x110000, 0x11000d, hrdtimes_scroll_w }, { 0x200000, 0x200fff, MWA16_RAM, &spriteram16, &spriteram_size }, { 0x280000, 0x2807ff, bigtwin_paletteram_w, &paletteram16 }, - { 0x280800, 0x280fff, MWA16_RAM },// unused + { 0x280800, 0x280fff, MWA16_RAM },/* unused */ { 0x300016, 0x300017, hrdtimes_coin_w }, -// disable sound command for now -// { 0x30001e, 0x30001f, playmark_snd_command_w }, +/* disable sound command for now */ +/* { 0x30001e, 0x30001f, playmark_snd_command_w }, */ { 0x304000, 0x304001, MWA16_NOP }, /* watchdog? irq ack? */ MEMORY_END @@ -401,7 +401,7 @@ static PORT_READ_START( hrdtimes_sound_readport ) PORT_END static PORT_WRITE_START( hrdtimes_sound_writeport ) -// { 0x00, 0x00, playmark_oki_banking_w }, /* 4 bit port */ +/* { 0x00, 0x00, playmark_oki_banking_w },*/ /* 4 bit port */ { 0x01, 0x01, playmark_oki_w }, { 0x02, 0x02, hrdtimes_snd_control_w }, /* OKI banking via this port */ PORT_END @@ -833,11 +833,11 @@ static MACHINE_DRIVER_START( wbeachvl ) MDRV_CPU_MEMORY(wbeachvl_readmem,wbeachvl_writemem) MDRV_CPU_VBLANK_INT(irq2_line_hold,1) -// disabled sound cpu as game fails to boot with it active -// MDRV_CPU_ADD(PIC16C57, (12000000/PIC16C5x_CLOCK_DIVIDER)) /* 3MHz */ +/* disabled sound cpu as game fails to boot with it active */ +/* MDRV_CPU_ADD(PIC16C57, (12000000/PIC16C5x_CLOCK_DIVIDER))*/ /* 3MHz */ /* Program and Data Maps are internal to the MCU */ -// MDRV_CPU_MEMORY(playmark_sound_readmem,playmark_sound_writemem) -// MDRV_CPU_PORTS(playmark_sound_readport,playmark_sound_writeport) +/* MDRV_CPU_MEMORY(playmark_sound_readmem,playmark_sound_writemem) */ +/* MDRV_CPU_PORTS(playmark_sound_readport,playmark_sound_writeport) */ MDRV_FRAMES_PER_SECOND(58) MDRV_VBLANK_DURATION(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -865,11 +865,11 @@ static MACHINE_DRIVER_START( hrdtimes ) MDRV_CPU_MEMORY(hrdtimes_readmem,hrdtimes_writemem) MDRV_CPU_VBLANK_INT(irq6_line_hold,1) -// disable sound cpu for now -// MDRV_CPU_ADD(PIC16C57, (12000000/PIC16C5x_CLOCK_DIVIDER)) /* 3MHz */ +/* disable sound cpu for now */ +/* MDRV_CPU_ADD(PIC16C57, (12000000/PIC16C5x_CLOCK_DIVIDER))*/ /* 3MHz */ /* Program and Data Maps are internal to the MCU */ -// MDRV_CPU_MEMORY(playmark_sound_readmem,playmark_sound_writemem) -// MDRV_CPU_PORTS(hrdtimes_sound_readport,hrdtimes_sound_writeport) +/* MDRV_CPU_MEMORY(playmark_sound_readmem,playmark_sound_writemem) */ +/* MDRV_CPU_PORTS(hrdtimes_sound_readport,hrdtimes_sound_writeport) */ MDRV_FRAMES_PER_SECOND(58) MDRV_VBLANK_DURATION(DEFAULT_60HZ_VBLANK_DURATION) @@ -929,9 +929,9 @@ ROM_START( wbeachvl ) ROM_LOAD16_BYTE( "wbv_02.bin", 0x000000, 0x40000, CRC(c7cca29e) SHA1(03af361081d688c4204a95f7f5babcc598b72c23) ) ROM_LOAD16_BYTE( "wbv_03.bin", 0x000001, 0x40000, CRC(db4e69d5) SHA1(119bf35a463d279ddde67ab08f6f1bab9f05cf0c) ) -// ROM_REGION( 0x1009, REGION_CPU2, 0 ) /* sound (PIC16C57) */ - // 0x1000 rom data (actually 0x800 12-bit words), + 0x9 config bytes -// ROM_LOAD( "pic16c57", 0x0000, 0x1009, CRC(35439064) SHA1(ab0c5bafd76a2cb2a2e5ddb9d0578fd7e2241e43) ) +/* ROM_REGION( 0x1009, REGION_CPU2, 0 )*/ /* sound (PIC16C57) */ + /* 0x1000 rom data (actually 0x800 12-bit words), + 0x9 config bytes */ +/* ROM_LOAD( "pic16c57", 0x0000, 0x1009, CRC(35439064) SHA1(ab0c5bafd76a2cb2a2e5ddb9d0578fd7e2241e43) ) */ ROM_REGION( 0x600000, REGION_GFX1, ROMREGION_DISPOSE ) ROM_LOAD( "wbv_10.bin", 0x000000, 0x80000, CRC(50680f0b) SHA1(ed76ef6ced70ba7e9558162aa94bbe9f19bbabe6) ) @@ -975,8 +975,8 @@ ROM_START( hrdtimes ) ROM_LOAD16_BYTE( "31.u67", 0x00000, 0x80000, CRC(53eb041b) SHA1(7437da1ceb26e9518a3085560b8a42f37e77ace9) ) ROM_LOAD16_BYTE( "32.u66", 0x00001, 0x80000, CRC(f2c6b382) SHA1(d73affed091a261c4bfe17f409657e0a46b6c163) ) -// ROM_REGION( 0x4000, REGION_CPU2, ROMREGION_ERASE00 ) -// ROM_LOAD( "pic16c57.bin", PIC16C57_PGM_OFFSET, 0x1000, CRC(db307198) SHA1(21e98a69e673f6d48eb48239b4c51f6e7aa19a66) ) /* PIC CPU dump */ +/* ROM_REGION( 0x4000, REGION_CPU2, ROMREGION_ERASE00 ) */ +/* ROM_LOAD( "pic16c57.bin", PIC16C57_PGM_OFFSET, 0x1000, CRC(db307198) SHA1(21e98a69e673f6d48eb48239b4c51f6e7aa19a66) )*/ /* PIC CPU dump */ ROM_REGION( 0x200000, REGION_GFX1, ROMREGION_DISPOSE ) ROM_LOAD( "33.u36", 0x000000, 0x80000, CRC(d1239ce5) SHA1(8e966a39a47f66c5e904ec4357c751e896ed47cb) ) @@ -1124,7 +1124,7 @@ static MEMORY_READ16_START( powerbal_readmem ) { 0x000000, 0x07ffff, MRA16_ROM }, { 0x088000, 0x0883ff, MRA16_RAM }, { 0x098000, 0x098fff, MRA16_RAM }, - { 0x099000, 0x09bfff, MRA16_RAM }, // not used + { 0x099000, 0x09bfff, MRA16_RAM }, /* not used */ { 0x0c2010, 0x0c2011, input_port_0_word_r }, { 0x0c2012, 0x0c2013, input_port_1_word_r }, { 0x0c2014, 0x0c2015, input_port_2_word_r }, @@ -1143,13 +1143,13 @@ static MEMORY_WRITE16_START( powerbal_writemem ) { 0x094002, 0x094003, MWA16_NOP }, { 0x094004, 0x094005, tile_banking_w }, { 0x098000, 0x098fff, magicstk_bgvideoram_w, &magicstk_videoram }, - { 0x099000, 0x09bfff, MWA16_RAM }, // not used + { 0x099000, 0x09bfff, MWA16_RAM }, /* not used */ { 0x0c201c, 0x0c201d, oki_banking }, { 0x0c201e, 0x0c201f, OKIM6295_data_0_lsb_w }, { 0x0c4000, 0x0c4001, MWA16_NOP }, { 0x0f0000, 0x0fffff, MWA16_RAM }, { 0x101000, 0x101fff, MWA16_RAM, &spriteram16, &spriteram_size }, - { 0x102000, 0x10200d, MWA16_NOP }, // not used scroll regs? + { 0x102000, 0x10200d, MWA16_NOP }, /* not used scroll regs? */ { 0x103000, 0x103fff, MWA16_RAM }, MEMORY_END diff --git a/src/drivers/polepos.c b/src/drivers/polepos.c index fef98ea4a..c864f99c9 100644 --- a/src/drivers/polepos.c +++ b/src/drivers/polepos.c @@ -283,7 +283,7 @@ READ16_HANDLER( polepos2_ic25_r ) last_result = (INT8)last_signed * (UINT8)last_unsigned; } -// logerror("%04X: read IC25 @ %04X = %02X\n", activecpu_get_pc(), offset, result); +/* logerror("%04X: read IC25 @ %04X = %02X\n", activecpu_get_pc(), offset, result); */ return result | (result << 8); } @@ -370,19 +370,19 @@ static WRITE16_HANDLER( polepos_z8002_nvi_enable_w ) } -static READ_HANDLER( in0_l ) { return readinputport(0) & auto_start_mask; } // fire and start buttons -static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } // coins -static READ_HANDLER( dipA_l ) { return readinputport(1); } // dips A -static READ_HANDLER( dipA_h ) { return readinputport(1) >> 4; } // dips A -static READ_HANDLER( dipB_l ) { return readinputport(2); } // dips B -static READ_HANDLER( dipB_h ) { return readinputport(2) >> 4; } // dips B -static READ_HANDLER( in1_l ) { return readinputport(5); } // wheel -static READ_HANDLER( in1_h ) { return readinputport(5) >> 4; } // wheel +static READ_HANDLER( in0_l ) { return readinputport(0) & auto_start_mask; } /* fire and start buttons */ +static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } /* coins */ +static READ_HANDLER( dipA_l ) { return readinputport(1); } /* dips A */ +static READ_HANDLER( dipA_h ) { return readinputport(1) >> 4; } /* dips A */ +static READ_HANDLER( dipB_l ) { return readinputport(2); } /* dips B */ +static READ_HANDLER( dipB_h ) { return readinputport(2) >> 4; } /* dips B */ +static READ_HANDLER( in1_l ) { return readinputport(5); } /* wheel */ +static READ_HANDLER( in1_h ) { return readinputport(5) >> 4; } /* wheel */ static WRITE_HANDLER( out_0 ) { -// no start lamps in pole position -// set_led_status(1,data & 1); -// set_led_status(0,data & 2); +/* no start lamps in pole position */ +/* set_led_status(1,data & 1); */ +/* set_led_status(0,data & 2); */ coin_counter_w(1,~data & 4); coin_counter_w(0,~data & 8); } @@ -499,7 +499,7 @@ INPUT_PORTS_START( polepos ) PORT_START PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BITX(0x02, IP_ACTIVE_LOW, IPT_BUTTON1 | POLEPOS_TOGGLE, "Gear Change", KEYCODE_SPACE, IP_JOY_DEFAULT ) /* Gear */ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) // start 1, program controlled + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* start 1, program controlled */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -571,7 +571,7 @@ INPUT_PORTS_START( poleposa ) PORT_START PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BITX(0x02, IP_ACTIVE_LOW, IPT_BUTTON1 | POLEPOS_TOGGLE, "Gear Change", KEYCODE_SPACE, IP_JOY_DEFAULT ) /* Gear */ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) // start 1, program controlled + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* start 1, program controlled */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -643,7 +643,7 @@ INPUT_PORTS_START( polepos2 ) PORT_START PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BITX(0x02, IP_ACTIVE_LOW, IPT_BUTTON1 | POLEPOS_TOGGLE, "Gear Change", KEYCODE_SPACE, IP_JOY_DEFAULT ) /* Gear */ - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) // start 1, program controlled + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SPECIAL ) /* start 1, program controlled */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) diff --git a/src/drivers/redclash.c b/src/drivers/redclash.c index e7ac68775..2157b3eaf 100644 --- a/src/drivers/redclash.c +++ b/src/drivers/redclash.c @@ -172,7 +172,7 @@ WRITE_HANDLER( zerohour_sound_output0_w ) { UINT16 fix_address = 0x5000 + offset; zerohour_snd_play(0, fix_address &7, data); -// printf("zerohour_sound_output0_w PC:%04x: fix_Address:%04x offset:%04x data:%02x\n",activecpu_get_pc(),fix_address,offset,data); +/* printf("zerohour_sound_output0_w PC:%04x: fix_Address:%04x offset:%04x data:%02x\n",activecpu_get_pc(),fix_address,offset,data); */ } WRITE_HANDLER( zerohour_sound_output1_w ) @@ -180,7 +180,7 @@ WRITE_HANDLER( zerohour_sound_output1_w ) UINT16 fix_address = 0x5801 + offset; zerohour_snd_play(1, fix_address &7, data); -// printf("zerohour_sound_output1_w PC:%04x: fix_Address:%04x offset:%04x data:%02x\n",activecpu_get_pc(),fix_address,offset,data); +/* printf("zerohour_sound_output1_w PC:%04x: fix_Address:%04x offset:%04x data:%02x\n",activecpu_get_pc(),fix_address,offset,data); */ } diff --git a/src/drivers/sbrkout.c b/src/drivers/sbrkout.c index 2b1930bd1..f65f57c07 100644 --- a/src/drivers/sbrkout.c +++ b/src/drivers/sbrkout.c @@ -58,9 +58,9 @@ extern VIDEO_UPDATE( sbrkout ); /* Colors used in overlay. */ #define OVERLAY_RED MAKE_ARGB(0x04,0xff,0x20,0x20) #define OVERLAY_GREEN MAKE_ARGB(0x04,0x20,0xff,0x20) -// Original blue is too dark so is replaced with crayola blue -// https://en.wikipedia.org/wiki/Shades_of_blue#Blue_(Crayola) -//#define OVERLAY_BLUE MAKE_ARGB(0x08,0x20,0x20,0xff) +/* Original blue is too dark so is replaced with crayola blue */ +/* https://en.wikipedia.org/wiki/Shades_of_blue#Blue_(Crayola) */ +/*#define OVERLAY_BLUE MAKE_ARGB(0x08,0x20,0x20,0xff) */ #define OVERLAY_BLUE MAKE_ARGB(0x04,0x1f,0x75,0xfe) #define OVERLAY_YELLOW MAKE_ARGB(0x04,0xff,0xff,0x20) @@ -70,7 +70,7 @@ extern VIDEO_UPDATE( sbrkout ); /* real machine, though a little ugly and likely just because of */ /* limited ability to do overlays back in 1978. */ /* For the authentic look, uncomment the definition below. */ -//#define USE_AUTHENTIC_OVERLAY 1 +/*#define USE_AUTHENTIC_OVERLAY 1 */ OVERLAY_START( sbrkout_overlay ) #ifdef USE_AUTHENTIC_OVERLAY OVERLAY_RECT( 216, 0, 256, 224, OVERLAY_BLUE) diff --git a/src/drivers/segac2.c b/src/drivers/segac2.c index 031cd4895..41218e7a5 100644 --- a/src/drivers/segac2.c +++ b/src/drivers/segac2.c @@ -211,7 +211,7 @@ unsigned char bios_6402; unsigned char bios_6403; unsigned char bios_6404; static unsigned char* ic3_ram; -//static unsigned char ic36_ram[0x4000]; +/*static unsigned char ic36_ram[0x4000]; */ static unsigned char ic37_ram[0x8000]; unsigned int readpos = 1; /* serial bank selection position (9-bit)*/ @@ -380,7 +380,7 @@ static MACHINE_INIT( megatech ) static MACHINE_INIT( megaplay ) { -// unsigned char* ram = memory_region(REGION_CPU3); +/* unsigned char* ram = memory_region(REGION_CPU3); */ /* mirroring of ram etc. */ cpu_setbank(1, &genesis_z80_ram[0]); @@ -1000,7 +1000,7 @@ static MEMORY_READ16_START( puckpkmn_readmem ) { 0xff0000, 0xffffff, MRA16_RAM }, /* Main Ram */ /* Unknown reads: */ -/* { 0xa10000, 0xa10001, MRA16_NOP }, // ? once /*/ +/* { 0xa10000, 0xa10001, MRA16_NOP },*/ /* once */ { 0xa10002, 0xa10005, MRA16_NOP }, /* ? alternative way of reading inputs ? */ { 0xa11100, 0xa11101, MRA16_NOP }, /* ? */ MEMORY_END @@ -1016,8 +1016,8 @@ static MEMORY_WRITE16_START( puckpkmn_writemem ) /* Unknown writes: */ { 0xa00000, 0xa00551, MWA16_RAM }, /* ? */ { 0xa10002, 0xa10005, MWA16_NOP }, /* ? alternative way of reading inputs ? */ -/* { 0xa10008, 0xa1000d, MWA16_NOP }, // ? once /*/ -/* { 0xa14000, 0xa14003, MWA16_NOP }, // ? once /*/ +/* { 0xa10008, 0xa1000d, MWA16_NOP },*/ /* ? once */ +/* { 0xa14000, 0xa14003, MWA16_NOP },*/ /* ? once */ { 0xa11100, 0xa11101, MWA16_NOP }, /* ? */ { 0xa11200, 0xa11201, MWA16_NOP }, /* ? */ MEMORY_END @@ -1314,15 +1314,15 @@ static READ16_HANDLER ( megaplay_68k_to_z80_r ) if ((offset >= 0x0000) && (offset <= 0x1fff)) { offset &=0x1fff; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "soundram_r returning %x\n",(gen_z80_shared[offset] << 8) + gen_z80_shared[offset+1]); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "soundram_r returning %x\n",(gen_z80_shared[offset] << 8) + gen_z80_shared[offset+1]); */ return (genesis_z80_ram[offset] << 8) + genesis_z80_ram[offset+1]; } if ((offset >= 0x2000) && (offset <= 0x3fff)) { offset &=0x1fff; -// if(offset == 0) -// return (readinputport(8) << 8) ^ 0xff00; +/* if(offset == 0) */ +/* return (readinputport(8) << 8) ^ 0xff00; */ return (ic36_ram[offset] << 8) + ic36_ram[offset+1]; } @@ -1558,7 +1558,7 @@ READ16_HANDLER ( megaplay_genesis_io_r ) return_value |= readinputport(1) & 0x03; } return_value = (genesis_io_ram[offset] & 0x80) | return_value; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "reading joypad 1 , type %02x %02x\n",genesis_io_ram[offset] & 0xb0, return_value &0x7f); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "reading joypad 1 , type %02x %02x\n",genesis_io_ram[offset] & 0xb0, return_value &0x7f); */ break; case 2: /* port B data (joypad 2) */ @@ -1571,12 +1571,12 @@ READ16_HANDLER ( megaplay_genesis_io_r ) return_value |= readinputport(3) & 0x03; } return_value = (genesis_io_ram[offset] & 0x80) | return_value; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "reading joypad 2 , type %02x %02x\n",genesis_io_ram[offset] & 0xb0, return_value &0x7f); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "reading joypad 2 , type %02x %02x\n",genesis_io_ram[offset] & 0xb0, return_value &0x7f); */ break; -// case 3: /* port C data */ -// return_value = bios_6402 << 3; -// break; +/* case 3: */ /* port C data */ +/* return_value = bios_6402 << 3; */ +/* break; */ default: return_value = genesis_io_ram[offset]; @@ -1587,7 +1587,7 @@ READ16_HANDLER ( megaplay_genesis_io_r ) WRITE16_HANDLER ( genesis_io_w ) { -// log_cb(RETRO_LOG_DEBUG, LOGPRE "write io offset :%02x data %04x PC: 0x%06x\n",offset,data,activecpu_get_previouspc()); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "write io offset :%02x data %04x PC: 0x%06x\n",offset,data,activecpu_get_previouspc()); */ switch (offset) { @@ -1636,7 +1636,7 @@ int genesis_region; void genesis_init_io (void) { - genesis_io_ram[0x00] = (genesis_region & 0xc0)| (0x00 & 0x3f); // region / pal / segacd etc. important! + genesis_io_ram[0x00] = (genesis_region & 0xc0)| (0x00 & 0x3f); /* region / pal / segacd etc. important! */ genesis_io_ram[0x01] = 0x7f; genesis_io_ram[0x02] = 0x7f; genesis_io_ram[0x03] = 0x7f; @@ -1680,14 +1680,14 @@ READ16_HANDLER ( genesis_68000_io_r ) int paddata,p; int inlines, outlines; -//printf("I/O read .. offset %02x data %02x\n",offset,genesis_io_ram[offset]); +/*printf("I/O read .. offset %02x data %02x\n",offset,genesis_io_ram[offset]); */ switch (offset) { - case 0x00: // version register + case 0x00: /* version register */ return genesis_io_ram[offset]; case 0x01: -// printf("I/O Data A read \n"); +/* printf("I/O Data A read \n"); */ /* When TH=0 When TH=1 @@ -1717,7 +1717,7 @@ READ16_HANDLER ( genesis_68000_io_r ) inlines = (genesis_io_ram[0x04]^0xff)&0x7f; outlines = (genesis_io_ram[0x04] | 0x80); -// printf ("ioram %02x inlines %02x paddata %02x outlines %02x othdata %02x\n",genesis_io_ram[0x04], inlines, paddata, outlines, genesis_io_ram[0x01]); +/* printf ("ioram %02x inlines %02x paddata %02x outlines %02x othdata %02x\n",genesis_io_ram[0x04], inlines, paddata, outlines, genesis_io_ram[0x01]); */ @@ -1728,7 +1728,7 @@ READ16_HANDLER ( genesis_68000_io_r ) return genesis_io_ram[offset]; case 0x02: -// printf("I/O Data B read \n"); +/* printf("I/O Data B read \n"); */ p = readinputport(1); if (genesis_io_ram[offset]&0x40) @@ -1749,7 +1749,7 @@ READ16_HANDLER ( genesis_68000_io_r ) return p | p <<8; case 0x03: -// printf("I/O Data C read \n"); +/* printf("I/O Data C read \n"); */ return genesis_io_ram[offset]; case 0x04: @@ -1784,9 +1784,9 @@ READ16_HANDLER ( genesis_68000_io_r ) */ -// return 0x30; -// return mame_rand(); -// return 0xff; +/* return 0x30; */ +/* return mame_rand(); */ +/* return 0xff; */ } /* @@ -1823,32 +1823,32 @@ READ16_HANDLER ( genesis_68000_io_r ) WRITE16_HANDLER ( genesis_68000_io_w ) { -// printf("I/O write offset %02x data %04x\n",offset,data); +/* printf("I/O write offset %02x data %04x\n",offset,data); */ switch (offset) { - case 0x00: // Version (read only?) + case 0x00: /* Version (read only?) */ printf("attempted write to version register?!\n"); break; - case 0x01: // Port A data -// printf("write to data port A with control register A %02x step1 %02x step2 %02x\n", genesis_io_ram[0x04], (genesis_io_ram[0x01] & !((genesis_io_ram[0x04]&0x7f)|0x80)), (data & ((genesis_io_ram[0x04]&0x7f)|0x80)) ); + case 0x01: /* Port A data */ +/* printf("write to data port A with control register A %02x step1 %02x step2 %02x\n", genesis_io_ram[0x04], (genesis_io_ram[0x01] & !((genesis_io_ram[0x04]&0x7f)|0x80)), (data & ((genesis_io_ram[0x04]&0x7f)|0x80)) ); */ genesis_io_ram[0x01] = (genesis_io_ram[0x01] & ((genesis_io_ram[0x04]^0xff)|0x80)) | (data & ((genesis_io_ram[0x04]&0x7f)|0x80)); break; - case 0x02: // Port B data -// printf("write to data port B with control register B %02x\n", genesis_io_ram[0x05]); + case 0x02: /* Port B data */ +/* printf("write to data port B with control register B %02x\n", genesis_io_ram[0x05]); */ genesis_io_ram[0x02] = (genesis_io_ram[0x02] & ((genesis_io_ram[0x05]^0xff)|0x80)) | (data & ((genesis_io_ram[0x05]&0x7f)|0x80)); break; - case 0x03: // Port C data -// printf("write to data port C with control register C %02x\n", genesis_io_ram[0x06]); + case 0x03: /* Port C data */ +/* printf("write to data port C with control register C %02x\n", genesis_io_ram[0x06]); */ genesis_io_ram[0x03] = (genesis_io_ram[0x03] & ((genesis_io_ram[0x06]^0xff)|0x80)) | (data & ((genesis_io_ram[0x06]&0x7f)|0x80)); break; - case 0x04: // Port A control + case 0x04: /* Port A control */ genesis_io_ram[offset]=data; break; - case 0x05: // Port B control + case 0x05: /* Port B control */ genesis_io_ram[offset]=data; break; - case 0x06: // Port C control + case 0x06: /* Port C control */ genesis_io_ram[offset]=data; break; @@ -1922,8 +1922,8 @@ MEMORY_END static MEMORY_WRITE16_START( sbubsm_writemem ) { 0x000000, 0x0fffff, MWA16_ROM }, /* Cartridge Program Rom */ -// { 0x200000, 0x20007f, MWA16_RAM }, - { 0x200000, 0x2023ff, MWA16_RAM }, // tested +/* { 0x200000, 0x20007f, MWA16_RAM }, */ + { 0x200000, 0x2023ff, MWA16_RAM }, /* tested */ { 0xa10000, 0xa1001f, genesis_io_w, &genesis_io_ram }, /* Genesis Input */ { 0xa11000, 0xa11203, genesis_ctrl_w }, { 0xa00000, 0xa0ffff, megaplay_68k_to_z80_w }, @@ -1947,8 +1947,8 @@ MEMORY_END static MEMORY_WRITE16_START( barek2ch_writemem ) { 0x000000, 0x1fffff, MWA16_ROM }, /* Cartridge Program Rom */ -// { 0x200000, 0x20007f, MWA16_RAM }, - { 0x200000, 0x2023ff, MWA16_RAM }, // tested +/* { 0x200000, 0x20007f, MWA16_RAM }, */ + { 0x200000, 0x2023ff, MWA16_RAM }, /* tested */ { 0xa10000, 0xa1001f, genesis_68000_io_w, &genesis_io_ram }, /* Genesis Input */ { 0xa11000, 0xa11203, genesis_ctrl_w }, { 0xa00000, 0xa0ffff, megaplay_68k_to_z80_w }, @@ -2198,7 +2198,7 @@ static WRITE_HANDLER( megaplay_bios_banksel_w ) */ bios_bank = data; bios_mode = MP_ROM; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: ROM bank %i selected [0x%02x]\n",bios_bank >> 6, data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: ROM bank %i selected [0x%02x]\n",bios_bank >> 6, data); */ } static READ_HANDLER( megaplay_bios_gamesel_r ) @@ -2210,7 +2210,7 @@ static WRITE_HANDLER( megaplay_bios_gamesel_w ) { bios_6403 = data; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6403 write: 0x%02x\n",data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6403 write: 0x%02x\n",data); */ bios_mode = data & 0x10; } @@ -2259,29 +2259,29 @@ static WRITE_HANDLER ( bank_w ) ic37_ram[(0x2000 * (bios_bank & 0x03)) + offset] = data; if(offset >= 0x2000 && (bios_width & 0x08)) -// ic36_ram[offset] = data; +/* ic36_ram[offset] = data; */ ic36_ram[offset - 0x2000] = data; } static READ_HANDLER( megaplay_bios_6402_r ) { - return genesis_io_ram[3];// & 0xfe; + return genesis_io_ram[3];/* & 0xfe; */ /* return bios_6402; & 0xfe;*/ } static WRITE_HANDLER( megaplay_bios_6402_w ) { genesis_io_ram[3] = (genesis_io_ram[3] & 0x07) | ((data & 0x70) >> 1); -// bios_6402 = (data >> 4) & 0x07; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6402 write: 0x%02x\n",data); +/* bios_6402 = (data >> 4) & 0x07; */ +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6402 write: 0x%02x\n",data); */ } static READ_HANDLER( megaplay_bios_6404_r ) { -// log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6404 read: returned 0x%02x\n",bios_6404 | (bios_6403 & 0x10) >> 4); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6404 read: returned 0x%02x\n",bios_6404 | (bios_6403 & 0x10) >> 4); */ return (bios_6404 & 0xfe) | ((bios_6403 & 0x10) >> 4); -// return bios_6404 | (bios_6403 & 0x10) >> 4; +/* return bios_6404 | (bios_6403 & 0x10) >> 4; */ } static WRITE_HANDLER( megaplay_bios_6404_w ) @@ -2290,13 +2290,13 @@ static WRITE_HANDLER( megaplay_bios_6404_w ) cpu_set_reset_line(0, PULSE_LINE); bios_6404 = data; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6404 write: 0x%02x\n",data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6404 write: 0x%02x\n",data); */ } static READ_HANDLER( megaplay_bios_6204_r ) { return (genesis_io_ram[3]); -// return (bios_width & 0xf8) + (bios_6204 & 0x07); +/* return (bios_width & 0xf8) + (bios_6204 & 0x07); */ } static WRITE_HANDLER( megaplay_bios_width_w ) @@ -2304,7 +2304,7 @@ static WRITE_HANDLER( megaplay_bios_width_w ) bios_width = data; genesis_io_ram[3] = (genesis_io_ram[3] & 0x07) | ((data & 0xf8)); -// log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6204 - Width write: %02x\n",data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6204 - Width write: %02x\n",data); */ } static READ_HANDLER( megaplay_bios_6600_r ) @@ -2315,13 +2315,13 @@ static READ_HANDLER( megaplay_bios_6600_r ) function to make the BIOS check all 4 slots (3 and 4 will be "not used") return (bios_6600 & 0xfe) | (bios_bank & 0x01); */ - return bios_6600;// & 0xfe; + return bios_6600;/* & 0xfe; */ } static WRITE_HANDLER( megaplay_bios_6600_w ) { bios_6600 = data; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6600 write: 0x%02x\n",data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS: 0x6600 write: 0x%02x\n",data); */ } static WRITE_HANDLER( megaplay_game_w ) @@ -2335,7 +2335,7 @@ static WRITE_HANDLER( megaplay_game_w ) { bios_mode = MP_GAME; readpos = 1; -// usrintf_showmessage("Game bank selected: 0x%03x",game_banksel); +/* usrintf_showmessage("Game bank selected: 0x%03x",game_banksel); */ log_cb(RETRO_LOG_DEBUG, LOGPRE "BIOS [0x%04x]: 68K address space bank selected: 0x%03x\n",activecpu_get_previouspc(),game_banksel); } } @@ -3998,7 +3998,7 @@ INPUT_PORTS_START ( mp_twc ) MEGAPLAY_DSWB PORT_START - // DSW C (per game settings) + /* DSW C (per game settings) */ PORT_DIPNAME( 0x01, 0x01, "Time" ) PORT_DIPSETTING( 0x01, "Normal" ) PORT_DIPSETTING( 0x00, "Short" ) @@ -4023,7 +4023,7 @@ INPUT_PORTS_START ( mp_soni2 ) MEGAPLAY_DSWB PORT_START - // DSW C (per game settings) + /* DSW C (per game settings) */ PORT_DIPNAME( 0x03, 0x01, "Initial Players (Normal mode)" ) PORT_DIPSETTING( 0x00, "4" ) PORT_DIPSETTING( 0x01, "3" ) @@ -4046,7 +4046,7 @@ INPUT_PORTS_START ( mp_sor2 ) MEGAPLAY_DSWB PORT_START - // DSW C (per game settings) + /* DSW C (per game settings) */ PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x00, "4" ) PORT_DIPSETTING( 0x01, "3" ) @@ -4069,7 +4069,7 @@ INPUT_PORTS_START ( mp_bio ) MEGAPLAY_DSWB PORT_START - // DSW C (per game settings) + /* DSW C (per game settings) */ PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPSETTING( 0x00, "5" ) PORT_DIPSETTING( 0x01, "4" ) @@ -4163,7 +4163,7 @@ INPUT_PORTS_START( barek2ch ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 | IPF_PLAYER2 ) PORT_START - PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) // apparently no use for these + PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) /* apparently no use for these */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -4194,7 +4194,7 @@ INPUT_PORTS_START( barek2ch ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_START - PORT_DIPNAME( 0x01, 0x01, "SW2:1" ) // at least some of the first 3 seem to control difficulty (enemies attack later / less frequently by switching these) + PORT_DIPNAME( 0x01, 0x01, "SW2:1" ) /* at least some of the first 3 seem to control difficulty (enemies attack later / less frequently by switching these) */ PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, "SW2:2" ) @@ -4218,7 +4218,7 @@ INPUT_PORTS_START( barek2ch ) PORT_DIPSETTING( 0x20, "7" ) PORT_DIPSETTING( 0x00, "8" ) - PORT_START // present on PCB but there doesn't seem to be any read for them + PORT_START /* present on PCB but there doesn't seem to be any read for them */ PORT_DIPNAME( 0x01, 0x01, "SW3:1" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -4376,7 +4376,7 @@ static struct YM2612interface gen_ym3438_intf = { 0 }, /* port I/O */ { 0 }, /* port I/O */ { 0 }, /* port I/O */ -/* { ym3438_interrupt } // IRQ handler /*/ +/* { ym3438_interrupt }*/ /* IRQ handler */ }; static struct SN76496interface sn76489_intf = @@ -4599,7 +4599,7 @@ static MACHINE_DRIVER_START( megaplay ) /* sound hardware */ MDRV_SOUND_ADD(YM2612, gen_ym3438_intf ) -// MDRV_CPU_PROGRAM_MAP(megaplay_genesis_readmem, genesis_writemem) +/* MDRV_CPU_PROGRAM_MAP(megaplay_genesis_readmem, genesis_writemem) */ MDRV_VIDEO_START(megaplay) MDRV_VIDEO_UPDATE(megaplay) @@ -4905,11 +4905,11 @@ ROM_START( ichirk ) /* Ichident-R (Puzzle & Action 2) (c)1994 Sega (Korea) */ /* Again the part numbers are quite strange for the Korean verison */ ROM_LOAD16_BYTE( "epr_ichi.32", 0x000000, 0x080000, CRC(804dea11) SHA1(40bf8cbd40969a5880df10914252b7f64d5ce8e9) ) ROM_LOAD16_BYTE( "epr_ichi.31", 0x000001, 0x080000, CRC(92452353) SHA1(d2e1da5b139965611cd8d707d23396b5d4c07d12) ) - ROM_LOAD16_BYTE( "epr16888", 0x100000, 0x080000, CRC(85d73722) SHA1(7ebe81b4d6c89f87f60200a3a8cddb07d581adef) ) // m17235a.34 - ROM_LOAD16_BYTE( "epr16887", 0x100001, 0x080000, CRC(bc3bbf25) SHA1(e760ad400bc183b38e9787d88c8ac084fbe2ae21) ) // m17220a.33 + ROM_LOAD16_BYTE( "epr16888", 0x100000, 0x080000, CRC(85d73722) SHA1(7ebe81b4d6c89f87f60200a3a8cddb07d581adef) ) /* m17235a.34 */ + ROM_LOAD16_BYTE( "epr16887", 0x100001, 0x080000, CRC(bc3bbf25) SHA1(e760ad400bc183b38e9787d88c8ac084fbe2ae21) ) /* m17220a.33 */ ROM_REGION( 0x080000, REGION_SOUND1, 0 ) - ROM_LOAD( "pa2_02.bin", 0x000000, 0x080000, CRC(fc7b0da5) SHA1(46770aa7e19b4f8a183be3f433c48ad677b552b1) ) // m17220a.4 + ROM_LOAD( "pa2_02.bin", 0x000000, 0x080000, CRC(fc7b0da5) SHA1(46770aa7e19b4f8a183be3f433c48ad677b552b1) ) /* m17220a.4 */ ROM_END ROM_START( ichirj ) /* Ichident-R (Puzzle & Action 2) (c)1994 Sega (Japan) */ @@ -5040,7 +5040,7 @@ ROM_START( aladmdb ) ROM_LOAD16_BYTE( "m4.bin", 0x100000, 0x080000, CRC(bc712661) SHA1(dfd554d000399e17b4ddc69761e572195ed4e1f0)) ROM_END -ROM_START( barek2ch ) // all 27c4001 +ROM_START( barek2ch ) /* all 27c4001 */ ROM_REGION( 0x400000, REGION_CPU1, 0 ) ROM_LOAD16_BYTE( "u14", 0x000001, 0x080000, CRC(b0ee177f) SHA1(d63e6ee30fe7f4aaab098d3920eabc456730b2c5) ) ROM_LOAD16_BYTE( "u15", 0x000000, 0x080000, CRC(09264195) SHA1(c5439731d932c90a57d68c4d82c9ebed8a01bd53) ) @@ -5049,7 +5049,7 @@ ROM_START( barek2ch ) // all 27c4001 ROM_END ROM_START( barek3mb ) - ROM_REGION( 0x400000, REGION_CPU1, 0 ) // 68000 Code + ROM_REGION( 0x400000, REGION_CPU1, 0 ) /* 68000 Code */ ROM_LOAD16_BYTE( "6.u19", 0x000000, 0x080000, CRC(2de19519) SHA1(f5fcef1da8b5370e399f0451382e3c6e7754c9c8) ) ROM_LOAD16_BYTE( "3.u18", 0x000001, 0x080000, CRC(db900e82) SHA1(172a4fe01a0ffd1ea3aed74f2c58234fd55b876d) ) ROM_LOAD16_BYTE( "4.u15", 0x100000, 0x080000, CRC(6353b4b1) SHA1(9f89a2f02170496ca798b89e37e1f2bae0e9155d) ) @@ -5059,7 +5059,7 @@ ROM_START( barek3mb ) ROM_END ROM_START( sonic2mb ) - ROM_REGION( 0x400000, REGION_CPU1, 0 ) // 68000 Code + ROM_REGION( 0x400000, REGION_CPU1, 0 ) /* 68000 Code */ ROM_LOAD16_BYTE( "m1", 0x000001, 0x080000, CRC(7b40aa24) SHA1(247882cd1f412366d61aeb4d85bbeefd5f108e1d) ) ROM_LOAD16_BYTE( "m2", 0x000000, 0x080000, CRC(84b3f758) SHA1(19846b9d951db6f78f3e155d33f1b6349fb87f1a) ) ROM_END @@ -5528,7 +5528,7 @@ ROM_START( mp_gaxe2 ) /* Golden Axe 2 */ ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* z80 */ ROM_REGION( 0x8000, REGION_USER1, 0 ) /* Game Instructions */ - ROM_LOAD( "ep15175-02b.ic3", 0x000000, 0x08000, CRC(3039b653) SHA1(b19874c74d0fc0cca1169f62e5e74f0e8ca83679) ) // 15175-02b.ic3 + ROM_LOAD( "ep15175-02b.ic3", 0x000000, 0x08000, CRC(3039b653) SHA1(b19874c74d0fc0cca1169f62e5e74f0e8ca83679) ) /* 15175-02b.ic3 */ ROM_REGION( 0x28000, REGION_CPU3, 0 ) /* Bios */ MEGAPLAY_BIOS @@ -6113,7 +6113,7 @@ Game does a check @ 1afc00 with work ram fff57c that makes it play like it was i rom[0x1afc08/2] = 0x6600; #endif - // 220000 = writes to mcu? 330000 = reads? + /* 220000 = writes to mcu? 330000 = reads? */ install_mem_write16_handler(0, 0x220000, 0x220001, aladbl_w); install_mem_read16_handler(0, 0x330000, 0x330001, aladbl_r); @@ -6130,7 +6130,7 @@ DRIVER_INIT( barek2ch ) for (i = 0x000000; i < 0x200000 / 2; i++) src[i] = BITSWAP16(src[i], 8, 11, 10, 13, 12, 14, 15, 9, 7, 6, 5, 4, 3, 2, 1, 0); - src[0x06 / 2] = 0x0210; // TODO: why is this needed? + src[0x06 / 2] = 0x0210; /* TODO: why is this needed? */ install_mem_read16_handler(0, 0x380070, 0x380071, input_port_2_word_r ); install_mem_read16_handler(0, 0x380078, 0x380079, input_port_3_word_r ); @@ -6313,7 +6313,7 @@ static DRIVER_INIT (megaplay) data8_t *game_rom = memory_region(REGION_CPU1); int offs; - memmove(src+0x10000,src+0x8000,0x18000); // move bios.. + memmove(src+0x10000,src+0x8000,0x18000); /* move bios.. */ /* copy game instruction rom to main map.. maybe this should just be accessed through a handler instead?.. */ diff --git a/src/drivers/segasyse.c b/src/drivers/segasyse.c index 6f0f1b14c..40cd46862 100644 --- a/src/drivers/segasyse.c +++ b/src/drivers/segasyse.c @@ -436,7 +436,7 @@ static WRITE_HANDLER (segae_ridleofp_port_fa_w) } if (data & 2) { - int curr = readinputport(5);// & 0x0fff; // fixes player 2 inputs in cocktail mode + int curr = readinputport(5);/* & 0x0fff; // fixes player 2 inputs in cocktail mode */ diff2 = ((curr - last2) & 0x0fff) | (curr & 0xf000); last2 = curr; } @@ -861,7 +861,7 @@ INPUT_PORTS_START( megrescu ) /* Used By Megumi Rescue */ PORT_DIPSETTING( 0x08, "3" ) PORT_DIPSETTING( 0x04, "4" ) PORT_BITX( 0, 0x00, IPT_DIPSWITCH_SETTING | IPF_CHEAT, "100", IP_KEY_NONE, IP_JOY_NONE ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) // Unknown + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) ) /* Unknown */ PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) ) @@ -876,7 +876,7 @@ INPUT_PORTS_START( megrescu ) /* Used By Megumi Rescue */ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) // Unknown + PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) /* Unknown */ PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) diff --git a/src/drivers/sf1.c b/src/drivers/sf1.c index 2a9543012..51fb36713 100644 --- a/src/drivers/sf1.c +++ b/src/drivers/sf1.c @@ -864,7 +864,7 @@ static MACHINE_DRIVER_START( sf1 ) MDRV_SOUND_ADD(YM2151, ym2151_interface) MDRV_SOUND_ADD(MSM5205, msm5205_interface) - // Lets add our SF1 music sample packs. + /* Lets add our SF1 music sample packs. */ MDRV_INSTALL_OST_SUPPORT(OST_SUPPORT_SF1) MACHINE_DRIVER_END diff --git a/src/drivers/sharrier.c b/src/drivers/sharrier.c index 066c96a86..d4e8d9e4b 100644 --- a/src/drivers/sharrier.c +++ b/src/drivers/sharrier.c @@ -1243,9 +1243,9 @@ ROM_START( enduror ) ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* second 68000 CPU */ ROM_LOAD16_BYTE("7634.rom", 0x0000, 0x8000, CRC(3e07fd32) SHA1(7acb9e9712ecfe928c421c84dece783e75077746) ) ROM_LOAD16_BYTE("7635.rom", 0x0001, 0x8000, CRC(22f762ab) SHA1(70fa87da76c714db7213c42128a0b6a27644a1d4) ) - // alternate version?? -// ROM_LOAD16_BYTE("7634a.rom", 0x0000, 0x8000, CRC(aec83731) ) -// ROM_LOAD16_BYTE("7635a.rom", 0x0001, 0x8000, CRC(b2fce96f) ) + /* alternate version?? */ +/* ROM_LOAD16_BYTE("7634a.rom", 0x0000, 0x8000, CRC(aec83731) ) */ +/* ROM_LOAD16_BYTE("7635a.rom", 0x0001, 0x8000, CRC(b2fce96f) ) */ ROM_REGION( 0x40000, REGION_GFX3, 0 ) /* Road Graphics (region size should be gr_bitmapwidth*256, 0 )*/ ROM_LOAD( "7633.rom", 0x0000, 0x8000, CRC(6f146210) SHA1(2f58f0c3563b434ed02700b9ca1545a696a5716e) ) @@ -1516,7 +1516,7 @@ INPUT_PORTS_START( enduror ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - /*PORT_START // Y /*/ + /*PORT_START /* Y */ /*PORT_ANALOG( 0xff, 0x0, IPT_AD_STICK_Y | IPF_CENTER , 100, 8, 0x0, 0xff )*/ INPUT_PORTS_END diff --git a/src/drivers/skydiver.c b/src/drivers/skydiver.c index 506367f03..5fbc0354d 100644 --- a/src/drivers/skydiver.c +++ b/src/drivers/skydiver.c @@ -129,11 +129,11 @@ static WRITE_HANDLER( skydiver_nmion_w ) static INTERRUPT_GEN( skydiver_interrupt ) { /* Convert range data to divide value and write to sound */ - discrete_sound_w(0, (0x01 << (~skydiver_videoram[0x394] & 0x07)) & 0xff); // Range 0-2 + discrete_sound_w(0, (0x01 << (~skydiver_videoram[0x394] & 0x07)) & 0xff); /* Range 0-2 */ - discrete_sound_w(1, skydiver_videoram[0x394] & 0x08); // Range 3 - note disable - discrete_sound_w(2, ~skydiver_videoram[0x395] & 0xff); // Note - freq - discrete_sound_w(3, skydiver_videoram[0x396] & 0x0f); // NAM - Noise Amplitude + discrete_sound_w(1, skydiver_videoram[0x394] & 0x08); /* Range 3 - note disable */ + discrete_sound_w(2, ~skydiver_videoram[0x395] & 0xff); /* Note - freq */ + discrete_sound_w(3, skydiver_videoram[0x396] & 0x0f); /* NAM - Noise Amplitude */ if (skydiver_nmion) @@ -375,10 +375,10 @@ static struct GfxDecodeInfo gfxdecodeinfo[] = const struct discrete_555_astbl_desc skydiverWhistl555 = { DISC_555_OUT_SQW | DISC_555_OUT_AC, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2.0 /3.0, // normally 2/3 of v555 - 5.0 / 3.0 // normally 1/3 of v555 + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2.0 /3.0, /* normally 2/3 of v555 */ + 5.0 / 3.0 /* normally 1/3 of v555 */ }; const struct discrete_lfsr_desc skydiver_lfsr={ @@ -466,11 +466,11 @@ static DISCRETE_SOUND_START(skydiver_sound_interface) /* The note generator is disabled by a low on */ /* RANGE3. */ /************************************************/ - // We will disable the divide if SKYDIVER_RANGE_DATA = 0 + /* We will disable the divide if SKYDIVER_RANGE_DATA = 0 */ DISCRETE_DIVIDE(NODE_20, SKYDIVER_RANGE_DATA, 12096000.0 /2.0 / 2.0, SKYDIVER_RANGE_DATA) DISCRETE_ADDER2(NODE_21, 1, SKYDIVER_NOTE_DATA, 1) - // We will disable the divide if SKYDIVER_NOTE_DATA = 0 - DISCRETE_DIVIDE(NODE_22, SKYDIVER_NOTE_DATA, NODE_20, NODE_21) // freq + /* We will disable the divide if SKYDIVER_NOTE_DATA = 0 */ + DISCRETE_DIVIDE(NODE_22, SKYDIVER_NOTE_DATA, NODE_20, NODE_21) /* freq */ DISCRETE_SQUAREWAVE(SKYDIVER_NOTE_SND, SKYDIVER_RANGE3_EN, NODE_22, 1000.0, 50.0, 0, 0.0) /************************************************/ diff --git a/src/drivers/slapfght.c b/src/drivers/slapfght.c index 0a43ce22d..51dfa46a9 100644 --- a/src/drivers/slapfght.c +++ b/src/drivers/slapfght.c @@ -682,7 +682,7 @@ INPUT_PORTS_START( getstar ) PORT_START /* DSW1 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) -// PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) +/* PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) */ PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 2C_3C ) ) @@ -760,7 +760,7 @@ INPUT_PORTS_START( getstarj ) PORT_START /* DSW1 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) -// PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) +/* PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) */ PORT_DIPSETTING( 0x04, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x03, DEF_STR( 2C_3C ) ) diff --git a/src/drivers/suna8.c b/src/drivers/suna8.c index 6d47d6a5f..e3d7ec4a6 100644 --- a/src/drivers/suna8.c +++ b/src/drivers/suna8.c @@ -46,8 +46,8 @@ extern data8_t suna8_unknown; /* Functions defined in vidhrdw: */ -WRITE_HANDLER( suna8_spriteram_w ); // for debug -WRITE_HANDLER( suna8_banked_spriteram_w ); // for debug +WRITE_HANDLER( suna8_spriteram_w ); /* for debug */ +WRITE_HANDLER( suna8_banked_spriteram_w ); /* for debug */ READ_HANDLER( suna8_banked_paletteram_r ); READ_HANDLER( suna8_banked_spriteram_r ); @@ -155,16 +155,16 @@ DRIVER_INIT( brickzn3 ) { switch ( i & 0xf ) { -//825b -> see 715a! -//8280 -> see 7192! -//8280: e=2 m=90 -//8281: e=2 m=90 -//8283: e=2 m=90 -//8250: e=0 -//8262: e=0 -//9a42: e=0 -//9a43: e=0 -//8253: e=0 +/*825b -> see 715a! */ +/*8280 -> see 7192! */ +/*8280: e=2 m=90 */ +/*8281: e=2 m=90 */ +/*8283: e=2 m=90 */ +/*8250: e=0 */ +/*8262: e=0 */ +/*9a42: e=0 */ +/*9a43: e=0 */ +/*8253: e=0 */ case 0x0: case 0x1: case 0x2: @@ -172,26 +172,26 @@ DRIVER_INIT( brickzn3 ) if (i & 0x40) encry = 0; else encry = 2; break; -//828c: e=0 -//9a3d: e=0 -//825e: e=0 -//826e: e=0 -//9a3f: e=0 +/*828c: e=0 */ +/*9a3d: e=0 */ +/*825e: e=0 */ +/*826e: e=0 */ +/*9a3f: e=0 */ case 0xc: case 0xd: case 0xe: case 0xf: encry = 0; break; -//8264: e=2 m=90 -//9a44: e=2 m=90 -//8255: e=2 m=90 -//8255: e=2 m=90 -//8285: e=2 m=90 -//9a37: e=2 m=90 -//8268: e=2 m=90 -//9a3a: e=2 m=90 -//825b: e=2 m=90 +/*8264: e=2 m=90 */ +/*9a44: e=2 m=90 */ +/*8255: e=2 m=90 */ +/*8255: e=2 m=90 */ +/*8285: e=2 m=90 */ +/*9a37: e=2 m=90 */ +/*8268: e=2 m=90 */ +/*9a3a: e=2 m=90 */ +/*825b: e=2 m=90 */ case 0x4: case 0x5: case 0x6: @@ -222,25 +222,25 @@ DRIVER_INIT( brickzn3 ) switch ( i & 0xf ) { -//0000: e=1 m=90 -//0001: e=1 m=90 -//0012: e=1 m=90 - -//00c0: e=1 m=10 -//0041: e=1 m=10 -//0042: e=1 m=10 -//0342: e=1 m=10 - -//05a0: e=1 m=90 -//04a1: e=2 m=90 -//04b1: e=2 m=90 -//05a1: e=2 m=90 -//05a2: e=1 m=90 - -//0560: e=1 m=10 -//0441: e=0 -//0571: e=0 -//0562: e=1 m=10 +/*0000: e=1 m=90 */ +/*0001: e=1 m=90 */ +/*0012: e=1 m=90 */ + +/*00c0: e=1 m=10 */ +/*0041: e=1 m=10 */ +/*0042: e=1 m=10 */ +/*0342: e=1 m=10 */ + +/*05a0: e=1 m=90 */ +/*04a1: e=2 m=90 */ +/*04b1: e=2 m=90 */ +/*05a1: e=2 m=90 */ +/*05a2: e=1 m=90 */ + +/*0560: e=1 m=10 */ +/*0441: e=0 */ +/*0571: e=0 */ +/*0562: e=1 m=10 */ case 0x1: switch( i & 0x440 ) { @@ -265,11 +265,11 @@ DRIVER_INIT( brickzn3 ) break; case 0x3: -//003: e=2 m=90 -//043: e=0 -//6a3: e=2 m=90 -//643: e=1 m=10 -//5d3: e=1 m=10 +/*003: e=2 m=90 */ +/*043: e=0 */ +/*6a3: e=2 m=90 */ +/*643: e=1 m=10 */ +/*5d3: e=1 m=10 */ switch( i & 0x440 ) { case 0x000: encry = 2; mask = 0x90; break; @@ -281,10 +281,10 @@ DRIVER_INIT( brickzn3 ) break; case 0x5: -//015: e=1 m=90 -//045: e=1 m=90 -//5b5: e=2 m=90 -//5d5: e=2 m=90 +/*015: e=1 m=90 */ +/*045: e=1 m=90 */ +/*5b5: e=2 m=90 */ +/*5d5: e=2 m=90 */ if (i & 0x400) encry = 2; else encry = 1; break; @@ -328,7 +328,7 @@ DRIVER_INIT( brickzn3 ) case 2: x ^= mask; - x = (((x & (1<<0))?1:0)<<0) | // swap + x = (((x & (1<<0))?1:0)<<0) | /* swap */ (((x & (1<<1))?1:0)<<1) | (((x & (1<<6))?1:0)<<2) | (((x & (1<<5))?1:0)<<3) | @@ -368,14 +368,14 @@ DRIVER_INIT( brickzn3 ) /* !!!!!! PATCHES !!!!!! */ -RAM[0x3337+size] = 0xc9; // RET Z -> RET (to avoid: jp $C800) -//RAM[0x3338+size] = 0x00; // jp $C800 -> NOP -//RAM[0x3339+size] = 0x00; // jp $C800 -> NOP -//RAM[0x333a+size] = 0x00; // jp $C800 -> NOP +RAM[0x3337+size] = 0xc9; /* RET Z -> RET (to avoid: jp $C800) */ +/*RAM[0x3338+size] = 0x00;*/ /* jp $C800 -> NOP */ +/*RAM[0x3339+size] = 0x00;*/ /* jp $C800 -> NOP */ +/*RAM[0x333a+size] = 0x00;*/ /* jp $C800 -> NOP */ -RAM[0x1406+size] = 0x00; // HALT -> NOP (NMI source??) -RAM[0x2487+size] = 0x00; // HALT -> NOP -RAM[0x256c+size] = 0x00; // HALT -> NOP +RAM[0x1406+size] = 0x00; /* HALT -> NOP (NMI source??) */ +RAM[0x2487+size] = 0x00; /* HALT -> NOP */ +RAM[0x256c+size] = 0x00; /* HALT -> NOP */ } @@ -403,7 +403,7 @@ INLINE data8_t hardhea2_decrypt(data8_t x, int encry, int mask) return (((x & (1<<0))?1:0)<<0) | (((x & (1<<1))?1:0)<<1) | (((x & (1<<2))?1:0)<<2) | - (((x & (1<<3))?1:0)<<3) | // swap + (((x & (1<<3))?1:0)<<3) | /* swap */ (((x & (1<<4))?1:0)<<4) | (((x & (1<<7))?1:0)<<5) | (((x & (1<<6))?1:0)<<6) | @@ -437,7 +437,7 @@ DRIVER_INIT( hardhea2 ) for (i = 0; i < 0x8000; i++) { -// Address lines scrambling +/* Address lines scrambling */ switch (i & 0x7000) { case 0x4000: @@ -536,7 +536,7 @@ DRIVER_INIT( hardhea2 ) for (i = 0x00000; i < 0x40000; i++) { -// Address lines scrambling +/* Address lines scrambling */ switch (i & 0x3f000) { /* @@ -600,7 +600,7 @@ INLINE data8_t starfigh_decrypt(data8_t x, int encry, int mask) return (((x & (1<<0))?1:0)<<0) | (((x & (1<<1))?1:0)<<1) | (((x & (1<<2))?1:0)<<2) | - (((x & (1<<3))?1:0)<<3) | // swap + (((x & (1<<3))?1:0)<<3) | /* swap */ (((x & (1<<4))?1:0)<<4) | (((x & (1<<7))?1:0)<<5) | (((x & (1<<6))?1:0)<<6) | @@ -634,7 +634,7 @@ DRIVER_INIT( starfigh ) for (i = 0; i < 0x8000; i++) { -// Address lines scrambling +/* Address lines scrambling */ switch (i & 0x7000) { case 0x0000: @@ -911,34 +911,34 @@ static WRITE_HANDLER( hardhead_flipscreen_w ) } static MEMORY_READ_START( hardhead_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0x8000, 0xbfff, MRA_BANK1 }, // Banked ROM - { 0xc000, 0xd7ff, MRA_RAM }, // RAM - { 0xd800, 0xd9ff, MRA_RAM }, // Palette - { 0xda00, 0xda00, hardhead_ip_r }, // Input Ports - { 0xda80, 0xda80, soundlatch2_r }, // From Sound CPU - { 0xdd80, 0xddff, hardhead_protection_r }, // Protection - { 0xe000, 0xffff, MRA_RAM }, // Sprites + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MRA_BANK1 }, /* Banked ROM */ + { 0xc000, 0xd7ff, MRA_RAM }, /* RAM */ + { 0xd800, 0xd9ff, MRA_RAM }, /* Palette */ + { 0xda00, 0xda00, hardhead_ip_r }, /* Input Ports */ + { 0xda80, 0xda80, soundlatch2_r }, /* From Sound CPU */ + { 0xdd80, 0xddff, hardhead_protection_r }, /* Protection */ + { 0xe000, 0xffff, MRA_RAM }, /* Sprites */ MEMORY_END static MEMORY_WRITE_START( hardhead_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0x8000, 0xbfff, MWA_ROM }, // Banked ROM - { 0xc000, 0xd7ff, MWA_RAM }, // RAM - { 0xd800, 0xd9ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, // Palette - { 0xda00, 0xda00, MWA_RAM, &hardhead_ip }, // Input Port Select - { 0xda80, 0xda80, hardhead_bankswitch_w }, // ROM Banking - { 0xdb00, 0xdb00, soundlatch_w }, // To Sound CPU - { 0xdb80, 0xdb80, hardhead_flipscreen_w }, // Flip Screen + Coin Lockout - { 0xdc00, 0xdc00, MWA_NOP }, // <- R (after bank select) - { 0xdc80, 0xdc80, MWA_NOP }, // <- R (after bank select) - { 0xdd00, 0xdd00, MWA_NOP }, // <- R (after ip select) - { 0xdd80, 0xddff, hardhead_protection_w }, // Protection - { 0xe000, 0xffff, suna8_spriteram_w, &spriteram }, // Sprites + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MWA_ROM }, /* Banked ROM */ + { 0xc000, 0xd7ff, MWA_RAM }, /* RAM */ + { 0xd800, 0xd9ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, /* Palette */ + { 0xda00, 0xda00, MWA_RAM, &hardhead_ip }, /* Input Port Select */ + { 0xda80, 0xda80, hardhead_bankswitch_w }, /* ROM Banking */ + { 0xdb00, 0xdb00, soundlatch_w }, /* To Sound CPU */ + { 0xdb80, 0xdb80, hardhead_flipscreen_w }, /* Flip Screen + Coin Lockout */ + { 0xdc00, 0xdc00, MWA_NOP }, /* <- R (after bank select) */ + { 0xdc80, 0xdc80, MWA_NOP }, /* <- R (after bank select) */ + { 0xdd00, 0xdd00, MWA_NOP }, /* <- R (after ip select) */ + { 0xdd80, 0xddff, hardhead_protection_w }, /* Protection */ + { 0xe000, 0xffff, suna8_spriteram_w, &spriteram }, /* Sprites */ MEMORY_END static PORT_READ_START( hardhead_readport ) - { 0x00, 0x00, IORP_NOP }, // ? IRQ Ack + { 0x00, 0x00, IORP_NOP }, /* ? IRQ Ack */ PORT_END static PORT_WRITE_START( hardhead_writeport ) @@ -987,34 +987,34 @@ static READ_HANDLER( rranger_soundstatus_r ) } static MEMORY_READ_START( rranger_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0x8000, 0xbfff, MRA_BANK1 }, // Banked ROM - { 0xc000, 0xc000, watchdog_reset_r }, // Watchdog (Tested!) - { 0xc002, 0xc002, input_port_0_r }, // P1 (Inputs) - { 0xc003, 0xc003, input_port_1_r }, // P2 - { 0xc004, 0xc004, rranger_soundstatus_r }, // Latch Status? - { 0xc200, 0xc200, MRA_NOP }, // Protection? - { 0xc280, 0xc280, input_port_2_r }, // DSW 1 - { 0xc2c0, 0xc2c0, input_port_3_r }, // DSW 2 - { 0xc600, 0xc7ff, MRA_RAM }, // Palette - { 0xc800, 0xdfff, MRA_RAM }, // RAM - { 0xe000, 0xffff, MRA_RAM }, // Sprites + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MRA_BANK1 }, /* Banked ROM */ + { 0xc000, 0xc000, watchdog_reset_r }, /* Watchdog (Tested!) */ + { 0xc002, 0xc002, input_port_0_r }, /* P1 (Inputs) */ + { 0xc003, 0xc003, input_port_1_r }, /* P2 */ + { 0xc004, 0xc004, rranger_soundstatus_r }, /* Latch Status? */ + { 0xc200, 0xc200, MRA_NOP }, /* Protection? */ + { 0xc280, 0xc280, input_port_2_r }, /* DSW 1 */ + { 0xc2c0, 0xc2c0, input_port_3_r }, /* DSW 2 */ + { 0xc600, 0xc7ff, MRA_RAM }, /* Palette */ + { 0xc800, 0xdfff, MRA_RAM }, /* RAM */ + { 0xe000, 0xffff, MRA_RAM }, /* Sprites */ MEMORY_END static MEMORY_WRITE_START( rranger_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0x8000, 0xbfff, MWA_ROM }, // Banked ROM - { 0xc000, 0xc000, soundlatch_w }, // To Sound CPU - { 0xc002, 0xc002, rranger_bankswitch_w }, // ROM Banking - { 0xc200, 0xc200, MWA_NOP }, // Protection? - { 0xc280, 0xc280, MWA_NOP }, // ? NMI Ack - { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, // Palette - { 0xc800, 0xdfff, MWA_RAM }, // RAM - { 0xe000, 0xffff, suna8_spriteram_w, &spriteram }, // Sprites + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MWA_ROM }, /* Banked ROM */ + { 0xc000, 0xc000, soundlatch_w }, /* To Sound CPU */ + { 0xc002, 0xc002, rranger_bankswitch_w }, /* ROM Banking */ + { 0xc200, 0xc200, MWA_NOP }, /* Protection? */ + { 0xc280, 0xc280, MWA_NOP }, /* ? NMI Ack */ + { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, /* Palette */ + { 0xc800, 0xdfff, MWA_RAM }, /* RAM */ + { 0xe000, 0xffff, suna8_spriteram_w, &spriteram }, /* Sprites */ MEMORY_END static PORT_READ_START( rranger_readport ) - { 0x00, 0x00, IORP_NOP }, // ? IRQ Ack + { 0x00, 0x00, IORP_NOP }, /* ? IRQ Ack */ PORT_END static PORT_WRITE_START( rranger_writeport ) @@ -1079,30 +1079,30 @@ static WRITE_HANDLER( brickzn_rombank_w ) } static MEMORY_READ_START( brickzn_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0x8000, 0xbfff, MRA_BANK1 }, // Banked ROM - { 0xc100, 0xc100, input_port_0_r }, // P1 (Buttons) - { 0xc101, 0xc101, input_port_1_r }, // P2 - { 0xc102, 0xc102, input_port_2_r }, // DSW 1 - { 0xc103, 0xc103, input_port_3_r }, // DSW 2 - { 0xc108, 0xc108, input_port_4_r }, // P1 (Analog) - { 0xc10c, 0xc10c, input_port_5_r }, // P2 - { 0xc140, 0xc140, brickzn_c140_r }, // ??? - { 0xc600, 0xc7ff, suna8_banked_paletteram_r }, // Palette (Banked) - { 0xc800, 0xdfff, MRA_RAM }, // RAM - { 0xe000, 0xffff, suna8_banked_spriteram_r }, // Sprites (Banked) + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MRA_BANK1 }, /* Banked ROM */ + { 0xc100, 0xc100, input_port_0_r }, /* P1 (Buttons) */ + { 0xc101, 0xc101, input_port_1_r }, /* P2 */ + { 0xc102, 0xc102, input_port_2_r }, /* DSW 1 */ + { 0xc103, 0xc103, input_port_3_r }, /* DSW 2 */ + { 0xc108, 0xc108, input_port_4_r }, /* P1 (Analog) */ + { 0xc10c, 0xc10c, input_port_5_r }, /* P2 */ + { 0xc140, 0xc140, brickzn_c140_r }, /* ??? */ + { 0xc600, 0xc7ff, suna8_banked_paletteram_r }, /* Palette (Banked) */ + { 0xc800, 0xdfff, MRA_RAM }, /* RAM */ + { 0xe000, 0xffff, suna8_banked_spriteram_r }, /* Sprites (Banked) */ MEMORY_END static MEMORY_WRITE_START( brickzn_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0x8000, 0xbfff, MWA_ROM }, // Banked ROM - { 0xc040, 0xc040, brickzn_rombank_w }, // ROM Bank - { 0xc060, 0xc060, brickzn_spritebank_w }, // Sprite RAM Bank + Flip Screen - { 0xc0a0, 0xc0a0, brickzn_palettebank_w }, // Palette RAM Bank + ? - { 0xc0c0, 0xc0c0, brickzn_unknown_w }, // ??? - { 0xc600, 0xc7ff, brickzn_banked_paletteram_w }, // Palette (Banked) - { 0xc800, 0xdfff, MWA_RAM }, // RAM - { 0xe000, 0xffff, suna8_banked_spriteram_w }, // Sprites (Banked) + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MWA_ROM }, /* Banked ROM */ + { 0xc040, 0xc040, brickzn_rombank_w }, /* ROM Bank */ + { 0xc060, 0xc060, brickzn_spritebank_w }, /* Sprite RAM Bank + Flip Screen */ + { 0xc0a0, 0xc0a0, brickzn_palettebank_w }, /* Palette RAM Bank + ? */ + { 0xc0c0, 0xc0c0, brickzn_unknown_w }, /* ??? */ + { 0xc600, 0xc7ff, brickzn_banked_paletteram_w }, /* Palette (Banked) */ + { 0xc800, 0xdfff, MWA_RAM }, /* RAM */ + { 0xe000, 0xffff, suna8_banked_spriteram_w }, /* Sprites (Banked) */ MEMORY_END static PORT_READ_START( brickzn_readport ) @@ -1122,7 +1122,7 @@ static data8_t suna8_nmi_enable; static WRITE_HANDLER( hardhea2_nmi_w ) { suna8_nmi_enable = data & 0x01; -// if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown nmi bits: %02X\n",activecpu_get_pc(),data); +/* if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown nmi bits: %02X\n",activecpu_get_pc(),data); */ } /* @@ -1191,35 +1191,35 @@ static WRITE_HANDLER( hardhea2_rambank_1_w ) static MEMORY_READ_START( hardhea2_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0x8000, 0xbfff, MRA_BANK1 }, // Banked ROM - { 0xc000, 0xc000, input_port_0_r }, // P1 (Inputs) - { 0xc001, 0xc001, input_port_1_r }, // P2 - { 0xc002, 0xc002, input_port_2_r }, // DSW 1 - { 0xc003, 0xc003, input_port_3_r }, // DSW 2 - { 0xc080, 0xc080, input_port_4_r }, // vblank? - { 0xc600, 0xc7ff, paletteram_r }, // Palette (Banked??) - { 0xc800, 0xdfff, MRA_BANK2 }, // RAM (Banked?) - { 0xe000, 0xffff, suna8_banked_spriteram_r }, // Sprites (Banked) + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MRA_BANK1 }, /* Banked ROM */ + { 0xc000, 0xc000, input_port_0_r }, /* P1 (Inputs) */ + { 0xc001, 0xc001, input_port_1_r }, /* P2 */ + { 0xc002, 0xc002, input_port_2_r }, /* DSW 1 */ + { 0xc003, 0xc003, input_port_3_r }, /* DSW 2 */ + { 0xc080, 0xc080, input_port_4_r }, /* vblank? */ + { 0xc600, 0xc7ff, paletteram_r }, /* Palette (Banked??) */ + { 0xc800, 0xdfff, MRA_BANK2 }, /* RAM (Banked?) */ + { 0xe000, 0xffff, suna8_banked_spriteram_r }, /* Sprites (Banked) */ MEMORY_END static MEMORY_WRITE_START( hardhea2_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0x8000, 0xbfff, MWA_ROM }, // Banked ROM - { 0xc200, 0xc200, hardhea2_spritebank_w }, // Sprite RAM Bank - { 0xc280, 0xc280, hardhea2_rombank_w }, // ROM Bank (?mirrored up to c2ff?) + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MWA_ROM }, /* Banked ROM */ + { 0xc200, 0xc200, hardhea2_spritebank_w }, /* Sprite RAM Bank */ + { 0xc280, 0xc280, hardhea2_rombank_w }, /* ROM Bank (?mirrored up to c2ff?) */ - // *** Protection + /* *** Protection */ { 0xc28c, 0xc28c, hardhea2_rombank_w }, - // Protection *** + /* Protection *** */ - { 0xc300, 0xc300, hardhea2_flipscreen_w }, // Flip Screen - { 0xc380, 0xc380, hardhea2_nmi_w }, // ? NMI related ? - { 0xc400, 0xc400, hardhea2_leds_w }, // Leds + Coin Counter - { 0xc480, 0xc480, MWA_NOP }, // ~ROM Bank - { 0xc500, 0xc500, soundlatch_w }, // To Sound CPU + { 0xc300, 0xc300, hardhea2_flipscreen_w }, /* Flip Screen */ + { 0xc380, 0xc380, hardhea2_nmi_w }, /* ? NMI related ? */ + { 0xc400, 0xc400, hardhea2_leds_w }, /* Leds + Coin Counter */ + { 0xc480, 0xc480, MWA_NOP }, /* ~ROM Bank */ + { 0xc500, 0xc500, soundlatch_w }, /* To Sound CPU */ - // *** Protection + /* *** Protection */ { 0xc50f, 0xc50f, hardhea2_spritebank_1_w }, { 0xc508, 0xc508, hardhea2_spritebank_0_w }, @@ -1231,11 +1231,11 @@ static MEMORY_WRITE_START( hardhea2_writemem ) { 0xc560, 0xc560, hardhea2_rambank_1_w }, { 0xc533, 0xc533, hardhea2_rambank_0_w }, - // Protection *** + /* Protection *** */ - { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, // Palette (Banked??) - { 0xc800, 0xdfff, MWA_BANK2 }, // RAM (Banked?) - { 0xe000, 0xffff, suna8_banked_spriteram_w }, // Sprites (Banked) + { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, /* Palette (Banked??) */ + { 0xc800, 0xdfff, MWA_BANK2 }, /* RAM (Banked?) */ + { 0xe000, 0xffff, suna8_banked_spriteram_w }, /* Sprites (Banked) */ MEMORY_END @@ -1256,29 +1256,29 @@ static WRITE_HANDLER( starfigh_spritebank_w ) } static MEMORY_READ_START( starfigh_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0x8000, 0xbfff, MRA_BANK1 }, // Banked ROM - { 0xc000, 0xc000, input_port_0_r }, // P1 (Inputs) - { 0xc001, 0xc001, input_port_1_r }, // P2 - { 0xc002, 0xc002, input_port_2_r }, // DSW 1 - { 0xc003, 0xc003, input_port_3_r }, // DSW 2 - { 0xc600, 0xc7ff, suna8_banked_paletteram_r }, // Palette (Banked??) - { 0xc800, 0xdfff, MRA_RAM }, // RAM - { 0xe000, 0xffff, suna8_banked_spriteram_r }, // Sprites (Banked) + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MRA_BANK1 }, /* Banked ROM */ + { 0xc000, 0xc000, input_port_0_r }, /* P1 (Inputs) */ + { 0xc001, 0xc001, input_port_1_r }, /* P2 */ + { 0xc002, 0xc002, input_port_2_r }, /* DSW 1 */ + { 0xc003, 0xc003, input_port_3_r }, /* DSW 2 */ + { 0xc600, 0xc7ff, suna8_banked_paletteram_r }, /* Palette (Banked??) */ + { 0xc800, 0xdfff, MRA_RAM }, /* RAM */ + { 0xe000, 0xffff, suna8_banked_spriteram_r }, /* Sprites (Banked) */ MEMORY_END static MEMORY_WRITE_START( starfigh_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0x8000, 0xbfff, MWA_ROM }, // Banked ROM - { 0xc200, 0xc200, starfigh_spritebank_w }, // Sprite RAM Bank - { 0xc380, 0xc3ff, starfigh_spritebank_latch_w }, // Sprite RAM Bank - { 0xc280, 0xc280, hardhea2_rombank_w }, // ROM Bank (?mirrored up to c2ff?) - { 0xc300, 0xc300, hardhea2_flipscreen_w }, // Flip Screen - { 0xc400, 0xc400, hardhea2_leds_w }, // Leds + Coin Counter - { 0xc500, 0xc500, soundlatch_w }, // To Sound CPU - { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, // Palette (Banked??) - { 0xc800, 0xdfff, MWA_RAM }, // RAM - { 0xe000, 0xffff, suna8_banked_spriteram_w }, // Sprites (Banked) + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MWA_ROM }, /* Banked ROM */ + { 0xc200, 0xc200, starfigh_spritebank_w }, /* Sprite RAM Bank */ + { 0xc380, 0xc3ff, starfigh_spritebank_latch_w }, /* Sprite RAM Bank */ + { 0xc280, 0xc280, hardhea2_rombank_w }, /* ROM Bank (?mirrored up to c2ff?) */ + { 0xc300, 0xc300, hardhea2_flipscreen_w }, /* Flip Screen */ + { 0xc400, 0xc400, hardhea2_leds_w }, /* Leds + Coin Counter */ + { 0xc500, 0xc500, soundlatch_w }, /* To Sound CPU */ + { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, /* Palette (Banked??) */ + { 0xc800, 0xdfff, MWA_RAM }, /* RAM */ + { 0xe000, 0xffff, suna8_banked_spriteram_w }, /* Sprites (Banked) */ MEMORY_END static PORT_READ_START( starfigh_readport ) @@ -1384,31 +1384,31 @@ static READ_HANDLER( sparkman_c0a3_r ) } static MEMORY_READ_START( sparkman_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0x8000, 0xbfff, MRA_BANK1 }, // Banked ROM - { 0xc000, 0xc000, input_port_0_r }, // P1 (Inputs) - { 0xc001, 0xc001, input_port_1_r }, // P2 - { 0xc002, 0xc002, input_port_2_r }, // DSW 1 - { 0xc003, 0xc003, input_port_3_r }, // DSW 2 - { 0xc080, 0xc080, input_port_4_r }, // Buttons - { 0xc0a3, 0xc0a3, sparkman_c0a3_r }, // ??? - { 0xc600, 0xc7ff, paletteram_r }, // Palette (Banked??) - { 0xc800, 0xdfff, MRA_RAM }, // RAM - { 0xe000, 0xffff, suna8_banked_spriteram_r }, // Sprites (Banked) + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MRA_BANK1 }, /* Banked ROM */ + { 0xc000, 0xc000, input_port_0_r }, /* P1 (Inputs) */ + { 0xc001, 0xc001, input_port_1_r }, /* P2 */ + { 0xc002, 0xc002, input_port_2_r }, /* DSW 1 */ + { 0xc003, 0xc003, input_port_3_r }, /* DSW 2 */ + { 0xc080, 0xc080, input_port_4_r }, /* Buttons */ + { 0xc0a3, 0xc0a3, sparkman_c0a3_r }, /* ??? */ + { 0xc600, 0xc7ff, paletteram_r }, /* Palette (Banked??) */ + { 0xc800, 0xdfff, MRA_RAM }, /* RAM */ + { 0xe000, 0xffff, suna8_banked_spriteram_r }, /* Sprites (Banked) */ MEMORY_END static MEMORY_WRITE_START( sparkman_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0x8000, 0xbfff, MWA_ROM }, // Banked ROM - { 0xc200, 0xc200, sparkman_spritebank_w }, // Sprite RAM Bank - { 0xc280, 0xc280, sparkman_rombank_w }, // ROM Bank (?mirrored up to c2ff?) - { 0xc300, 0xc300, sparkman_flipscreen_w }, // Flip Screen - { 0xc380, 0xc3ff, sparkman_cmd_prot_w }, // Protection - { 0xc400, 0xc400, sparkman_leds_w }, // Leds + Coin Counter - { 0xc500, 0xc500, soundlatch_w }, // To Sound CPU - { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, // Palette (Banked??) - { 0xc800, 0xdfff, suna8_wram_w, &suna8_wram }, // RAM - { 0xe000, 0xffff, suna8_banked_spriteram_w }, // Sprites (Banked) + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0x8000, 0xbfff, MWA_ROM }, /* Banked ROM */ + { 0xc200, 0xc200, sparkman_spritebank_w }, /* Sprite RAM Bank */ + { 0xc280, 0xc280, sparkman_rombank_w }, /* ROM Bank (?mirrored up to c2ff?) */ + { 0xc300, 0xc300, sparkman_flipscreen_w }, /* Flip Screen */ + { 0xc380, 0xc3ff, sparkman_cmd_prot_w }, /* Protection */ + { 0xc400, 0xc400, sparkman_leds_w }, /* Leds + Coin Counter */ + { 0xc500, 0xc500, soundlatch_w }, /* To Sound CPU */ + { 0xc600, 0xc7ff, paletteram_RRRRGGGGBBBBxxxx_swap_w, &paletteram }, /* Palette (Banked??) */ + { 0xc800, 0xdfff, suna8_wram_w, &suna8_wram }, /* RAM */ + { 0xe000, 0xffff, suna8_banked_spriteram_w }, /* Sprites (Banked) */ MEMORY_END @@ -1425,24 +1425,24 @@ MEMORY_END ***************************************************************************/ static MEMORY_READ_START( hardhead_sound_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0xc000, 0xc7ff, MRA_RAM }, // RAM - { 0xc800, 0xc800, YM3812_status_port_0_r }, // ? unsure - { 0xd800, 0xd800, soundlatch_r }, // From Main CPU + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0xc000, 0xc7ff, MRA_RAM }, /* RAM */ + { 0xc800, 0xc800, YM3812_status_port_0_r }, /* ? unsure */ + { 0xd800, 0xd800, soundlatch_r }, /* From Main CPU */ MEMORY_END static MEMORY_WRITE_START( hardhead_sound_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0xc000, 0xc7ff, MWA_RAM }, // RAM - { 0xd000, 0xd000, soundlatch2_w }, // - { 0xa000, 0xa000, YM3812_control_port_0_w }, // YM3812 + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0xc000, 0xc7ff, MWA_RAM }, /* RAM */ + { 0xd000, 0xd000, soundlatch2_w }, /* */ + { 0xa000, 0xa000, YM3812_control_port_0_w }, /* YM3812 */ { 0xa001, 0xa001, YM3812_write_port_0_w }, - { 0xa002, 0xa002, AY8910_control_port_0_w }, // AY8910 + { 0xa002, 0xa002, AY8910_control_port_0_w }, /* AY8910 */ { 0xa003, 0xa003, AY8910_write_port_0_w }, MEMORY_END static PORT_READ_START( hardhead_sound_readport ) - { 0x01, 0x01, IORP_NOP }, // ? IRQ Ack + { 0x01, 0x01, IORP_NOP }, /* ? IRQ Ack */ PORT_END static PORT_WRITE_START( hardhead_sound_writeport ) @@ -1455,18 +1455,18 @@ PORT_END ***************************************************************************/ static MEMORY_READ_START( rranger_sound_readmem ) - { 0x0000, 0x7fff, MRA_ROM }, // ROM - { 0xc000, 0xc7ff, MRA_RAM }, // RAM - { 0xd800, 0xd800, soundlatch_r }, // From Main CPU + { 0x0000, 0x7fff, MRA_ROM }, /* ROM */ + { 0xc000, 0xc7ff, MRA_RAM }, /* RAM */ + { 0xd800, 0xd800, soundlatch_r }, /* From Main CPU */ MEMORY_END static MEMORY_WRITE_START( rranger_sound_writemem ) - { 0x0000, 0x7fff, MWA_ROM }, // ROM - { 0xc000, 0xc7ff, MWA_RAM }, // RAM - { 0xd000, 0xd000, soundlatch2_w }, // - { 0xa000, 0xa000, YM2203_control_port_0_w }, // YM2203 + { 0x0000, 0x7fff, MWA_ROM }, /* ROM */ + { 0xc000, 0xc7ff, MWA_RAM }, /* RAM */ + { 0xd000, 0xd000, soundlatch2_w }, /* */ + { 0xa000, 0xa000, YM2203_control_port_0_w }, /* YM2203 */ { 0xa001, 0xa001, YM2203_write_port_0_w }, - { 0xa002, 0xa002, YM2203_control_port_1_w }, // AY8910 + { 0xa002, 0xa002, YM2203_control_port_1_w }, /* AY8910 */ { 0xa003, 0xa003, YM2203_write_port_1_w }, MEMORY_END @@ -1482,19 +1482,19 @@ PORT_END ***************************************************************************/ static MEMORY_READ_START( brickzn_sound_readmem ) - { 0x0000, 0xbfff, MRA_ROM }, // ROM - { 0xe000, 0xe7ff, MRA_RAM }, // RAM - { 0xf800, 0xf800, soundlatch_r }, // From Main CPU + { 0x0000, 0xbfff, MRA_ROM }, /* ROM */ + { 0xe000, 0xe7ff, MRA_RAM }, /* RAM */ + { 0xf800, 0xf800, soundlatch_r }, /* From Main CPU */ MEMORY_END static MEMORY_WRITE_START( brickzn_sound_writemem ) - { 0x0000, 0xbfff, MWA_ROM }, // ROM - { 0xc000, 0xc000, YM3812_control_port_0_w }, // YM3812 + { 0x0000, 0xbfff, MWA_ROM }, /* ROM */ + { 0xc000, 0xc000, YM3812_control_port_0_w }, /* YM3812 */ { 0xc001, 0xc001, YM3812_write_port_0_w }, - { 0xc002, 0xc002, AY8910_control_port_0_w }, // AY8910 + { 0xc002, 0xc002, AY8910_control_port_0_w }, /* AY8910 */ { 0xc003, 0xc003, AY8910_write_port_0_w }, - { 0xe000, 0xe7ff, MWA_RAM }, // RAM - { 0xf000, 0xf000, soundlatch2_w }, // To PCM CPU + { 0xe000, 0xe7ff, MWA_RAM }, /* RAM */ + { 0xf000, 0xf000, soundlatch2_w }, /* To PCM CPU */ MEMORY_END static PORT_READ_START( brickzn_sound_readport ) @@ -1507,10 +1507,10 @@ PORT_END /* PCM Z80 , 4 DACs (4 bits per sample), NO RAM !! */ static MEMORY_READ_START( brickzn_pcm_readmem ) - { 0x0000, 0xffff, MRA_ROM }, // ROM + { 0x0000, 0xffff, MRA_ROM }, /* ROM */ MEMORY_END static MEMORY_WRITE_START( brickzn_pcm_writemem ) - { 0x0000, 0xffff, MWA_ROM }, // ROM + { 0x0000, 0xffff, MWA_ROM }, /* ROM */ MEMORY_END @@ -1520,10 +1520,10 @@ static WRITE_HANDLER( brickzn_pcm_w ) } static PORT_READ_START( brickzn_pcm_readport ) - { 0x00, 0x00, soundlatch2_r }, // From Sound CPU + { 0x00, 0x00, soundlatch2_r }, /* From Sound CPU */ PORT_END static PORT_WRITE_START( brickzn_pcm_writeport ) - { 0x00, 0x03, brickzn_pcm_w }, // 4 x DAC + { 0x00, 0x03, brickzn_pcm_w }, /* 4 x DAC */ PORT_END @@ -1552,13 +1552,13 @@ PORT_END INPUT_PORTS_START( hardhead ) - PORT_START // IN0 - Player 1 - $da00 (ip = 0) + PORT_START /* IN0 - Player 1 - $da00 (ip = 0) */ JOY(1) - PORT_START // IN1 - Player 2 - $da00 (ip = 1) + PORT_START /* IN1 - Player 2 - $da00 (ip = 1) */ JOY(2) - PORT_START // IN2 - DSW 1 - $da00 (ip = 2) + PORT_START /* IN2 - DSW 1 - $da00 (ip = 2) */ PORT_DIPNAME( 0x01, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1584,7 +1584,7 @@ INPUT_PORTS_START( hardhead ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 - DSW 2 - $da00 (ip = 3) + PORT_START /* IN3 - DSW 2 - $da00 (ip = 3) */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1616,13 +1616,13 @@ INPUT_PORTS_END INPUT_PORTS_START( rranger ) - PORT_START // IN0 - Player 1 - $c002 + PORT_START /* IN0 - Player 1 - $c002 */ JOY(1) - PORT_START // IN1 - Player 2 - $c003 + PORT_START /* IN1 - Player 2 - $c003 */ JOY(2) - PORT_START // IN2 - DSW 1 - $c280 + PORT_START /* IN2 - DSW 1 - $c280 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1647,7 +1647,7 @@ INPUT_PORTS_START( rranger ) PORT_DIPSETTING( 0x40, "Harder" ) PORT_DIPSETTING( 0x00, "Hardest" ) - PORT_START // IN3 - DSW 2 - $c2c0 + PORT_START /* IN3 - DSW 2 - $c2c0 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1681,14 +1681,14 @@ INPUT_PORTS_END INPUT_PORTS_START( brickzn ) - PORT_START // IN0 - Player 1 - $c100 + PORT_START /* IN0 - Player 1 - $c100 */ JOY(1) - PORT_START // IN1 - Player 2 - $c101 + PORT_START /* IN1 - Player 2 - $c101 */ JOY(2) - PORT_START // IN2 - DSW 1 - $c102 - PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) // rom 38:b840 + PORT_START /* IN2 - DSW 1 - $c102 */ + PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) /* rom 38:b840 */ PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) @@ -1706,15 +1706,15 @@ INPUT_PORTS_START( brickzn ) PORT_DIPSETTING( 0x10, "Harder" ) PORT_DIPSETTING( 0x08, "Very Hard" ) PORT_DIPSETTING( 0x00, "Hardest" ) -// PORT_BITX( 0x40, 0x40, IPT_DIPSWITCH_NAME | IPF_CHEAT, "Invulnerability", IP_KEY_NONE, IP_JOY_NONE ) -// PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) // + Invulnerability +/* PORT_BITX( 0x40, 0x40, IPT_DIPSWITCH_NAME | IPF_CHEAT, "Invulnerability", IP_KEY_NONE, IP_JOY_NONE ) */ +/* PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) */ +/* PORT_DIPSETTING( 0x00, DEF_STR( On ) ) */ + PORT_SERVICE( 0x40, IP_ACTIVE_LOW ) /* + Invulnerability */ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 - DSW 2 - $c103 + PORT_START /* IN3 - DSW 2 - $c103 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1739,10 +1739,10 @@ INPUT_PORTS_START( brickzn ) PORT_DIPSETTING( 0x40, "4" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START // IN4 - Player 1 - $c108 + PORT_START /* IN4 - Player 1 - $c108 */ PORT_ANALOG( 0xff, 0x00, IPT_TRACKBALL_X | IPF_REVERSE, 50, 0, 0, 0) - PORT_START // IN5 - Player 2 - $c10c + PORT_START /* IN5 - Player 2 - $c10c */ PORT_ANALOG( 0xff, 0x00, IPT_TRACKBALL_X | IPF_REVERSE, 50, 0, 0, 0) INPUT_PORTS_END @@ -1754,13 +1754,13 @@ INPUT_PORTS_END INPUT_PORTS_START( hardhea2 ) - PORT_START // IN0 - Player 1 - $c000 + PORT_START /* IN0 - Player 1 - $c000 */ JOY(1) - PORT_START // IN1 - Player 2 - $c001 + PORT_START /* IN1 - Player 2 - $c001 */ JOY(2) - PORT_START // IN2 - DSW 1 - $c002 + PORT_START /* IN2 - DSW 1 - $c002 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1784,7 +1784,7 @@ INPUT_PORTS_START( hardhea2 ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 - DSW 2 - $c003 + PORT_START /* IN3 - DSW 2 - $c003 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1809,7 +1809,7 @@ INPUT_PORTS_START( hardhea2 ) PORT_DIPSETTING( 0x40, "4" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START // IN4 - Buttons - $c080 + PORT_START /* IN4 - Buttons - $c080 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1828,13 +1828,13 @@ INPUT_PORTS_END INPUT_PORTS_START( sparkman ) - PORT_START // IN0 - Player 1 - $c000 + PORT_START /* IN0 - Player 1 - $c000 */ JOY(1) - PORT_START // IN1 - Player 2 - $c001 + PORT_START /* IN1 - Player 2 - $c001 */ JOY(2) - PORT_START // IN2 - DSW 1 - $c002 + PORT_START /* IN2 - DSW 1 - $c002 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) @@ -1858,7 +1858,7 @@ INPUT_PORTS_START( sparkman ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_START // IN3 - DSW 2 - $c003 + PORT_START /* IN3 - DSW 2 - $c003 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1883,7 +1883,7 @@ INPUT_PORTS_START( sparkman ) PORT_DIPSETTING( 0x40, "4" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START // IN4 - Buttons - $c080 + PORT_START /* IN4 - Buttons - $c080 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 | IPF_PLAYER1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON3 | IPF_PLAYER2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1918,7 +1918,7 @@ static struct GfxLayout layout_8x8x4 = static struct GfxDecodeInfo suna8_gfxdecodeinfo[] = { - { REGION_GFX1, 0, &layout_8x8x4, 0, 16 }, // [0] Sprites + { REGION_GFX1, 0, &layout_8x8x4, 0, 16 }, /* [0] Sprites */ { -1 } }; @@ -2097,8 +2097,8 @@ static MACHINE_DRIVER_START( brickzn ) MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* SUNA PROTECTION BLOCK */ MDRV_CPU_MEMORY(brickzn_readmem,brickzn_writemem) MDRV_CPU_PORTS(brickzn_readport,brickzn_writeport) -// MDRV_CPU_VBLANK_INT(brickzn_interrupt, 2) - MDRV_CPU_VBLANK_INT(irq0_line_hold,1) // nmi breaks ramtest but is needed! +/* MDRV_CPU_VBLANK_INT(brickzn_interrupt, 2) */ + MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* nmi breaks ramtest but is needed! */ MDRV_CPU_ADD_TAG("sound", Z80, 24000000 / 4) /* Z0840006PSC */ MDRV_CPU_FLAGS(CPU_AUDIO_CPU) @@ -2111,7 +2111,7 @@ static MACHINE_DRIVER_START( brickzn ) MDRV_CPU_PORTS(brickzn_pcm_readport,brickzn_pcm_writeport) MDRV_FRAMES_PER_SECOND(60) - MDRV_VBLANK_DURATION(DEFAULT_REAL_60HZ_VBLANK_DURATION) // we're using IPT_VBLANK + MDRV_VBLANK_DURATION(DEFAULT_REAL_60HZ_VBLANK_DURATION) /* we're using IPT_VBLANK */ /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_TYPE_RASTER) @@ -2312,7 +2312,7 @@ Sound processor - Z80 ROM_START( hardhead ) ROM_REGION( 0x48000, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "p1", 0x00000, 0x8000, CRC(c6147926) SHA1(8d1609aaeac344c6aec102e92d34caab22a8ec64) ) // 1988,9,14 + ROM_LOAD( "p1", 0x00000, 0x8000, CRC(c6147926) SHA1(8d1609aaeac344c6aec102e92d34caab22a8ec64) ) /* 1988,9,14 */ ROM_LOAD( "p2", 0x10000, 0x8000, CRC(faa2cf9a) SHA1(5987f146b58fcbc3aaa9c010d86022b5172bcfb4) ) ROM_LOAD( "p3", 0x18000, 0x8000, CRC(3d24755e) SHA1(519a179594956f7c3ddfaca362c42b453c928e25) ) ROM_LOAD( "p4", 0x20000, 0x8000, CRC(0241ac79) SHA1(b3c3b98fb29836cbc9fd35ac49e02bfefd3b0c79) ) @@ -2340,7 +2340,7 @@ ROM_END ROM_START( hardhedb ) ROM_REGION( 0x48000, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "9_1_6l.rom", 0x00000, 0x8000, CRC(750e6aee) SHA1(ec8f61a1a3d95ef0e3748968f6da73e972763493) ) // 1988,9,14 (already decrypted) + ROM_LOAD( "9_1_6l.rom", 0x00000, 0x8000, CRC(750e6aee) SHA1(ec8f61a1a3d95ef0e3748968f6da73e972763493) ) /* 1988,9,14 (already decrypted) */ ROM_LOAD( "p2", 0x10000, 0x8000, CRC(faa2cf9a) SHA1(5987f146b58fcbc3aaa9c010d86022b5172bcfb4) ) ROM_LOAD( "p3", 0x18000, 0x8000, CRC(3d24755e) SHA1(519a179594956f7c3ddfaca362c42b453c928e25) ) ROM_LOAD( "p4", 0x20000, 0x8000, CRC(0241ac79) SHA1(b3c3b98fb29836cbc9fd35ac49e02bfefd3b0c79) ) @@ -2351,7 +2351,7 @@ ROM_START( hardhedb ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* Sound Z80 Code */ ROM_LOAD( "p13", 0x0000, 0x8000, CRC(493c0b41) SHA1(994a334253e905c39ec912765e8b0f4b1be900bc) ) -// ROM_LOAD( "2_13_9h.rom", 0x00000, 0x8000, CRC(1b20e5ec) ) +/* ROM_LOAD( "2_13_9h.rom", 0x00000, 0x8000, CRC(1b20e5ec) ) */ ROM_REGION( 0x40000, REGION_GFX1, ROMREGION_DISPOSE | ROMREGION_INVERT ) /* Sprites */ ROM_LOAD( "p5", 0x00000, 0x8000, CRC(e9aa6fba) SHA1(f286727541f08b136a7d45e13975652bdc8fd663) ) @@ -2427,7 +2427,7 @@ Sound processor - Z80 ROM_START( rranger ) ROM_REGION( 0x48000, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "1", 0x00000, 0x8000, CRC(4fb4f096) SHA1(c5ac3e04080cdcf570769918587e8cf8d455fc30) ) // V 2.0 1988,4,15 + ROM_LOAD( "1", 0x00000, 0x8000, CRC(4fb4f096) SHA1(c5ac3e04080cdcf570769918587e8cf8d455fc30) ) /* V 2.0 1988,4,15 */ ROM_LOAD( "2", 0x10000, 0x8000, CRC(ff65af29) SHA1(90f9a0c862e2a9da0343446a325961ab29d26b4b) ) ROM_LOAD( "3", 0x18000, 0x8000, CRC(64e09436) SHA1(077f0d38d489562532d5f7678434a85ca04d373c) ) ROM_LOAD( "r4", 0x30000, 0x8000, CRC(4346fae6) SHA1(a9f000e4427a1e9902627402dce14dc8ee04dbf8) ) @@ -2454,7 +2454,7 @@ ROM_END ROM_START( sranger ) ROM_REGION( 0x48000, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "r1", 0x00000, 0x8000, CRC(4eef1ede) ) // V 2.0 1988,4,15 + ROM_LOAD( "r1", 0x00000, 0x8000, CRC(4eef1ede) ) /* V 2.0 1988,4,15 */ ROM_LOAD( "2", 0x10000, 0x8000, CRC(ff65af29) SHA1(90f9a0c862e2a9da0343446a325961ab29d26b4b) ) ROM_LOAD( "3", 0x18000, 0x8000, CRC(64e09436) SHA1(077f0d38d489562532d5f7678434a85ca04d373c) ) ROM_LOAD( "r4", 0x30000, 0x8000, CRC(4346fae6) SHA1(a9f000e4427a1e9902627402dce14dc8ee04dbf8) ) @@ -2481,14 +2481,14 @@ ROM_END ROM_START( srangerb ) ROM_REGION( 0x48000, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "r1bt", 0x00000, 0x8000, CRC(40635e7c) ) // NYWACORPORATION LTD 88-1-07 + ROM_LOAD( "r1bt", 0x00000, 0x8000, CRC(40635e7c) ) /* NYWACORPORATION LTD 88-1-07 */ ROM_LOAD( "2", 0x10000, 0x8000, CRC(ff65af29) SHA1(90f9a0c862e2a9da0343446a325961ab29d26b4b) ) ROM_LOAD( "3", 0x18000, 0x8000, CRC(64e09436) SHA1(077f0d38d489562532d5f7678434a85ca04d373c) ) ROM_LOAD( "r4", 0x30000, 0x8000, CRC(4346fae6) SHA1(a9f000e4427a1e9902627402dce14dc8ee04dbf8) ) ROM_CONTINUE( 0x20000, 0x8000 ) ROM_LOAD( "r5", 0x38000, 0x8000, CRC(6a7ca1c3) SHA1(0f0b508e9b20909e9efa07b42d67732082b6940b) ) ROM_CONTINUE( 0x28000, 0x8000 ) - ROM_LOAD( "r5bt", 0x28000, 0x8000, BAD_DUMP CRC(f7f391b5) ) // wrong length + ROM_LOAD( "r5bt", 0x28000, 0x8000, BAD_DUMP CRC(f7f391b5) ) /* wrong length */ ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* Sound Z80 Code */ ROM_LOAD( "14", 0x0000, 0x8000, CRC(11c83aa1) SHA1(d1f75096528b220a3f858eac62e3b4111fa013de) ) @@ -2509,7 +2509,7 @@ ROM_END ROM_START( srangerw ) ROM_REGION( 0x48000, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "w1", 0x00000, 0x8000, CRC(2287d3fc) ) // 88,2,28 + ROM_LOAD( "w1", 0x00000, 0x8000, CRC(2287d3fc) ) /* 88,2,28 */ ROM_LOAD( "2", 0x10000, 0x8000, CRC(ff65af29) SHA1(90f9a0c862e2a9da0343446a325961ab29d26b4b) ) ROM_LOAD( "3", 0x18000, 0x8000, CRC(64e09436) SHA1(077f0d38d489562532d5f7678434a85ca04d373c) ) ROM_LOAD( "r4", 0x30000, 0x8000, CRC(4346fae6) SHA1(a9f000e4427a1e9902627402dce14dc8ee04dbf8) ) @@ -2566,7 +2566,7 @@ Large epoxy(?) module near the cpu's. ROM_START( brickzn ) ROM_REGION( 0x50000 * 2, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "brickzon.009", 0x00000, 0x08000, CRC(1ea68dea) ) // V5.0 1992,3,3 + ROM_LOAD( "brickzon.009", 0x00000, 0x08000, CRC(1ea68dea) ) /* V5.0 1992,3,3 */ ROM_RELOAD( 0x50000, 0x08000 ) ROM_LOAD( "brickzon.008", 0x10000, 0x20000, CRC(c61540ba) ) ROM_RELOAD( 0x60000, 0x20000 ) @@ -2593,7 +2593,7 @@ ROM_END ROM_START( brickzn3 ) ROM_REGION( 0x50000 * 2, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "39", 0x00000, 0x08000, CRC(043380bd) ) // V3.0 1992,1,23 + ROM_LOAD( "39", 0x00000, 0x08000, CRC(043380bd) ) /* V3.0 1992,1,23 */ ROM_RELOAD( 0x50000, 0x08000 ) ROM_LOAD( "38", 0x10000, 0x20000, CRC(e16216e8) ) ROM_RELOAD( 0x60000, 0x20000 ) @@ -2658,7 +2658,7 @@ Sound is a Yamaha YM3812 and a AY-3-8910A ROM_START( hardhea2 ) ROM_REGION( 0x50000 * 2, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "hrd-hd9", 0x00000, 0x08000, CRC(69c4c307) ) // V 2.0 1991,2,12 + ROM_LOAD( "hrd-hd9", 0x00000, 0x08000, CRC(69c4c307) ) /* V 2.0 1991,2,12 */ ROM_RELOAD( 0x50000, 0x08000 ) ROM_LOAD( "hrd-hd10", 0x10000, 0x10000, CRC(77ec5b0a) ) ROM_RELOAD( 0x60000, 0x10000 ) @@ -2699,15 +2699,15 @@ ROM_END ROM_START( starfigh ) ROM_REGION( 0x50000 * 2, REGION_CPU1, 0 ) /* Main Z80 Code */ - ROM_LOAD( "starfgtr.l1", 0x00000, 0x08000, CRC(f93802c6) ) // V.1 + ROM_LOAD( "starfgtr.l1", 0x00000, 0x08000, CRC(f93802c6) ) /* V.1 */ ROM_RELOAD( 0x50000, 0x08000 ) ROM_LOAD( "starfgtr.j1", 0x10000, 0x10000, CRC(fcfcf08a) ) ROM_RELOAD( 0x60000, 0x10000 ) ROM_LOAD( "starfgtr.i1", 0x20000, 0x10000, CRC(6935fcdb) ) ROM_RELOAD( 0x70000, 0x10000 ) - ROM_LOAD( "starfgtr.l3", 0x30000, 0x10000, CRC(50c072a4) ) // 0xxxxxxxxxxxxxxx = 0xFF (ROM Test: OK) + ROM_LOAD( "starfgtr.l3", 0x30000, 0x10000, CRC(50c072a4) ) /* 0xxxxxxxxxxxxxxx = 0xFF (ROM Test: OK) */ ROM_RELOAD( 0x80000, 0x10000 ) - ROM_LOAD( "starfgtr.j3", 0x40000, 0x10000, CRC(3fe3c714) ) // clear text here + ROM_LOAD( "starfgtr.j3", 0x40000, 0x10000, CRC(3fe3c714) ) /* clear text here */ ROM_RELOAD( 0x90000, 0x10000 ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* Music Z80 Code */ diff --git a/src/drivers/system16.c b/src/drivers/system16.c index d79e9a044..ef8813498 100644 --- a/src/drivers/system16.c +++ b/src/drivers/system16.c @@ -1,6 +1,6 @@ /* Sega System16 Hardware - major cleanup in progress - still a lot to do! + major cleanup in progress - still a lot to do!H see vidhrdw/system16.c for more information @@ -150,12 +150,12 @@ To do: #include "cpu/z80/z80.h" #include "cpu/i8039/i8039.h" #include "system16.h" - +#include "machine/fd1089.h" extern void mc8123_decrypt_0066(void); /***************************************************************************/ -// 7751 emulation +/* 7751 emulation */ WRITE_HANDLER( sys16_7751_audio_8255_w ); READ_HANDLER( sys16_7751_audio_8255_r ); READ_HANDLER( sys16_7751_sh_rom_r ); @@ -344,7 +344,7 @@ static PORT_WRITE_START( sound_writeport ) { 0x01, 0x01, YM2151_data_port_0_w }, PORT_END -// 7751 Sound +/* 7751 Sound */ static MEMORY_READ_START( sound_readmem_7751 ) { 0x0000, 0x7fff, MRA_ROM }, { 0xe800, 0xe800, soundlatch_r }, @@ -353,7 +353,7 @@ MEMORY_END static PORT_READ_START( sound_readport_7751 ) { 0x01, 0x01, YM2151_status_port_0_r }, - //{ 0x0e, 0x0e, sys16_7751_audio_8255_r }, + /*{ 0x0e, 0x0e, sys16_7751_audio_8255_r }, */ { 0xc0, 0xc0, soundlatch_r }, PORT_END @@ -386,7 +386,7 @@ static PORT_WRITE_START( writeport_7751 ) { I8039_p7, I8039_p7, sys16_7751_sh_rom_select_w }, PORT_END -// 7759 +/* 7759 */ static MEMORY_READ_START( sound_readmem_7759 ) { 0x0000, 0x7fff, MRA_ROM }, { 0x8000, 0xdfff, MRA_BANK1 }, @@ -422,7 +422,7 @@ static WRITE16_HANDLER( sound_command_nmi_w ){ } } -//static data16_t coinctrl; +/*static data16_t coinctrl; */ static READ16_HANDLER( sys16_coinctrl_r ){ return coinctrl; @@ -655,71 +655,75 @@ static void type1_sys16_textram( void ) } /***************************************************************************/ -// sys16A +/* sys16A */ ROM_START( alexkidd ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "epr10429.42", 0x000000, 0x10000, CRC(bdf49eca) SHA1(899bc2d346544e4a33de51b60e02ebf7ee82cea8) ) - ROM_LOAD16_BYTE( "epr10427.26", 0x000001, 0x10000, CRC(f6e3dd29) SHA1(bb94ebc062bb7c6c13b68579053b9cbe8b92417c) ) - ROM_LOAD16_BYTE( "epr10430.43", 0x020000, 0x10000, CRC(89e3439f) SHA1(7c751bb477584842d93fda6686b03e289140bd62) ) - ROM_LOAD16_BYTE( "epr10428.25", 0x020001, 0x10000, CRC(dbed3210) SHA1(1e2d22935a633641ff88967d67ec673ee25cbf55) ) + ROM_LOAD16_BYTE( "epr-10447.43", 0x000000, 0x10000, CRC(29e87f71) SHA1(af980e55c02b3de1121c144fee23af74d24042ac) ) + ROM_LOAD16_BYTE( "epr-10445.26", 0x000001, 0x10000, CRC(25ce5b6f) SHA1(dfec64df7e8d145d30740808bc94bdbbe667c4e8) ) + ROM_LOAD16_BYTE( "epr-10448.42", 0x020000, 0x10000, CRC(05baedb5) SHA1(fc15989bf3d850170e4e018d74f18553f0268576) ) + ROM_LOAD16_BYTE( "epr-10446.25", 0x020001, 0x10000, CRC(cd61d23c) SHA1(c235c4fef28556e9f2d07e815ad213c308e85598) ) ROM_REGION( 0x18000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */ - ROM_LOAD( "10431.95", 0x00000, 0x08000, CRC(a7962c39) SHA1(c816fc5d9f21b2ba32b9841e64b634bce7ea78c8) ) - ROM_LOAD( "10432.94", 0x08000, 0x08000, CRC(db8cd24e) SHA1(656d98844ad9ccaa68e3f501137dddd0a27d999d) ) - ROM_LOAD( "10433.93", 0x10000, 0x08000, CRC(e163c8c2) SHA1(ac54c5ecedca5b1a2c550de32687ca57c4d3a411) ) + ROM_LOAD( "epr-10431.95", 0x00000, 0x08000, CRC(a7962c39) SHA1(c816fc5d9f21b2ba32b9841e64b634bce7ea78c8) ) + ROM_LOAD( "epr-10432.94", 0x08000, 0x08000, CRC(db8cd24e) SHA1(656d98844ad9ccaa68e3f501137dddd0a27d999d) ) + ROM_LOAD( "epr-10433.93", 0x10000, 0x08000, CRC(e163c8c2) SHA1(ac54c5ecedca5b1a2c550de32687ca57c4d3a411) ) ROM_REGION( 0x040000, REGION_GFX2, 0 ) /* sprites */ - ROM_LOAD16_BYTE( "10437.10", 0x000001, 0x8000, CRC(522f7618) SHA1(9a6bc857dfef1dd1b7bffa034523c1c4cd8b3f4c) ) - ROM_LOAD16_BYTE( "10441.11", 0x000000, 0x8000, CRC(74e3a35c) SHA1(26b980a0a3aee94ac38e0e0c7d305bb35a60d1c4) ) - ROM_LOAD16_BYTE( "10438.17", 0x010001, 0x8000, CRC(738a6362) SHA1(a3c5f10c263cb216d275875f6333484a1cca281b) ) - ROM_LOAD16_BYTE( "10442.18", 0x010000, 0x8000, CRC(86cb9c14) SHA1(42bd0ed985de61ff183eed0192257966caa01594) ) - ROM_LOAD16_BYTE( "10439.23", 0x020001, 0x8000, CRC(b391aca7) SHA1(ca9d80b67e5365f709f90a5342b5e3aa7c7126e1) ) - ROM_LOAD16_BYTE( "10443.24", 0x020000, 0x8000, CRC(95d32635) SHA1(788af2af1ae783128bcdc8cd44d17cd2f1542231) ) - ROM_LOAD16_BYTE( "10440.29", 0x030001, 0x8000, CRC(23939508) SHA1(68450a18fc7e35f5b0155632aa68cffd251be38c) ) - ROM_LOAD16_BYTE( "10444.30", 0x030000, 0x8000, CRC(82115823) SHA1(e4103003cda949bebe57815115a5028f4fe8e7d7) ) + ROM_LOAD16_BYTE( "epr-10437.10", 0x00001, 0x8000, CRC(522f7618) SHA1(9a6bc857dfef1dd1b7bffa034523c1c4cd8b3f4c) ) + ROM_LOAD16_BYTE( "epr-10441.11", 0x00000, 0x8000, CRC(74e3a35c) SHA1(26b980a0a3aee94ac38e0e0c7d305bb35a60d1c4) ) + ROM_LOAD16_BYTE( "epr-10438.17", 0x10001, 0x8000, CRC(738a6362) SHA1(a3c5f10c263cb216d275875f6333484a1cca281b) ) + ROM_LOAD16_BYTE( "epr-10442.18", 0x10000, 0x8000, CRC(86cb9c14) SHA1(42bd0ed985de61ff183eed0192257966caa01594) ) + ROM_LOAD16_BYTE( "epr-10439.23", 0x20001, 0x8000, CRC(b391aca7) SHA1(ca9d80b67e5365f709f90a5342b5e3aa7c7126e1) ) + ROM_LOAD16_BYTE( "epr-10443.24", 0x20000, 0x8000, CRC(95d32635) SHA1(788af2af1ae783128bcdc8cd44d17cd2f1542231) ) + ROM_LOAD16_BYTE( "epr-10440.29", 0x30001, 0x8000, CRC(23939508) SHA1(68450a18fc7e35f5b0155632aa68cffd251be38c) ) + ROM_LOAD16_BYTE( "epr-10444.30", 0x30000, 0x8000, CRC(82115823) SHA1(e4103003cda949bebe57815115a5028f4fe8e7d7) ) + ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* sound CPU */ - ROM_LOAD( "10434.12", 0x0000, 0x8000, CRC(77141cce) SHA1(6c5e83527f7e11a5ff5cc4fa75d55618a55e1a58) ) + ROM_LOAD( "epr-10434.12", 0x0000, 0x8000, CRC(77141cce) SHA1(6c5e83527f7e11a5ff5cc4fa75d55618a55e1a58) ) ROM_REGION( 0x1000, REGION_CPU3, 0 ) /* 4k for 7751 onboard ROM */ ROM_LOAD( "7751.bin", 0x0000, 0x0400, CRC(6a9534fc) SHA1(67ad94674db5c2aab75785668f610f6f4eccd158) ) /* 7751 - U34 */ ROM_REGION( 0x10000, REGION_SOUND1, 0 ) /* 7751 sound data (not used yet) */ - ROM_LOAD( "10435.1", 0x0000, 0x8000, CRC(ad89f6e3) SHA1(812a132142065b0fe13b5f0ac534b6d8830ba102) ) - ROM_LOAD( "10436.2", 0x8000, 0x8000, CRC(96c76613) SHA1(fe3e4e649fd2cb2453eec0c92015bd54b3b9a1b5) ) + ROM_LOAD( "epr-10435.1", 0x0000, 0x8000, CRC(ad89f6e3) SHA1(812a132142065b0fe13b5f0ac534b6d8830ba102) ) + ROM_LOAD( "epr-10436.2", 0x8000, 0x8000, CRC(96c76613) SHA1(fe3e4e649fd2cb2453eec0c92015bd54b3b9a1b5) ) ROM_END -ROM_START( alexkida ) - ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "10447.43", 0x000000, 0x10000, CRC(29e87f71) SHA1(af980e55c02b3de1121c144fee23af74d24042ac) ) - ROM_LOAD16_BYTE( "10445.26", 0x000001, 0x10000, CRC(25ce5b6f) SHA1(dfec64df7e8d145d30740808bc94bdbbe667c4e8) ) - ROM_LOAD16_BYTE( "10448.42", 0x020000, 0x10000, CRC(05baedb5) SHA1(fc15989bf3d850170e4e018d74f18553f0268576) ) - ROM_LOAD16_BYTE( "10446.25", 0x020001, 0x10000, CRC(cd61d23c) SHA1(c235c4fef28556e9f2d07e815ad213c308e85598) ) - - ROM_REGION( 0x18000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */ - ROM_LOAD( "10431.95", 0x00000, 0x08000, CRC(a7962c39) SHA1(c816fc5d9f21b2ba32b9841e64b634bce7ea78c8) ) - ROM_LOAD( "10432.94", 0x08000, 0x08000, CRC(db8cd24e) SHA1(656d98844ad9ccaa68e3f501137dddd0a27d999d) ) - ROM_LOAD( "10433.93", 0x10000, 0x08000, CRC(e163c8c2) SHA1(ac54c5ecedca5b1a2c550de32687ca57c4d3a411) ) - - ROM_REGION( 0x040000, REGION_GFX2, 0 ) /* sprites */ - ROM_LOAD16_BYTE( "10437.10", 0x000001, 0x8000, CRC(522f7618) SHA1(9a6bc857dfef1dd1b7bffa034523c1c4cd8b3f4c) ) - ROM_LOAD16_BYTE( "10441.11", 0x000000, 0x8000, CRC(74e3a35c) SHA1(26b980a0a3aee94ac38e0e0c7d305bb35a60d1c4) ) - ROM_LOAD16_BYTE( "10438.17", 0x010001, 0x8000, CRC(738a6362) SHA1(a3c5f10c263cb216d275875f6333484a1cca281b) ) - ROM_LOAD16_BYTE( "10442.18", 0x010000, 0x8000, CRC(86cb9c14) SHA1(42bd0ed985de61ff183eed0192257966caa01594) ) - ROM_LOAD16_BYTE( "10439.23", 0x020001, 0x8000, CRC(b391aca7) SHA1(ca9d80b67e5365f709f90a5342b5e3aa7c7126e1) ) - ROM_LOAD16_BYTE( "10443.24", 0x020000, 0x8000, CRC(95d32635) SHA1(788af2af1ae783128bcdc8cd44d17cd2f1542231) ) - ROM_LOAD16_BYTE( "10440.29", 0x030001, 0x8000, CRC(23939508) SHA1(68450a18fc7e35f5b0155632aa68cffd251be38c) ) - ROM_LOAD16_BYTE( "10444.30", 0x030000, 0x8000, CRC(82115823) SHA1(e4103003cda949bebe57815115a5028f4fe8e7d7) ) +ROM_START( alexkidd1 ) + ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "epr-10429.43", 0x000000, 0x10000, CRC(bdf49eca) SHA1(899bc2d346544e4a33de51b60e02ebf7ee82cea8) ) + ROM_LOAD16_BYTE( "epr-10427.26", 0x000001, 0x10000, CRC(f6e3dd29) SHA1(bb94ebc062bb7c6c13b68579053b9cbe8b92417c) ) + ROM_LOAD16_BYTE( "epr-10430.42", 0x020000, 0x10000, CRC(89e3439f) SHA1(7c751bb477584842d93fda6686b03e289140bd62) ) + ROM_LOAD16_BYTE( "epr-10428.25", 0x020001, 0x10000, CRC(dbed3210) SHA1(1e2d22935a633641ff88967d67ec673ee25cbf55) ) + + ROM_REGION( 0x18000, REGION_GFX1, 0 ) /* tiles */ + ROM_LOAD( "epr-10431.95", 0x00000, 0x08000, CRC(a7962c39) SHA1(c816fc5d9f21b2ba32b9841e64b634bce7ea78c8) ) + ROM_LOAD( "epr-10432.94", 0x08000, 0x08000, CRC(db8cd24e) SHA1(656d98844ad9ccaa68e3f501137dddd0a27d999d) ) + ROM_LOAD( "epr-10433.93", 0x10000, 0x08000, CRC(e163c8c2) SHA1(ac54c5ecedca5b1a2c550de32687ca57c4d3a411) ) + + ROM_REGION( 0x040000, REGION_GFX2, 0 ) /* sprites */ + ROM_LOAD16_BYTE( "epr-10437.10", 0x00001, 0x8000, CRC(522f7618) SHA1(9a6bc857dfef1dd1b7bffa034523c1c4cd8b3f4c) ) + ROM_LOAD16_BYTE( "epr-10441.11", 0x00000, 0x8000, CRC(74e3a35c) SHA1(26b980a0a3aee94ac38e0e0c7d305bb35a60d1c4) ) + ROM_LOAD16_BYTE( "epr-10438.17", 0x10001, 0x8000, CRC(738a6362) SHA1(a3c5f10c263cb216d275875f6333484a1cca281b) ) + ROM_LOAD16_BYTE( "epr-10442.18", 0x10000, 0x8000, CRC(86cb9c14) SHA1(42bd0ed985de61ff183eed0192257966caa01594) ) + ROM_LOAD16_BYTE( "epr-10439.23", 0x20001, 0x8000, CRC(b391aca7) SHA1(ca9d80b67e5365f709f90a5342b5e3aa7c7126e1) ) + ROM_LOAD16_BYTE( "epr-10443.24", 0x20000, 0x8000, CRC(95d32635) SHA1(788af2af1ae783128bcdc8cd44d17cd2f1542231) ) + ROM_LOAD16_BYTE( "epr-10440.29", 0x30001, 0x8000, CRC(23939508) SHA1(68450a18fc7e35f5b0155632aa68cffd251be38c) ) + ROM_LOAD16_BYTE( "epr-10444.30", 0x30000, 0x8000, CRC(82115823) SHA1(e4103003cda949bebe57815115a5028f4fe8e7d7) ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* sound CPU */ - ROM_LOAD( "10434.12", 0x0000, 0x8000, CRC(77141cce) SHA1(6c5e83527f7e11a5ff5cc4fa75d55618a55e1a58) ) + ROM_LOAD( "epr-10434.12", 0x0000, 0x8000, CRC(77141cce) SHA1(6c5e83527f7e11a5ff5cc4fa75d55618a55e1a58) ) ROM_REGION( 0x1000, REGION_CPU3, 0 ) /* 4k for 7751 onboard ROM */ ROM_LOAD( "7751.bin", 0x0000, 0x0400, CRC(6a9534fc) SHA1(67ad94674db5c2aab75785668f610f6f4eccd158) ) /* 7751 - U34 */ - ROM_REGION( 0x10000, REGION_SOUND1, 0 ) /* 7751 sound data */ - ROM_LOAD( "10435.1", 0x0000, 0x8000, CRC(ad89f6e3) SHA1(812a132142065b0fe13b5f0ac534b6d8830ba102) ) - ROM_LOAD( "10436.2", 0x8000, 0x8000, CRC(96c76613) SHA1(fe3e4e649fd2cb2453eec0c92015bd54b3b9a1b5) ) + ROM_REGION( 0x10000, REGION_SOUND1, 0 ) /* 7751 sound data (not used yet) */ + ROM_LOAD( "epr-10435.1", 0x0000, 0x8000, CRC(ad89f6e3) SHA1(812a132142065b0fe13b5f0ac534b6d8830ba102) ) + ROM_LOAD( "epr-10436.2", 0x8000, 0x8000, CRC(96c76613) SHA1(fe3e4e649fd2cb2453eec0c92015bd54b3b9a1b5) ) + + ROM_REGION( 0x2000, REGION_USER2, 0 ) /* decryption key */ + ROM_LOAD( "317-0021.key", 0x0000, 0x2000, BAD_DUMP CRC(504388a3) SHA1(20625e9e99c08a28b253676cc843ae5228ec9d5b) ) ROM_END /* @@ -728,33 +732,34 @@ ROM_END */ ROM_START( afighter ) - ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ -// cpu 317-0018 - ROM_LOAD16_BYTE( "10348",0x00000,0x08000, CRC(e51e3012) SHA1(bb5522aacb55b5f04aa4cb7a642e202f0ddd7c84) ) - ROM_LOAD16_BYTE( "10349",0x00001,0x08000, CRC(4b434c37) SHA1(5f3afbdb9cdb0762e56b702a195274f30193b472) ) - ROM_LOAD16_BYTE( "10350",0x20000,0x08000, CRC(f2cd6b3f) SHA1(380f75b8c1696b388179641866cd1d23f78664e7) ) - ROM_LOAD16_BYTE( "10351",0x20001,0x08000, CRC(ede21d8d) SHA1(b3e3944d706c606fd01e00d9511f020ce9aec9f0) ) - ROM_LOAD16_BYTE( "10352",0x40000,0x08000, CRC(f8abb143) SHA1(97e78291c15bdf95fd35adca6b9e002480137b12) ) - ROM_LOAD16_BYTE( "10353",0x40001,0x08000, CRC(5a757dc9) SHA1(b0540844c8a09195f5d12312f8e27c334641d7b8) ) - - ROM_REGION( 0x30000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */ - ROM_LOAD( "10281",0x00000,0x10000, CRC(30e92cda) SHA1(36293a2a8a22dca5350571f19f3d5d04e1b27458) ) - ROM_LOAD( "10282",0x10000,0x10000, CRC(b67b8910) SHA1(f3f029a3e6547114cec28e5cf8fda65ef434c353) ) - ROM_LOAD( "10283",0x20000,0x10000, CRC(e7dbfd2d) SHA1(91bae3fbc4a3c612dc507eecfa8de1c2e1e7afee) ) + ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ + ROM_LOAD16_BYTE( "epr-10350", 0x00001, 0x08000, CRC(f2cd6b3f) SHA1(380f75b8c1696b388179641866cd1d23f78664e7) ) + ROM_LOAD16_BYTE( "epr-10353", 0x00000, 0x08000, CRC(5a757dc9) SHA1(b0540844c8a09195f5d12312f8e27c334641d7b8) ) + ROM_LOAD16_BYTE( "epr-10349", 0x10001, 0x08000, CRC(4b434c37) SHA1(5f3afbdb9cdb0762e56b702a195274f30193b472) ) + ROM_LOAD16_BYTE( "epr-10352", 0x10000, 0x08000, CRC(f8abb143) SHA1(97e78291c15bdf95fd35adca6b9e002480137b12) ) + ROM_LOAD16_BYTE( "epr-10348", 0x20001, 0x08000, CRC(e51e3012) SHA1(bb5522aacb55b5f04aa4cb7a642e202f0ddd7c84) ) + ROM_LOAD16_BYTE( "epr-10351", 0x20000, 0x08000, CRC(ede21d8d) SHA1(b3e3944d706c606fd01e00d9511f020ce9aec9f0) ) + + ROM_REGION( 0x30000, REGION_GFX1, 0 ) /* tiles */ + ROM_LOAD( "epr-10281.95", 0x00000, 0x10000, CRC(30e92cda) SHA1(36293a2a8a22dca5350571f19f3d5d04e1b27458) ) + ROM_LOAD( "epr-10282.94", 0x10000, 0x10000, CRC(b67b8910) SHA1(f3f029a3e6547114cec28e5cf8fda65ef434c353) ) + ROM_LOAD( "epr-10283.93", 0x20000, 0x10000, CRC(e7dbfd2d) SHA1(91bae3fbc4a3c612dc507eecfa8de1c2e1e7afee) ) ROM_REGION( 0x40000, REGION_GFX2, 0 ) /* sprites */ - ROM_LOAD16_BYTE( "10285",0x00001,0x08000, CRC(98aa3d04) SHA1(1d26d17a72e55281e3444fee9c5af69ffb9e3c69) ) - ROM_LOAD16_BYTE( "10286",0x00000,0x08000, CRC(8da050cf) SHA1(c28e8968dbd9c110672581f4486f70d5f45df7f5) ) - ROM_LOAD16_BYTE( "10287",0x10001,0x08000, CRC(7989b74a) SHA1(a87acafe82b37a11d8f8b1f2ee4c9b2e1bb8161c) ) - ROM_LOAD16_BYTE( "10288",0x10000,0x08000, CRC(d3ce551a) SHA1(0ff2170d9ef89058273025dd8d5e1021094adef1) ) - ROM_LOAD16_BYTE( "10289",0x20001,0x08000, CRC(c59d1b98) SHA1(e232f2519234981c0e4ffecdd25c48083d9f93a8) ) - ROM_LOAD16_BYTE( "10290",0x20000,0x08000, CRC(39354223) SHA1(d8a73d3f7fc2d83d23bb7434f43bc8804f35cc16) ) - ROM_LOAD16_BYTE( "10291",0x30001,0x08000, CRC(6e4b245c) SHA1(1f8cecf7ea2d2dfa5ce18d7ee34b0da2cc40221e) ) - ROM_LOAD16_BYTE( "10292",0x30000,0x08000, CRC(cef289a3) SHA1(7ab817b6348c168f79be325fb3cc2cca14ee0f8e) ) + ROM_LOAD16_BYTE( "epr-10285", 0x00001, 0x08000, CRC(98aa3d04) SHA1(1d26d17a72e55281e3444fee9c5af69ffb9e3c69) ) + ROM_LOAD16_BYTE( "epr-10286", 0x10001, 0x08000, CRC(8da050cf) SHA1(c28e8968dbd9c110672581f4486f70d5f45df7f5) ) + ROM_LOAD16_BYTE( "epr-10287", 0x20001, 0x08000, CRC(7989b74a) SHA1(a87acafe82b37a11d8f8b1f2ee4c9b2e1bb8161c) ) + ROM_LOAD16_BYTE( "epr-10288", 0x30001, 0x08000, CRC(d3ce551a) SHA1(0ff2170d9ef89058273025dd8d5e1021094adef1) ) + ROM_LOAD16_BYTE( "epr-10289", 0x00000, 0x08000, CRC(c59d1b98) SHA1(e232f2519234981c0e4ffecdd25c48083d9f93a8) ) + ROM_LOAD16_BYTE( "epr-10290", 0x10000, 0x08000, CRC(39354223) SHA1(d8a73d3f7fc2d83d23bb7434f43bc8804f35cc16) ) + ROM_LOAD16_BYTE( "epr-10291", 0x20000, 0x08000, CRC(6e4b245c) SHA1(1f8cecf7ea2d2dfa5ce18d7ee34b0da2cc40221e) ) + ROM_LOAD16_BYTE( "epr-10292", 0x30000, 0x08000, CRC(cef289a3) SHA1(7ab817b6348c168f79be325fb3cc2cca14ee0f8e) ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* sound CPU */ - ROM_LOAD( "10284",0x00000,0x8000, CRC(8ff09116) SHA1(8b99b6d2499897cfbd037a7e7cf5bc53bce8a63a) ) + ROM_LOAD( "epr-10284.12", 0x00000, 0x8000, CRC(8ff09116) SHA1(8b99b6d2499897cfbd037a7e7cf5bc53bce8a63a) ) + ROM_REGION( 0x2000, REGION_USER2, 0 ) /* decryption key */ + ROM_LOAD( "317-0018.key", 0x0000, 0x2000, CRC(65b5b1af) SHA1(9a236c0c223064f9a2a56561e10b9ffed0f567a3) ) ROM_END /* @@ -764,10 +769,10 @@ ROM_END ROM_START( afightera ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "epr10315.bin", 0x00001, 0x08000, CRC(2ea55eae) SHA1(91d582eaa0483d547d1a37dedb8f029a0fccb526) ) // decrypted version of 10350 + ROM_LOAD16_BYTE( "epr10315.bin", 0x00001, 0x08000, CRC(2ea55eae) SHA1(91d582eaa0483d547d1a37dedb8f029a0fccb526) ) /* decrypted version of 10350 */ ROM_LOAD16_BYTE( "epr10318.bin", 0x00000, 0x08000, CRC(d05b240d) SHA1(aa4aa7b18b53ac7b533855a44f9a4a0c14e1da2a) ) - ROM_LOAD16_BYTE( "epr10316.bin", 0x10001, 0x08000, CRC(07522474) SHA1(1a4bce4c04defab3516a90b9fa62fad1945a1176) ) // == epr10294.bin - ROM_LOAD16_BYTE( "epr10319.bin", 0x10000, 0x08000, CRC(e48c4d80) SHA1(9c40972f81e004de84db4199e7dc0ceb6a998e76) ) // == epr10297.bin + ROM_LOAD16_BYTE( "epr10316.bin", 0x10001, 0x08000, CRC(07522474) SHA1(1a4bce4c04defab3516a90b9fa62fad1945a1176) ) /* == epr10294.bin */ + ROM_LOAD16_BYTE( "epr10319.bin", 0x10000, 0x08000, CRC(e48c4d80) SHA1(9c40972f81e004de84db4199e7dc0ceb6a998e76) ) /* == epr10297.bin */ ROM_LOAD16_BYTE( "epr10317.bin", 0x20001, 0x08000, CRC(6e00db36) SHA1(5e3d03f7441515ad7dac411f492f2e159330a90a) ) ROM_LOAD16_BYTE( "epr10320.bin", 0x20000, 0x08000, CRC(5f97c2fa) SHA1(5fef94bc275d9132dde8b72bfb661f10efdc91b1) ) @@ -803,12 +808,12 @@ static MEMORY_READ16_START( alexkidd_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc40002, 0xc40005, MRA16_NOP }, //?? - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_3_word_r }, // dip1 - { 0xc42002, 0xc42003, input_port_4_word_r }, // dip2 + { 0xc40002, 0xc40005, MRA16_NOP }, /*?? */ + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_3_word_r }, /* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r }, /* dip2 */ { 0xc60000, 0xc60001, MRA16_NOP }, { 0xfff108, 0xfff109, alexkidd_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, @@ -821,7 +826,7 @@ static MEMORY_WRITE16_START( alexkidd_writemem ) { 0x440000, 0x440fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x840000, 0x840fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, { 0xc40000, 0xc40001, sound_command_nmi_w }, - { 0xc40002, 0xc40005, MWA16_NOP }, //?? + { 0xc40002, 0xc40005, MWA16_NOP }, /*?? */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -831,12 +836,12 @@ static MEMORY_READ16_START( afighter_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc40002, 0xc40005, MRA16_NOP }, //?? - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_3_word_r }, // dip1 - { 0xc42002, 0xc42003, input_port_4_word_r }, // dip2 + { 0xc40002, 0xc40005, MRA16_NOP }, /*?? */ + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_3_word_r }, /* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r }, /* dip2 */ { 0xc60000, 0xc60001, MRA16_NOP }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -848,7 +853,7 @@ static MEMORY_WRITE16_START( afighter_writemem ) { 0x440000, 0x440fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x840000, 0x840fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, { 0xc40000, 0xc40001, sound_command_nmi_w }, - { 0xc40002, 0xc40005, MWA16_NOP }, //?? + { 0xc40002, 0xc40005, MWA16_NOP }, /*?? */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -872,7 +877,7 @@ static MACHINE_INIT( afighter ){ sys16_bg_priority_mode=1; sys16_fg_priority_mode=4; - sys16_tilebank_switch=0x2000; // fixes bg tiles + sys16_tilebank_switch=0x2000; /* fixes bg tiles */ sys16_update_proc = type1_sys16_textram; } @@ -976,7 +981,7 @@ static MACHINE_DRIVER_START( afighter ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( aliensyn ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "11083.a4", 0x00000, 0x8000, CRC(cb2ad9b3) SHA1(66284b4e1071b3cb4b36960a2dba8949325f9e86) ) @@ -1008,7 +1013,7 @@ ROM_START( aliensyn ) ROM_LOAD( "epr-10726.a10", 0x30000, 0x8000, CRC(d50b7736) SHA1(b1f8e3b0cf2ffee5382098100cfabe21b383cd51) ) ROM_END -// sys16A - use a different sound chip? +/* sys16A - use a different sound chip? */ ROM_START( aliensya ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code. I guessing the order a bit here */ ROM_LOAD16_BYTE( "10808", 0x00000, 0x8000, CRC(e669929f) SHA1(b5ab41d6f31f0369f8c5f5eb6fc08e8c23312b96) ) @@ -1042,7 +1047,7 @@ ROM_END ROM_START( aliensyj ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* Custom 68000 code . I guessing the order a bit here */ -// custom cpu 317-0033 +/* custom cpu 317-0033 */ ROM_LOAD16_BYTE( "epr10699.43", 0x00000, 0x8000, CRC(3fd38d17) SHA1(538c1246121051a1af9ba2a4259eb1fe7e4952e1) ) ROM_LOAD16_BYTE( "epr10696.26", 0x00001, 0x8000, CRC(d734f19f) SHA1(4a08c35084f7a9364ba0f058b9a9ffc30c8b5a78) ) ROM_LOAD16_BYTE( "epr10700.42", 0x10000, 0x8000, CRC(3b04b252) SHA1(0e40e89e8feb7c98ee1da1c3fb3fe1d317c66842) ) @@ -1112,11 +1117,11 @@ static MEMORY_READ16_START( aliensyn_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -1127,7 +1132,7 @@ static MEMORY_WRITE16_START( aliensyn_writemem ) { 0x440000, 0x440fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x840000, 0x840fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, { 0xc00006, 0xc00007, sound_command_w }, - { 0xc00020, 0xc0003f, MWA16_NOP }, // config regs + { 0xc00020, 0xc0003f, MWA16_NOP }, /* config regs */ { 0xc40000, 0xc40001, sys16_coinctrl_w }, { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -1156,6 +1161,10 @@ static DRIVER_INIT( aliensyn ) sys16_bg1_trans=1; } +static DRIVER_INIT( alexkida ) +{ + fd1089a_decrypt(); +} /***************************************************************************/ INPUT_PORTS_START( aliensyn ) @@ -1201,7 +1210,7 @@ static MACHINE_DRIVER_START( aliensyn ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( altbeast ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "11705", 0x000000, 0x20000, CRC(57dc5c7a) SHA1(a5cc9b10a00778f5163fc915b956fa5d0d7a37ce) ) @@ -1230,7 +1239,7 @@ ROM_END ROM_START( jyuohki ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* Custom 68000 code. */ -// custom cpu 317-0065 +/* custom cpu 317-0065 */ ROM_LOAD16_BYTE( "epr11670.a7", 0x000000, 0x20000, CRC(b748eb07) SHA1(f3663831610bcb358340f14c2c96833dd7591bfb) ) ROM_LOAD16_BYTE( "epr11669.a5", 0x000001, 0x20000, CRC(005ecd11) SHA1(c392195955cf727752f03db92414701cc2bf1f4a) ) @@ -1255,7 +1264,7 @@ ROM_START( jyuohki ) ROM_LOAD( "opr11673", 0x30000, 0x20000, CRC(400c4a36) SHA1(de4bdfa91734410e0a7f6a16bf8336db172f458a) ) ROM_END -// sys16B +/* sys16B */ ROM_START( altbeas2 ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr11740", 0x000000, 0x20000, CRC(ce227542) SHA1(54adcc1246943360bb68498e971809a0d4f9fe0c) ) @@ -1277,7 +1286,7 @@ ROM_START( altbeas2 ) ROM_LOAD16_BYTE( "epr11684.b8", 0xc0000, 0x20000, CRC(b20c0edb) SHA1(6c8694d05e3adac37c9015037ab800233371db36) ) ROM_REGION( 0x50000, REGION_CPU2, 0 ) /* sound CPU */ - ROM_LOAD( "opr11686", 0x00000, 0x08000, CRC(828a45b3) SHA1(df921701b411afac1b6716b6798a1bffc2180133) ) // ??? + ROM_LOAD( "opr11686", 0x00000, 0x08000, CRC(828a45b3) SHA1(df921701b411afac1b6716b6798a1bffc2180133) ) /* ??? */ ROM_LOAD( "opr11672", 0x10000, 0x20000, CRC(bbd7f460) SHA1(bbc5c2219cb3a827d84062b19affd9780da2a3cf) ) ROM_LOAD( "opr11673", 0x30000, 0x20000, CRC(400c4a36) SHA1(de4bdfa91734410e0a7f6a16bf8336db172f458a) ) ROM_END @@ -1290,7 +1299,7 @@ static READ16_HANDLER( altbeast_skip_r ) return sys16_workingram[0x301c/2]; } -// ??? What is this, input test shows 4 bits to each player, but what does it do? +/* ??? What is this, input test shows 4 bits to each player, but what does it do? */ static READ16_HANDLER( altbeast_io_r ) { return 0xff; @@ -1302,13 +1311,13 @@ static MEMORY_READ16_START( altbeast_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc40000, 0xc40001, MRA16_NOP }, // write-only register, game does bclr #6, $C40001 - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 + { 0xc40000, 0xc40001, MRA16_NOP }, /* write-only register, game does bclr #6, $C40001 */ + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ { 0xc41004, 0xc41005, altbeast_io_r }, - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xfff01c, 0xfff01d, altbeast_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -1323,7 +1332,7 @@ static MEMORY_WRITE16_START( altbeast_writemem ) { 0xc40000, 0xc40001, sys16_coinctrl_w }, { 0xc43000, 0xc43fff, MWA16_NOP }, { 0xfe0006, 0xfe0007, sound_command_w }, - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -1409,7 +1418,7 @@ static MACHINE_DRIVER_START( altbeas2 ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( atomicp ) ROM_REGION( 0x020000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "ap-t2.bin", 0x000000, 0x10000, CRC(97421047) SHA1(18d61260470da7a0bef532f81df567a613c0d821) ) @@ -1443,7 +1452,7 @@ static READ16_HANDLER( atomicp_skip_r ){ if (activecpu_get_pc()==0x7fc) {cpu_spinuntil_int(); return 0xffff;} return sys16_workingram[0x0902/2]; } -// AM_RANGE(0xffc902, 0xffc903) AM_READ(atomicp_skip_r) +/* AM_RANGE(0xffc902, 0xffc903) AM_READ(atomicp_skip_r) */ #endif @@ -1453,24 +1462,24 @@ static MEMORY_READ16_START( atomicp_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41000, 0xc41001, input_port_0_word_r }, // player1 - { 0xc41002, 0xc41003, input_port_1_word_r }, // player2 - { 0xc41004, 0xc41005, input_port_3_word_r }, // dip1 - { 0xc41006, 0xc41007, input_port_4_word_r }, // dip2 + { 0xc41000, 0xc41001, input_port_0_word_r }, /* player1 */ + { 0xc41002, 0xc41003, input_port_1_word_r }, /* player2 */ + { 0xc41004, 0xc41005, input_port_3_word_r }, /* dip1 */ + { 0xc41006, 0xc41007, input_port_4_word_r }, /* dip2 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END static MEMORY_WRITE16_START( atomicp_writemem ) { 0x000000, 0x01ffff, MWA16_ROM }, - { 0x080000, 0x080003, MWA16_NOP }, // looks like sound chip, but isn't YM2413 data + { 0x080000, 0x080003, MWA16_NOP }, /* looks like sound chip, but isn't YM2413 data */ { 0x3f0000, 0x3fffff, sys16_tilebank_w }, { 0x400000, 0x40ffff, SYS16_MWA16_TILERAM, &sys16_tileram }, { 0x410000, 0x410fff, SYS16_MWA16_TEXTRAM, &sys16_textram }, { 0x440000, 0x44ffff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x840000, 0x840fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, - { 0x123406, 0x123407, MWA16_NOP }, // ? - { 0xc40000, 0xc40001, MWA16_NOP },// ? - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0x123406, 0x123407, MWA16_NOP }, /* ? */ + { 0xc40000, 0xc40001, MWA16_NOP },/* ? */ + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -1487,15 +1496,15 @@ static WRITE16_HANDLER( snapper_sound_w ) static MEMORY_WRITE16_START( snapper_writemem ) { 0x000000, 0x01ffff, MWA16_ROM }, - { 0x080000, 0x080003, snapper_sound_w }, // looks like sound chip, but isn't YM2413 data // seems correct for Snapper + { 0x080000, 0x080003, snapper_sound_w }, /* looks like sound chip, but isn't YM2413 data seems correct for Snapper */ { 0x3f0000, 0x3fffff, sys16_tilebank_w }, { 0x400000, 0x40ffff, SYS16_MWA16_TILERAM, &sys16_tileram }, { 0x410000, 0x410fff, SYS16_MWA16_TEXTRAM, &sys16_textram }, { 0x440000, 0x44ffff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x840000, 0x840fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, - { 0x123406, 0x123407, MWA16_NOP }, // ? - { 0xc40000, 0xc40001, MWA16_NOP },// ? - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0x123406, 0x123407, MWA16_NOP }, /* ? */ + { 0xc40000, 0xc40001, MWA16_NOP },/* ? */ + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -1539,9 +1548,9 @@ INPUT_PORTS_START( atomicp ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) - PORT_START // dummy + PORT_START /* dummy */ - PORT_START // dip1 + PORT_START /* dip1 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) ) @@ -1568,7 +1577,7 @@ INPUT_PORTS_START( atomicp ) PORT_DIPSETTING( 0x40, "3" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START // dip2 + PORT_START /* dip2 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1610,9 +1619,9 @@ INPUT_PORTS_START( snapper ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START // dummy + PORT_START /* dummy */ - PORT_START // dip1 + PORT_START /* dip1 */ PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_B ) ) PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) ) @@ -1637,7 +1646,7 @@ INPUT_PORTS_START( snapper ) PORT_DIPSETTING( 0x40, "3" ) PORT_DIPSETTING( 0x00, "5" ) - PORT_START // dip2 + PORT_START /* dip2 */ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1707,7 +1716,7 @@ MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( bayroute ) ROM_REGION( 0xc0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "br.4a", 0x000000, 0x10000, CRC(91c6424b) SHA1(79a968ade7690d5944ee815e19586cb82c3aa562) ) @@ -1741,7 +1750,7 @@ ROM_END ROM_START( bayrouta ) ROM_REGION( 0xc0000, REGION_CPU1, 0 ) /* 68000 code */ -// custom cpu 317-0116 +/* custom cpu 317-0116 */ ROM_LOAD16_BYTE( "epr12517.a7", 0x000000, 0x20000, CRC(436728a9) SHA1(0f6753493ad2c1776880862b462f10ef936a9ee5) ) ROM_LOAD16_BYTE( "epr12516.a5", 0x000001, 0x20000, CRC(4ff0353f) SHA1(f5960f9e80e42d0a3f82d6670b1f2e39b51ffcef) ) /* empty 0x40000-0x80000*/ @@ -1833,16 +1842,16 @@ static MEMORY_READ16_START( bayroute_readmem ) { 0x700000, 0x70ffff, SYS16_MRA16_TILERAM }, { 0x710000, 0x710fff, SYS16_MRA16_TEXTRAM }, { 0x800000, 0x800fff, SYS16_MRA16_PALETTERAM }, - { 0x901002, 0x901003, input_port_0_word_r }, // player1 - { 0x901006, 0x901007, input_port_1_word_r }, // player2 - { 0x901000, 0x901001, input_port_2_word_r }, // service - { 0x902002, 0x902003, input_port_3_word_r }, // dip1 - { 0x902000, 0x902001, input_port_4_word_r }, // dip2 + { 0x901002, 0x901003, input_port_0_word_r }, /* player1 */ + { 0x901006, 0x901007, input_port_1_word_r }, /* player2 */ + { 0x901000, 0x901001, input_port_2_word_r }, /* service */ + { 0x902002, 0x902003, input_port_3_word_r }, /* dip1 */ + { 0x902000, 0x902001, input_port_4_word_r }, /* dip2 */ MEMORY_END static MEMORY_WRITE16_START( bayroute_writemem ) { 0x000000, 0x0bffff, MWA16_ROM }, - { 0x100000, 0x100003, MWA16_NOP }, // tilebank control? + { 0x100000, 0x100003, MWA16_NOP }, /* tilebank control? */ { 0x500000, 0x503fff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, { 0x600000, 0x600fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x700000, 0x70ffff, SYS16_MWA16_TILERAM, &sys16_tileram }, @@ -1850,7 +1859,7 @@ static MEMORY_WRITE16_START( bayroute_writemem ) { 0x800000, 0x800fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, { 0x900000, 0x900001, sys16_coinctrl_w }, { 0xff0006, 0xff0007, sound_command_w }, - { 0xff0020, 0xff003f, MWA16_NOP },// config regs + { 0xff0020, 0xff003f, MWA16_NOP },/* config regs */ MEMORY_END /***************************************************************************/ @@ -1925,7 +1934,7 @@ MACHINE_DRIVER_END Body Slam ***************************************************************************/ -// pre16 +/* pre16 */ ROM_START( bodyslam ) ROM_REGION( 0x30000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr10066.b9", 0x000000, 0x8000, CRC(6cd53290) SHA1(68ef83ad99a26a507d9bc4cd715462169f4ac41f) ) @@ -2010,11 +2019,11 @@ static MEMORY_READ16_START( bodyslam_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_3_word_r }, // dip1 - { 0xc42002, 0xc42003, input_port_4_word_r },// dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_3_word_r }, /* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r },/* dip2 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -2047,8 +2056,8 @@ static MACHINE_INIT( bodyslam ){ sys16_update_proc = type1_sys16_textram; } -// I have no idea if this is needed, but I cannot find any code for the countdown -// timer in the code and this seems to work ok. +/* I have no idea if this is needed, but I cannot find any code for the countdown */ +/* timer in the code and this seems to work ok. */ static void bodyslam_irq_timer(void) { UINT8 flag = sys16_workingram[0x200/2] >> 8; @@ -2144,7 +2153,7 @@ static MACHINE_DRIVER_START( bodyslam ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( dduxbl ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "dduxb03.bin", 0x000000, 0x20000, CRC(e7526012) SHA1(a1798008bfa1ce9b87dc330f3817b1978052fcfd) ) @@ -2186,11 +2195,11 @@ static MEMORY_READ16_START( dduxbl_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41004, 0xc41005, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41004, 0xc41005, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xfff6e0, 0xfff6e1, dduxbl_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -2205,7 +2214,7 @@ static MEMORY_WRITE16_START( dduxbl_writemem ) { 0xc40000, 0xc40001, sys16_coinctrl_w }, { 0xc40006, 0xc40007, sound_command_w }, { 0xc46000, 0xc4603f, SYS16_MWA16_EXTRAM2, &sys16_extraram2 }, - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -2224,7 +2233,7 @@ static void dduxbl_update_proc( void ){ unsigned char rd = sys16_extraram2[0x0026/2] & 0xff; if (lu==4 && ld==4 && ru==5 && rd==5) - { // fix a bug in chicago round (un-tested in MAME) + { /* fix a bug in chicago round (un-tested in MAME) */ int vs=(*(UINT16 *)(&sys16_workingram[0x36ec])); sys16_bg_scrolly = vs & 0xff; sys16_fg_scrolly = vs & 0xff; @@ -2329,7 +2338,7 @@ static MACHINE_DRIVER_START( dduxbl ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( eswat ) ROM_REGION( 0x080000, REGION_CPU1, 0 ) /* 68000 code - custom CPU 317-0192 */ @@ -2393,11 +2402,11 @@ static MEMORY_READ16_START( eswat_readmem ) { 0x410000, 0x418fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r },// player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r },/* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xffc454, 0xffc455, eswatbl_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -2504,7 +2513,7 @@ static MACHINE_DRIVER_START( eswat ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16A +/* sys16A */ ROM_START( fantzono ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "7385.43", 0x000000, 0x8000, CRC(5cb64450) SHA1(5831405359975dd7d8c6614b20fd9b18a5d6410d) ) @@ -2571,11 +2580,11 @@ static MEMORY_READ16_START( fantzono_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r },// player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_3_word_r }, // dip1 - { 0xc42002, 0xc42003, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r },/* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_3_word_r }, /* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r }, /* dip2 */ { 0xc40000, 0xc40003, SYS16_MRA16_EXTRAM2 }, { 0xffc22a, 0xffc22b, fantzone_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, @@ -2599,11 +2608,11 @@ static MEMORY_READ16_START( fantzone_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_3_word_r }, // dip1 - { 0xc42002, 0xc42003, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_3_word_r }, /* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r }, /* dip2 */ { 0xffc22a, 0xffc22b, fantzone_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -2626,17 +2635,17 @@ static MACHINE_INIT( fantzono ){ sys16_textmode=1; sys16_spritesystem = sys16_sprite_fantzone; sys16_sprxoffset = -0xbe; -// sys16_fgxoffset = sys16_bgxoffset = 8; - sys16_fg_priority_mode=3; // fixes end of game priority +/* sys16_fgxoffset = sys16_bgxoffset = 8; */ + sys16_fg_priority_mode=3; /* fixes end of game priority */ sys16_fg_priority_value=0xd000; sys16_patch_code( 0x20e7, 0x16 ); sys16_patch_code( 0x30ef, 0x16 ); - // solving Fantasy Zone scrolling bug + /* solving Fantasy Zone scrolling bug */ sys16_patch_code(0x308f,0x00); - // invincible + /* invincible */ /* sys16_patch_code(0x224e,0x4e); sys16_patch_code(0x224f,0x71); sys16_patch_code(0x2250,0x4e); @@ -2660,13 +2669,13 @@ static MACHINE_INIT( fantzone ){ sys16_textmode=1; sys16_spritesystem = sys16_sprite_fantzone; sys16_sprxoffset = -0xbe; - sys16_fg_priority_mode=3; // fixes end of game priority + sys16_fg_priority_mode=3; /* fixes end of game priority */ sys16_fg_priority_value=0xd000; sys16_patch_code( 0x2135, 0x16 ); sys16_patch_code( 0x3649, 0x16 ); - // hack? solving Fantasy Zone scrolling bug + /* hack? solving Fantasy Zone scrolling bug */ sys16_patch_code(0x35e9,0x00); sys16_update_proc = type1_sys16_textram; @@ -2729,7 +2738,7 @@ static MACHINE_DRIVER_START( fantzone ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( fpoint ) ROM_REGION( 0x020000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "12591b.bin", 0x000000, 0x10000, CRC(248b3e1b) SHA1(b473c2a057a61896596ac4761e875d72c4f91529) ) @@ -2763,7 +2772,7 @@ ROM_START( fpointbl ) ROM_LOAD16_BYTE( "12597.bin", 0x00000, 0x010000, CRC(6961e676) SHA1(7639d2da086b57a9a8d6100fdacf40d97d7c4772) ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* sound CPU */ - ROM_LOAD( "flpoint.001", 0x0000, 0x8000, CRC(c5b8e0fe) SHA1(6cf8c67151d8604326fc6dbf976c0635b452a844) ) // bootleg rom doesn't work, but should be correct! + ROM_LOAD( "flpoint.001", 0x0000, 0x8000, CRC(c5b8e0fe) SHA1(6cf8c67151d8604326fc6dbf976c0635b452a844) ) /* bootleg rom doesn't work, but should be correct! */ ROM_END @@ -2783,7 +2792,7 @@ ROM_START( fpointbj ) ROM_LOAD16_BYTE( "12597.bin", 0x00000, 0x010000, CRC(6961e676) SHA1(7639d2da086b57a9a8d6100fdacf40d97d7c4772) ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* sound CPU */ - ROM_LOAD( "flpoint.001", 0x0000, 0x8000, CRC(c5b8e0fe) SHA1(6cf8c67151d8604326fc6dbf976c0635b452a844) ) // bootleg rom doesn't work, but should be correct! + ROM_LOAD( "flpoint.001", 0x0000, 0x8000, CRC(c5b8e0fe) SHA1(6cf8c67151d8604326fc6dbf976c0635b452a844) ) /* bootleg rom doesn't work, but should be correct! */ /* stuff below isn't used but loaded because it was on the board .. */ ROM_REGION( 0x0120, REGION_PROMS, 0 ) @@ -2804,11 +2813,11 @@ static READ16_HANDLER( fp_io_service_dummy_r ){ static MEMORY_READ16_START( fpoint_readmem ) { 0x000000, 0x01ffff, MRA16_ROM }, { 0x02002e, 0x020049, fp_io_service_dummy_r }, - { 0x601002, 0x601003, input_port_0_word_r }, // player1 - { 0x601004, 0x601005, input_port_1_word_r }, // player2 - { 0x601000, 0x601001, input_port_2_word_r }, // service - { 0x600000, 0x600001, input_port_4_word_r }, // dip2 - { 0x600002, 0x600003, input_port_3_word_r }, // dip1 + { 0x601002, 0x601003, input_port_0_word_r }, /* player1 */ + { 0x601004, 0x601005, input_port_1_word_r }, /* player2 */ + { 0x601000, 0x601001, input_port_2_word_r }, /* service */ + { 0x600000, 0x600001, input_port_4_word_r }, /* dip2 */ + { 0x600002, 0x600003, input_port_3_word_r }, /* dip1 */ { 0x400000, 0x40ffff, SYS16_MRA16_TILERAM }, { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, @@ -3006,7 +3015,7 @@ static MACHINE_DRIVER_START( fpointbl ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( goldnaxe ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr12523.a7", 0x00000, 0x20000, CRC(8e6128d7) SHA1(b8de216f4ca08815ca98d39a773024d191d21b4d) ) @@ -3035,7 +3044,7 @@ ROM_END ROM_START( goldnaxj ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ -// Custom cpu 317-0121 +/* Custom cpu 317-0121 */ ROM_LOAD16_BYTE( "epr12540.a7", 0x00000, 0x20000, CRC(0c7ccc6d) SHA1(25bc29eee731befc665472c2c1998cac8447cc21) ) ROM_LOAD16_BYTE( "epr12539.a5", 0x00001, 0x20000, CRC(1f24f7d0) SHA1(a09cdf394c03069707f7ed400b8fbdc13674fa74) ) /* emtpy 0x40000 - 0x80000 */ @@ -3062,7 +3071,7 @@ ROM_END ROM_START( goldnabl ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ -// protected code +/* protected code */ ROM_LOAD16_BYTE( "ga6.a22", 0x00000, 0x10000, CRC(f95b459f) SHA1(dadf66d63454ed62fefa521d4fed249d28c63778) ) ROM_LOAD16_BYTE( "ga4.a20", 0x00001, 0x10000, CRC(83eabdf5) SHA1(1effef966f513fbdec2026d535658e17ef7dea51) ) ROM_LOAD16_BYTE( "ga11.a27",0x20000, 0x10000, CRC(f4ef9349) SHA1(3ffa335e74ffbc10f80387268da659643c566897) ) @@ -3121,11 +3130,11 @@ static MEMORY_READ16_START( goldnaxe_readmem ) { 0x140000, 0x140fff, SYS16_MRA16_PALETTERAM }, { 0x1f0000, 0x1f0003, SYS16_MRA16_EXTRAM }, { 0x200000, 0x200fff, SYS16_MRA16_SPRITERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r },// dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r },/* dip2 */ { 0xffecd0, 0xffecd1, ga_io_players_r }, { 0xffec96, 0xffec97, ga_io_service_r }, { 0xffec1c, 0xffec1d, goldnaxe_skip_r }, @@ -3156,12 +3165,12 @@ static MEMORY_WRITE16_START( goldnaxe_writemem ) { 0x1f0000, 0x1f0003, SYS16_MWA16_EXTRAM, &sys16_extraram }, { 0x200000, 0x200fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0xc40000, 0xc40001, sys16_coinctrl_w }, - { 0xc43000, 0xc43001, MWA16_NOP }, // ? -// { 0xfe0006, 0xfe0007, MWA16_NOP }, I think this is the real sound out - { 0xffec1c, 0xffec1d, goldnaxe_prot_w },// how does this really work? - { 0xffecfc, 0xffecfd, ga_sound_command_w },// probably just a buffer + { 0xc43000, 0xc43001, MWA16_NOP }, /* ? */ +/* { 0xfe0006, 0xfe0007, MWA16_NOP }, I think this is the real sound out */ + { 0xffec1c, 0xffec1d, goldnaxe_prot_w },/* how does this really work? */ + { 0xffecfc, 0xffecfd, ga_sound_command_w },/* probably just a buffer */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, /* fails SCRATCH RAM test because of hacks */ -// { 0xfffc00, 0xffffff, MWA16_NOP }, /* 0x400 bytes; battery backed up */ +/* { 0xfffc00, 0xffffff, MWA16_NOP }, 0x400 bytes; battery backed up */ MEMORY_END /***************************************************************************/ @@ -3180,9 +3189,9 @@ static MACHINE_INIT( goldnaxe ){ }; sys16_obj_bank = bank; -// protection patch; no longer needed -// sys16_patch_code( 0x3CB2, 0x60 ); -// sys16_patch_code( 0x3CB3, 0x1e ); +/* protection patch; no longer needed */ +/* sys16_patch_code( 0x3CB2, 0x60 ); */ +/* sys16_patch_code( 0x3CB3, 0x1e ); */ sys16_update_proc = goldnaxe_update_proc; } @@ -3241,7 +3250,7 @@ static MACHINE_DRIVER_START( goldnaxe ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( goldnaxa ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr12545.a2", 0x00000, 0x40000, CRC(a97c4e4d) SHA1(41cda15ae56185725233db669d9f8c4a8c1eb1c3) ) @@ -3267,7 +3276,7 @@ ROM_END ROM_START( goldnaxb ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ -// Custom 68000 ver 317-0110 +/* Custom 68000 ver 317-0110 */ ROM_LOAD16_BYTE( "epr12389.a2", 0x00000, 0x40000, CRC(35d5fa77) SHA1(b16b312eb1c91c412fee61002599812e30e321ee) ) ROM_LOAD16_BYTE( "epr12388.a1", 0x00001, 0x40000, CRC(72952a93) SHA1(b31888429ad81388a96333dc0b2c7e2223134834) ) @@ -3291,7 +3300,7 @@ ROM_END ROM_START( goldnaxc ) ROM_REGION( 0x0c0000, REGION_CPU1, 0 ) /* 68000 code */ -// Custom 68000 ver 317-0122 +/* Custom 68000 ver 317-0122 */ ROM_LOAD16_BYTE( "epr12543.a2", 0x00000, 0x40000, CRC(b0df9ca4) SHA1(240f3c2998f969569d992f796e006f5ea4434e55) ) ROM_LOAD16_BYTE( "epr12542.a1", 0x00001, 0x40000, CRC(b7994d3c) SHA1(87570f23826922fca465c69df6b892c59f14e103) ) @@ -3321,8 +3330,8 @@ static READ16_HANDLER( goldnaxa_skip_r ){ return sys16_workingram[0x2c1c/2]; } -// This version has somekind of hardware comparitor for collision detection, -// and a hardware multiplier. +/* This version has somekind of hardware comparitor for collision detection, */ +/* and a hardware multiplier. */ static data16_t ga_hardware_collision_data[5]; static WRITE16_HANDLER( ga_hardware_collision_w ) { @@ -3370,11 +3379,11 @@ static MEMORY_READ16_START( goldnaxa_readmem ) { 0x1f1008, 0x1f1009, ga_hardware_collision_r }, { 0x1f2000, 0x1f2003, SYS16_MRA16_EXTRAM }, { 0x200000, 0x200fff, SYS16_MRA16_SPRITERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xffecd0, 0xffecd1, ga_io_players_r }, { 0xffec96, 0xffec97, ga_io_service_r }, { 0xffec1c, 0xffec1d, goldnaxa_skip_r }, @@ -3406,7 +3415,7 @@ static MACHINE_INIT( goldnaxa ){ 10,11,0,0 }; sys16_obj_bank = bank; - //? + /*? */ sys16_patch_code( 0x3CA2, 0x60 ); sys16_patch_code( 0x3CA3, 0x1e ); @@ -3426,7 +3435,7 @@ static MACHINE_DRIVER_START( goldnaxa ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( hwchamp ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "rom0-e.bin", 0x000000, 0x20000, CRC(e5abfed7) SHA1(1f875dbaf8665c1dbfe336470580361b18a8ed4e) ) @@ -3493,7 +3502,7 @@ static READ16_HANDLER( hwc_io_handles_r ){ static int dodge_toggle=0; int data=0,ret; if(offset==0){ - // monitor + /* monitor */ data=input_port_0_r( offset ); if(input_port_1_r( offset ) & 4){ if(dodge_toggle) data=0x38; else data=0x60; @@ -3510,11 +3519,11 @@ static READ16_HANDLER( hwc_io_handles_r ){ if( hwc_handles_shifts[offset]==0) dodge_toggle^=1; } else if(offset==1){ - // left handle + /* left handle */ if(input_port_1_r( offset ) & 1) data=0xff; } else { - // right handle + /* right handle */ if(input_port_1_r( offset ) & 2) data=0xff; } @@ -3535,11 +3544,11 @@ static WRITE16_HANDLER( hwc_ctrl1_w ){ static WRITE16_HANDLER( hwc_ctrl2_w ){ if( ACCESSING_LSB ){ /* bit 4 is GONG */ -// if (data & 0x10) usrintf_showmessage("GONG"); +/* if (data & 0x10) usrintf_showmessage("GONG"); */ /* are the following really lamps? */ -// set_led_status(1,data & 0x20); -// set_led_status(2,data & 0x40); -// set_led_status(3,data & 0x80); +/* set_led_status(1,data & 0x20); */ +/* set_led_status(2,data & 0x40); */ +/* set_led_status(3,data & 0x80); */ } } @@ -3549,9 +3558,9 @@ static MEMORY_READ16_START( hwchamp_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xc43020, 0xc43025, hwc_io_handles_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -3585,12 +3594,12 @@ PORT_START /* Monitor */ PORT_ANALOG( 0xff, 0x80, IPT_PADDLE , 70, 4, 0x0, 0xff ) PORT_START /* Handles (Fake) */ - PORT_BITX(0x01, 0, IPT_BUTTON1, IP_NAME_DEFAULT, KEYCODE_F, IP_JOY_NONE ) // right hit - PORT_BITX(0x02, 0, IPT_BUTTON2, IP_NAME_DEFAULT, KEYCODE_D, IP_JOY_NONE ) // left hit - PORT_BITX(0x04, 0, IPT_BUTTON3, IP_NAME_DEFAULT, KEYCODE_B, IP_JOY_NONE ) // right dodge - PORT_BITX(0x08, 0, IPT_BUTTON4, IP_NAME_DEFAULT, KEYCODE_Z, IP_JOY_NONE ) // left dodge - PORT_BITX(0x10, 0, IPT_BUTTON5, IP_NAME_DEFAULT, KEYCODE_V, IP_JOY_NONE ) // right sway - PORT_BITX(0x20, 0, IPT_BUTTON6, IP_NAME_DEFAULT, KEYCODE_X, IP_JOY_NONE ) // left swat + PORT_BITX(0x01, 0, IPT_BUTTON1, IP_NAME_DEFAULT, KEYCODE_F, IP_JOY_NONE ) /* right hit */ + PORT_BITX(0x02, 0, IPT_BUTTON2, IP_NAME_DEFAULT, KEYCODE_D, IP_JOY_NONE ) /* left hit */ + PORT_BITX(0x04, 0, IPT_BUTTON3, IP_NAME_DEFAULT, KEYCODE_B, IP_JOY_NONE ) /* right dodge */ + PORT_BITX(0x08, 0, IPT_BUTTON4, IP_NAME_DEFAULT, KEYCODE_Z, IP_JOY_NONE ) /* left dodge */ + PORT_BITX(0x10, 0, IPT_BUTTON5, IP_NAME_DEFAULT, KEYCODE_V, IP_JOY_NONE ) /* right sway */ + PORT_BITX(0x20, 0, IPT_BUTTON6, IP_NAME_DEFAULT, KEYCODE_X, IP_JOY_NONE ) /* left swat */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -3598,7 +3607,7 @@ PORT_START /* Handles (Fake) */ SYS16_COINAGE PORT_START /* DSW1 */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) // Not Used + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) ) /* Not Used */ PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) @@ -3636,7 +3645,7 @@ static MACHINE_DRIVER_START( hwchamp ) MACHINE_DRIVER_END /***************************************************************************/ -// pre16 +/* pre16 */ ROM_START( mjleague ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr-7404.09b", 0x000000, 0x8000, CRC(ec1655b5) SHA1(5c1df364fa9733daa4478c5f88298089e4963c33) ) @@ -3644,7 +3653,7 @@ ROM_START( mjleague ) ROM_LOAD16_BYTE( "epr-7405.10b", 0x010000, 0x8000, CRC(7a4f4e38) SHA1(65a22097dd933e83f326bd64b3863915897780a6) ) ROM_LOAD16_BYTE( "epr-7402.07b", 0x010001, 0x8000, CRC(b7bef762) SHA1(214450e0b094f99ef38dec2a3e5cbdb0b30e917d) ) ROM_LOAD16_BYTE( "epra7406.11b", 0x020000, 0x8000, CRC(bb743639) SHA1(5d99638a79f02ce14374d3b1f3d9fbfc5c13c6e1) ) - ROM_LOAD16_BYTE( "epra7403.08b", 0x020001, 0x8000, CRC(d86250cf) SHA1(fb5dabb7b9b9fe0bbe93e28c60311c7b3256107a) ) // Fails memory test. Bad rom? + ROM_LOAD16_BYTE( "epra7403.08b", 0x020001, 0x8000, CRC(d86250cf) SHA1(fb5dabb7b9b9fe0bbe93e28c60311c7b3256107a) ) /* Fails memory test. Bad rom? */ ROM_REGION( 0x18000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */ ROM_LOAD( "epr-7051.09a", 0x00000, 0x08000, CRC(10ca255a) SHA1(ccf58ffcac2f7fbdbfbdf32601a1b97f359cbd91) ) @@ -3660,8 +3669,8 @@ ROM_START( mjleague ) ROM_LOAD16_BYTE( "epr-7061.04b", 0x020000, 0x8000, CRC(c808dad5) SHA1(9b65acc8dc23b16e56327298188d1a6ab48b2b5d) ) ROM_LOAD16_BYTE( "epr-7058.08a", 0x030001, 0x8000, CRC(b543675f) SHA1(35ffc9295a8849a18fabe156fdbc9801ea2179cd) ) ROM_LOAD16_BYTE( "epr-7062.05b", 0x030000, 0x8000, CRC(9168eb47) SHA1(daaa7836e627a0679e65373d8f20a9383ba4c905) ) -// ROM_LOAD16_BYTE( "epr-7055.05a", 0x040001, 0x8000, CRC(1fb860bd) SHA1(4a4155d0352dfae9e402a2b2f1558ef17b1303b4) ) loaded twice?? -// ROM_LOAD16_BYTE( "epr-7059.02b", 0x040000, 0x8000, CRC(3d14091d) SHA1(36208415b2012b6e948fefa15b0f7041748066be) ) loaded twice?? +/* ROM_LOAD16_BYTE( "epr-7055.05a", 0x040001, 0x8000, CRC(1fb860bd) SHA1(4a4155d0352dfae9e402a2b2f1558ef17b1303b4) ) loaded twice?? */ +/* ROM_LOAD16_BYTE( "epr-7059.02b", 0x040000, 0x8000, CRC(3d14091d) SHA1(36208415b2012b6e948fefa15b0f7041748066be) ) loaded twice?? */ ROM_REGION( 0x20000, REGION_CPU2, 0 ) /* sound CPU */ ROM_LOAD( "eprc7054.01b", 0x00000, 0x8000, CRC(4443b744) SHA1(73359a6e9d62b382dee47fea31b9e17eb26a0321) ) @@ -3720,7 +3729,7 @@ static READ16_HANDLER( mjl_io_bat_r ) int data2=input_port_1_r( offset ); int ret=0; - // Hitting has 8 values, but for easy of playing, I've only added 3 + /* Hitting has 8 values, but for easy of playing, I've only added 3 */ if(data1 &1) ret=0x00; else if(data1 &2) ret=0x03; @@ -3746,8 +3755,8 @@ static MEMORY_READ16_START( mjleague_readmem ) { 0xc41002, 0xc41003, mjl_io_player1_r }, { 0xc41006, 0xc41007, mjl_io_player2_r }, { 0xc41004, 0xc41005, mjl_io_bat_r }, - { 0xc42000, 0xc42001, input_port_3_word_r }, // dip1 - { 0xc42002, 0xc42003, input_port_4_word_r }, // dip2 + { 0xc42000, 0xc42001, input_port_3_word_r }, /* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r }, /* dip2 */ { 0xc60000, 0xc60001, MRA16_NOP }, /* What is this? Watchdog? */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -3771,7 +3780,7 @@ static MACHINE_INIT( mjleague ){ sys16_sprxoffset = -0xbd; sys16_fgxoffset = sys16_bgxoffset = 8; - // remove memory test because it fails. + /* remove memory test because it fails. */ sys16_patch_code( 0xBD42, 0x66 ); sys16_update_proc = type1_sys16_textram; @@ -3820,7 +3829,7 @@ PORT_START /* DSW1 */ PORT_DIPNAME( 0x10, 0x10, "Team Select" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x10, DEF_STR( On ) ) - PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) //??? something to do with cocktail mode? + PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) /*??? something to do with cocktail mode? */ PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) @@ -3857,7 +3866,7 @@ static MACHINE_DRIVER_START( mjleague ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( passsht ) ROM_REGION( 0x20000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr11871.a4", 0x000000, 0x10000, CRC(0f9ccea5) SHA1(515a2721a35332df0303f4b9616122194b5c7170) ) @@ -3940,11 +3949,11 @@ static MEMORY_READ16_START( passsht_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41004, 0xc41005, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41004, 0xc41005, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -3975,22 +3984,22 @@ static READ16_HANDLER( passht4b_service_r ){ passht4b_io1_val=0xff; - // player 1 buttons + /* player 1 buttons */ if(!(readinputport(0) & 0x10)) passht4b_io1_val &=0xfe; if(!(readinputport(0) & 0x20)) passht4b_io1_val &=0xfd; if(!(readinputport(0) & 0x80)) passht4b_io1_val &=0xfc; - // player 2 buttons + /* player 2 buttons */ if(!(readinputport(1) & 0x10)) passht4b_io1_val &=0xfb; if(!(readinputport(1) & 0x20)) passht4b_io1_val &=0xf7; if(!(readinputport(1) & 0x80)) passht4b_io1_val &=0xf3; - // player 3 buttons + /* player 3 buttons */ if(!(readinputport(5) & 0x10)) passht4b_io1_val &=0xef; if(!(readinputport(5) & 0x20)) passht4b_io1_val &=0xdf; if(!(readinputport(5) & 0x80)) passht4b_io1_val &=0xcf; - // player 4 buttons + /* player 4 buttons */ if(!(readinputport(6) & 0x10)) passht4b_io1_val &=0xbf; if(!(readinputport(6) & 0x20)) passht4b_io1_val &=0x7f; if(!(readinputport(6) & 0x80)) passht4b_io1_val &=0x3f; @@ -4012,12 +4021,12 @@ static MEMORY_READ16_START( passht4b_readmem ) { 0xc41002, 0xc41003, passht4b_io1_r }, { 0xc41004, 0xc41005, passht4b_io2_r }, { 0xc41006, 0xc41007, passht4b_io3_r }, - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 - { 0xc43000, 0xc43001, input_port_0_word_r },// player1 // test mode only - { 0xc43002, 0xc43003, input_port_1_word_r }, // player2 - { 0xc43004, 0xc43005, input_port_5_word_r }, // player3 - { 0xc43006, 0xc43007, input_port_6_word_r }, // player4 + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ + { 0xc43000, 0xc43001, input_port_0_word_r },/* player1 test mode only */ + { 0xc43002, 0xc43003, input_port_1_word_r }, /* player2 */ + { 0xc43004, 0xc43005, input_port_5_word_r }, /* player3 */ + { 0xc43006, 0xc43007, input_port_6_word_r }, /* player4 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -4053,11 +4062,11 @@ static MEMORY_WRITE_START(passht4b_writemem_sound ) MEMORY_END static PORT_READ_START( passht4b_read_sound_port ) -// ADDRESS_MAP_GLOBAL_MASK(0xff) +/* ADDRESS_MAP_GLOBAL_MASK(0xff) */ PORT_END static PORT_WRITE_START( passht4b_write_sound_port ) -// ADDRESS_MAP_GLOBAL_MASK(0xff) +/* ADDRESS_MAP_GLOBAL_MASK(0xff) */ PORT_END /***************************************************************************/ @@ -4086,7 +4095,7 @@ static MACHINE_INIT( passsht ){ sys16_sprxoffset = -0x48; sys16_spritesystem = sys16_sprite_passshot; - // fix name entry + /* fix name entry */ sys16_patch_code( 0x13a8,0xc0); sys16_update_proc = passsht_update_proc; @@ -4095,7 +4104,7 @@ static MACHINE_INIT( passsht ){ static MACHINE_INIT( passht4b ){ sys16_spritesystem = sys16_sprite_passshot; - // fix name entry + /* fix name entry */ sys16_patch_code( 0x138a,0xc0); sys16_update_proc = passht4b_update_proc; @@ -4285,7 +4294,7 @@ static MACHINE_DRIVER_START( passht4b ) MACHINE_DRIVER_END /***************************************************************************/ -// pre16 +/* pre16 */ ROM_START( quartet ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr7458a.9b", 0x000000, 0x8000, CRC(42e7b23e) SHA1(9df3b1b915723f9a927ef03d80ae7983a8c91a21) ) @@ -4377,13 +4386,13 @@ static MEMORY_READ16_START( quartet_readmem ) { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, { 0xc40002, 0xc40003, sys16_coinctrl_r }, - { 0xc41000, 0xc41001, input_port_0_word_r },// p1 - { 0xc41002, 0xc41003, input_port_1_word_r }, // p2 - { 0xc41004, 0xc41005, input_port_2_word_r }, // p3 - { 0xc41006, 0xc41007, input_port_3_word_r }, // p4 - { 0xc42000, 0xc42001, input_port_3_word_r },// dip1 - { 0xc42002, 0xc42003, input_port_5_word_r }, // dip2 -// { 0xffc800, 0xffc801, quartet_skip_r }, + { 0xc41000, 0xc41001, input_port_0_word_r },/* p1 */ + { 0xc41002, 0xc41003, input_port_1_word_r }, /* p2 */ + { 0xc41004, 0xc41005, input_port_2_word_r }, /* p3 */ + { 0xc41006, 0xc41007, input_port_3_word_r }, /* p4 */ + { 0xc42000, 0xc42001, input_port_3_word_r },/* dip1 */ + { 0xc42002, 0xc42003, input_port_5_word_r }, /* dip2 */ +/* { 0xffc800, 0xffc801, quartet_skip_r }, */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -4409,10 +4418,10 @@ static void quartet_update_proc( void ) sys16_fg_scrollx = sys16_workingram[0x0d14/2] & 0x01ff; sys16_bg_scrollx = sys16_workingram[0x0d18/2] & 0x01ff; -//let's fix this properly -// if(((*(UINT16 *)(&sys16_extraram[4])) & 0xff) == 1) -// sys16_quartet_title_kludge=1; -// else +/*let's fix this properly */ +/* if(((*(UINT16 *)(&sys16_extraram[4])) & 0xff) == 1) */ +/* sys16_quartet_title_kludge=1; */ +/* else */ sys16_quartet_title_kludge=0; } @@ -4428,7 +4437,7 @@ static MACHINE_INIT( quartet ){ /***************************************************************************/ INPUT_PORTS_START( quartet ) - // Player 1 + /* Player 1 */ PORT_START PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN | IPF_8WAY ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP | IPF_8WAY ) @@ -4439,7 +4448,7 @@ INPUT_PORTS_START( quartet ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* player 1 coin 2 really */ - // Player 2 + /* Player 2 */ PORT_START PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN | IPF_8WAY | IPF_PLAYER2 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP | IPF_8WAY | IPF_PLAYER2 ) @@ -4450,7 +4459,7 @@ INPUT_PORTS_START( quartet ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 | IPF_PLAYER2) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* player 2 coin 2 really */ - // Player 3 + /* Player 3 */ PORT_START PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN | IPF_8WAY | IPF_PLAYER3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP | IPF_8WAY | IPF_PLAYER3 ) @@ -4461,7 +4470,7 @@ INPUT_PORTS_START( quartet ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 | IPF_PLAYER3 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* player 3 coin 2 really */ - // Player 4 + /* Player 4 */ PORT_START PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN | IPF_8WAY | IPF_PLAYER4 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP | IPF_8WAY | IPF_PLAYER4 ) @@ -4511,7 +4520,7 @@ static MACHINE_DRIVER_START( quartet ) MACHINE_DRIVER_END /***************************************************************************/ -// pre16 +/* pre16 */ ROM_START( quartet2 ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "quartet2.b9", 0x000000, 0x8000, CRC(67177cd8) SHA1(c4ea001dfbeeb29a09d597fb50d71f54e4e9572a) ) @@ -4602,12 +4611,12 @@ static MEMORY_READ16_START( quartet2_readmem ) { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, { 0xc40002, 0xc40003, sys16_coinctrl_r }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_3_word_r },// dip1 - { 0xc42002, 0xc42003, input_port_4_word_r }, // dip2 -// { 0xffc800, 0xffc801, quartet2_skip_r }, + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_3_word_r },/* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r }, /* dip2 */ +/* { 0xffc800, 0xffc801, quartet2_skip_r }, */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -4684,7 +4693,7 @@ MACHINE_DRIVER_END Riot City ***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( riotcity ) ROM_REGION( 0xc0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr14612.bin", 0x000000, 0x20000, CRC(a1b331ec) SHA1(49136ffed35ecc9e5e9a6ea7acbe534e6ccc9dd8) ) @@ -4725,11 +4734,11 @@ static MEMORY_READ16_START( riotcity_readmem ) { 0x000000, 0x0bffff, MRA16_ROM }, { 0xf40000, 0xf40fff, SYS16_MRA16_SPRITERAM }, { 0xf60000, 0xf60fff, SYS16_MRA16_PALETTERAM }, - { 0xf81002, 0xf81003, input_port_0_word_r }, // player1 - { 0xf81006, 0xf81007, input_port_1_word_r }, // player2 - { 0xf81000, 0xf81001, input_port_2_word_r }, // service - { 0xf82002, 0xf82003, input_port_3_word_r }, // dip1 - { 0xf82000, 0xf82001, input_port_4_word_r }, // dip2 + { 0xf81002, 0xf81003, input_port_0_word_r }, /* player1 */ + { 0xf81006, 0xf81007, input_port_1_word_r }, /* player2 */ + { 0xf81000, 0xf81001, input_port_2_word_r }, /* service */ + { 0xf82002, 0xf82003, input_port_3_word_r }, /* dip1 */ + { 0xf82000, 0xf82001, input_port_4_word_r }, /* dip2 */ { 0xfa0000, 0xfaffff, SYS16_MRA16_TILERAM }, { 0xfb0000, 0xfb0fff, SYS16_MRA16_TEXTRAM }, { 0xffecde, 0xffecdf, riotcity_skip_r }, @@ -4739,7 +4748,7 @@ MEMORY_END static MEMORY_WRITE16_START( riotcity_writemem ) { 0x000000, 0x0bffff, MWA16_ROM }, { 0xf00006, 0xf00007, sound_command_w }, - { 0xf00020, 0xf0003f, MWA16_NOP }, // config regs + { 0xf00020, 0xf0003f, MWA16_NOP }, /* config regs */ { 0xf20000, 0xf2ffff, sys16_tilebank_w }, { 0xf40000, 0xf40fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0xf60000, 0xf60fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, @@ -4812,7 +4821,7 @@ MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( sdi ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "a4.rom", 0x000000, 0x8000, CRC(f2c41dd6) SHA1(7fdbf819e42c7af0efe3976ffd919ee142efe1bc) ) @@ -4839,10 +4848,10 @@ ROM_START( sdi ) ROM_LOAD( "a7.rom", 0x0000, 0x8000, CRC(793f9f7f) SHA1(9e4fde376db9e99a83eb2fc734c6721c122ba9af) ) ROM_END -// sys16A +/* sys16A */ ROM_START( sdioj ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ -// Custom cpu 317-0027 +/* Custom cpu 317-0027 */ ROM_LOAD16_BYTE( "epr10970.43", 0x000000, 0x8000, CRC(b8fa4a2c) SHA1(06b448bbee0a2b2809d9af7a2a22c5847343c079) ) ROM_LOAD16_BYTE( "epr10968.26", 0x000001, 0x8000, CRC(a3f97793) SHA1(0f924fae0d13b3387a0e5171482f6d413432ddb3) ) ROM_LOAD16_BYTE( "epr10971.42", 0x010000, 0x8000, CRC(c44a0328) SHA1(3736bb83e728bb0e15ea58bc2a6c2fe66a1a4885) ) @@ -4887,17 +4896,17 @@ static MEMORY_READ16_START( sdi_readmem ) { 0x410000, 0x411fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41004, 0xc41005, input_port_0_word_r },// player1 - { 0xc41002, 0xc41003, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42004, 0xc42005, input_port_4_word_r }, // dip2 + { 0xc41004, 0xc41005, input_port_0_word_r },/* player1 */ + { 0xc41002, 0xc41003, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42004, 0xc42005, input_port_4_word_r }, /* dip2 */ { 0xc43000, 0xc43001, io_p1mousex_r }, { 0xc43004, 0xc43005, io_p1mousey_r }, { 0xc43008, 0xc43009, io_p2mousex_r }, { 0xc4300c, 0xc4300d, io_p2mousey_r }, -// { 0xc42000, 0xc42001, MRA16_NOP }, /* What is this? */ +/* { 0xc42000, 0xc42001, MRA16_NOP }, /* What is this? */ { 0xc60000, 0xc60001, MRA16_NOP }, /* What is this? */ { 0xffc400, 0xffc401, sdi_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, @@ -5016,7 +5025,7 @@ MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( shinobi ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "shinobi.a4", 0x00000, 0x10000, CRC(b930399d) SHA1(955ff2948e1990463631b0bc5c7f5275384236cc) ) @@ -5047,7 +5056,7 @@ ROM_END ROM_START( shinobib ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ -// Custom cpu 317-0049 +/* Custom cpu 317-0049 */ ROM_LOAD16_BYTE( "epr11282", 0x00000, 0x10000, CRC(5f2e5524) SHA1(9e5fcabb95abbe6c8178e82f4971abdbc92bff73) ) ROM_LOAD16_BYTE( "epr11280", 0x00001, 0x10000, CRC(bdfe5c38) SHA1(65f537e38b74c66576d57c770d182dc13302cca6) ) ROM_LOAD16_BYTE( "epr11283", 0x20000, 0x10000, CRC(9d46e707) SHA1(37ab25b3b37365c9f45837bfb6ec80652691dd4c) ) @@ -5088,11 +5097,11 @@ static MEMORY_READ16_START( shinobi_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r },// dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r },/* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xc43000, 0xc43001, MRA16_NOP }, { 0xfff01c, 0xfff01d, shinobi_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, @@ -5170,10 +5179,10 @@ static MACHINE_DRIVER_START( shinobi ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16A +/* sys16A */ ROM_START( shinobia ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ -// custom cpu 317-0050 +/* custom cpu 317-0050 */ ROM_LOAD16_BYTE( "epr11262.42", 0x000000, 0x10000, CRC(d4b8df12) SHA1(64bfa2dd8a3d99728d9eeb114887272d9590d0b8) ) ROM_LOAD16_BYTE( "epr11260.27", 0x000001, 0x10000, CRC(2835c95d) SHA1(b5b42af265d3a16183e02d58b053ec2894072679) ) ROM_LOAD16_BYTE( "epr11263.43", 0x020000, 0x10000, CRC(a2a620bd) SHA1(f8b135ce14d6c5eac5e40ddfd5ad2f1e6f2bc7a6) ) @@ -5207,17 +5216,17 @@ ROM_END ROM_START( shinobl ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ -// Star Bootleg +/* Star Bootleg */ ROM_LOAD16_BYTE( "b3", 0x000000, 0x10000, CRC(38e59646) SHA1(6a13015a93260ab99811b95950bb122eade01c27) ) ROM_LOAD16_BYTE( "b1", 0x000001, 0x10000, CRC(8529d192) SHA1(202b912d20a2d82abe055b4a5e8c509ab7d69ff8) ) ROM_LOAD16_BYTE( "epr11263.43", 0x020000, 0x10000, CRC(a2a620bd) SHA1(f8b135ce14d6c5eac5e40ddfd5ad2f1e6f2bc7a6) ) ROM_LOAD16_BYTE( "epr11261.25", 0x020001, 0x10000, CRC(a3ceda52) SHA1(97a1c52a162fb1d43b3f8f16613b70ce582a8d26) ) -// Beta Bootleg -// ROM_LOAD16_BYTE( "4", 0x000000, 0x10000, CRC(c178a39c) ) -// ROM_LOAD16_BYTE( "2", 0x000001, 0x10000, CRC(5ad8ebf2) ) -// ROM_LOAD16_BYTE( "epr11263.43", 0x020000, 0x10000, CRC(a2a620bd) SHA1(f8b135ce14d6c5eac5e40ddfd5ad2f1e6f2bc7a6) ) -// ROM_LOAD16_BYTE( "epr11261.25", 0x020001, 0x10000, CRC(a3ceda52) SHA1(97a1c52a162fb1d43b3f8f16613b70ce582a8d26) ) +/* Beta Bootleg */ +/* ROM_LOAD16_BYTE( "4", 0x000000, 0x10000, CRC(c178a39c) ) */ +/* ROM_LOAD16_BYTE( "2", 0x000001, 0x10000, CRC(5ad8ebf2) ) */ +/* ROM_LOAD16_BYTE( "epr11263.43", 0x020000, 0x10000, CRC(a2a620bd) SHA1(f8b135ce14d6c5eac5e40ddfd5ad2f1e6f2bc7a6) ) */ +/* ROM_LOAD16_BYTE( "epr11261.25", 0x020001, 0x10000, CRC(a3ceda52) SHA1(97a1c52a162fb1d43b3f8f16613b70ce582a8d26) ) */ ROM_REGION( 0x30000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */ ROM_LOAD( "epr11264.95", 0x00000, 0x10000, CRC(46627e7d) SHA1(66bb5b22a2100e7b9df303007a837bc2d52cf7ba) ) @@ -5232,8 +5241,8 @@ ROM_START( shinobl ) ROM_LOAD16_BYTE( "epr11292.23", 0x40001, 0x10000, CRC(c29ac34e) SHA1(b5e9b8c3233a7d6797f91531a0d9123febcf1660) ) ROM_LOAD16_BYTE( "epr11296.24", 0x40000, 0x10000, CRC(04a437f8) SHA1(ea5fed64443236e3404fab243761e60e2e48c84c) ) ROM_LOAD16_BYTE( "epr11293.29", 0x60001, 0x10000, CRC(41f41063) SHA1(5cc461e9738dddf9eea06831fce3702d94674163) ) -// ROM_LOAD16_BYTE( "epr11297.30", 0x60000, 0x10000, CRC(b6e1fd72) SHA1(eb86e4bf880bd1a1d9bcab3f2f2e917bcaa06172) ) - ROM_LOAD16_BYTE( "b17", 0x60000, 0x10000, CRC(0315cf42) SHA1(2d129171aece883cb9c2805f894b3867ec98332b) ) // Beta bootleg uses the rom above. +/* ROM_LOAD16_BYTE( "epr11297.30", 0x60000, 0x10000, CRC(b6e1fd72) SHA1(eb86e4bf880bd1a1d9bcab3f2f2e917bcaa06172) ) */ + ROM_LOAD16_BYTE( "b17", 0x60000, 0x10000, CRC(0315cf42) SHA1(2d129171aece883cb9c2805f894b3867ec98332b) ) /* Beta bootleg uses the rom above. */ ROM_REGION( 0x20000, REGION_CPU2, 0 ) /* sound CPU */ ROM_LOAD( "epr11267.12", 0x0000, 0x8000, CRC(dd50b745) SHA1(52e1977569d3713ad864d607170c9a61cd059a65) ) @@ -5253,11 +5262,11 @@ static MEMORY_READ16_START( shinobl_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42000, 0xc42001, input_port_3_word_r }, // dip1 - { 0xc42002, 0xc42003, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42000, 0xc42001, input_port_3_word_r }, /* dip1 */ + { 0xc42002, 0xc42003, input_port_4_word_r }, /* dip2 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -5311,11 +5320,11 @@ static MEMORY_READ16_START( sonicbom_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -5325,22 +5334,22 @@ static MEMORY_WRITE16_START( sonicbom_writemem ) { 0x410000, 0x410fff, SYS16_MWA16_TEXTRAM, &sys16_textram }, { 0x440000, 0x440fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x840000, 0x840fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, - { 0x123406, 0x123407, sound_command_w }, // sonicbom - { 0xfe0006, 0xfe0007, sound_command_w }, // tetris + { 0x123406, 0x123407, sound_command_w }, /* sonicbom */ + { 0xfe0006, 0xfe0007, sound_command_w }, /* tetris */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END static MACHINE_INIT( sonicbom ) { -// fd1094_machine_init(); using the decrypted version -// sys16_sprxoffset = -0x40; +/* fd1094_machine_init(); using the decrypted version */ +/* sys16_sprxoffset = -0x40; */ sys16_update_proc = type0_sys16_textram; } static DRIVER_INIT( sonicbom ) { - //fd1094_driver_init(0x0053); using the decrypted version + /*fd1094_driver_init(0x0053); using the decrypted version */ } @@ -5400,14 +5409,14 @@ ROM_START( sonicbom ) ROM_LOAD( "opr11346.b11", 0x20000, 0x10000, CRC(e5ada66c) SHA1(7e8e34ea909848d0d1b1fcccf628bf9ec169ae9b) ) ROM_REGION( 0x100000, REGION_GFX2, ROMREGION_ERASE00 ) /* sprites */ - ROM_LOAD16_BYTE( "opr11352.b3", 0x60001, 0x010000, CRC(047fa4b0) SHA1(d6c6f920a71db7734000cb64f3001145c4e05c6e) ) // | - ROM_LOAD16_BYTE( "opr11356.b7", 0x60000, 0x010000, CRC(aea3c39d) SHA1(2a4f01463b3f29c8d6858c3e99ef70ac548598b4) ) // \Guns on desert floor (2nd attract level) - ROM_LOAD16_BYTE( "opr11351.b2", 0xa0001, 0x010000, CRC(63b1f1ca) SHA1(1f19a3af099d4a6ad196968b0a3c17a11384e474) ) // | - ROM_LOAD16_BYTE( "opr11355.b6", 0xa0000, 0x010000, CRC(fe0fa332) SHA1(15ea820f87399e35b798969d3800614701a61161) ) // \Turrets on buildings (1st attract level) - ROM_LOAD16_BYTE( "opr11350.b1", 0xc0001, 0x010000, CRC(525ba1df) SHA1(e35487c8bf4009a767e54258d9a55056d13ba02a) ) // | - ROM_LOAD16_BYTE( "opr11354.b5", 0xc0000, 0x010000, CRC(793fa3ac) SHA1(14d5a71667b4745d5b556cc15334dd9bff8de93f) ) // \Title Logo, Player Ship - ROM_LOAD16_BYTE( "opr11353.b4", 0xe0001, 0x010000, CRC(4e0791f8) SHA1(3278bfd478a2fdbcf2d641268c9ca4ccd5a5bd2f) ) // | - ROM_LOAD16_BYTE( "opr11357.b8", 0xe0000, 0x010000, CRC(a7c5ea41) SHA1(405e6ebd2cff22179de70fd31fae5ff967fbaf63) ) // \Player Bullets etc. + ROM_LOAD16_BYTE( "opr11352.b3", 0x60001, 0x010000, CRC(047fa4b0) SHA1(d6c6f920a71db7734000cb64f3001145c4e05c6e) ) /* | */ + ROM_LOAD16_BYTE( "opr11356.b7", 0x60000, 0x010000, CRC(aea3c39d) SHA1(2a4f01463b3f29c8d6858c3e99ef70ac548598b4) ) /* \Guns on desert floor (2nd attract level) */ + ROM_LOAD16_BYTE( "opr11351.b2", 0xa0001, 0x010000, CRC(63b1f1ca) SHA1(1f19a3af099d4a6ad196968b0a3c17a11384e474) ) /* | */ + ROM_LOAD16_BYTE( "opr11355.b6", 0xa0000, 0x010000, CRC(fe0fa332) SHA1(15ea820f87399e35b798969d3800614701a61161) ) /* \Turrets on buildings (1st attract level) */ + ROM_LOAD16_BYTE( "opr11350.b1", 0xc0001, 0x010000, CRC(525ba1df) SHA1(e35487c8bf4009a767e54258d9a55056d13ba02a) ) /* | */ + ROM_LOAD16_BYTE( "opr11354.b5", 0xc0000, 0x010000, CRC(793fa3ac) SHA1(14d5a71667b4745d5b556cc15334dd9bff8de93f) ) /* \Title Logo, Player Ship */ + ROM_LOAD16_BYTE( "opr11353.b4", 0xe0001, 0x010000, CRC(4e0791f8) SHA1(3278bfd478a2fdbcf2d641268c9ca4ccd5a5bd2f) ) /* | */ + ROM_LOAD16_BYTE( "opr11357.b8", 0xe0000, 0x010000, CRC(a7c5ea41) SHA1(405e6ebd2cff22179de70fd31fae5ff967fbaf63) ) /* \Player Bullets etc. */ ROM_REGION( 0x30000, REGION_CPU2, 0 ) /* sound CPU */ ROM_LOAD( "epr11347.a7", 0x00000, 0x8000, CRC(b41f0ced) SHA1(946b58c0f5b4541fac93add065916319302fe5e0) ) @@ -5415,7 +5424,7 @@ ROM_START( sonicbom ) ROM_LOAD( "epr11349.a9", 0x20000, 0x8000, CRC(8e4b6204) SHA1(ec0a2812b4726b5ff236f2fbb63fd2dd13cf4935) ) ROM_END -// sys16A custom +/* sys16A custom */ ROM_START( tetris ) ROM_REGION( 0x020000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr12201.rom", 0x000000, 0x8000, CRC(338e9b51) SHA1(f56a1124c963d4ad72a806b26f9aa906aaa37d2b) ) @@ -5434,7 +5443,7 @@ ROM_START( tetris ) ROM_LOAD( "epr12205.rom", 0x0000, 0x8000, CRC(6695dc99) SHA1(08123aa24c302bc9243329384bd9c2545a4d50c3) ) ROM_END -// sys16B +/* sys16B */ ROM_START( tetrisbl ) ROM_REGION( 0x020000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "rom2.bin", 0x000000, 0x10000, CRC(4d165c38) SHA1(04706b1977ae18bd09bafaf8ea65f8e5f32e04b8) ) @@ -5453,10 +5462,10 @@ ROM_START( tetrisbl ) ROM_LOAD( "s-prog.rom", 0x0000, 0x8000, CRC(bd9ba01b) SHA1(fafa7dc36cc057a50ae4cdf7a35f3594292336f4) ) ROM_END -// sys16B +/* sys16B */ ROM_START( tetrisa ) ROM_REGION( 0x020000, REGION_CPU1, 0 ) /* 68000 code */ -// Custom Cpu 317-0092 +/* Custom Cpu 317-0092 */ ROM_LOAD16_BYTE( "tetris.a7", 0x000000, 0x10000, CRC(9ce15ac9) SHA1(0fdbd3ca37e4c0efa7c66415714bfc10637ced6c) ) ROM_LOAD16_BYTE( "tetris.a5", 0x000001, 0x10000, CRC(98d590ca) SHA1(4d18409c0b5734d0adcea5646d13f65b687dd05d) ) @@ -5482,11 +5491,11 @@ static MEMORY_READ16_START( tetris_readmem ) { 0x418000, 0x41803f, SYS16_MRA16_EXTRAM2 }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xc80000, 0xc80001, MRA16_NOP }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -5540,9 +5549,9 @@ PORT_START /* DSW1 */ PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x02, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Unknown ) ) // from the code it looks like some kind of difficulty - PORT_DIPSETTING( 0x0c, "A" ) // level, but all 4 levels points to the same place - PORT_DIPSETTING( 0x08, "B" ) // so it doesn't actually change anything!! + PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Unknown ) ) /* from the code it looks like some kind of difficulty */ + PORT_DIPSETTING( 0x0c, "A" ) /* level, but all 4 levels points to the same place */ + PORT_DIPSETTING( 0x08, "B" ) /* so it doesn't actually change anything!! */ PORT_DIPSETTING( 0x04, "C" ) PORT_DIPSETTING( 0x00, "D" ) PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) @@ -5571,7 +5580,7 @@ static MACHINE_DRIVER_START( tetris ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( timscanr ) ROM_REGION( 0x030000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "ts10853.bin", 0x00000, 0x8000, CRC(24d7c5fb) SHA1(b1796e77cf968f9bdae7a47c5c02b93aaec10ade) ) @@ -5614,12 +5623,12 @@ static MEMORY_READ16_START( timscanr_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r },// player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r },// dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 - { 0xc41004, 0xc41005, input_port_5_word_r }, // dip3 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r },/* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r },/* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ + { 0xc41004, 0xc41005, input_port_5_word_r }, /* dip3 */ { 0xffc00c, 0xffc00d, timscanr_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -5661,7 +5670,7 @@ INPUT_PORTS_START( timscanr ) SYS16_COINAGE PORT_START /* DSW2 */ - PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) //?? + PORT_DIPNAME( 0x01, 0x00, DEF_STR( Cabinet ) ) /*?? */ PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x01, DEF_STR( Cocktail ) ) PORT_DIPNAME( 0x1e, 0x14, "Bonus" ) @@ -5693,7 +5702,7 @@ PORT_START /* DSW2 */ PORT_DIPSETTING( 0x00, "5" ) PORT_START /* DSW3 */ - PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) //?? + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) /*?? */ PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) ) @@ -5733,7 +5742,7 @@ MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( toryumon ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "17689", 0x00000, 0x20000, CRC(4f0dee19) SHA1(efb5bf29e27029e9ea3fdd57ad7af54b4e1e9a97) ) @@ -5768,12 +5777,12 @@ static MEMORY_READ16_START( toryumon_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xe41002, 0xe41003, input_port_0_word_r }, // player1 + { 0xe41002, 0xe41003, input_port_0_word_r }, /* player1 */ { 0xe41004, 0xe41005, MRA16_NOP }, - { 0xe41006, 0xe41007, input_port_1_word_r }, // player2 - { 0xe41000, 0xe41001, input_port_2_word_r }, // service - { 0xe42002, 0xe42003, input_port_3_word_r }, // dip1 - { 0xe42000, 0xe42001, input_port_4_word_r }, // dip2 + { 0xe41006, 0xe41007, input_port_1_word_r }, /* player2 */ + { 0xe41000, 0xe41001, input_port_2_word_r }, /* service */ + { 0xe42002, 0xe42003, input_port_3_word_r }, /* dip1 */ + { 0xe42000, 0xe42001, input_port_4_word_r }, /* dip2 */ { 0xff0000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -5787,7 +5796,7 @@ static MEMORY_WRITE16_START( toryumon_writemem ) { 0xe40000, 0xe40001, sys16_coinctrl_w }, { 0xe43000, 0xe43fff, MWA16_NOP }, { 0xfe0006, 0xfe0007, sound_command_w }, - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xff0000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -5846,7 +5855,7 @@ MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( tturf ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "12327.7a", 0x00000, 0x20000, CRC(0376c593) SHA1(3057828b16ee3b7cbb57a76047eecf74d1d8b465) ) @@ -5869,13 +5878,13 @@ ROM_START( tturf ) ROM_REGION( 0x50000, REGION_CPU2, 0 ) /* sound CPU */ ROM_LOAD( "epr-12328.a10", 0x00000, 0x08000, CRC(13a346de) SHA1(4e8cb12b7936c4c5d8ebc9ba563099ac2056ee60) ) - ROM_LOAD( "12329.11a", 0x10000, 0x10000, CRC(ed9a686d) SHA1(da433033d501ee871429ee676b3972b14179df9f) ) // speech - // note: it needs this hole otherwise voice samples won't playback + ROM_LOAD( "12329.11a", 0x10000, 0x10000, CRC(ed9a686d) SHA1(da433033d501ee871429ee676b3972b14179df9f) ) /* speech */ + /* note: it needs this hole otherwise voice samples won't playback */ ROM_LOAD( "12330.12a", 0x30000, 0x10000, CRC(fb762bca) SHA1(ff9191c5ec38c711ebb7c2ad043f62b6d7e2203c) ) ROM_END -// sys16B +/* sys16B */ ROM_START( tturfu ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr12266.bin", 0x00000, 0x10000, CRC(f549def8) SHA1(9e913509d46274bd192455321904ec9884b5f629) ) @@ -5922,8 +5931,8 @@ static MEMORY_READ16_START( tturf_readmem ) { 0x400000, 0x40ffff, SYS16_MRA16_TILERAM }, { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x500000, 0x500fff, SYS16_MRA16_PALETTERAM }, - { 0x602002, 0x602003, input_port_3_word_r }, // dip1 - { 0x602000, 0x602001, input_port_4_word_r }, // dip2 + { 0x602002, 0x602003, input_port_3_word_r }, /* dip1 */ + { 0x602000, 0x602001, input_port_4_word_r }, /* dip2 */ MEMORY_END static MEMORY_WRITE16_START( tturf_writemem ) @@ -5934,7 +5943,7 @@ static MEMORY_WRITE16_START( tturf_writemem ) { 0x410000, 0x410fff, SYS16_MWA16_TEXTRAM, &sys16_textram }, { 0x500000, 0x500fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, { 0x600000, 0x600001, sys16_coinctrl_w }, - { 0xff0020, 0xff003f, MWA16_NOP }, // config regs + { 0xff0020, 0xff003f, MWA16_NOP }, /* config regs */ MEMORY_END /***************************************************************************/ @@ -6078,7 +6087,7 @@ static MACHINE_DRIVER_START( tturfu ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( tturfbl ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "tt042197.rom", 0x00000, 0x10000, CRC(deee5af1) SHA1(0caba775021dc7e28ac6b7af8eac4f49d3102c83) ) @@ -6118,13 +6127,13 @@ static MEMORY_READ16_START( tturfbl_readmem ) { 0x400000, 0x40ffff, SYS16_MRA16_TILERAM }, { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x500000, 0x500fff, SYS16_MRA16_PALETTERAM }, - { 0x600002, 0x600003, input_port_3_word_r }, // dip1 - { 0x600000, 0x600001, input_port_4_word_r }, // dip2 - { 0x601002, 0x601003, input_port_0_word_r }, // player1 - { 0x601004, 0x601005, input_port_1_word_r }, // player2 - { 0x601000, 0x601001, input_port_2_word_r }, // service - { 0x602002, 0x602003, input_port_3_word_r }, // dip1 - { 0x602000, 0x602001, input_port_4_word_r }, // dip2 + { 0x600002, 0x600003, input_port_3_word_r }, /* dip1 */ + { 0x600000, 0x600001, input_port_4_word_r }, /* dip2 */ + { 0x601002, 0x601003, input_port_0_word_r }, /* player1 */ + { 0x601004, 0x601005, input_port_1_word_r }, /* player2 */ + { 0x601000, 0x601001, input_port_2_word_r }, /* service */ + { 0x602002, 0x602003, input_port_3_word_r }, /* dip1 */ + { 0x602000, 0x602001, input_port_4_word_r }, /* dip2 */ { 0xc46000, 0xc4601f, SYS16_MRA16_EXTRAM3 }, MEMORY_END @@ -6139,7 +6148,7 @@ static MEMORY_WRITE16_START( tturfbl_writemem ) { 0x600006, 0x600007, sound_command_w }, { 0xc44000, 0xc44001, MWA16_NOP }, { 0xc46000, 0xc4601f, SYS16_MWA16_EXTRAM3, &sys16_extraram3 }, - { 0xff0020, 0xff003f, MWA16_NOP }, // config regs + { 0xff0020, 0xff003f, MWA16_NOP }, /* config regs */ MEMORY_END /***************************************************************************/ @@ -6197,7 +6206,7 @@ static DRIVER_INIT( tturfbl ) } /***************************************************************************/ -// sound ?? +/* sound ?? */ static MACHINE_DRIVER_START( tturfbl ) /* basic machine hardware */ @@ -6218,7 +6227,7 @@ MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( wb3 ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr12259.a7", 0x000000, 0x20000, CRC(54927c7e) SHA1(09a4c25b40aba2056c79b5c2e6e8cb7e6c05bc16) ) @@ -6245,7 +6254,7 @@ ROM_END ROM_START( wb3a ) ROM_REGION( 0x40000, REGION_CPU1, 0 ) /* 68000 code */ -// Custom CPU 317-0089 +/* Custom CPU 317-0089 */ ROM_LOAD16_BYTE( "epr12137.a7", 0x000000, 0x20000, CRC(6f81238e) SHA1(b578165c1624f8a112e9eea098fb4551cc38faa1) ) ROM_LOAD16_BYTE( "epr12136.a5", 0x000001, 0x20000, CRC(4cf05003) SHA1(bd4c64c327e53143aa94062f91946eda0a7146c2) ) @@ -6276,11 +6285,11 @@ static MEMORY_READ16_START( wb3_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -6337,7 +6346,7 @@ PORT_START /* DSW1 */ PORT_DIPSETTING( 0x0c, "3" ) PORT_DIPSETTING( 0x08, "4" ) PORT_DIPSETTING( 0x04, "5" ) - PORT_DIPNAME( 0x10, 0x10, DEF_STR( Bonus_Life ) ) //?? + PORT_DIPNAME( 0x10, 0x10, DEF_STR( Bonus_Life ) ) /*?? */ PORT_DIPSETTING( 0x10, "5000/10000/18000/30000" ) PORT_DIPSETTING( 0x00, "5000/15000/30000" ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) @@ -6345,7 +6354,7 @@ PORT_START /* DSW1 */ PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x40, 0x40, "Allow Round Select" ) PORT_DIPSETTING( 0x40, DEF_STR( No ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) // no collision though + PORT_DIPSETTING( 0x00, DEF_STR( Yes ) ) /* no collision though */ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -6364,7 +6373,7 @@ static MACHINE_DRIVER_START( wb3 ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( wb3bl ) ROM_REGION( 0x040000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "wb3_03", 0x000000, 0x10000, CRC(0019ab3b) SHA1(89d49a437690fa6e0c35bb9f1450042f89504714) ) @@ -6399,11 +6408,11 @@ static MEMORY_READ16_START( wb3bl_readmem ) { 0x410000, 0x410fff, SYS16_MRA16_TEXTRAM }, { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41004, 0xc41005, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41004, 0xc41005, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xc46000, 0xc4601f, SYS16_MRA16_EXTRAM3 }, { 0xff0000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -6495,7 +6504,7 @@ static MACHINE_DRIVER_START( wb3bl ) MACHINE_DRIVER_END /***************************************************************************/ -// sys16B +/* sys16B */ ROM_START( wrestwar ) ROM_REGION( 0xc0000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "ww.a7", 0x00000, 0x20000, CRC(eeaba126) SHA1(ca1f630ff0cfc301205d2b8226d7614eadc117b7) ) @@ -6541,10 +6550,10 @@ static MEMORY_READ16_START( wrestwar_readmem ) { 0x110000, 0x111fff, SYS16_MRA16_TEXTRAM }, { 0x200000, 0x200fff, SYS16_MRA16_SPRITERAM }, { 0x300000, 0x300fff, SYS16_MRA16_PALETTERAM }, - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41006, 0xc41007, input_port_1_word_r }, // player2 - { 0xc42002, 0xc42003, input_port_3_word_r }, // dip1 - { 0xc42000, 0xc42001, input_port_4_word_r }, // dip2 + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41006, 0xc41007, input_port_1_word_r }, /* player2 */ + { 0xc42002, 0xc42003, input_port_3_word_r }, /* dip1 */ + { 0xc42000, 0xc42001, input_port_4_word_r }, /* dip2 */ { 0xffe082, 0xffe083, ww_io_service_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -6663,11 +6672,11 @@ static MACHINE_DRIVER_START( s16dummy ) MACHINE_DRIVER_END /*****************************************************************************/ -// Cotton +/* Cotton */ ROM_START( cotton ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ -// custom cpu 317-????? +/* custom cpu 317-????? */ ROM_LOAD16_BYTE( "epr13858.a7", 0x000000, 0x20000, CRC(276f42fe) SHA1(47d2f910f6f101628cb0c660e5fd12c0e331bd99) ) ROM_LOAD16_BYTE( "epr13856.a5", 0x000001, 0x20000, CRC(14e6b5e7) SHA1(708c69cddd1c60e729a74f539d40e67b2a6d9d6f) ) ROM_LOAD16_BYTE( "epr13859.a8", 0x040000, 0x20000, CRC(4703ef9d) SHA1(8b03a71736a599c337ad5d95cbc812ea38b0cc43) ) @@ -6707,7 +6716,7 @@ ROM_END ROM_START( cottona ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ -// custom cpu 317-0181a +/* custom cpu 317-0181a */ ROM_LOAD16_BYTE( "ep13921a.a7", 0x000000, 0x20000, CRC(f047a037) SHA1(e4a9eeb1f2cf6b5ee3b2fcf74be917ffd3e6ca0e) ) ROM_LOAD16_BYTE( "ep13919a.a5", 0x000001, 0x20000, CRC(651108b1) SHA1(1ab32085ca1a8cb3d464059b0abb10253decd423) ) ROM_LOAD16_BYTE( "ep13922a.a8", 0x040000, 0x20000, CRC(1ca248c5) SHA1(f7df2ccf54a3f1f09334c3b3df3dcd2ec33f99d1) ) @@ -6745,7 +6754,7 @@ ROM_START( cottona ) ROM_END /*****************************************************************************/ -// MVP +/* MVP */ ROM_START( mvp ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ @@ -6773,7 +6782,7 @@ ROM_START( mvp ) ROM_END /*****************************************************************************/ -// Excite League +/* Excite League */ ROM_START( exctleag ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ @@ -6811,7 +6820,7 @@ ROM_END /*****************************************************************************/ -// Super League +/* Super League */ ROM_START( suprleag ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ @@ -6849,11 +6858,11 @@ ROM_END /*****************************************************************************/ /*****************************************************************************/ -// Ryukyu +/* Ryukyu */ ROM_START( ryukyu ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ -// cpu 317-5023 +/* cpu 317-5023 */ ROM_LOAD16_BYTE( "13347",0x00000,0x10000, CRC(398031fa) SHA1(5c118c85b7af1a83726b95bbeb85cb5020254f57) ) ROM_LOAD16_BYTE( "13348",0x00001,0x10000, CRC(5f0e0c86) SHA1(f8f5912a190d0755cc5158e2e43cceb825f95b4f) ) @@ -6875,7 +6884,7 @@ ROM_END /***************************************************************************/ -// Ace Attacker +/* Ace Attacker */ ROM_START( aceattac ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "11491.4a", 0x000000, 0x10000, CRC(77b820f1) SHA1(c33183c94c5029e2c4d6444f37404da66aacecc4) ) @@ -6921,10 +6930,10 @@ GAME( 1986, quartt2j, quartet, quartet2, quartet2, 0, ROT0, "Sega", /* System16A */ /* rom parent machine inp init */ -GAMEX(1986, afighter, 0, afighter, afighter, 0, ROT270, "Sega", "Action Fighter (FD1089A 317-0018)", GAME_NOT_WORKING ) +GAME( 1986, afighter, 0, afighter, afighter, alexkida, ROT270, "Sega", "Action Fighter (FD1089A 317-0018)" ) GAME( 1986, afightera, afighter, afighter, afighter, 0, ROT270, "Sega", "Action Fighter (unprotected)" ) -GAMEX(1986, alexkidd, 0, alexkidd, alexkidd, 0, ROT0, "Sega", "Alex Kidd: The Lost Stars (set 1)", GAME_NOT_WORKING ) -GAME( 1986, alexkida, alexkidd, alexkidd, alexkidd, 0, ROT0, "Sega", "Alex Kidd: The Lost Stars (set 2)" ) +GAME( 1986, alexkidd, 0, alexkidd, alexkidd, 0, ROT0, "Sega", "Alex Kidd: The Lost Stars (set 2, unprotected)" ) +GAME( 1986, alexkidd1, alexkidd, alexkidd, alexkidd, alexkida, ROT0, "Sega", "Alex Kidd: The Lost Stars (set 1, FD1089A 317-0021)" ) GAME( 1986, fantzone, 0, fantzone, fantzone, 0, ROT0, "Sega", "Fantasy Zone (Japan New Ver.)" ) GAME( 1986, fantzono, fantzone, fantzono, fantzone, 0, ROT0, "Sega", "Fantasy Zone (Old Ver.)" ) GAMEX(19??, ryukyu , 0, s16dummy, s16dummy, 0, ROT0, "Sega", "Ryukyu", GAME_NOT_WORKING ) @@ -6941,8 +6950,8 @@ GAMEX(1988, tetrisa, tetris, tetris, tetris, 0, ROT0, "Sega", /* System16B */ /* rom parent machine inp init */ GAMEX(19??, aceattac, 0, s16dummy, s16dummy, 0, ROT0, "Sega", "Ace Attacker", GAME_NOT_WORKING ) -GAMEX(1990, atomicp, 0, atomicp, atomicp, 0, ROT0, "Philko", "Atomic Point (Korea)", GAME_NO_SOUND ) // korean clone board.. -GAME( 1990, snapper, 0, snapper, snapper, 0, ROT0, "Philko", "Snapper (Korea)" ) // korean clone board.. +GAMEX(1990, atomicp, 0, atomicp, atomicp, 0, ROT0, "Philko", "Atomic Point (Korea)", GAME_NO_SOUND ) /* korean clone board.. */ +GAME( 1990, snapper, 0, snapper, snapper, 0, ROT0, "Philko", "Snapper (Korea)" ) /* korean clone board.. */ GAME( 1987, aliensyn, 0, aliensyn, aliensyn, aliensyn, ROT0, "Sega", "Alien Syndrome (set 1)" ) GAMEX(1987, aliensya, aliensyn, aliensyn, aliensyn, aliensyn, ROT0, "Sega", "Alien Syndrome (set 2)", GAME_NOT_WORKING ) GAMEX(1987, aliensyj, aliensyn, aliensyn, aliensyn, aliensyn, ROT0, "Sega", "Alien Syndrome (Japan)", GAME_NOT_WORKING ) diff --git a/src/drivers/system18.c b/src/drivers/system18.c index 20e5546a0..bd2d3f3b8 100644 --- a/src/drivers/system18.c +++ b/src/drivers/system18.c @@ -284,7 +284,7 @@ static MEMORY_WRITE_START( sound_writemem_18 ) /**** D/A register ****/ { 0xc000, 0xc008, RF5C68_reg_w }, { 0xd000, 0xdfff, RF5C68_w }, - { 0xe000, 0xffff, MWA_RAM }, //?? + { 0xe000, 0xffff, MWA_RAM }, /*?? */ MEMORY_END @@ -302,9 +302,9 @@ static WRITE_HANDLER( sys18_soundbank_w ) static PORT_READ_START( sound_readport_18 ) { 0x80, 0x80, YM2612_status_port_0_A_r }, -// { 0x82, 0x82, YM2612_status_port_0_B_r }, -// { 0x90, 0x90, YM2612_status_port_1_A_r }, -// { 0x92, 0x92, YM2612_status_port_1_B_r }, +/* { 0x82, 0x82, YM2612_status_port_0_B_r }, */ +/* { 0x90, 0x90, YM2612_status_port_1_A_r }, */ +/* { 0x92, 0x92, YM2612_status_port_1_B_r }, */ { 0xc0, 0xc0, soundlatch_r }, PORT_END @@ -396,14 +396,14 @@ static WRITE16_HANDLER( vdp_w ) vdp.addr = (vdp.addr & 0x3FFF) | ((data & 3) << 14); vdp.addr_latch = vdp.addr & 0xC000; - // Read-ahead for VRAM + /* Read-ahead for VRAM */ if(vdp.code == 0) { vdp.read_buffer = vdp.vram[(vdp.addr >> 1) & 0x7FFF]; vdp.addr = (vdp.addr + vdp.reg[0x0F]) & 0xFFFF; } - // Check for DMA request + /* Check for DMA request */ if((vdp.reg[1] & 0x20) && (vdp.code & 0x20)) { log_cb(RETRO_LOG_DEBUG, LOGPRE "vdp: DMA disabled in this system.\n"); @@ -471,7 +471,7 @@ static int io_reg[0x10]; void sys18_io_reset(void) { - // All output latches are reset + /* All output latches are reset */ io_reg[0x00] = 0x00; io_reg[0x01] = 0x00; io_reg[0x02] = 0x00; @@ -481,10 +481,10 @@ void sys18_io_reset(void) io_reg[0x06] = 0x00; io_reg[0x07] = 0x00; - // CNT2-0 pins reset + /* CNT2-0 pins reset */ io_reg[0x0E] = 0x00; - // All ports are inputs + /* All ports are inputs */ io_reg[0x0F] = 0x00; } @@ -650,7 +650,7 @@ static WRITE16_HANDLER( sys18_io_w ) break; case 0x3000/2: /* Expansion connector */ -// log_cb(RETRO_LOG_DEBUG, LOGPRE "write expansion area %06X = %04X (%06X)\n", offset, data, activecpu_get_pc()); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "write expansion area %06X = %04X (%06X)\n", offset, data, activecpu_get_pc()); */ break; } } @@ -683,7 +683,7 @@ static MEMORY_WRITE16_START( shdancer_writemem ) { 0xc00000, 0xc0ffff, vdp_w }, { 0xe40000, 0xe4ffff, sys18_io_w }, { 0xfe0006, 0xfe0007, sound_command_nmi_w }, - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -728,10 +728,10 @@ static DRIVER_INIT( shdancer ){ unsigned char *RAM = memory_region(REGION_CPU2); static const int shdancer_sound_info[] = { - 0x0f, 0x00000, // ROM #1 = 128K - 0x1f, 0x20000, // ROM #2 = 256K - 0x1f, 0x60000, // ROM #3 = 256K - 0x1f, 0xA0000 // ROM #4 = 256K + 0x0f, 0x00000, /* ROM #1 = 128K */ + 0x1f, 0x20000, /* ROM #2 = 256K */ + 0x1f, 0x60000, /* ROM #3 = 256K */ + 0x1f, 0xA0000 /* ROM #4 = 256K */ }; sys18_splittab_fg_x=&sys16_textram[0x0f80/2]; @@ -755,7 +755,7 @@ static READ16_HANDLER( shdancrj_skip_r ){ } static MACHINE_INIT( shdancrj ){ -// sys16_patch_code(0x6821, 0xdf); /* ? */ +/* sys16_patch_code(0x6821, 0xdf);*/ /* ? */ sys16_update_proc = shdancer_update_proc; } @@ -763,10 +763,10 @@ static DRIVER_INIT( shdancrj ){ unsigned char *RAM = memory_region(REGION_CPU2); static const int shdancrj_sound_info[] = { - 0x0f, 0x00000, // ROM #1 = 128K - 0x1f, 0x20000, // ROM #2 = 256K - 0x1f, 0x60000, // ROM #3 = 256K - 0x1f, 0xA0000 // ROM #4 = 256K + 0x0f, 0x00000, /* ROM #1 = 128K */ + 0x1f, 0x20000, /* ROM #2 = 256K */ + 0x1f, 0x60000, /* ROM #3 = 256K */ + 0x1f, 0xA0000 /* ROM #4 = 256K */ }; sys18_splittab_fg_x=&sys16_textram[0x0f80/2]; @@ -803,10 +803,10 @@ static DRIVER_INIT( shdancrb ){ unsigned char *RAM = memory_region(REGION_CPU2); static const int shdancrb_sound_info[] = { - 0x0f, 0x00000, // ROM #1 = 128K - 0x1f, 0x20000, // ROM #2 = 256K - 0x1f, 0x60000, // ROM #3 = 256K - 0x1f, 0xA0000 // ROM #4 = 256K + 0x0f, 0x00000, /* ROM #1 = 128K */ + 0x1f, 0x20000, /* ROM #2 = 256K */ + 0x1f, 0x60000, /* ROM #3 = 256K */ + 0x1f, 0xA0000 /* ROM #4 = 256K */ }; sys18_splittab_fg_x=&sys16_textram[0x0f80/2]; @@ -868,11 +868,11 @@ static MEMORY_READ16_START( shdancbl_readmem ) { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, { 0xc00000, 0xc0ffff, vdp_r }, { 0xe40000, 0xe4ffff, sys18_io_r }, - { 0xc40000, 0xc40001, input_port_3_word_r }, // dip1 - { 0xc40002, 0xc40003, input_port_4_word_r }, // dip2 - { 0xc41002, 0xc41003, input_port_0_word_r }, // player1 - { 0xc41004, 0xc41005, input_port_1_word_r }, // player2 - { 0xc41000, 0xc41001, input_port_2_word_r }, // service + { 0xc40000, 0xc40001, input_port_3_word_r }, /* dip1 */ + { 0xc40002, 0xc40003, input_port_4_word_r }, /* dip2 */ + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41004, 0xc41005, input_port_1_word_r }, /* player2 */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, MEMORY_END @@ -883,12 +883,12 @@ static MEMORY_WRITE16_START( shdancbl_writemem ) { 0x440000, 0x440fff, SYS16_MWA16_SPRITERAM, &sys16_spriteram }, { 0x840000, 0x840fff, SYS16_MWA16_PALETTERAM, &paletteram16 }, { 0xc00000, 0xc0ffff, vdp_w }, - { 0xe4001c, 0xe4001d, MWA16_NOP }, // to prevent access to screen blanking control below + { 0xe4001c, 0xe4001d, MWA16_NOP }, /* to prevent access to screen blanking control below */ { 0xe40000, 0xe4ffff, sys18_io_w }, { 0xc40006, 0xc40007, sound_command_irq_w }, - { 0xc44000, 0xc44001, MWA16_NOP }, // only used via clr.w after tilebank set - { 0xc46000, 0xc46fff, MWA16_NOP },// bootleg specific video hardware - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0xc44000, 0xc44001, MWA16_NOP }, /* only used via clr.w after tilebank set */ + { 0xc46000, 0xc46fff, MWA16_NOP },/* bootleg specific video hardware */ + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -971,13 +971,13 @@ static MEMORY_READ16_START( moonwalk_readmem ) { 0x440000, 0x440fff, SYS16_MRA16_SPRITERAM }, { 0x840000, 0x840fff, SYS16_MRA16_PALETTERAM }, { 0xc00000, 0xc0ffff, vdp_r }, - { 0xc40000, 0xc40001, input_port_3_word_r }, // dip1 - { 0xc40002, 0xc40003, input_port_4_word_r }, // dip2 - { 0xc41002, 0xc41003, input_port_0_word_r },// player1 - { 0xc41004, 0xc41005, input_port_1_word_r }, // player2 - { 0xc41006, 0xc41007, input_port_5_word_r }, // player3 - { 0xc41008, 0xc41009, MRA16_NOP }, // figure this out, extra input for 3p? - { 0xc41000, 0xc41001, input_port_2_word_r }, // service + { 0xc40000, 0xc40001, input_port_3_word_r }, /* dip1 */ + { 0xc40002, 0xc40003, input_port_4_word_r }, /* dip2 */ + { 0xc41002, 0xc41003, input_port_0_word_r }, /* player1 */ + { 0xc41004, 0xc41005, input_port_1_word_r }, /* player2 */ + { 0xc41006, 0xc41007, input_port_5_word_r }, /* player3 */ + { 0xc41008, 0xc41009, MRA16_NOP }, /* figure this out, extra input for 3p? */ + { 0xc41000, 0xc41001, input_port_2_word_r }, /* service */ { 0xe40000, 0xe4ffff, SYS16_MRA16_EXTRAM2 }, { 0xffe02c, 0xffe02d, moonwlkb_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, @@ -994,7 +994,7 @@ static MEMORY_WRITE16_START( moonwalk_writemem ) { 0xc46600, 0xc46601, sys18_refreshenable_w }, { 0xc46800, 0xc46801, sys18_tilebank_w }, { 0xe40000, 0xe4ffff, SYS16_MWA16_EXTRAM2, &sys16_extraram2 }, - { 0xfe0020, 0xfe003f, MWA16_NOP }, // config regs + { 0xfe0020, 0xfe003f, MWA16_NOP }, /* config regs */ { 0xffc000, 0xffffff, SYS16_MWA16_WORKINGRAM, &sys16_workingram }, MEMORY_END @@ -1066,7 +1066,7 @@ static MACHINE_INIT( moonwalk ){ sys16_patch_code( 0x109fb, 0x00); sys16_patch_code( 0x109fd, 0x00); - // * SEGA mark + /* SEGA mark */ sys16_patch_code( 0x70212, 0x4e); sys16_patch_code( 0x70213, 0x71); @@ -1077,10 +1077,10 @@ static DRIVER_INIT( moonwalk ){ unsigned char *RAM= memory_region(REGION_CPU2); static const int moonwalk_sound_info[] = { - 0x0f, 0x00000, // ROM #1 = 128K - 0x1f, 0x20000, // ROM #2 = 256K - 0x1f, 0x60000, // ROM #3 = 256K - 0x1f, 0xA0000 // ROM #4 = 256K + 0x0f, 0x00000, /* ROM #1 = 128K */ + 0x1f, 0x20000, /* ROM #2 = 256K */ + 0x1f, 0x60000, /* ROM #3 = 256K */ + 0x1f, 0xA0000 /* ROM #4 = 256K */ }; sys18_splittab_fg_x=&sys16_textram[0x0f80/2]; @@ -1103,12 +1103,12 @@ static MEMORY_READ16_START( astorm_readmem ) { 0x110000, 0x110fff, SYS16_MRA16_TEXTRAM }, { 0x140000, 0x140fff, SYS16_MRA16_PALETTERAM }, { 0x200000, 0x200fff, SYS16_MRA16_SPRITERAM }, - { 0xa00000, 0xa00001, input_port_3_word_r }, // dip1 - { 0xa00002, 0xa00003, input_port_4_word_r }, // dip2 - { 0xa01002, 0xa01003, input_port_0_word_r }, // player1 - { 0xa01004, 0xa01005, input_port_1_word_r }, // player2 - { 0xa01006, 0xa01007, input_port_5_word_r }, // player3 - { 0xa01000, 0xa01001, input_port_2_word_r }, // service + { 0xa00000, 0xa00001, input_port_3_word_r }, /* dip1 */ + { 0xa00002, 0xa00003, input_port_4_word_r }, /* dip2 */ + { 0xa01002, 0xa01003, input_port_0_word_r }, /* player1 */ + { 0xa01004, 0xa01005, input_port_1_word_r }, /* player2 */ + { 0xa01006, 0xa01007, input_port_5_word_r }, /* player3 */ + { 0xa01000, 0xa01001, input_port_2_word_r }, /* service */ { 0xc00000, 0xc0ffff, vdp_r }, { 0xffec2c, 0xffec2d, astorm_skip_r }, { 0xffc000, 0xffffff, SYS16_MRA16_WORKINGRAM }, @@ -1166,7 +1166,7 @@ static void astorm_update_proc( void ){ sys16_bg2_page[0] = (data>>4)&0xf; sys16_bg2_page[2] = data&0xf; -// enable regs +/* enable regs */ if(sys16_fg2_scrollx | sys16_fg2_scrolly | sys16_textram[0x0e84/2]) sys18_fg2_active=1; else @@ -1247,15 +1247,15 @@ static DRIVER_INIT( astorm ){ unsigned char *RAM= memory_region(REGION_CPU2); static const int astormbl_sound_info[] = { - 0x0f, 0x00000, // ROM #1 = 128K - 0x1f, 0x20000, // ROM #2 = 256K - 0x1f, 0x60000, // ROM #3 = 256K - 0x1f, 0xA0000 // ROM #4 = 256K + 0x0f, 0x00000, /* ROM #1 = 128K */ + 0x1f, 0x20000, /* ROM #2 = 256K */ + 0x1f, 0x60000, /* ROM #3 = 256K */ + 0x1f, 0xA0000 /* ROM #4 = 256K */ }; sys18_splittab_fg_x=&sys16_textram[0x0f80/2]; sys18_splittab_bg_x=&sys16_textram[0x0fc0/2]; - sys16_MaxShadowColors = 0; // doesn't seem to use transparent shadows + sys16_MaxShadowColors = 0; /* doesn't seem to use transparent shadows */ memcpy(sys18_sound_info, astormbl_sound_info, sizeof(sys18_sound_info)); memcpy(RAM,&RAM[0x10000],0xa000); @@ -1274,7 +1274,7 @@ static MACHINE_DRIVER_START( system18 ) MDRV_CPU_MEMORY(sound_readmem_18,sound_writemem_18) MDRV_CPU_PORTS(sound_readport_18,sound_writeport_18) - MDRV_FRAMES_PER_SECOND(57.23) //dankcushions + MDRV_FRAMES_PER_SECOND(57.23) /*dankcushions */ MDRV_VBLANK_DURATION(DEFAULT_60HZ_VBLANK_DURATION) /* video hardware */ @@ -1490,7 +1490,7 @@ INPUT_PORTS_START( moonwalk ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 | IPF_PLAYER3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 | IPF_PLAYER3 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 | IPF_PLAYER3 ) -// PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) +/* PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) */ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN | IPF_8WAY | IPF_PLAYER3 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_UP | IPF_8WAY | IPF_PLAYER3 ) @@ -1545,7 +1545,7 @@ INPUT_PORTS_END /*****************************************************************************/ -// Alien Storm +/* Alien Storm */ ROM_START( astorm ) ROM_REGION( 0x080000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr13085.bin", 0x000000, 0x40000, CRC(15f74e2d) SHA1(30d9d099ec18907edd3d20df312565c3bd5a80de) ) @@ -1627,7 +1627,7 @@ ROM_START( astormbl ) ROM_LOAD( "epr13078.bin", 0xb0000, 0x40000, CRC(15684dc5) SHA1(595051006de24f791dae937584e502ff2fa31d9c) ) ROM_END -// Bloxeed +/* Bloxeed */ ROM_START( bloxeed ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "rom-e.rom", 0x000000, 0x20000, CRC(a481581a) SHA1(5ce5a0a082622919d2fe0e7d52ec807b2e2c25a2) ) @@ -1646,7 +1646,7 @@ ROM_START( bloxeed ) ROM_LOAD( "sound0.rom", 0x00000, 0x20000, CRC(6f2fc63c) SHA1(3cce22c8f80013f05b5a2d36c42a61a81e4d6cbd) ) ROM_END -// Clutch Hitter +/* Clutch Hitter */ ROM_START( cltchitr ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "epr13795.6a", 0x000000, 0x40000, CRC(b0b60b67) SHA1(ee3325ddb7461008f556c1696157a766225b9ef5) ) @@ -1673,7 +1673,7 @@ ROM_START( cltchitr ) ROM_LOAD( "epr13792.6c", 0x100000, 0x80000, CRC(808f9695) SHA1(d50677d20083ad56dbf0864db05f76f93a4e9eba) ) ROM_END -// DD Crew +/* DD Crew */ ROM_START( ddcrew ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "14153.6a", 0x000000, 0x40000, CRC(e01fae0c) SHA1(7166f955324f73e94d8ae6d2a5b2f4b497e62933) ) @@ -1703,7 +1703,7 @@ ROM_START( ddcrew ) ROM_LOAD( "14132.6c", 0x120000, 0x80000, CRC(1fae0220) SHA1(8414c74318ea915816c6b67801ac7c8c3fc905f9) ) ROM_END -// Laser Ghost +/* Laser Ghost */ ROM_START( lghost ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "13429", 0x000000, 0x20000, CRC(0e0ccf26) SHA1(072c39771f4d8806c05499bad9a0e7f63709333e) ) @@ -1820,7 +1820,7 @@ ROM_START( moonwlkb ) ROM_LOAD( "mpr13249.b6", 0xb0000, 0x40000, CRC(623edc5d) SHA1(c32d9f818d40f311877fbe6532d9e95b6045c3c4) ) ROM_END -// Shadow Dancer +/* Shadow Dancer */ ROM_START( shdancer ) ROM_REGION( 0x080000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "shdancer.a6", 0x000000, 0x40000, CRC(3d5b3fa9) SHA1(370dd6e8ab9fb9e77eee9262d13fbdb4cf575abc) ) @@ -1867,49 +1867,49 @@ ROM_START( shdancbl ) ROM_REGION( 0x200000, REGION_GFX2, 0 ) /* sprites */ - // 12719 + /* 12719 */ ROM_LOAD16_BYTE( "ic73", 0x000001, 0x10000, CRC(59e77c96) SHA1(08da058529ac83352a4528d3792a21edda348f7a) ) ROM_LOAD16_BYTE( "ic74", 0x020001, 0x10000, CRC(90ea5407) SHA1(4bdd93c86cb35822517433d491aa8be6857dd36c) ) ROM_LOAD16_BYTE( "ic75", 0x040001, 0x10000, CRC(27d2fa61) SHA1(0ba3cd9448e54ce9fc9433f3edd28de9a4e451e9) ) ROM_LOAD16_BYTE( "ic76", 0x060001, 0x10000, CRC(f36db688) SHA1(a527298ce9ca1d9f5aa7b9eac93985f34ca8119f) ) - // 12726 + /* 12726 */ ROM_LOAD16_BYTE( "ic58", 0x000000, 0x10000, CRC(9cd5c8c7) SHA1(54c2d0a683bda37eb9a75f90f4ca5e620c09c4cf) ) ROM_LOAD16_BYTE( "ic59", 0x020000, 0x10000, CRC(ff40e872) SHA1(bd2c4aac427d106a46318f4cb2eb05c34d3c70b6) ) ROM_LOAD16_BYTE( "ic60", 0x040000, 0x10000, CRC(826d7245) SHA1(bb3394de058bd63b9939cd05f22c925e0cdc840a) ) ROM_LOAD16_BYTE( "ic61", 0x060000, 0x10000, CRC(dcf8068b) SHA1(9c78de224df76fc90fb90f1bbd9b22dad0874f69) ) - // 12718 + /* 12718 */ ROM_LOAD16_BYTE( "ic77", 0x080001, 0x10000, CRC(f93470b7) SHA1(1041afa43aa8d0589d6def9743721cdbda617f78) ) - ROM_LOAD16_BYTE( "ic78", 0x0A0001, 0x10000, CRC(4d523ea3) SHA1(053c30778017127dddeae0783af463aef17bcc9a) ) // corrupt? (bad sprite when dog attacts in attract mode) + ROM_LOAD16_BYTE( "ic78", 0x0A0001, 0x10000, CRC(4d523ea3) SHA1(053c30778017127dddeae0783af463aef17bcc9a) ) /* corrupt? (bad sprite when dog attacts in attract mode) */ ROM_LOAD16_BYTE( "ic95", 0x0C0001, 0x10000, CRC(828b8294) SHA1(f2cdb882fb0709a909e6ef98f0315aceeb8bf283) ) ROM_LOAD16_BYTE( "ic94", 0x0E0001, 0x10000, CRC(542b2d1e) SHA1(1ce91aea6c49e6e365a91c30ca3049682c2162da) ) - // 12725 + /* 12725 */ ROM_LOAD16_BYTE( "ic62", 0x080000, 0x10000, CRC(50ca8065) SHA1(8c0d6ae34b9da6c376df387e8fc8b1068bcb4dcb) ) ROM_LOAD16_BYTE( "ic63", 0x0A0000, 0x10000, CRC(d1866aa9) SHA1(524c82a12a1c484a246b8d49d9f05a774d008108) ) ROM_LOAD16_BYTE( "ic90", 0x0C0000, 0x10000, CRC(3602b758) SHA1(d25b6c8420e07d0f2ac3e1d8717f14738466df16) ) ROM_LOAD16_BYTE( "ic89", 0x0E0000, 0x10000, CRC(1ba4be93) SHA1(6f4fe2016e375be3df477436f5cde7508a24ecd1) ) - // 12717 + /* 12717 */ ROM_LOAD16_BYTE( "ic79", 0x100001, 0x10000, CRC(f22548ee) SHA1(723cb7604784c6715817daa8c86c18c6bcd1388d) ) ROM_LOAD16_BYTE( "ic80", 0x120001, 0x10000, CRC(6209f7f9) SHA1(09b33c99d972a62af8ef56dacfa6262f002aba0c) ) ROM_LOAD16_BYTE( "ic81", 0x140001, 0x10000, CRC(34692f23) SHA1(56126a81ac279662e3e3423da5205f65a62c4600) ) ROM_LOAD16_BYTE( "ic82", 0x160001, 0x10000, CRC(7ae40237) SHA1(fae97cfcfd3cd557da3330158831e4727c438745) ) - // 12724 + /* 12724 */ ROM_LOAD16_BYTE( "ic64", 0x100000, 0x10000, CRC(7a8b7bcc) SHA1(00cbbbc4b3db48ca3ac65ff56b02c7d63a1b898a) ) ROM_LOAD16_BYTE( "ic65", 0x120000, 0x10000, CRC(90ffca14) SHA1(00962e5309a79ce34c6f420036054bc607595dfe) ) ROM_LOAD16_BYTE( "ic66", 0x140000, 0x10000, CRC(5d655517) SHA1(2a1c197dde62bd7946ca7b5f1c2833bdbc2e2e32) ) ROM_LOAD16_BYTE( "ic67", 0x160000, 0x10000, CRC(0e5d0855) SHA1(3c15088f7fdda5c2bba9c89d244bbcff022f05fd) ) - // 12716 + /* 12716 */ ROM_LOAD16_BYTE( "ic83", 0x180001, 0x10000, CRC(a9040a32) SHA1(7b0b375285f528b2833c50892b55b0d4c550506d) ) ROM_LOAD16_BYTE( "ic84", 0x1A0001, 0x10000, CRC(d6810031) SHA1(a82857a9ac442fbe076cdafcf7390765391ed136) ) ROM_LOAD16_BYTE( "ic92", 0x1C0001, 0x10000, CRC(b57d5cb5) SHA1(636f1a07a84d37cecbe388a2f585893c4611436c) ) ROM_LOAD16_BYTE( "ic91", 0x1E0001, 0x10000, CRC(49def6c8) SHA1(d8b2cc1993f0808553f87bf56fdbe47374576c5a) ) - // 12723 + /* 12723 */ ROM_LOAD16_BYTE( "ic68", 0x180000, 0x10000, CRC(8d684e53) SHA1(00e82ddaf875a7452ff978b7b7eb87a1a5a8fb64) ) ROM_LOAD16_BYTE( "ic69", 0x1A0000, 0x10000, CRC(c47d32e2) SHA1(92b21f51abdd7950fb09d965b1d71b7bffac31ec) ) ROM_LOAD16_BYTE( "ic88", 0x1C0000, 0x10000, CRC(9de140e1) SHA1(f1125e056a898a4fa519b49ae866c5c742e36bf7) ) diff --git a/src/drivers/taito_f3.c b/src/drivers/taito_f3.c index 126af054a..5712f2f44 100644 --- a/src/drivers/taito_f3.c +++ b/src/drivers/taito_f3.c @@ -3020,11 +3020,11 @@ ROM_START( bublbob2p ) ROM_LOAD16_BYTE("snd-l-4ec1.ic65", 0x100001, 0x20000, CRC(d302d8bc) SHA1(02a2e69d0f4406578b12b05ab25d2abdf5bbba3c) ) ROM_REGION16_BE(0x800000, REGION_SOUND1 , ROMREGION_SOUNDONLY | ROMREGION_ERASE00 ) - ROM_LOAD16_BYTE("cq80-snd-data0-7b5f.ic43", 0x000000, 0x080000, CRC(bf8f26d3) SHA1(b165fc62ed30ae56d27caffbb0b16321d3c5ef8b) ) // C8 - ROM_LOAD16_BYTE("cq80-snd-data1-933b.ic44", 0x100000, 0x080000, CRC(62b00475) SHA1(d2b44940cefca76897b291d83b5ca8ec18dbe1fa) ) // C9 + ROM_LOAD16_BYTE("cq80-snd-data0-7b5f.ic43", 0x000000, 0x080000, CRC(bf8f26d3) SHA1(b165fc62ed30ae56d27caffbb0b16321d3c5ef8b) ) /* C8 */ + ROM_LOAD16_BYTE("cq80-snd-data1-933b.ic44", 0x100000, 0x080000, CRC(62b00475) SHA1(d2b44940cefca76897b291d83b5ca8ec18dbe1fa) ) /* C9 */ - ROM_LOAD16_BYTE("cq80-snd3-std5-3a9c.ic10", 0x600000, 0x080000, CRC(26312451) SHA1(9f947a11592fd8420fc581914bf16e7ade75390c) ) // -std- - ROM_LOAD16_BYTE("cq80-snd2-std6-a148.ic11", 0x700000, 0x080000, CRC(2edaa9dc) SHA1(72fead505c4f44e5736ff7d545d72dfa37d613e2) ) // -std- + ROM_LOAD16_BYTE("cq80-snd3-std5-3a9c.ic10", 0x600000, 0x080000, CRC(26312451) SHA1(9f947a11592fd8420fc581914bf16e7ade75390c) ) /* -std- */ + ROM_LOAD16_BYTE("cq80-snd2-std6-a148.ic11", 0x700000, 0x080000, CRC(2edaa9dc) SHA1(72fead505c4f44e5736ff7d545d72dfa37d613e2) ) /* -std- */ ROM_END /******************************************************************************/ diff --git a/src/drivers/thief.c b/src/drivers/thief.c index 5f07ab273..d1892a437 100644 --- a/src/drivers/thief.c +++ b/src/drivers/thief.c @@ -84,24 +84,24 @@ static void tape_set_motor( int bOn ) { if( bOn ) { - // Start if not playing + /* Start if not playing */ if (!sample_playing( kTalkTrack )) sample_start( 0, kTalkTrack, 1 ); - // Resume + /* Resume */ sample_set_pause( kTalkTrack, 0 ); - // Start if not playing + /* Start if not playing */ if (!sample_playing( kCrashTrack )) sample_start( 1, kCrashTrack, 1 ); - // Resume + /* Resume */ sample_set_pause( kCrashTrack, 0 ); } else { - // Pause + /* Pause */ sample_set_pause( kTalkTrack, 1 ); sample_set_pause( kCrashTrack, 1 ); } diff --git a/src/drivers/toaplan2.c b/src/drivers/toaplan2.c index 2e97b6d48..b085df196 100644 --- a/src/drivers/toaplan2.c +++ b/src/drivers/toaplan2.c @@ -1479,7 +1479,7 @@ static MEMORY_WRITE16_START( kbash_writemem ) { 0x000000, 0x07ffff, MWA16_ROM }, { 0x100000, 0x103fff, MWA16_RAM }, { 0x200000, 0x200003, kbash_sub_cpu_w }, /* sound number to play */ -/* { 0x200002, 0x200003, kbash_sub_cpu_w2 }, // ??? /*/ +/* { 0x200002, 0x200003, kbash_sub_cpu_w2 },*/ /* ??? */ { 0x20801c, 0x20801d, toaplan2_coin_word_w }, { 0x300000, 0x300001, toaplan2_0_voffs_w }, { 0x300004, 0x300007, toaplan2_0_videoram16_w }, @@ -1616,7 +1616,7 @@ static MEMORY_WRITE16_START( pipibibi_writemem ) { 0x083800, 0x087fff, MWA16_RAM }, /* SpriteRAM (unused) */ { 0x0c0000, 0x0c0fff, paletteram16_xBBBBBGGGGGRRRRR_word_w, &paletteram16 }, { 0x120000, 0x120fff, MWA16_RAM }, /* Copy of SpriteRAM ? */ -/* { 0x13f000, 0x13f001, MWA16_NOP }, // ??? /*/ +/* { 0x13f000, 0x13f001, MWA16_NOP },*/ /* ??? */ { 0x180000, 0x182fff, pipibibi_videoram16_w }, /* TileRAM */ { 0x188000, 0x18800f, pipibibi_scroll_w }, { 0x190010, 0x190011, pipibibi_z80_task_w }, /* Z80 task to perform */ @@ -1637,11 +1637,11 @@ static MEMORY_READ16_START( fixeight_readmem ) #else { 0x28e000, 0x28efff, shared_ram_r }, { 0x28f000, 0x28f001, Zx80_status_port_r }, /* Zx80 status port */ -/* { 0x28f002, 0x28f003, MRA16_RAM }, // part of shared ram /*/ -/* { 0x28f004, 0x28f005, input_port_5_word_r }, // Dip Switch A - Wrong !!! /*/ -/* { 0x28f006, 0x28f007, input_port_6_word_r }, // Dip Switch B - Wrong !!! /*/ -/* { 0x28f008, 0x28f009, input_port_7_word_r }, // Territory Jumper block - Wrong !!! /*/ -/* { 0x28f002, 0x28fbff, MRA16_RAM }, // part of shared ram /*/ +/* { 0x28f002, 0x28f003, MRA16_RAM },*/ /* part of shared ram */ +/* { 0x28f004, 0x28f005, input_port_5_word_r },*/ /* Dip Switch A - Wrong !!! */ +/* { 0x28f006, 0x28f007, input_port_6_word_r },*/ /* Dip Switch B - Wrong !!! */ +/* { 0x28f008, 0x28f009, input_port_7_word_r },*/ /* Territory Jumper block - Wrong !!! */ +/* { 0x28f002, 0x28fbff, MRA16_RAM },*/ /* part of shared ram */ { 0x28fc00, 0x28ffff, Zx80_sharedram_r }, /* 16-bit on 68000 side, 8-bit on Zx80 side */ #endif { 0x300004, 0x300007, toaplan2_0_videoram16_r }, @@ -1665,9 +1665,9 @@ static MEMORY_WRITE16_START( fixeight_writemem ) #else { 0x28e000, 0x28efff, shared_ram_w, &toaplan2_shared_ram16 }, { 0x28f000, 0x28f001, Zx80_command_port_w }, /* Zx80 command port */ -/* { 0x28f002, 0x28f003, MWA16_RAM }, // part of shared ram /*/ -/* { 0x28f004, 0x28f009, MWA16_NOP }, // part of shared ram /*/ -/* { 0x28f002, 0x28fbff, MWA16_RAM }, // part of shared ram /*/ +/* { 0x28f002, 0x28f003, MWA16_RAM },*/ /* part of shared ram */ +/* { 0x28f004, 0x28f009, MWA16_NOP },*/ /* part of shared ram */ +/* { 0x28f002, 0x28fbff, MWA16_RAM },*/ /* part of shared ram */ { 0x28fc00, 0x28ffff, Zx80_sharedram_w, &Zx80_shared_ram }, /* 16-bit on 68000 side, 8-bit on Zx80 side */ #endif { 0x300000, 0x300001, toaplan2_0_voffs_w }, /* VideoRAM selector/offset */ @@ -1719,7 +1719,7 @@ MEMORY_END static MEMORY_READ16_START( vfive_readmem ) { 0x000000, 0x07ffff, MRA16_ROM }, { 0x100000, 0x103fff, MRA16_RAM }, -/* { 0x200000, 0x20ffff, MRA16_ROM }, // Sound ROM is here ??? /*/ +/* { 0x200000, 0x20ffff, MRA16_ROM },*/ /* Sound ROM is here ??? */ { 0x200010, 0x200011, input_port_1_word_r }, /* Player 1 controls */ { 0x200014, 0x200015, input_port_2_word_r }, /* Player 2 controls */ { 0x200018, 0x200019, input_port_3_word_r }, /* Coin/System inputs */ @@ -1743,7 +1743,7 @@ MEMORY_END static MEMORY_WRITE16_START( vfive_writemem ) { 0x000000, 0x07ffff, MWA16_ROM }, { 0x100000, 0x103fff, MWA16_RAM }, -/* { 0x200000, 0x20ffff, MWA16_ROM }, // Sound ROM is here ??? /*/ +/* { 0x200000, 0x20ffff, MWA16_ROM },*/ /* Sound ROM is here ??? */ { 0x20001c, 0x20001d, toaplan2_coin_word_w }, /* Coin count/lock */ #if Zx80 { 0x21e000, 0x21fbff, shared_ram_w, &toaplan2_shared_ram16 }, /* $21F000 */ @@ -1913,7 +1913,7 @@ static MEMORY_WRITE16_START( shippumd_writemem ) { 0x000000, 0x0fffff, MWA16_ROM }, { 0x100000, 0x10ffff, MWA16_RAM }, { 0x218000, 0x21bfff, raizing_shared_ram_w }, -/* { 0x21c008, 0x21c009, MWA16_NOP }, // ??? /*/ +/* { 0x21c008, 0x21c009, MWA16_NOP },*/ /* ??? */ { 0x21c01c, 0x21c01d, toaplan2_coin_word_w }, { 0x300000, 0x300001, toaplan2_0_voffs_w }, { 0x300004, 0x300007, toaplan2_0_videoram16_w }, @@ -2175,7 +2175,7 @@ static MEMORY_READ_START( ghox_hd647180_readmem ) { 0x40000, 0x4f7ff, shared_ram8_r }, { 0x80002, 0x80002, input_port_4_r }, { 0x80004, 0x80004, input_port_5_r }, - { 0x80006, 0x80006, MRA_NOP }, // nothing? + { 0x80006, 0x80006, MRA_NOP }, /* nothing? */ { 0x80008, 0x80008, ghox_p1_v_analog_r }, { 0x8000a, 0x8000a, ghox_p2_v_analog_r }, { 0x8000c, 0x8000e, input_port_3_r }, @@ -2218,7 +2218,7 @@ PORT_END #if Zx80 static MEMORY_READ_START( Zx80_readmem ) { 0x00000, 0x03fff, MRA_ROM }, -/* { 0x00000, 0x007ff, MRA_RAM }, // External shared RAM (Banked) /*/ +/* { 0x00000, 0x007ff, MRA_RAM },*/ /* External shared RAM (Banked) */ { 0x04000, 0x04000, YM2151_status_port_0_r }, { 0x04002, 0x04002, OKIM6295_status_0_r }, { 0x04008, 0x04008, input_port_1_r }, @@ -2230,7 +2230,7 @@ MEMORY_END static MEMORY_WRITE_START( Zx80_writemem ) { 0x00000, 0x03fff, MWA_ROM, }, -/* { 0x00000, 0x007ff, MWA_RAM, }, // External shared RAM (Banked) /*/ +/* { 0x00000, 0x007ff, MWA_RAM, },*/ /* External shared RAM (Banked) */ { 0x04000, 0x04000, YM2151_register_port_0_w }, { 0x04001, 0x04001, YM2151_data_port_0_w }, { 0x04002, 0x04002, OKIM6295_data_0_w }, @@ -2831,8 +2831,8 @@ INPUT_PORTS_END INPUT_PORTS_START( pipibibi ) PORT_START /* (0) VBlank */ -/* PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK ) // This video HW /*/ -/* PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // doesnt wait for VBlank /*/ +/* PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VBLANK ) */ /* This video HW */ +/* PORT_BIT( 0xfffe, IP_ACTIVE_HIGH, IPT_UNKNOWN ) */ /* doesnt wait for VBlank */ TOAPLAN2_PLAYER_INPUT( IPF_PLAYER1, IPT_UNKNOWN, IPT_UNKNOWN ) @@ -4090,8 +4090,8 @@ static struct GfxDecodeInfo truxton2_gfxdecodeinfo[] = { { REGION_GFX1, 0, &tilelayout , 0, 128 }, { REGION_GFX1, 0, &spritelayout , 0, 64 }, -/* { REGION_CPU1, 0x40000, &truxton2_tx_tilelayout, 0, 128 }, // Truxton 2 /*/ -/* { REGION_CPU1, 0x68000, &truxton2_tx_tilelayout, 0, 128 }, // Fix Eight /*/ +/* { REGION_CPU1, 0x40000, &truxton2_tx_tilelayout, 0, 128 },*/ /* Truxton 2 */ +/* { REGION_CPU1, 0x68000, &truxton2_tx_tilelayout, 0, 128 },*/ /* Fix Eight */ { 0, 0, &truxton2_tx_tilelayout, 0, 128 }, { -1 } /* end of array */ }; @@ -4500,7 +4500,7 @@ static MACHINE_DRIVER_START( fixeight ) MDRV_VBLANK_DURATION(DEFAULT_REAL_60HZ_VBLANK_DURATION) MDRV_MACHINE_INIT(toaplan2) -/*/ MDRV_NVRAM_HANDLER(fixeight) // See 37B6 code /*/ +/* MDRV_NVRAM_HANDLER(fixeight)*/ /* See 37B6 code */ /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_TYPE_RASTER | VIDEO_UPDATE_BEFORE_VBLANK) diff --git a/src/drivers/toypop.c b/src/drivers/toypop.c index 8a4ca1cac..64e272be4 100644 --- a/src/drivers/toypop.c +++ b/src/drivers/toypop.c @@ -34,7 +34,7 @@ different. #include "machine/namcoio.h" -// vidhrdw\toypop.c +/* vidhrdw\toypop.c */ extern data16_t *toypop_bg_image; extern data8_t *toypop_videoram; WRITE_HANDLER( toypop_videoram_w ); @@ -55,17 +55,17 @@ PALETTE_INIT( toypop ); ***************************************************************************/ -static READ_HANDLER( in0_l ) { return readinputport(0); } // P1 joystick -static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } // P2 joystick -static READ_HANDLER( in1_l ) { return readinputport(1); } // fire and start buttons -static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } // coins -static READ_HANDLER( dipA_l ) { return readinputport(2); } // dips A -static READ_HANDLER( dipA_h ) { return readinputport(2) >> 4; } // dips A -static READ_HANDLER( dipB_l ) { return readinputport(3); } // dips B -static READ_HANDLER( dipB_h ) { return readinputport(3) >> 4; } // dips B -static READ_HANDLER( in2_l ) { return readinputport(4); } // P1 joystick left in liblrabl -static READ_HANDLER( in2_h ) { return readinputport(4) >> 4; } // P2 joystick left in liblrabl -static READ_HANDLER( in3 ) { return readinputport(5); } // test, cocktail, optional buttons +static READ_HANDLER( in0_l ) { return readinputport(0); } /* P1 joystick */ +static READ_HANDLER( in0_h ) { return readinputport(0) >> 4; } /* P2 joystick */ +static READ_HANDLER( in1_l ) { return readinputport(1); } /* fire and start buttons */ +static READ_HANDLER( in1_h ) { return readinputport(1) >> 4; } /* coins */ +static READ_HANDLER( dipA_l ) { return readinputport(2); } /* dips A */ +static READ_HANDLER( dipA_h ) { return readinputport(2) >> 4; } /* dips A */ +static READ_HANDLER( dipB_l ) { return readinputport(3); } /* dips B */ +static READ_HANDLER( dipB_h ) { return readinputport(3) >> 4; } /* dips B */ +static READ_HANDLER( in2_l ) { return readinputport(4); } /* P1 joystick left in liblrabl */ +static READ_HANDLER( in2_h ) { return readinputport(4) >> 4; } /* P2 joystick left in liblrabl */ +static READ_HANDLER( in3 ) { return readinputport(5); } /* test, cocktail, optional buttons */ static WRITE_HANDLER( out_coin0 ) { coin_lockout_global_w(data & 4); @@ -182,8 +182,8 @@ WRITE_HANDLER( toypop_sound_interrupt_disable_w ) INTERRUPT_GEN( toypop_main_interrupt ) { - irq0_line_assert(); // this also checks if irq is enabled - IMPORTANT! - // so don't replace with cpu_set_irq_line(0, 0, ASSERT_LINE); + irq0_line_assert(); /* this also checks if irq is enabled - IMPORTANT! */ + /* so don't replace with cpu_set_irq_line(0, 0, ASSERT_LINE); */ namcoio_set_irq_line(0,PULSE_LINE); namcoio_set_irq_line(1,PULSE_LINE); @@ -335,11 +335,11 @@ MEMORY_END *************************************/ static MEMORY_READ16_START( readmem_68k ) - { 0x000000, 0x007fff, MRA16_ROM }, // ROM code - { 0x080000, 0x0bffff, MRA16_RAM }, // RAM - { 0x100000, 0x100fff, toypop_m68000_sharedram_r }, // shared RAM with the main CPU - { 0x180000, 0x187fff, toypop_merged_background_r }, // RAM merged with the background image - { 0x190000, 0x1dffff, MRA16_RAM }, // RAM containing the background image + { 0x000000, 0x007fff, MRA16_ROM }, /* ROM code */ + { 0x080000, 0x0bffff, MRA16_RAM }, /* RAM */ + { 0x100000, 0x100fff, toypop_m68000_sharedram_r }, /* shared RAM with the main CPU */ + { 0x180000, 0x187fff, toypop_merged_background_r }, /* RAM merged with the background image */ + { 0x190000, 0x1dffff, MRA16_RAM }, /* RAM containing the background image */ MEMORY_END static MEMORY_WRITE16_START( writemem_68k ) @@ -383,7 +383,7 @@ INPUT_PORTS_START( liblrabl ) PORT_DIPSETTING( 0x00, "2" ) PORT_DIPSETTING( 0x03, "3" ) PORT_DIPSETTING( 0x01, "5" ) - // TODO: bonus scores are different for 5 lives + /* TODO: bonus scores are different for 5 lives */ PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x04, "40k 120k and every 120k" ) PORT_DIPSETTING( 0x1c, "40k 120k 200k 400k..." ) @@ -501,7 +501,7 @@ INPUT_PORTS_START( toypop ) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Demo_Sounds ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - PORT_DIPNAME( 0x10, 0x10, "Entering" ) // ??? + PORT_DIPNAME( 0x10, 0x10, "Entering" ) /* ??? */ PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x10, DEF_STR( On ) ) PORT_DIPNAME( 0x60, 0x60, DEF_STR( Difficulty ) ) @@ -519,8 +519,8 @@ INPUT_PORTS_START( toypop ) PORT_START /* 56XX #2 pins 30-33 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) // would be Cabinet, but this game has no cocktail mode - PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) // service mode again + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED ) /* would be Cabinet, but this game has no cocktail mode */ + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) /* service mode again */ INPUT_PORTS_END @@ -642,9 +642,9 @@ ROM_START( liblrabl ) ROM_LOAD( "9t.rom", 0x0000, 0x4000, CRC(a88e24ca) SHA1(eada133579f19de09255084dcdc386311606a335) ) /* sprites */ ROM_REGION( 0x0600, REGION_PROMS, 0 ) /* color proms */ - ROM_LOAD( "lr1-3.1r", 0x0000, 0x0100, CRC(f3ec0d07) SHA1(b0aad1fb6df79f202889600f486853995352f9c2) ) // palette: red component - ROM_LOAD( "lr1-2.1s", 0x0100, 0x0100, CRC(2ae4f702) SHA1(838fdca9e91fea4f64a59880ac47c48973bb8fbf) ) // palette: green component - ROM_LOAD( "lr1-1.1t", 0x0200, 0x0100, CRC(7601f208) SHA1(572d070ca387b780030ed5de38a8970b7cc14349) ) // palette: blue component + ROM_LOAD( "lr1-3.1r", 0x0000, 0x0100, CRC(f3ec0d07) SHA1(b0aad1fb6df79f202889600f486853995352f9c2) ) /* palette: red component */ + ROM_LOAD( "lr1-2.1s", 0x0100, 0x0100, CRC(2ae4f702) SHA1(838fdca9e91fea4f64a59880ac47c48973bb8fbf) ) /* palette: green component */ + ROM_LOAD( "lr1-1.1t", 0x0200, 0x0100, CRC(7601f208) SHA1(572d070ca387b780030ed5de38a8970b7cc14349) ) /* palette: blue component */ ROM_LOAD( "lr1-5.5l", 0x0300, 0x0100, CRC(940f5397) SHA1(825a7bd78a8a08d30bad2e4890ae6e9ad88b36b8) ) /* characters */ ROM_LOAD( "lr1-6.2p", 0x0400, 0x0200, CRC(a6b7f850) SHA1(7cfde16dfd5c4d5b876b4fbe4f924f1385932a93) ) /* sprites */ @@ -672,9 +672,9 @@ ROM_START( toypop ) ROM_LOAD( "tp1-6.9t", 0x0000, 0x4000, CRC(481ffeaf) SHA1(c51735ad3a1dbb46ad414408b54554e9223b2219) ) /* sprites */ ROM_REGION( 0x0600, REGION_PROMS, 0 ) /* color proms */ - ROM_LOAD( "tp1-3.1r", 0x0000, 0x0100, CRC(cfce2fa5) SHA1(b42aa0f34d885389d2650bf7a0531b95703b8a28) ) // palette: red component - ROM_LOAD( "tp1-2.1s", 0x0100, 0x0100, CRC(aeaf039d) SHA1(574560526100d38635aecd71eb73499c4f57d586) ) // palette: green component - ROM_LOAD( "tp1-1.1t", 0x0200, 0x0100, CRC(08e7cde3) SHA1(5261aca6834d635d17f8afaa8e35848930030ba4) ) // palette: blue component + ROM_LOAD( "tp1-3.1r", 0x0000, 0x0100, CRC(cfce2fa5) SHA1(b42aa0f34d885389d2650bf7a0531b95703b8a28) ) /* palette: red component */ + ROM_LOAD( "tp1-2.1s", 0x0100, 0x0100, CRC(aeaf039d) SHA1(574560526100d38635aecd71eb73499c4f57d586) ) /* palette: green component */ + ROM_LOAD( "tp1-1.1t", 0x0200, 0x0100, CRC(08e7cde3) SHA1(5261aca6834d635d17f8afaa8e35848930030ba4) ) /* palette: blue component */ ROM_LOAD( "tp1-4.5l", 0x0300, 0x0100, CRC(74138973) SHA1(2e21dbb1b19dd089da52e70fcb0ca91336e004e6) ) /* characters */ ROM_LOAD( "tp1-5.2p", 0x0400, 0x0200, CRC(4d77fa5a) SHA1(2438910314b23ecafb553230244f3931861ad2da) ) /* sprites */ diff --git a/src/drivers/trackfld.c b/src/drivers/trackfld.c index 1d8a4caae..921397e52 100644 --- a/src/drivers/trackfld.c +++ b/src/drivers/trackfld.c @@ -158,7 +158,7 @@ static WRITE_HANDLER( coin_w ) static MEMORY_READ_START( readmem ) { 0x1200, 0x1200, input_port_4_r }, /* DIP 2 */ { 0x1280, 0x1280, input_port_0_r }, /* IO Coin */ -/* { 0x1281, 0x1281, input_port_1_r }, // P1 IO /*/ +/* { 0x1281, 0x1281, input_port_1_r },*/ /* P1 IO /*/ { 0x1281, 0x1281, konami_IN1_r }, /* P1 IO and handle fake button for cheating */ { 0x1282, 0x1282, input_port_2_r }, /* P2 IO */ { 0x1283, 0x1283, input_port_3_r }, /* DIP 1 */ @@ -191,7 +191,7 @@ static MEMORY_READ_START( mastkin_readmem ) { 0x1200, 0x1200, input_port_4_r }, /* DIP 2 */ { 0x1280, 0x1280, input_port_0_r }, /* IO Coin */ { 0x1281, 0x1281, input_port_1_r }, /* P1 IO */ -/* { 0x1282, 0x1282, input_port_2_r }, // unused /*/ +/* { 0x1282, 0x1282, input_port_2_r },*/ /* unused */ { 0x1283, 0x1283, input_port_3_r }, /* DIP 1 */ { 0x1800, 0x1fff, MRA_RAM }, { 0x2800, 0x3fff, MRA_RAM }, @@ -778,44 +778,44 @@ static DRIVER_INIT( mastkin ) UINT8 *prom = memory_region(REGION_PROMS); int i; - // We don't have the colour PROMs. - // So we try and put together a palette that works. - // It is not the original, as no one seems to have screenshots - // or flyers or video of the original machine in action. - // I suspect the sky was originally red, but it looks odd - // so I've gone with light blue. - prom[0] = 0; // ?? - prom[1] = 246; // Monster horn + part of fire breath + part of bullets + arms of queen - prom[2] = 246; // Your skin + bat head - prom[3] = 12; // Front of your trousers + death explosion - prom[4] = 255; // Sword (half) - prom[5] = 110; // Your hair + enemy face + top of your boots - prom[6] = 12; // Back of your body + bat body - prom[7] = 28; // Back of your trousers - prom[8] = 11; // Front of enemy trousers - prom[9] = 246; // Your hands and forehead - prom[10] = 11; // Your front of body + bat wings + enemy hair + enemy feet - prom[11] = 10; // Your boots + enemy arms + hilt of your sword - prom[12] = 4; // Queen's eye + flame from monsters - prom[13] = 2; // Your eyes + patch on arm + body of enemy + back of enemy trousers - prom[14] = 14; // Your shoulders - prom[15] = 254; // Your sword (middle) + spot on enemy neck - prom[16] = 0; // Title screen background + slight part of sticks + minor dirt lines - prom[17] = 10; // Highlight on columns + top of sticks + title text + score digits + timer lines + lives handle - prom[18] = 11; // Title columns left + highlight on bricks + major dirt lines + high score text - prom[19] = 2; // Title columns main + title dirt + major bricks + major sticks + major dirt lines + house tops in background - prom[20] = 1; // Column shadows + other highlight on bricks + background house colour + more dirt lines - prom[21] = 90; // The Masters Of text + little stones on road + top of mountains + high score digits - prom[22] = 16; // Written By text + hills + road minus stones - prom[23] = 25; // More stones on road + lines on hill + square around Written By text - prom[24] = 20; // Brick grouting + progress meter highlight + score text - prom[25] = 11; // Brick wall edge highlight + sword highlight on lives - prom[26] = 2; // Top of brick wall + highlight on lives - prom[27] = 2; // Credit text + progress highlight - prom[28] = 11; // Bottom of life meter + hilt of lives - prom[29] = 240; // Sky + bottom of life meter - prom[30] = 11; // Surround of timer - prom[31] = 4; // Top of life meter + /* We don't have the colour PROMs. */ + /* So we try and put together a palette that works. */ + /* It is not the original, as no one seems to have screenshots */ + /* or flyers or video of the original machine in action. */ + /* I suspect the sky was originally red, but it looks odd */ + /* so I've gone with light blue. */ + prom[0] = 0; /* ?? */ + prom[1] = 246; /* Monster horn + part of fire breath + part of bullets + arms of queen */ + prom[2] = 246; /* Your skin + bat head */ + prom[3] = 12; /* Front of your trousers + death explosion */ + prom[4] = 255; /* Sword (half) */ + prom[5] = 110; /* Your hair + enemy face + top of your boots */ + prom[6] = 12; /* Back of your body + bat body */ + prom[7] = 28; /* Back of your trousers */ + prom[8] = 11; /* Front of enemy trousers */ + prom[9] = 246; /* Your hands and forehead */ + prom[10] = 11; /* Your front of body + bat wings + enemy hair + enemy feet */ + prom[11] = 10; /* Your boots + enemy arms + hilt of your sword */ + prom[12] = 4; /* Queen's eye + flame from monsters */ + prom[13] = 2; /* Your eyes + patch on arm + body of enemy + back of enemy trousers */ + prom[14] = 14; /* Your shoulders */ + prom[15] = 254; /* Your sword (middle) + spot on enemy neck */ + prom[16] = 0; /* Title screen background + slight part of sticks + minor dirt lines */ + prom[17] = 10; /* Highlight on columns + top of sticks + title text + score digits + timer lines + lives handle */ + prom[18] = 11; /* Title columns left + highlight on bricks + major dirt lines + high score text */ + prom[19] = 2; /* Title columns main + title dirt + major bricks + major sticks + major dirt lines + house tops in background */ + prom[20] = 1; /* Column shadows + other highlight on bricks + background house colour + more dirt lines */ + prom[21] = 90; /* The Masters Of text + little stones on road + top of mountains + high score digits */ + prom[22] = 16; /* Written By text + hills + road minus stones */ + prom[23] = 25; /* More stones on road + lines on hill + square around Written By text */ + prom[24] = 20; /* Brick grouting + progress meter highlight + score text */ + prom[25] = 11; /* Brick wall edge highlight + sword highlight on lives */ + prom[26] = 2; /* Top of brick wall + highlight on lives */ + prom[27] = 2; /* Credit text + progress highlight */ + prom[28] = 11; /* Bottom of life meter + hilt of lives */ + prom[29] = 240; /* Sky + bottom of life meter */ + prom[30] = 11; /* Surround of timer */ + prom[31] = 4; /* Top of life meter */ /* build a fake lookup table since we don't have the color PROMs */ for (i = 0; i < 0x0200; i++) diff --git a/src/drivers/triplhnt.c b/src/drivers/triplhnt.c index 179f251f8..f505e85ab 100644 --- a/src/drivers/triplhnt.c +++ b/src/drivers/triplhnt.c @@ -67,9 +67,9 @@ static void triplhnt_update_misc(int offset) coin_lockout_w(0, !(triplhnt_misc_flags & 0x08)); coin_lockout_w(1, !(triplhnt_misc_flags & 0x08)); - discrete_sound_w(3, (triplhnt_misc_flags >> 2) & 1); // screech - discrete_sound_w(4, (~triplhnt_misc_flags >> 1) & 1); // Lamp is used to reset noise - discrete_sound_w(1, (~triplhnt_misc_flags >> 7) & 1); // bear + discrete_sound_w(3, (triplhnt_misc_flags >> 2) & 1); /* screech */ + discrete_sound_w(4, (~triplhnt_misc_flags >> 1) & 1); /* Lamp is used to reset noise */ + discrete_sound_w(1, (~triplhnt_misc_flags >> 7) & 1); /* bear */ is_witch_hunt = readinputport(2) == 0x40; diff --git a/src/drivers/tumblep.c b/src/drivers/tumblep.c index e37ad717d..df792e2b7 100644 --- a/src/drivers/tumblep.c +++ b/src/drivers/tumblep.c @@ -221,7 +221,7 @@ MEMORY_END static MEMORY_WRITE16_START( tumblepop_writemem ) #if TUMBLEP_HACK - { 0x000000, 0x07ffff, MWA16_RAM }, // To write levels modifications + { 0x000000, 0x07ffff, MWA16_RAM }, /* To write levels modifications */ #else { 0x000000, 0x07ffff, MWA16_ROM }, #endif @@ -251,7 +251,7 @@ MEMORY_END static MEMORY_WRITE16_START( tumblepopb_writemem ) #if TUMBLEP_HACK - { 0x000000, 0x07ffff, MWA16_RAM }, // To write levels modifications + { 0x000000, 0x07ffff, MWA16_RAM }, /* To write levels modifications */ #else { 0x000000, 0x07ffff, MWA16_ROM }, #endif @@ -273,7 +273,7 @@ MEMORY_END static MEMORY_READ16_START( fncywld_readmem ) { 0x000000, 0x0fffff, MRA16_ROM }, { 0x100000, 0x100001, YM2151_status_port_0_lsb_r }, - { 0x100002, 0x100003, MRA16_NOP }, // ym? + { 0x100002, 0x100003, MRA16_NOP }, /* ym? */ { 0x100004, 0x100005, OKIM6295_status_0_lsb_r }, { 0x140000, 0x140fff, MRA16_RAM }, { 0x160000, 0x1607ff, MRA16_RAM }, @@ -281,12 +281,12 @@ static MEMORY_READ16_START( fncywld_readmem ) { 0x320000, 0x321fff, MRA16_RAM }, { 0x322000, 0x323fff, MRA16_RAM }, { 0x1a0000, 0x1a07ff, MRA16_RAM }, - { 0xff0000, 0xffffff, MRA16_RAM }, // RAM + { 0xff0000, 0xffffff, MRA16_RAM }, /* RAM */ MEMORY_END static MEMORY_WRITE16_START( fncywld_writemem ) #if FNCYWLD_HACK - { 0x000000, 0x0fffff, MWA16_RAM }, // To write levels modifications + { 0x000000, 0x0fffff, MWA16_RAM }, /* To write levels modifications */ #else { 0x000000, 0x0fffff, MWA16_ROM }, #endif @@ -305,14 +305,14 @@ static MEMORY_WRITE16_START( fncywld_writemem ) { 0x340400, 0x34047f, MWA16_NOP }, /* Unused col scroll */ { 0x342000, 0x3421ff, MWA16_NOP }, { 0x342400, 0x34247f, MWA16_NOP }, - { 0xff0000, 0xffffff, MWA16_RAM }, // RAM + { 0xff0000, 0xffffff, MWA16_RAM }, /* RAM */ MEMORY_END static MEMORY_READ16_START( magipur_readmem ) { 0x000000, 0x00ffff, MRA16_RAM }, { 0xf00000, 0xffffff, MRA16_ROM }, { 0x100000, 0x100001, YM2151_status_port_0_lsb_r }, - { 0x100002, 0x100003, MRA16_NOP }, // ym? + { 0x100002, 0x100003, MRA16_NOP }, /* ym? */ { 0x100004, 0x100005, OKIM6295_status_0_lsb_r }, { 0x140000, 0x140fff, MRA16_RAM }, { 0x160000, 0x1607ff, MRA16_RAM }, @@ -320,7 +320,7 @@ static MEMORY_READ16_START( magipur_readmem ) { 0x320000, 0x321fff, MRA16_RAM }, { 0x322000, 0x323fff, MRA16_RAM }, { 0x1a0000, 0x1a07ff, MRA16_RAM }, - { 0xff0000, 0xffffff, MRA16_RAM }, // RAM + { 0xff0000, 0xffffff, MRA16_RAM }, /* RAM */ MEMORY_END static MEMORY_WRITE16_START( magipur_writemem ) @@ -342,7 +342,7 @@ static MEMORY_WRITE16_START( magipur_writemem ) { 0x340400, 0x34047f, MWA16_NOP }, /* Unused col scroll */ { 0x342000, 0x3421ff, MWA16_NOP }, { 0x342400, 0x34247f, MWA16_NOP }, - { 0xff0000, 0xffffff, MWA16_RAM }, // RAM + { 0xff0000, 0xffffff, MWA16_RAM }, /* RAM */ MEMORY_END static MEMORY_READ16_START( htchctch_readmem ) @@ -367,7 +367,7 @@ static MEMORY_WRITE16_START( htchctch_writemem ) { 0x300000, 0x30000f, tumblep_control_0_w }, { 0x320000, 0x320fff, tumblep_pf1_data_w, &tumblep_pf1_data }, { 0x322000, 0x322fff, tumblep_pf2_data_w, &tumblep_pf2_data }, - { 0x341000, 0x342fff, MWA16_RAM }, // extra ram? + { 0x341000, 0x342fff, MWA16_RAM }, /* extra ram? */ MEMORY_END @@ -437,8 +437,8 @@ WRITE16_HANDLER( semicom_soundcmd_w ) if (ACCESSING_LSB) { soundlatch_w(0,data & 0xff); - // needed for Super Trio which reads the sound with polling -// cpu_spinuntil_time(TIME_IN_USEC(100)); + /* needed for Super Trio which reads the sound with polling */ +/* cpu_spinuntil_time(TIME_IN_USEC(100)); */ cpu_boost_interleave(0, TIME_IN_USEC(20)); } @@ -541,14 +541,14 @@ INPUT_PORTS_START( tumblep ) #if TUMBLEP_HACK PORT_DIPNAME( 0x08, 0x08, "Remove Monsters" ) #else - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) // See notes + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) /* See notes */ #endif PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) #if TUMBLEP_HACK PORT_DIPNAME( 0x04, 0x04, "Edit Levels" ) #else - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // See notes + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) /* See notes */ #endif PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -596,7 +596,7 @@ INPUT_PORTS_START( fncywld ) PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x40, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x60, DEF_STR( 2C_1C ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) // duplicated setting +/* PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )*/ /* duplicated setting */ PORT_DIPSETTING( 0xe0, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) ) @@ -604,10 +604,10 @@ INPUT_PORTS_START( fncywld ) PORT_DIPNAME( 0x10, 0x10, "Allow Continue" ) PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) ) // to be confirmed + PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) ) /* to be confirmed */ PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, "Language" ) // only seems to the title screen + PORT_DIPNAME( 0x04, 0x04, "Language" ) /* only seems to the title screen */ PORT_DIPSETTING( 0x04, "English" ) PORT_DIPSETTING( 0x00, "Korean" ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Flip_Screen ) ) @@ -623,7 +623,7 @@ INPUT_PORTS_START( fncywld ) PORT_DIPSETTING( 0x00, "2" ) PORT_DIPSETTING( 0xc0, "3" ) PORT_DIPSETTING( 0x40, "4" ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) // to be confirmed + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) /* to be confirmed */ PORT_DIPSETTING( 0x30, "Easy" ) PORT_DIPSETTING( 0x20, "Normal" ) PORT_DIPSETTING( 0x10, "Hard" ) @@ -631,14 +631,14 @@ INPUT_PORTS_START( fncywld ) #if FNCYWLD_HACK PORT_DIPNAME( 0x08, 0x08, "Remove Monsters" ) #else - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) // See notes + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) /* See notes */ #endif PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) #if FNCYWLD_HACK PORT_DIPNAME( 0x04, 0x04, "Edit Levels" ) #else - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // See notes + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) /* See notes */ #endif PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -686,7 +686,7 @@ INPUT_PORTS_START( magipur ) PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x40, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x60, DEF_STR( 2C_1C ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) // duplicated setting +/* PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )*/ /* duplicated setting */ PORT_DIPSETTING( 0xe0, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) ) @@ -694,7 +694,7 @@ INPUT_PORTS_START( magipur ) PORT_DIPNAME( 0x10, 0x10, "Allow Continue" ) PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x10, DEF_STR( Yes ) ) - PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) ) // to be confirmed + PORT_DIPNAME( 0x08, 0x00, DEF_STR( Demo_Sounds ) ) /* to be confirmed */ PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) @@ -713,15 +713,15 @@ INPUT_PORTS_START( magipur ) PORT_DIPSETTING( 0x00, "2" ) PORT_DIPSETTING( 0xc0, "3" ) PORT_DIPSETTING( 0x40, "4" ) - PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) // to be confirmed + PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) /* to be confirmed */ PORT_DIPSETTING( 0x30, "Easy" ) PORT_DIPSETTING( 0x20, "Normal" ) PORT_DIPSETTING( 0x10, "Hard" ) PORT_DIPSETTING( 0x00, "Hardest" ) - PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) // See notes + PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) ) /* See notes */ PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) // See notes + PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unused ) ) /* See notes */ PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unused ) ) @@ -865,7 +865,7 @@ INPUT_PORTS_START( cookbib ) PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_DIPNAME( 0x80, 0x80, "Stage Skip" ) // to be confirmed + PORT_DIPNAME( 0x80, 0x80, "Stage Skip" ) /* to be confirmed */ PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) @@ -1080,7 +1080,7 @@ INPUT_PORTS_START( sdfight ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK ) // to be confirmed + PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_VBLANK ) /* to be confirmed */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1608,7 +1608,7 @@ ROM_START( tumblep ) ROM_LOAD( "hl02-.f16", 0x00000, 0x10000, CRC(a5cab888) SHA1(622f6adb01e31b8f3adbaed2b9900b54c5922c57) ) ROM_REGION( 0x080000, REGION_GFX1, ROMREGION_DISPOSE ) - ROM_LOAD( "map-02.rom", 0x00000, 0x80000, CRC(dfceaa26) SHA1(83e391ff39efda71e5fa368ac68ba7d6134bac21) ) // encrypted + ROM_LOAD( "map-02.rom", 0x00000, 0x80000, CRC(dfceaa26) SHA1(83e391ff39efda71e5fa368ac68ba7d6134bac21) ) /* encrypted */ ROM_REGION( 0x100000, REGION_GFX2, ROMREGION_DISPOSE ) ROM_LOAD( "map-01.rom", 0x00000, 0x80000, CRC(e81ffa09) SHA1(01ada9557ead91eb76cf00db118d6c432104a398) ) @@ -1627,7 +1627,7 @@ ROM_START( tumblepj ) ROM_LOAD( "hl02-.f16", 0x00000, 0x10000, CRC(a5cab888) SHA1(622f6adb01e31b8f3adbaed2b9900b54c5922c57) ) ROM_REGION( 0x080000, REGION_GFX1, ROMREGION_DISPOSE ) - ROM_LOAD( "map-02.rom", 0x00000, 0x80000, CRC(dfceaa26) SHA1(83e391ff39efda71e5fa368ac68ba7d6134bac21) ) // encrypted + ROM_LOAD( "map-02.rom", 0x00000, 0x80000, CRC(dfceaa26) SHA1(83e391ff39efda71e5fa368ac68ba7d6134bac21) ) /* encrypted */ ROM_REGION( 0x100000, REGION_GFX2, ROMREGION_DISPOSE ) ROM_LOAD( "map-01.rom", 0x00000, 0x80000, CRC(e81ffa09) SHA1(01ada9557ead91eb76cf00db118d6c432104a398) ) @@ -1677,7 +1677,7 @@ ROM_START( jumpkids ) ROM_LOAD16_BYTE( "24.16c", 0x00001, 0x40000, CRC(5795d98b) SHA1(d1435f0b79a4fa45770c56b91f078c1885fbd048) ) ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* Z80 Code */ - ROM_LOAD( "23.3c", 0x00000, 0x10000, BAD_DUMP CRC(d7dbbd8c) SHA1(3fbbd0c205ddc8aa8c14cc8f482dbe27d4a909c4) ) // bad + ROM_LOAD( "23.3c", 0x00000, 0x10000, BAD_DUMP CRC(d7dbbd8c) SHA1(3fbbd0c205ddc8aa8c14cc8f482dbe27d4a909c4) ) /* bad */ ROM_REGION( 0x80000, REGION_GFX1, ROMREGION_DISPOSE ) /* GFX */ ROM_LOAD16_BYTE( "30.15j", 0x00000, 0x40000, CRC(44b9a089) SHA1(b6f99b0b597d540b375616dad4354fc9dbb75a21) ) @@ -1685,7 +1685,7 @@ ROM_START( jumpkids ) ROM_REGION( 0x100000, REGION_GFX2, ROMREGION_DISPOSE ) /* GFX */ ROM_LOAD16_BYTE( "25.1g", 0x00000, 0x40000, CRC(176ae857) SHA1(e3178d2a15452a36eb94caf5e5ff3a561783a5f4) ) - ROM_LOAD16_BYTE( "28.1l", 0x00001, 0x40000, BAD_DUMP CRC(dc35c5a0) SHA1(854429261151c58b94542e9ca51b0807e8bc1f5f) ) // bad + ROM_LOAD16_BYTE( "28.1l", 0x00001, 0x40000, BAD_DUMP CRC(dc35c5a0) SHA1(854429261151c58b94542e9ca51b0807e8bc1f5f) ) /* bad */ ROM_LOAD16_BYTE( "26.2g", 0x80000, 0x40000, CRC(e8b34980) SHA1(edbf5517c6c9c9c3344d11eabb4a58da87386725) ) ROM_LOAD16_BYTE( "27.1j", 0x80001, 0x40000, CRC(3918dda3) SHA1(9409b5a5dc4c44c1ddcb77278541d012b5d8e052) ) @@ -1759,7 +1759,7 @@ ROM_START( htchctch ) ROM_LOAD( "p02.b5", 0x00000, 0x10000 , CRC(c5a03186) SHA1(42561ab36e6d7a43828d3094e64bd1229ab893ba) ) ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* Intel 87C52 MCU Code */ -// ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ +/* ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP )*/ /* can't be dumped */ ROM_REGION16_BE( 0x200, REGION_USER1, 0 ) /* Data from Shared RAM */ /* this is not a real rom but instead the data extracted from @@ -1791,7 +1791,7 @@ ROM_START( cookbib ) ROM_LOAD( "prg-s.ub5", 0x00000, 0x10000 , CRC(547d6ea3) SHA1(42929e453c4f1c90c29197a9bed953139cfe2873) ) ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* Intel 87C52 MCU Code */ -// ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ +/* ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ ROM_REGION16_BE( 0x200, REGION_USER1, 0 ) /* Data from Shared RAM */ /* this is not a real rom but instead the data extracted from @@ -1823,7 +1823,7 @@ ROM_START( chokchok ) ROM_LOAD( "ub5.bin", 0x00000, 0x10000 , CRC(30c2171d) SHA1(3954e286d57b955af6ba9b1a0b49c442d7f295ae) ) ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* Intel 87C52 MCU Code */ -// ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ +/* ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP )*/ /* can't be dumped */ ROM_REGION16_BE( 0x200, REGION_USER1, 0 ) /* Data from Shared RAM */ /* this is not a real rom but instead the data extracted from @@ -1866,7 +1866,7 @@ ROM_START( bcstry ) ROM_CONTINUE( 0x8000, 0x4000 ) ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* Intel 87C52 MCU Code */ -// ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ +/* ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP )*/ /* can't be dumped */ ROM_REGION16_BE( 0x200, REGION_USER1, 0 ) /* Data from Shared RAM */ /* this is not a real rom but instead the data extracted from @@ -1878,32 +1878,32 @@ ROM_START( bcstry ) ROM_LOAD( "bcstry_u.64", 0x00000, 0x40000, CRC(23f0e0fe) SHA1(a8c3cbb6378797db353ca2873e73ff157a6f8a3c) ) ROM_REGION( 0x200000, REGION_GFX1, 0 ) /* Tiles */ - ROM_LOAD16_BYTE( "bcstry_u.109", 0x000000, 0x20000, CRC(eb04d37a) SHA1(818dc7aafac577920d94c65e47d965dc0474d92c) ) // tiles a plane 0 - ROM_CONTINUE ( 0x100000,0x20000) // tiles a plane 1 - ROM_CONTINUE ( 0x040000,0x20000) // tiles b plane 0 - ROM_CONTINUE ( 0x140000,0x20000) // tiles b plane 1 - ROM_LOAD16_BYTE( "bcstry_u.113", 0x000001, 0x20000, CRC(746ecdd7) SHA1(afb6dbc0fb94e7ce96a9b219f5f7cd3721d1c1c4) ) // tiles a plane 2 - ROM_CONTINUE ( 0x100001,0x20000) // tiles a plane 3 - ROM_CONTINUE ( 0x040001,0x20000) // tiles b plane 2 - ROM_CONTINUE ( 0x140001,0x20000) // tiles b plane 3 - ROM_LOAD16_BYTE( "bcstry_u.110", 0x080000, 0x20000, CRC(1bfe65c3) SHA1(27dec16b271866ff336d8b25d352977ca80c35bf) ) // tiles c plane 0 - ROM_CONTINUE ( 0x180000,0x20000) // tiles c plane 1 - ROM_CONTINUE ( 0x0c0000,0x20000) // tiles d plane 0 - ROM_CONTINUE ( 0x1c0000,0x20000) // tiles d plane 1 - ROM_LOAD16_BYTE( "bcstry_u.111", 0x080001, 0x20000, CRC(c8bf3a3c) SHA1(604fc57c4d3a581016aa2516236c568488d23c77) ) // tiles c plane 2 - ROM_CONTINUE ( 0x180001,0x20000) // tiles c plane 3 - ROM_CONTINUE ( 0x0c0001,0x20000) // tiles d plane 2 - ROM_CONTINUE ( 0x1c0001,0x20000) // tiles d plane 3 + ROM_LOAD16_BYTE( "bcstry_u.109", 0x000000, 0x20000, CRC(eb04d37a) SHA1(818dc7aafac577920d94c65e47d965dc0474d92c) ) /* tiles a plane 0 */ + ROM_CONTINUE ( 0x100000,0x20000) /* tiles a plane 1 */ + ROM_CONTINUE ( 0x040000,0x20000) /* tiles b plane 0 */ + ROM_CONTINUE ( 0x140000,0x20000) /* tiles b plane 1 */ + ROM_LOAD16_BYTE( "bcstry_u.113", 0x000001, 0x20000, CRC(746ecdd7) SHA1(afb6dbc0fb94e7ce96a9b219f5f7cd3721d1c1c4) ) /* tiles a plane 2 */ + ROM_CONTINUE ( 0x100001,0x20000) /* tiles a plane 3 */ + ROM_CONTINUE ( 0x040001,0x20000) /* tiles b plane 2 */ + ROM_CONTINUE ( 0x140001,0x20000) /* tiles b plane 3 */ + ROM_LOAD16_BYTE( "bcstry_u.110", 0x080000, 0x20000, CRC(1bfe65c3) SHA1(27dec16b271866ff336d8b25d352977ca80c35bf) ) /* tiles c plane 0 */ + ROM_CONTINUE ( 0x180000,0x20000) /* tiles c plane 1 */ + ROM_CONTINUE ( 0x0c0000,0x20000) /* tiles d plane 0 */ + ROM_CONTINUE ( 0x1c0000,0x20000) /* tiles d plane 1 */ + ROM_LOAD16_BYTE( "bcstry_u.111", 0x080001, 0x20000, CRC(c8bf3a3c) SHA1(604fc57c4d3a581016aa2516236c568488d23c77) ) /* tiles c plane 2 */ + ROM_CONTINUE ( 0x180001,0x20000) /* tiles c plane 3 */ + ROM_CONTINUE ( 0x0c0001,0x20000) /* tiles d plane 2 */ + ROM_CONTINUE ( 0x1c0001,0x20000) /* tiles d plane 3 */ ROM_REGION( 0x400000, REGION_GFX2, ROMREGION_DISPOSE ) /* Sprites */ - ROM_LOAD16_BYTE( "bcstry_u.100", 0x000000, 0x80000, CRC(8c11cbed) SHA1(e04e53af4fe732bf9d20a9ae5c2a90b576ee0b83) ) // b - ROM_LOAD16_BYTE( "bcstry_u.106", 0x000001, 0x80000, CRC(5219bcbf) SHA1(4b88eab7ffc2dc1de451ae4ee52f1536e179ea13) ) // b - ROM_LOAD16_BYTE( "bcstry_u.99", 0x100000, 0x80000, CRC(cdb1af87) SHA1(df1fbda5c7ce4fbd64d6db9eb80946e06119f096) ) // a - ROM_LOAD16_BYTE( "bcstry_u.105", 0x100001, 0x80000, CRC(8166b596) SHA1(cbf6f5cec5f6991bb1d4ec0ea03cd617ff38fc3b) ) // a - ROM_LOAD16_BYTE( "bcstry_u.104", 0x200000, 0x80000, CRC(377c0c71) SHA1(77efa9530b1c311d93c84dd8452701414f740269) ) // b - ROM_LOAD16_BYTE( "bcstry_u.108", 0x200001, 0x80000, CRC(442307ed) SHA1(71b7f19af64d9961f0f9205b86b4b0ebc13fddda) ) // b - ROM_LOAD16_BYTE( "bcstry_u.102", 0x300000, 0x80000, CRC(71b40ece) SHA1(1a13dfd7615a6f61851897ebcb10fa69bc8ae525) ) // a - ROM_LOAD16_BYTE( "bcstry_u.107", 0x300001, 0x80000, CRC(ab3c923a) SHA1(aaca1d2ed7b53e0933e0bd94a19458dd1598f204) ) // a + ROM_LOAD16_BYTE( "bcstry_u.100", 0x000000, 0x80000, CRC(8c11cbed) SHA1(e04e53af4fe732bf9d20a9ae5c2a90b576ee0b83) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.106", 0x000001, 0x80000, CRC(5219bcbf) SHA1(4b88eab7ffc2dc1de451ae4ee52f1536e179ea13) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.99", 0x100000, 0x80000, CRC(cdb1af87) SHA1(df1fbda5c7ce4fbd64d6db9eb80946e06119f096) ) /* a */ + ROM_LOAD16_BYTE( "bcstry_u.105", 0x100001, 0x80000, CRC(8166b596) SHA1(cbf6f5cec5f6991bb1d4ec0ea03cd617ff38fc3b) ) /* a */ + ROM_LOAD16_BYTE( "bcstry_u.104", 0x200000, 0x80000, CRC(377c0c71) SHA1(77efa9530b1c311d93c84dd8452701414f740269) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.108", 0x200001, 0x80000, CRC(442307ed) SHA1(71b7f19af64d9961f0f9205b86b4b0ebc13fddda) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.102", 0x300000, 0x80000, CRC(71b40ece) SHA1(1a13dfd7615a6f61851897ebcb10fa69bc8ae525) ) /* a */ + ROM_LOAD16_BYTE( "bcstry_u.107", 0x300001, 0x80000, CRC(ab3c923a) SHA1(aaca1d2ed7b53e0933e0bd94a19458dd1598f204) ) /* a */ ROM_END ROM_START( bcstrya ) @@ -1920,7 +1920,7 @@ ROM_START( bcstrya ) ROM_CONTINUE( 0x8000, 0x4000 ) ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* Intel 87C52 MCU Code */ -// ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ +/* ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP )*/ /* can't be dumped */ ROM_REGION16_BE( 0x200, REGION_USER1, 0 ) /* Data from Shared RAM */ /* this is not a real rom but instead the data extracted from @@ -1931,32 +1931,32 @@ ROM_START( bcstrya ) ROM_LOAD( "bcstry_u.64", 0x00000, 0x40000, CRC(23f0e0fe) SHA1(a8c3cbb6378797db353ca2873e73ff157a6f8a3c) ) ROM_REGION( 0x200000, REGION_GFX1, 0 ) /* Tiles */ - ROM_LOAD16_BYTE( "bcstry_u.109", 0x000000, 0x20000, CRC(eb04d37a) SHA1(818dc7aafac577920d94c65e47d965dc0474d92c) ) // tiles a plane 0 - ROM_CONTINUE ( 0x100000,0x20000) // tiles a plane 1 - ROM_CONTINUE ( 0x040000,0x20000) // tiles b plane 0 - ROM_CONTINUE ( 0x140000,0x20000) // tiles b plane 1 - ROM_LOAD16_BYTE( "bcstry_u.113", 0x000001, 0x20000, CRC(746ecdd7) SHA1(afb6dbc0fb94e7ce96a9b219f5f7cd3721d1c1c4) ) // tiles a plane 2 - ROM_CONTINUE ( 0x100001,0x20000) // tiles a plane 3 - ROM_CONTINUE ( 0x040001,0x20000) // tiles b plane 2 - ROM_CONTINUE ( 0x140001,0x20000) // tiles b plane 3 - ROM_LOAD16_BYTE( "bcstry_u.110", 0x080000, 0x20000, CRC(1bfe65c3) SHA1(27dec16b271866ff336d8b25d352977ca80c35bf) ) // tiles c plane 0 - ROM_CONTINUE ( 0x180000,0x20000) // tiles c plane 1 - ROM_CONTINUE ( 0x0c0000,0x20000) // tiles d plane 0 - ROM_CONTINUE ( 0x1c0000,0x20000) // tiles d plane 1 - ROM_LOAD16_BYTE( "bcstry_u.111", 0x080001, 0x20000, CRC(c8bf3a3c) SHA1(604fc57c4d3a581016aa2516236c568488d23c77) ) // tiles c plane 2 - ROM_CONTINUE ( 0x180001,0x20000) // tiles c plane 3 - ROM_CONTINUE ( 0x0c0001,0x20000) // tiles d plane 2 - ROM_CONTINUE ( 0x1c0001,0x20000) // tiles d plane 3 + ROM_LOAD16_BYTE( "bcstry_u.109", 0x000000, 0x20000, CRC(eb04d37a) SHA1(818dc7aafac577920d94c65e47d965dc0474d92c) ) /* tiles a plane 0 */ + ROM_CONTINUE ( 0x100000,0x20000) /* tiles a plane 1 */ + ROM_CONTINUE ( 0x040000,0x20000) /* tiles b plane 0 */ + ROM_CONTINUE ( 0x140000,0x20000) /* tiles b plane 1 */ + ROM_LOAD16_BYTE( "bcstry_u.113", 0x000001, 0x20000, CRC(746ecdd7) SHA1(afb6dbc0fb94e7ce96a9b219f5f7cd3721d1c1c4) ) /* tiles a plane 2 */ + ROM_CONTINUE ( 0x100001,0x20000) /* tiles a plane 3 */ + ROM_CONTINUE ( 0x040001,0x20000) /* tiles b plane 2 */ + ROM_CONTINUE ( 0x140001,0x20000) /* tiles b plane 3 */ + ROM_LOAD16_BYTE( "bcstry_u.110", 0x080000, 0x20000, CRC(1bfe65c3) SHA1(27dec16b271866ff336d8b25d352977ca80c35bf) ) /* tiles c plane 0 */ + ROM_CONTINUE ( 0x180000,0x20000) /* tiles c plane 1 */ + ROM_CONTINUE ( 0x0c0000,0x20000) /* tiles d plane 0 */ + ROM_CONTINUE ( 0x1c0000,0x20000) /* tiles d plane 1 */ + ROM_LOAD16_BYTE( "bcstry_u.111", 0x080001, 0x20000, CRC(c8bf3a3c) SHA1(604fc57c4d3a581016aa2516236c568488d23c77) ) /* tiles c plane 2 */ + ROM_CONTINUE ( 0x180001,0x20000) /* tiles c plane 3 */ + ROM_CONTINUE ( 0x0c0001,0x20000) /* tiles d plane 2 */ + ROM_CONTINUE ( 0x1c0001,0x20000) /* tiles d plane 3 */ ROM_REGION( 0x400000, REGION_GFX2, ROMREGION_DISPOSE ) /* Sprites */ - ROM_LOAD16_BYTE( "bcstry_u.100", 0x000000, 0x80000, CRC(8c11cbed) SHA1(e04e53af4fe732bf9d20a9ae5c2a90b576ee0b83) ) // b - ROM_LOAD16_BYTE( "bcstry_u.106", 0x000001, 0x80000, CRC(5219bcbf) SHA1(4b88eab7ffc2dc1de451ae4ee52f1536e179ea13) ) // b - ROM_LOAD16_BYTE( "bcstry_u.99", 0x100000, 0x80000, CRC(cdb1af87) SHA1(df1fbda5c7ce4fbd64d6db9eb80946e06119f096) ) // a - ROM_LOAD16_BYTE( "bcstry_u.105", 0x100001, 0x80000, CRC(8166b596) SHA1(cbf6f5cec5f6991bb1d4ec0ea03cd617ff38fc3b) ) // a - ROM_LOAD16_BYTE( "bcstry_u.104", 0x200000, 0x80000, CRC(377c0c71) SHA1(77efa9530b1c311d93c84dd8452701414f740269) ) // b - ROM_LOAD16_BYTE( "bcstry_u.108", 0x200001, 0x80000, CRC(442307ed) SHA1(71b7f19af64d9961f0f9205b86b4b0ebc13fddda) ) // b - ROM_LOAD16_BYTE( "bcstry_u.102", 0x300000, 0x80000, CRC(71b40ece) SHA1(1a13dfd7615a6f61851897ebcb10fa69bc8ae525) ) // a - ROM_LOAD16_BYTE( "bcstry_u.107", 0x300001, 0x80000, CRC(ab3c923a) SHA1(aaca1d2ed7b53e0933e0bd94a19458dd1598f204) ) // a + ROM_LOAD16_BYTE( "bcstry_u.100", 0x000000, 0x80000, CRC(8c11cbed) SHA1(e04e53af4fe732bf9d20a9ae5c2a90b576ee0b83) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.106", 0x000001, 0x80000, CRC(5219bcbf) SHA1(4b88eab7ffc2dc1de451ae4ee52f1536e179ea13) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.99", 0x100000, 0x80000, CRC(cdb1af87) SHA1(df1fbda5c7ce4fbd64d6db9eb80946e06119f096) ) /* a */ + ROM_LOAD16_BYTE( "bcstry_u.105", 0x100001, 0x80000, CRC(8166b596) SHA1(cbf6f5cec5f6991bb1d4ec0ea03cd617ff38fc3b) ) /* a */ + ROM_LOAD16_BYTE( "bcstry_u.104", 0x200000, 0x80000, CRC(377c0c71) SHA1(77efa9530b1c311d93c84dd8452701414f740269) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.108", 0x200001, 0x80000, CRC(442307ed) SHA1(71b7f19af64d9961f0f9205b86b4b0ebc13fddda) ) /* b */ + ROM_LOAD16_BYTE( "bcstry_u.102", 0x300000, 0x80000, CRC(71b40ece) SHA1(1a13dfd7615a6f61851897ebcb10fa69bc8ae525) ) /* a */ + ROM_LOAD16_BYTE( "bcstry_u.107", 0x300001, 0x80000, CRC(ab3c923a) SHA1(aaca1d2ed7b53e0933e0bd94a19458dd1598f204) ) /* a */ ROM_END /* SD Fight */ @@ -1976,8 +1976,7 @@ ROM_START( sdfight ) ROM_LOAD( "ua7", 0x00000, 0x10000 , CRC(c3d36da4) SHA1(7290a977bfa9a3d5e0c98a0f589d877e38aa10a1) ) ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* Intel 87C52 MCU Code */ - //ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP ) /* can't be dumped */ - + /*ROM_LOAD( "87c52.mcu", 0x00000, 0x10000 , NO_DUMP )*/ /* can't be dumped */ ROM_REGION16_BE( 0x200, REGION_USER1, ROMREGION_ERASE00 ) /* Data from Shared RAM */ ROM_LOAD16_WORD( "protdata.bin", 0x00000, 0x200 , CRC(efb8b822) SHA1(139c39771c057ae322d3601f7e0a58b43fa8860a) ) @@ -1985,32 +1984,32 @@ ROM_START( sdfight ) ROM_LOAD( "uc1", 0x00000, 0x40000, CRC(535cae2c) SHA1(e9d59ab23cbbc0375987ea68e170ddb1cc75cff8) ) ROM_REGION( 0x200000, REGION_GFX1, 0 ) /* Tiles */ - ROM_LOAD16_BYTE( "9.ug11", 0x000001, 0x20000, CRC(bf809ccd) SHA1(4d648d7cdeb5ce4a918b8372dbd33c2fbf307dc0) ) // tiles a plane 0 - ROM_CONTINUE ( 0x100001,0x20000) // tiles a plane 1 - ROM_CONTINUE ( 0x040001,0x20000) // tiles b plane 0 - ROM_CONTINUE ( 0x140001,0x20000) // tiles b plane 1 - ROM_LOAD16_BYTE( "10.ug12", 0x000000, 0x20000, CRC(a5a3bfa2) SHA1(9b0d791f80f4cba14b7fab1aa7550784d6c4c4f7) ) // tiles a plane 2 - ROM_CONTINUE ( 0x100000,0x20000) // tiles a plane 3 - ROM_CONTINUE ( 0x040000,0x20000) // tiles b plane 2 - ROM_CONTINUE ( 0x140000,0x20000) // tiles b plane 3 - ROM_LOAD16_BYTE( "15.ui11", 0x080001, 0x20000, CRC(3bc8aa6d) SHA1(a8983957da5e286ec437f2fc83dfabf81fe56ca2) ) // tiles c plane 0 - ROM_CONTINUE ( 0x180001,0x20000) // tiles c plane 1 - ROM_CONTINUE ( 0x0c0001,0x20000) // tiles d plane 0 - ROM_CONTINUE ( 0x1c0001,0x20000) // tiles d plane 1 - ROM_LOAD16_BYTE( "16.ui12", 0x080000, 0x20000, CRC(71e6b78d) SHA1(a676395b2357093c4800d8520df10f7ef17cb3ee) ) // tiles c plane 2 - ROM_CONTINUE ( 0x180000,0x20000) // tiles c plane 3 - ROM_CONTINUE ( 0x0c0000,0x20000) // tiles d plane 2 - ROM_CONTINUE ( 0x1c0000,0x20000) // tiles d plane 3 + ROM_LOAD16_BYTE( "9.ug11", 0x000001, 0x20000, CRC(bf809ccd) SHA1(4d648d7cdeb5ce4a918b8372dbd33c2fbf307dc0) ) /* tiles a plane 0 */ + ROM_CONTINUE ( 0x100001,0x20000) /* tiles a plane 1 */ + ROM_CONTINUE ( 0x040001,0x20000) /* tiles b plane 0 */ + ROM_CONTINUE ( 0x140001,0x20000) /* tiles b plane 1 */ + ROM_LOAD16_BYTE( "10.ug12", 0x000000, 0x20000, CRC(a5a3bfa2) SHA1(9b0d791f80f4cba14b7fab1aa7550784d6c4c4f7) ) /* tiles a plane 2 */ + ROM_CONTINUE ( 0x100000,0x20000) /* tiles a plane 3 */ + ROM_CONTINUE ( 0x040000,0x20000) /* tiles b plane 2 */ + ROM_CONTINUE ( 0x140000,0x20000) /* tiles b plane 3 */ + ROM_LOAD16_BYTE( "15.ui11", 0x080001, 0x20000, CRC(3bc8aa6d) SHA1(a8983957da5e286ec437f2fc83dfabf81fe56ca2) ) /* tiles c plane 0 */ + ROM_CONTINUE ( 0x180001,0x20000) /* tiles c plane 1 */ + ROM_CONTINUE ( 0x0c0001,0x20000) /* tiles d plane 0 */ + ROM_CONTINUE ( 0x1c0001,0x20000) /* tiles d plane 1 */ + ROM_LOAD16_BYTE( "16.ui12", 0x080000, 0x20000, CRC(71e6b78d) SHA1(a676395b2357093c4800d8520df10f7ef17cb3ee) ) /* tiles c plane 2 */ + ROM_CONTINUE ( 0x180000,0x20000) /* tiles c plane 3 */ + ROM_CONTINUE ( 0x0c0000,0x20000) /* tiles d plane 2 */ + ROM_CONTINUE ( 0x1c0000,0x20000) /* tiles d plane 3 */ ROM_REGION( 0x400000, REGION_GFX2, ROMREGION_DISPOSE ) /* Sprites */ - ROM_LOAD16_BYTE( "11.uk2", 0x000000, 0x80000, CRC(d006fadc) SHA1(79014bc0c7909763829ba02d5434d4543b4b80e5) ) // b - ROM_LOAD16_BYTE( "12.uk3", 0x000001, 0x80000, CRC(2a2f4153) SHA1(d86692ee17ad052fdd8fccded57e3e30012026f6) ) // b - ROM_LOAD16_BYTE( "5.uj2", 0x100000, 0x80000, CRC(f1246cbf) SHA1(de80a8f0d29ee76e11f38d9982ffcb4fd228153a) ) // b - ROM_LOAD16_BYTE( "6.uj3", 0x100001, 0x80000, CRC(d346878c) SHA1(93174f6f6cc797323c5e429bf324d4ffe081f072) ) // b - ROM_LOAD16_BYTE( "13.uk4", 0x200000, 0x80000, CRC(9bc40774) SHA1(b56c57258ec9c07c7efff9c0c632390d2d5ce4e2) ) // a - ROM_LOAD16_BYTE( "14.uk5", 0x200001, 0x80000, CRC(a1e61674) SHA1(a5a50f479a019b39082429fa3425a95480838f84) ) // a - ROM_LOAD16_BYTE( "7.uj4", 0x300000, 0x80000, CRC(dbdece8a) SHA1(20199cc915a1f8088372682c054cac69bc3b4918) ) // a - ROM_LOAD16_BYTE( "8.uj5", 0x300001, 0x80000, CRC(60be7dd1) SHA1(d212dee3acf696cac0843e968a71ec1fb9b16dc9) ) // a + ROM_LOAD16_BYTE( "11.uk2", 0x000000, 0x80000, CRC(d006fadc) SHA1(79014bc0c7909763829ba02d5434d4543b4b80e5) ) /* b */ + ROM_LOAD16_BYTE( "12.uk3", 0x000001, 0x80000, CRC(2a2f4153) SHA1(d86692ee17ad052fdd8fccded57e3e30012026f6) ) /* b */ + ROM_LOAD16_BYTE( "5.uj2", 0x100000, 0x80000, CRC(f1246cbf) SHA1(de80a8f0d29ee76e11f38d9982ffcb4fd228153a) ) /* b */ + ROM_LOAD16_BYTE( "6.uj3", 0x100001, 0x80000, CRC(d346878c) SHA1(93174f6f6cc797323c5e429bf324d4ffe081f072) ) /* b */ + ROM_LOAD16_BYTE( "13.uk4", 0x200000, 0x80000, CRC(9bc40774) SHA1(b56c57258ec9c07c7efff9c0c632390d2d5ce4e2) ) /* a */ + ROM_LOAD16_BYTE( "14.uk5", 0x200001, 0x80000, CRC(a1e61674) SHA1(a5a50f479a019b39082429fa3425a95480838f84) ) /* a */ + ROM_LOAD16_BYTE( "7.uj4", 0x300000, 0x80000, CRC(dbdece8a) SHA1(20199cc915a1f8088372682c054cac69bc3b4918) ) /* a */ + ROM_LOAD16_BYTE( "8.uj5", 0x300001, 0x80000, CRC(60be7dd1) SHA1(d212dee3acf696cac0843e968a71ec1fb9b16dc9) ) /* a */ ROM_END /* Super Trio */ @@ -2053,7 +2052,7 @@ void tumblep_patch_code(UINT16 offset) /* A hack which enables all Dip Switches effects */ UINT16 *RAM = (UINT16 *)memory_region(REGION_CPU1); RAM[(offset + 0)/2] = 0x0240; - RAM[(offset + 2)/2] = 0xffff; // andi.w #$f3ff, D0 + RAM[(offset + 2)/2] = 0xffff; /* andi.w #$f3ff, D0 */ } @@ -2122,7 +2121,7 @@ static DRIVER_INIT( magipur ) { UINT16 *src = (UINT16 *)memory_region(REGION_CPU1); - // copy vector table? game expects RAM at 0, and ROM at f00000?! + /* copy vector table? game expects RAM at 0, and ROM at f00000?! */ memcpy(mainram, src, 0x80); memcpy(maincpu, memory_region(REGION_CPU1), memory_region_length(REGION_CPU1)); @@ -2133,7 +2132,7 @@ static DRIVER_INIT( magipur ) static READ16_HANDLER( bcstory_1a0_read ) { -// printf("bcstory_io %06x\n",activecpu_get_pc()); +/* printf("bcstory_io %06x\n",activecpu_get_pc()); */ if (activecpu_get_pc()==0x0560) return 0x1a0; else return readinputport(2); } @@ -2141,7 +2140,7 @@ static READ16_HANDLER( bcstory_1a0_read ) static DRIVER_INIT ( bcstory ) { tumblepb_gfx1_decrypt(); - install_mem_read16_handler(0, 0x180008, 0x180009, bcstory_1a0_read ); // io should be here?? + install_mem_read16_handler(0, 0x180008, 0x180009, bcstory_1a0_read ); /* io should be here?? */ } @@ -2149,19 +2148,19 @@ static DRIVER_INIT ( bcstory ) static DRIVER_INIT( htchctch ) { -// UINT16 *HCROM = (UINT16*)memory_region(REGION_CPU1); +/* UINT16 *HCROM = (UINT16*)memory_region(REGION_CPU1); */ UINT16 *PROTDATA = (UINT16*)memory_region(REGION_USER1); int i; /* simulate RAM initialization done by the protection MCU */ /* verified on real hardware */ -// static UINT16 htchctch_mcu68k[] = -// { -// /* moved to protdata.bin file .. */ -// }; +/* static UINT16 htchctch_mcu68k[] = */ +/* { */ +/* moved to protdata.bin file .. */ +/* }; */ -// for (i = 0;i < sizeof(htchctch_mcu68k)/sizeof(htchctch_mcu68k[0]);i++) -// tumblep_mainram[0x000/2 + i] = htchctch_mcu68k[i]; +/* for (i = 0;i < sizeof(htchctch_mcu68k)/sizeof(htchctch_mcu68k[0]);i++) */ +/* tumblep_mainram[0x000/2 + i] = htchctch_mcu68k[i]; */ for (i = 0;i < 0x200/2;i++) tumblep_mainram[0x000/2 + i] = PROTDATA[i]; @@ -2248,7 +2247,7 @@ static DRIVER_INIT( htchctch ) /* put the address we to read to in A2 */ HCROM[0x1e10c/2] = 0x45f9; HCROM[0x1e10e/2] = 0x0012; -// HCROM[0x1e110/2] = 0x2000; +/* HCROM[0x1e110/2] = 0x2000; */ HCROM[0x1e110/2] = 0x2000+0x60+0x60+0x60+0x60+0x60; /* put the number of rows into D3 */ @@ -2262,15 +2261,15 @@ static DRIVER_INIT( htchctch ) HCROM[0x1e11c/2] = 0x0008; - // move content of a2 to d4 (byte) + /* move content of a2 to d4 (byte) */ HCROM[0x1e11e/2] = 0x1812; - HCROM[0x1e120/2] = 0xe84c; // shift d4 right by 4 + HCROM[0x1e120/2] = 0xe84c; /* shift d4 right by 4 */ - HCROM[0x1e122/2] = 0x0244; // mask with 0x000f - HCROM[0x1e124/2] = 0x000f; // + HCROM[0x1e122/2] = 0x0244; /* mask with 0x000f */ + HCROM[0x1e124/2] = 0x000f; /* */ - HCROM[0x1e126/2] = 0x3004; // d4 -> d0 + HCROM[0x1e126/2] = 0x3004; /* d4 -> d0 */ /* jump to character draw to draw first bit */ HCROM[0x1e128/2] = 0x4eb9; @@ -2283,13 +2282,13 @@ static DRIVER_INIT( htchctch ) HCROM[0x1e132/2] = 0x0002; - // move content of a2 to d4 (byte) + /* move content of a2 to d4 (byte) */ HCROM[0x1e134/2] = 0x1812; - HCROM[0x1e136/2] = 0x0244; // mask with 0x000f - HCROM[0x1e138/2] = 0x000f; // + HCROM[0x1e136/2] = 0x0244; /* mask with 0x000f */ + HCROM[0x1e138/2] = 0x000f; /* */ - HCROM[0x1e13a/2] = 0x3004; // d4 -> d0 + HCROM[0x1e13a/2] = 0x3004; /* d4 -> d0 */ /* jump to character draw to draw second bit */ HCROM[0x1e13c/2] = 0x4eb9; @@ -2306,7 +2305,7 @@ static DRIVER_INIT( htchctch ) HCROM[0x1e14a/2] = 0x0000; HCROM[0x1e14c/2] = 0x0001; -// brr +/* brr */ /* decrease counter d2 */ HCROM[0x1e14e/2] = 0x5382; @@ -2334,7 +2333,7 @@ static DRIVER_INIT( htchctch ) /* if its not 0 then branch back */ HCROM[0x1e166/2] = 0x66b0; - HCROM[0x1e168/2] = 0x4e75; // rts + HCROM[0x1e168/2] = 0x4e75; /* rts */ /* DRAW CHARACTER SUBROUTINE, note, this won't restore a1,d1, don't other places! */ @@ -2355,7 +2354,7 @@ static DRIVER_INIT( htchctch ) HCROM[0x1e20e/2] = 0xf000; /* write d1 -> a1 for TOP half */ - HCROM[0x1e210/2] = 0x32c1; // not ideal .. we don't need to increase a1 + HCROM[0x1e210/2] = 0x32c1; /* not ideal .. we don't need to increase a1 */ /* move address into A0->A1 for use by this subroutine */ HCROM[0x1e212/2] = 0x2248; @@ -2378,12 +2377,12 @@ static DRIVER_INIT( htchctch ) HCROM[0x1e224/2] = 0xf000; /* write d1 -> a1 for BOTTOM half */ - HCROM[0x1e226/2] = 0x32c1; // not ideal .. we don't need to increase a1 + HCROM[0x1e226/2] = 0x32c1; /* not ideal .. we don't need to increase a1 */ HCROM[0x1e228/2] = 0x4e75; - install_mem_write16_handler(0, 0x140000, 0x1407ff, MWA16_NOP ); // kill palette writes as the interrupt code we don't have controls them + install_mem_write16_handler(0, 0x140000, 0x1407ff, MWA16_NOP ); /* kill palette writes as the interrupt code we don't have controls them */ { @@ -2466,12 +2465,12 @@ GAME( 1991, tumblepj, tumblep, tumblep, tumblep, tumblep, ROT0, "Data East C GAMEX(1991, tumblepb, tumblep, tumblepb, tumblep, tumblepb, ROT0, "bootleg", "Tumble Pop (bootleg set 1)", GAME_IMPERFECT_SOUND ) GAMEX(1991, tumblep2, tumblep, tumblepb, tumblep, tumblepb, ROT0, "bootleg", "Tumble Pop (bootleg set 2)", GAME_IMPERFECT_SOUND ) GAMEX(1993, jumpkids, 0, jumpkids, tumblep, jumpkids, ROT0, "Comad", "Jump Kids", GAME_NO_SOUND ) -GAME( 1996, fncywld, 0, fncywld, fncywld, fncywld, ROT0, "Unico", "Fancy World - Earth of Crisis" ) // game says 1996, testmode 1995? +GAME( 1996, fncywld, 0, fncywld, fncywld, fncywld, ROT0, "Unico", "Fancy World - Earth of Crisis" ) /* game says 1996, testmode 1995? */ GAME( 1996, magipur, 0, magipur, magipur, magipur, ROT0, "Unico", "Magic Purple" ) -GAME( 1995, htchctch, 0, htchctch, htchctch, htchctch, ROT0, "SemiCom", "Hatch Catch" ) // not 100% sure about gfx offsets -GAME( 1995, cookbib, 0, cookbib, cookbib, htchctch, ROT0, "SemiCom", "Cookie & Bibi" ) // not 100% sure about gfx offsets -GAMEX(1995, chokchok, 0, cookbib, chokchok, chokchok, ROT0, "SemiCom", "Choky! Choky!", GAME_IMPERFECT_GRAPHICS ) // corruption during attract mode (tmap disable?) -GAMEX(1997, bcstry, 0, bcstory, bcstory, bcstory, ROT0, "SemiCom", "B.C. Story (set 1)", GAME_IMPERFECT_GRAPHICS) // gfx offsets? -GAMEX(1997, bcstrya, bcstry, bcstory, bcstory, bcstory, ROT0, "SemiCom", "B.C. Story (set 2)", GAME_IMPERFECT_GRAPHICS) // gfx offsets? +GAME( 1995, htchctch, 0, htchctch, htchctch, htchctch, ROT0, "SemiCom", "Hatch Catch" ) /* not 100% sure about gfx offsets */ +GAME( 1995, cookbib, 0, cookbib, cookbib, htchctch, ROT0, "SemiCom", "Cookie & Bibi" ) /* not 100% sure about gfx offsets */ +GAMEX(1995, chokchok, 0, cookbib, chokchok, chokchok, ROT0, "SemiCom", "Choky! Choky!", GAME_IMPERFECT_GRAPHICS ) /* corruption during attract mode (tmap disable?) */ +GAMEX(1997, bcstry, 0, bcstory, bcstory, bcstory, ROT0, "SemiCom", "B.C. Story (set 1)", GAME_IMPERFECT_GRAPHICS) /* gfx offsets? */ +GAMEX(1997, bcstrya, bcstry, bcstory, bcstory, bcstory, ROT0, "SemiCom", "B.C. Story (set 2)", GAME_IMPERFECT_GRAPHICS) /* gfx offsets? */ GAME( 1996, sdfight, 0, sdfight, sdfight, bcstory, ROT0, "SemiCom", "SD Fighter (Korea)") GAME( 1994, suprtrio, 0, suprtrio, suprtrio, suprtrio, ROT0, "Gameace", "Super Trio" ) diff --git a/src/drivers/vicdual.c b/src/drivers/vicdual.c index 86ea4837f..a3bd36bbf 100644 --- a/src/drivers/vicdual.c +++ b/src/drivers/vicdual.c @@ -161,11 +161,11 @@ WRITE_HANDLER( frogs_sh_port2_w ) if (data & 0x01) - sample_start (3, 3, 0); // Hop + sample_start (3, 3, 0); /* Hop */ if (data & 0x02) - sample_start (0, 0, 0); // Boing + sample_start (0, 0, 0); /* Boing */ if (new_croak) - sample_start (2, 2, 0); // Croak + sample_start (2, 2, 0); /* Croak */ else { if (last_croak) @@ -188,12 +188,12 @@ if (data & 0x02) * 12 seconds. */ if (!last_buzzz) - sample_start (1, 1, 1); // Buzzz + sample_start (1, 1, 1); /* Buzzz */ } else sample_stop(1); if (data & 0x80) - sample_start (4, 4, 0); // Splash + sample_start (4, 4, 0); /* Splash */ last_croak = new_croak; last_buzzz = new_buzzz; @@ -649,7 +649,7 @@ INPUT_PORTS_START( samurai ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_VBLANK ) /* either vblank, or a timer. In the */ /* Carnival schematics, it's a timer. */ -/* PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) // timer /*/ +/* PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )*/ /* timer */ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNUSED ) diff --git a/src/drivers/xmen.c b/src/drivers/xmen.c index ac5e49e62..7c5b5ef14 100644 --- a/src/drivers/xmen.c +++ b/src/drivers/xmen.c @@ -518,12 +518,12 @@ static INTERRUPT_GEN( xmen6p_interrupt ) } else { -// if (xmen_irqenabled&0x04) -// { +/* if (xmen_irqenabled&0x04) */ +/* { */ irq3_line_hold(); -// xmen_current_frame = 0x0000; +/* xmen_current_frame = 0x0000; */ -// } +/* } */ } } diff --git a/src/includes/system16.h b/src/includes/system16.h index 57876321d..cd13a2fdb 100644 --- a/src/includes/system16.h +++ b/src/includes/system16.h @@ -115,7 +115,7 @@ extern READ16_HANDLER( SYS16_CPU2_RESET_HACK ); extern struct GfxDecodeInfo sys16_gfxdecodeinfo[]; -// encryption decoding +/* encryption decoding */ void endurob2_decode_data(data16_t *dest,data16_t *source,int size); void endurob2_decode_data2(data16_t *dest,data16_t *source,int size); void enduror_decode_data(data16_t *dest,data16_t *source,int size); diff --git a/src/info.c b/src/info.c index 7fd9048bd..3d4986976 100644 --- a/src/info.c +++ b/src/info.c @@ -813,7 +813,7 @@ void print_mame_xml() "\t\t\n" "\t\t\n" "\t\t\n" -// "\t\t\n" +/* "\t\t\n" */ "\t\t\n" "\t\t\n" /*"\t\t\n"*/ diff --git a/src/inptport.c b/src/inptport.c index 1e46d1e7d..a6dc35564 100644 --- a/src/inptport.c +++ b/src/inptport.c @@ -1215,7 +1215,7 @@ ScanJoysticks( struct InputPort *in ) } } - else if (options.restrict_4_way) //start use alternative code + else if (options.restrict_4_way) /*start use alternative code */ { if(options.content_flags[CONTENT_ROTATE_JOY_45]) { @@ -1231,7 +1231,7 @@ ScanJoysticks( struct InputPort *in ) else if (mJoy4Way[i]) mJoy4Way[i]=0; } - else // just a regular 4-way - last press no code needed just ignore diagonals and no movement + else /* just a regular 4-way - last press no code needed just ignore diagonals and no movement */ { if ( (mJoyCurrent[i]) && (mJoyCurrent[i] !=5) && (mJoyCurrent[i] !=6) && (mJoyCurrent[i] !=9) && (mJoyCurrent[i] !=10) ) diff --git a/src/machine/bonzeadv.c b/src/machine/bonzeadv.c index 7c96f88f5..b5ae51f47 100644 --- a/src/machine/bonzeadv.c +++ b/src/machine/bonzeadv.c @@ -251,7 +251,7 @@ static const struct cchip_mapping level05[] = { 0x14e0, 0x1830, 0x09c, 0x158, 0x16b0, 0x00b0, 0x0088, 0x0060 }, { 0x1830, 0x18d0, 0x09c, 0x158, 0x1770, 0x0118, 0x00c0, 0x0060 }, - //-------------------------- + /*-------------------------- */ { 0x14e0, 0x1650, 0x29c, 0x2f0, 0x15a8, 0x0268, 0x0080, 0x0058 }, { 0x14e0, 0x1610, 0x2f0, 0x3fc, 0x1518, 0x0368, 0x0090, 0x0058 }, { 0x14e0, 0x1630, 0x3fc, 0x46c, 0x1500, 0x03e8, 0x0090, 0x0058 }, diff --git a/src/machine/cps2crypt.c b/src/machine/cps2crypt.c index d790c8b94..9c35b8518 100644 --- a/src/machine/cps2crypt.c +++ b/src/machine/cps2crypt.c @@ -1,5 +1,5 @@ -// license:BSD-3-Clause -// copyright-holders:Paul Leaman, Andreas Naive, Nicola Salmoria,Charles MacDonald +/* license:BSD-3-Clause */ +/* copyright-holders:Paul Leaman, Andreas Naive, Nicola Salmoria,Charles MacDonald */ /****************************************************************************** CPS-2 Encryption @@ -114,7 +114,7 @@ the decryption keys. #include "driver.h" #include "cpu/m68000/m68000.h" -//#include "ui/uimain.h" +/*#include "ui/uimain.h" */ #include "includes/cps1.h" @@ -131,20 +131,20 @@ static const int fn2_groupB[8] = { 3, 5, 9, 10, 8, 15, 12, 11 }; /******************************************************************************/ -// The order of the input and output bits in the s-boxes is arbitrary. -// Each s-box can be XORed with an arbitrary vale in range 0-3 (but the same value -// must be used for the corresponding output bits in f1 and f3 or in f2 and f4) +/* The order of the input and output bits in the s-boxes is arbitrary. */ +/* Each s-box can be XORed with an arbitrary vale in range 0-3 (but the same value */ +/* must be used for the corresponding output bits in f1 and f3 or in f2 and f4) */ struct sbox { const uint8_t table[64]; - const int inputs[6]; // positions of the inputs bits, -1 means no input except from key - const int outputs[2]; // positions of the output bits + const int inputs[6]; /* positions of the inputs bits, -1 means no input except from key */ + const int outputs[2]; /* positions of the output bits */ }; -// the above struct better defines how the hardware works, however -// to speed up the decryption at run time we convert it to the -// following one +/* the above struct better defines how the hardware works, however */ +/* to speed up the decryption at run time we convert it to the */ +/* following one */ struct optimised_sbox { uint8_t input_lookup[256]; @@ -154,7 +154,7 @@ struct optimised_sbox static const struct sbox fn1_r1_boxes[4] = { - { // subkey bits 0- 5 + { /* subkey bits 0- 5 */ { 0,2,2,0,1,0,1,1,3,2,0,3,0,3,1,2,1,1,1,2,1,3,2,2,2,3,3,2,1,1,1,2, 2,2,0,0,3,1,3,1,1,1,3,0,0,1,0,0,1,2,2,1,2,3,2,2,2,3,1,3,2,0,1,3, @@ -162,7 +162,7 @@ static const struct sbox fn1_r1_boxes[4] = { 3, 4, 5, 6, -1, -1 }, { 3, 6 } }, - { // subkey bits 6-11 + { /* subkey bits 6-11 */ { 3,0,2,2,2,1,1,1,1,2,1,0,0,0,2,3,2,3,1,3,0,0,0,2,1,2,2,3,0,3,3,3, 0,1,3,2,3,3,3,1,1,1,1,2,0,1,2,1,3,2,3,1,1,3,2,2,2,3,1,3,2,3,0,0, @@ -170,7 +170,7 @@ static const struct sbox fn1_r1_boxes[4] = { 0, 1, 2, 4, 7, -1 }, { 2, 7 } }, - { // subkey bits 12-17 + { /* subkey bits 12-17 */ { 3,0,3,1,1,0,2,2,3,1,2,0,3,3,2,3,0,1,0,1,2,3,0,2,0,2,0,1,0,0,1,0, 2,3,1,2,1,0,2,0,2,1,0,1,0,2,1,0,3,1,2,3,1,3,1,1,1,2,0,2,2,0,0,0, @@ -178,7 +178,7 @@ static const struct sbox fn1_r1_boxes[4] = { 0, 1, 2, 3, 6, 7 }, { 0, 1 } }, - { // subkey bits 18-23 + { /* subkey bits 18-23 */ { 3,2,0,3,0,2,2,1,1,2,3,2,1,3,2,1,2,2,1,3,3,2,1,0,1,0,1,3,0,0,0,2, 2,1,0,1,0,1,0,1,3,1,1,2,2,3,2,0,3,3,2,0,2,1,3,3,0,0,3,0,1,1,3,3, @@ -190,7 +190,7 @@ static const struct sbox fn1_r1_boxes[4] = static const struct sbox fn1_r2_boxes[4] = { - { // subkey bits 24-29 + { /* subkey bits 24-29 */ { 3,3,2,0,3,0,3,1,0,3,0,1,0,2,1,3,1,3,0,3,3,1,3,3,3,2,3,2,2,3,1,2, 0,2,2,1,0,1,2,0,3,3,0,1,3,2,1,2,3,0,1,3,0,1,2,2,1,2,1,2,0,1,3,0, @@ -198,7 +198,7 @@ static const struct sbox fn1_r2_boxes[4] = { 0, 1, 2, 3, 6, -1 }, { 1, 6 } }, - { // subkey bits 30-35 + { /* subkey bits 30-35 */ { 1,2,3,2,1,3,0,1,1,0,2,0,0,2,3,2,3,3,0,1,2,2,1,0,1,0,1,2,3,2,1,3, 2,2,2,0,1,0,2,3,2,1,2,1,2,1,0,3,0,1,2,3,1,2,1,3,2,0,3,2,3,0,2,0, @@ -206,7 +206,7 @@ static const struct sbox fn1_r2_boxes[4] = { 2, 4, 5, 6, 7, -1 }, { 5, 7 } }, - { // subkey bits 36-41 + { /* subkey bits 36-41 */ { 0,1,0,2,1,1,0,1,0,2,2,2,1,3,0,0,1,1,3,1,2,2,2,3,1,0,3,3,3,2,2,2, 1,1,3,0,3,1,3,0,1,3,3,2,1,1,0,0,1,2,2,2,1,1,1,2,2,0,0,3,2,3,1,3, @@ -214,7 +214,7 @@ static const struct sbox fn1_r2_boxes[4] = { 1, 2, 3, 4, 5, 7 }, { 0, 3 } }, - { // subkey bits 42-47 + { /* subkey bits 42-47 */ { 2,1,0,3,3,3,2,0,1,2,1,1,1,0,3,1,1,3,3,0,1,2,1,0,0,0,3,0,3,0,3,0, 1,3,3,3,0,3,2,0,2,1,2,2,2,1,1,3,0,1,0,1,0,1,1,1,1,3,1,0,1,2,3,3, @@ -226,7 +226,7 @@ static const struct sbox fn1_r2_boxes[4] = static const struct sbox fn1_r3_boxes[4] = { - { // subkey bits 48-53 + { /* subkey bits 48-53 */ { 0,0,0,3,3,1,1,0,2,0,2,0,0,0,3,2,0,1,2,3,2,2,1,0,3,0,0,0,0,0,2,3, 3,0,0,1,1,2,3,3,0,1,3,2,0,1,3,3,2,0,0,1,0,2,0,0,0,3,1,3,3,3,3,3, @@ -234,7 +234,7 @@ static const struct sbox fn1_r3_boxes[4] = { 0, 1, 5, 6, 7, -1 }, { 0, 5 } }, - { // subkey bits 54-59 + { /* subkey bits 54-59 */ { 2,3,2,3,0,2,3,0,2,2,3,0,3,2,0,2,1,0,2,3,1,1,1,0,0,1,0,2,1,2,2,1, 3,0,2,1,2,3,3,0,3,2,3,1,0,2,1,0,1,2,2,3,0,2,1,3,1,3,0,2,1,1,1,3, @@ -242,7 +242,7 @@ static const struct sbox fn1_r3_boxes[4] = { 2, 3, 4, 6, 7, -1 }, { 6, 7 } }, - { // subkey bits 60-65 + { /* subkey bits 60-65 */ { 3,0,2,1,1,3,1,2,2,1,2,2,2,0,0,1,2,3,1,0,2,0,0,2,3,1,2,0,0,0,3,0, 2,1,1,2,0,0,1,2,3,1,1,2,0,1,3,0,3,1,1,0,0,2,3,0,0,0,0,3,2,0,0,0, @@ -250,7 +250,7 @@ static const struct sbox fn1_r3_boxes[4] = { 0, 2, 3, 4, 5, 6 }, { 1, 4 } }, - { // subkey bits 66-71 + { /* subkey bits 66-71 */ { 0,1,0,0,2,1,3,2,3,3,2,1,0,1,1,1,1,1,0,3,3,1,1,0,0,2,2,1,0,3,3,2, 1,3,3,0,3,0,2,1,1,2,3,2,2,2,1,0,0,3,3,3,2,2,3,1,0,2,3,0,3,1,1,0, @@ -262,7 +262,7 @@ static const struct sbox fn1_r3_boxes[4] = static const struct sbox fn1_r4_boxes[4] = { - { // subkey bits 72-77 + { /* subkey bits 72-77 */ { 1,1,1,1,1,0,1,3,3,2,3,0,1,2,0,2,3,3,0,1,2,1,2,3,0,3,2,3,2,0,1,2, 0,1,0,3,2,1,3,2,3,1,2,3,2,0,1,2,2,0,0,0,2,1,3,0,3,1,3,0,1,3,3,0, @@ -270,7 +270,7 @@ static const struct sbox fn1_r4_boxes[4] = { 1, 2, 3, 4, 5, 7 }, { 0, 4 } }, - { // subkey bits 78-83 + { /* subkey bits 78-83 */ { 3,0,0,0,0,1,0,2,3,3,1,3,0,3,1,2,2,2,3,1,0,0,2,0,1,0,2,2,3,3,0,0, 1,1,3,0,2,3,0,3,0,3,0,2,0,2,0,1,0,3,0,1,3,1,1,0,0,1,3,3,2,2,1,0, @@ -278,7 +278,7 @@ static const struct sbox fn1_r4_boxes[4] = { 0, 1, 2, 3, 5, 6 }, { 1, 3 } }, - { // subkey bits 84-89 + { /* subkey bits 84-89 */ { 0,1,1,2,0,1,3,1,2,0,3,2,0,0,3,0,3,0,1,2,2,3,3,2,3,2,0,1,0,0,1,0, 3,0,2,3,0,2,2,2,1,1,0,2,2,0,0,1,2,1,1,1,2,3,0,3,1,2,3,3,1,1,3,0, @@ -286,7 +286,7 @@ static const struct sbox fn1_r4_boxes[4] = { 0, 2, 4, 5, 6, 7 }, { 2, 6 } }, - { // subkey bits 90-95 + { /* subkey bits 90-95 */ { 0,1,2,2,0,1,0,3,2,2,1,1,3,2,0,2,0,1,3,3,0,2,2,3,3,2,0,0,2,1,3,3, 1,1,1,3,1,2,1,1,0,3,3,2,3,2,3,0,3,1,0,0,3,0,0,0,2,2,2,1,2,3,0,0, @@ -300,7 +300,7 @@ static const struct sbox fn1_r4_boxes[4] = static const struct sbox fn2_r1_boxes[4] = { - { // subkey bits 0- 5 + { /* subkey bits 0- 5 */ { 2,0,2,0,3,0,0,3,1,1,0,1,3,2,0,1,2,0,1,2,0,2,0,2,2,2,3,0,2,1,3,0, 0,1,0,1,2,2,3,3,0,3,0,2,3,0,1,2,1,1,0,2,0,3,1,1,2,2,1,3,1,1,3,1, @@ -308,7 +308,7 @@ static const struct sbox fn2_r1_boxes[4] = { 0, 3, 4, 5, 7, -1 }, { 6, 7 } }, - { // subkey bits 6-11 + { /* subkey bits 6-11 */ { 1,1,0,3,0,2,0,1,3,0,2,0,1,1,0,0,1,3,2,2,0,2,2,2,2,0,1,3,3,3,1,1, 1,3,1,3,2,2,2,2,2,2,0,1,0,1,1,2,3,1,1,2,0,3,3,3,2,2,3,1,1,1,3,0, @@ -316,7 +316,7 @@ static const struct sbox fn2_r1_boxes[4] = { 1, 2, 3, 4, 6, -1 }, { 3, 5 } }, - { // subkey bits 12-17 + { /* subkey bits 12-17 */ { 1,0,2,2,3,3,3,3,1,2,2,1,0,1,2,1,1,2,3,1,2,0,0,1,2,3,1,2,0,0,0,2, 2,0,1,1,0,0,2,0,0,0,2,3,2,3,0,1,3,0,0,0,2,3,2,0,1,3,2,1,3,1,1,3, @@ -324,7 +324,7 @@ static const struct sbox fn2_r1_boxes[4] = { 1, 2, 4, 5, 6, 7 }, { 1, 4 } }, - { // subkey bits 18-23 + { /* subkey bits 18-23 */ { 1,3,3,0,3,2,3,1,3,2,1,1,3,3,2,1,2,3,0,3,1,0,0,2,3,0,0,0,3,3,0,1, 2,3,0,0,0,1,2,1,3,0,0,1,0,2,2,2,3,3,1,2,1,3,0,0,0,3,0,1,3,2,2,0, @@ -336,7 +336,7 @@ static const struct sbox fn2_r1_boxes[4] = static const struct sbox fn2_r2_boxes[4] = { - { // subkey bits 24-29 + { /* subkey bits 24-29 */ { 3,1,3,0,3,0,3,1,3,0,0,1,1,3,0,3,1,1,0,1,2,3,2,3,3,1,2,2,2,0,2,3, 2,2,2,1,1,3,3,0,3,1,2,1,1,1,0,2,0,3,3,0,0,2,0,0,1,1,2,1,2,1,1,0, @@ -344,7 +344,7 @@ static const struct sbox fn2_r2_boxes[4] = { 0, 2, 4, 6, -1, -1 }, { 4, 6 } }, - { // subkey bits 30-35 + { /* subkey bits 30-35 */ { 0,3,0,3,3,2,1,2,3,1,1,1,2,0,2,3,0,3,1,2,2,1,3,3,3,2,1,2,2,0,1,0, 2,3,0,1,2,0,1,1,2,0,2,1,2,0,2,3,3,1,0,2,3,3,0,3,1,1,3,0,0,1,2,0, @@ -352,7 +352,7 @@ static const struct sbox fn2_r2_boxes[4] = { 1, 3, 4, 5, 6, 7 }, { 0, 3 } }, - { // subkey bits 36-41 + { /* subkey bits 36-41 */ { 0,0,2,1,3,2,1,0,1,2,2,2,1,1,0,3,1,2,2,3,2,1,1,0,3,0,0,1,1,2,3,1, 3,3,2,2,1,0,1,1,1,2,0,1,2,3,0,3,3,0,3,2,2,0,2,2,1,2,3,2,1,0,2,1, @@ -360,7 +360,7 @@ static const struct sbox fn2_r2_boxes[4] = { 0, 1, 3, 4, 5, 7 }, { 1, 7 } }, - { // subkey bits 42-47 + { /* subkey bits 42-47 */ { 0,2,1,2,0,2,2,0,1,3,2,0,3,2,3,0,3,3,2,3,1,2,3,1,2,2,0,0,2,2,1,2, 2,3,3,3,1,1,0,0,0,3,2,0,3,2,3,1,1,1,1,0,1,0,1,3,0,0,1,2,2,3,2,0, @@ -372,7 +372,7 @@ static const struct sbox fn2_r2_boxes[4] = static const struct sbox fn2_r3_boxes[4] = { - { // subkey bits 48-53 + { /* subkey bits 48-53 */ { 2,1,2,1,2,3,1,3,2,2,1,3,3,0,0,1,0,2,0,3,3,1,0,0,1,1,0,2,3,2,1,2, 1,1,2,1,1,3,2,2,0,2,2,3,3,3,2,0,0,0,0,0,3,3,3,0,1,2,1,0,2,3,3,1, @@ -380,7 +380,7 @@ static const struct sbox fn2_r3_boxes[4] = { 2, 3, 4, 6, -1, -1 }, { 3, 5 } }, - { // subkey bits 54-59 + { /* subkey bits 54-59 */ { 3,2,3,3,1,0,3,0,2,0,1,1,1,0,3,0,3,1,3,1,0,1,2,3,2,2,3,2,0,1,1,2, 3,0,0,2,1,0,0,2,2,0,1,0,0,2,0,0,1,3,1,3,2,0,3,3,1,0,2,2,2,3,0,0, @@ -388,7 +388,7 @@ static const struct sbox fn2_r3_boxes[4] = { 0, 1, 3, 5, 7, -1 }, { 0, 2 } }, - { // subkey bits 60-65 + { /* subkey bits 60-65 */ { 2,2,1,0,2,3,3,0,0,0,1,3,1,2,3,2,2,3,1,3,0,3,0,3,3,2,2,1,0,0,0,2, 1,2,2,2,0,0,1,2,0,1,3,0,2,3,2,1,3,2,2,2,3,1,3,0,2,0,2,1,0,3,3,1, @@ -396,7 +396,7 @@ static const struct sbox fn2_r3_boxes[4] = { 0, 1, 2, 3, 5, 7 }, { 1, 6 } }, - { // subkey bits 66-71 + { /* subkey bits 66-71 */ { 1,2,3,2,0,2,1,3,3,1,0,1,1,2,2,0,0,1,1,1,2,1,1,2,0,1,3,3,1,1,1,2, 3,3,1,0,2,1,1,1,2,1,0,0,2,2,3,2,3,2,2,0,2,2,3,3,0,2,3,0,2,2,1,1, @@ -408,7 +408,7 @@ static const struct sbox fn2_r3_boxes[4] = static const struct sbox fn2_r4_boxes[4] = { - { // subkey bits 72-77 + { /* subkey bits 72-77 */ { 2,0,1,1,2,1,3,3,1,1,1,2,0,1,0,2,0,1,2,0,2,3,0,2,3,3,2,2,3,2,0,1, 3,0,2,0,2,3,1,3,2,0,0,1,1,2,3,1,1,1,0,1,2,0,3,3,1,1,1,3,3,1,1,0, @@ -416,7 +416,7 @@ static const struct sbox fn2_r4_boxes[4] = { 0, 1, 3, 6, 7, -1 }, { 0, 3 } }, - { // subkey bits 78-83 + { /* subkey bits 78-83 */ { 1,2,2,1,0,3,3,1,0,2,2,2,1,0,1,0,1,1,0,1,0,2,1,0,2,1,0,2,3,2,3,3, 2,2,1,2,2,3,1,3,3,3,0,1,0,1,3,0,0,0,1,2,0,3,3,2,3,2,1,3,2,1,0,2, @@ -424,7 +424,7 @@ static const struct sbox fn2_r4_boxes[4] = { 0, 1, 2, 4, 5, 6 }, { 4, 7 } }, - { // subkey bits 84-89 + { /* subkey bits 84-89 */ { 2,3,2,1,3,2,3,0,0,2,1,1,0,0,3,2,3,1,0,1,2,2,2,1,3,2,2,1,0,2,1,2, 0,3,1,0,0,3,1,1,3,3,2,0,1,0,1,3,0,0,1,2,1,2,3,2,1,0,0,3,2,1,1,3, @@ -432,7 +432,7 @@ static const struct sbox fn2_r4_boxes[4] = { 0, 2, 3, 4, 5, 7 }, { 1, 2 } }, - { // subkey bits 90-95 + { /* subkey bits 90-95 */ { 2,0,0,3,2,2,2,1,3,3,1,1,2,0,0,3,1,0,3,2,1,0,2,0,3,2,2,3,2,0,3,0, 1,3,0,2,2,1,3,3,0,1,0,3,1,1,3,2,0,3,0,2,3,2,1,3,2,3,0,0,1,3,2,1, @@ -461,8 +461,8 @@ static uint8_t fn(uint8_t in, const struct optimised_sbox *sboxes, uint32_t key) -// srckey is the 64-bit master key (2x32 bits) -// dstkey will contain the 96-bit key for the 1st FN (4x24 bits) +/* srckey is the 64-bit master key (2x32 bits) */ +/* dstkey will contain the 96-bit key for the 1st FN (4x24 bits) */ static void expand_1st_key(uint32_t *dstkey, const uint32_t *srckey) { static const int bits[96] = @@ -496,8 +496,8 @@ static void expand_1st_key(uint32_t *dstkey, const uint32_t *srckey) } -// srckey is the 64-bit master key (2x32 bits) XORed with the subkey -// dstkey will contain the 96-bit key for the 2nd FN (4x24 bits) +/* srckey is the 64-bit master key (2x32 bits) XORed with the subkey */ +/* dstkey will contain the 96-bit key for the 2nd FN (4x24 bits) */ static void expand_2nd_key(uint32_t *dstkey, const uint32_t *srckey) { static const int bits[96] = @@ -532,12 +532,12 @@ static void expand_2nd_key(uint32_t *dstkey, const uint32_t *srckey) -// seed is the 16-bit seed generated by the first FN -// subkey will contain the 64-bit key to be XORed with the master key -// for the 2nd FN (2x32 bits) +/* seed is the 16-bit seed generated by the first FN */ +/* subkey will contain the 64-bit key to be XORed with the master key */ +/* for the 2nd FN (2x32 bits) */ static void expand_subkey(uint32_t* subkey, uint16_t seed) { - // Note that each row of the table is a permutation of the seed bits. + /* Note that each row of the table is a permutation of the seed bits. */ static const int bits[64] = { 5, 10, 14, 9, 4, 0, 15, 6, 1, 8, 3, 2, 12, 7, 13, 11, @@ -613,13 +613,13 @@ static void optimise_sboxes(struct optimised_sbox* out, const struct sbox* in) { int i; - // precalculate the input lookup + /* precalculate the input lookup */ for (i = 0; i < 256; ++i) { out[box].input_lookup[i] = extract_inputs(i, in[box].inputs); } - // precalculate the output masks + /* precalculate the output masks */ for (i = 0; i < 64; ++i) { int o = in[box].table[i]; @@ -652,10 +652,10 @@ static void cps2_decrypt(uint16_t *rom, uint16_t *dec, int length, const uint32_ optimise_sboxes(&sboxes2[3*4], fn2_r4_boxes); - // expand master key to 1st FN 96-bit key + /* expand master key to 1st FN 96-bit key */ expand_1st_key(key1, master_key); - // add extra bits for s-boxes with less than 6 inputs + /* add extra bits for s-boxes with less than 6 inputs */ key1[0] ^= BIT(key1[0], 1) << 4; key1[0] ^= BIT(key1[0], 2) << 5; key1[0] ^= BIT(key1[0], 8) << 11; @@ -673,29 +673,29 @@ static void cps2_decrypt(uint16_t *rom, uint16_t *dec, int length, const uint32_ if ((i & 0xff) == 0) { - char loadingMessage[256]; // for displaying with UI + char loadingMessage[256]; /* for displaying with UI */ sprintf(loadingMessage, "Decrypting %d%%", i*100/0x10000); - //machine.ui().set_startup_text(loadingMessage,false); + /*machine.ui().set_startup_text(loadingMessage,false); */ } - // pass the address through FN1 + /* pass the address through FN1 */ seed = feistel(i, fn1_groupA, fn1_groupB, &sboxes1[0*4], &sboxes1[1*4], &sboxes1[2*4], &sboxes1[3*4], key1[0], key1[1], key1[2], key1[3]); - // expand the result to 64-bit + /* expand the result to 64-bit */ expand_subkey(subkey, seed); - // XOR with the master key + /* XOR with the master key */ subkey[0] ^= master_key[0]; subkey[1] ^= master_key[1]; - // expand key to 2nd FN 96-bit key + /* expand key to 2nd FN 96-bit key */ expand_2nd_key(key2, subkey); - // add extra bits for s-boxes with less than 6 inputs + /* add extra bits for s-boxes with less than 6 inputs */ key2[0] ^= BIT(key2[0], 0) << 5; key2[0] ^= BIT(key2[0], 6) << 11; key2[1] ^= BIT(key2[1], 0) << 5; @@ -706,7 +706,7 @@ static void cps2_decrypt(uint16_t *rom, uint16_t *dec, int length, const uint32_ key2[3] ^= BIT(key2[3], 1) << 5; - // decrypt the opcodes + /* decrypt the opcodes */ for (a = i; a < length/2; a += 0x10000) { if (a >= lower_limit && a <= upper_limit) @@ -745,7 +745,7 @@ DRIVER_INIT( my_cps2 ) { data8_t *m_region_key = (data8_t *)memory_region(REGION_USER5); data16_t *rom = (data16_t *)memory_region(REGION_CPU1); -// data16_t *decrypted_opcodes = (data16_t *)memory_region(REGION_USER1); +/* data16_t *decrypted_opcodes = (data16_t *)memory_region(REGION_USER1); */ data16_t *decrypted_opcodes = (data16_t *)auto_malloc(0x0400000); if (m_region_key) @@ -762,7 +762,7 @@ DRIVER_INIT( my_cps2 ) for (b = 0; b < 10 * 16; b++) { int bit = (317 - b) % 160; - //if ((m_region_key->base()[bit / 8] >> ((bit ^ 7) % 8)) & 1) + /*if ((m_region_key->base()[bit / 8] >> ((bit ^ 7) % 8)) & 1) */ if ((m_region_key[bit / 8] >> ((bit ^ 7) % 8)) & 1) { decoded[b / 16] |= (0x8000 >> (b % 16)); @@ -771,16 +771,16 @@ DRIVER_INIT( my_cps2 ) key[0] = (decoded[0] << 16) | decoded[1]; key[1] = (decoded[2] << 16) | decoded[3]; - // decoded[4] == watchdog instruction third word - // decoded[5] == watchdog instruction second word - // decoded[6] == watchdog instruction first word - // decoded[7] == 0x4000 (bits 8 to 23 of CPS2 object output address) - // decoded[8] == 0x0900 + /* decoded[4] == watchdog instruction third word */ + /* decoded[5] == watchdog instruction second word */ + /* decoded[6] == watchdog instruction first word */ + /* decoded[7] == 0x4000 (bits 8 to 23 of CPS2 object output address) */ + /* decoded[8] == 0x0900 */ if (decoded[9] == 0xffff) { - // On a dead board, the only encrypted range is actually FF0000-FFFFFF. - // It doesn't start from 0, and it's the upper half of a 128kB bank. + /* On a dead board, the only encrypted range is actually FF0000-FFFFFF. */ + /* It doesn't start from 0, and it's the upper half of a 128kB bank. */ upper = 0xffffff; lower = 0xff0000; } @@ -792,7 +792,7 @@ DRIVER_INIT( my_cps2 ) logerror("cps2 decrypt 0x%08x,0x%08x,0x%08x,0x%08x\n", key[0], key[1], lower, upper); - // we have a proper key so use it to decrypt + /* we have a proper key so use it to decrypt */ cps2_decrypt((uint16_t *)rom, decrypted_opcodes, 0x0400000, key, lower , upper ); memory_set_opcode_base(0,decrypted_opcodes); memory_set_encrypted_opcode_range(0,0,memory_region_length(REGION_CPU1)); diff --git a/src/machine/irem_cpu.c b/src/machine/irem_cpu.c index b1acae068..ec25b1315 100644 --- a/src/machine/irem_cpu.c +++ b/src/machine/irem_cpu.c @@ -50,7 +50,7 @@ int m90_game_kludge; #define xxxx 0x90 /* Unknown */ -// gunforce, kengo, hasamu +/* gunforce, kengo, hasamu */ const UINT8 gunforce_decryption_table[256] = { 0xff,xxxx,xxxx,0x2c,xxxx,xxxx,0x43,0x88, xxxx,0x13,0x0a,0xbd,0xba,0x60,0xea,xxxx, /* 00 */ xxxx,xxxx,0xf2,0x29,0xb3,0x22,xxxx,0x0c, 0xa9,0x5f,0x9d,0x07,xxxx,xxxx,0x0b,0xbb, /* 10 */ @@ -69,23 +69,23 @@ const UINT8 gunforce_decryption_table[256] = { xxxx,0xf9,xxxx,0x2f,0x85,xxxx,0xeb,0xa2, xxxx,0xe2,0x11,xxxx,0x4b,0x7e,xxxx,0x78, /* E0 */ xxxx,xxxx,0x09,0xa1,0x03,xxxx,0x23,0xc1, 0x8e,0xe9,0xd1,0x7c,xxxx,xxxx,0xc7,0x06, /* F0 */ }; -// 0x13 (0x29) guess -// 0x18 (0xa9) guess -// 0x50 (0x08) guess - changed based on airass -// 0x63 (0xc0) guess -// 0x7e (0x18) opcode is right but arguments could be swapped -// 0xcc (0x00) guess -// 0xea (0x11) guess -// 0x51 (0x77) guess (kengo) -// 0x96 (0x0e) complete guess (kengo), maybe wrong but I don't see what it could be +/* 0x13 (0x29) guess */ +/* 0x18 (0xa9) guess */ +/* 0x50 (0x08) guess - changed based on airass */ +/* 0x63 (0xc0) guess */ +/* 0x7e (0x18) opcode is right but arguments could be swapped */ +/* 0xcc (0x00) guess */ +/* 0xea (0x11) guess */ +/* 0x51 (0x77) guess (kengo) */ +/* 0x96 (0x0e) complete guess (kengo), maybe wrong but I don't see what it could be */ -//double check 22 (boot bomb at 2a000) -//47a7 (46e0 in boot) - hmm +/*double check 22 (boot bomb at 2a000) */ +/*47a7 (46e0 in boot) - hmm */ -// 0x00 is NOT 0x20 (no context in bomberman) +/* 0x00 is NOT 0x20 (no context in bomberman) */ -// bmaster, bomberman +/* bmaster, bomberman */ const UINT8 bomberman_decryption_table[256] = { xxxx,xxxx,0x79,xxxx,0x9d,0x48,xxxx,xxxx, xxxx,xxxx,0x2e,xxxx,xxxx,0xa5,0x72,xxxx, /* 00 */ 0x46,0x5b,0xb1,0x3a,0xc3,xxxx,0x35,xxxx, xxxx,0x23,xxxx,0x99,xxxx,0x05,xxxx,0x3c, /* 10 */ @@ -104,42 +104,42 @@ const UINT8 bomberman_decryption_table[256] = { 0xbd,xxxx,0x81,0xb7,xxxx,0x8a,0x0d,xxxx, 0x58,0xa1,0xa9,0x36,xxxx,0xc4,xxxx,0x8f, /* E0 */ 0x8c,0x1f,0x51,0x04,0xf2,xxxx,0xb3,0xb4, 0xe9,0x2a,xxxx,xxxx,xxxx,0x25,xxxx,0xbc, /* F0 */ }; -// 49 -> 4a (verified in a bombrman PCB) +/* 49 -> 4a (verified in a bombrman PCB) */ -// lethalth, gunforc2, quizf1 +/* lethalth, gunforc2, quizf1 */ const UINT8 lethalth_decryption_table[256] = { 0x7f,0x26,0x5d,xxxx,0xba,xxxx,0x1e,0x5e, 0xb8,0x49,0xbc,0xe8,0x01,xxxx,0x4a,0x25, /* 00 */ -// ssss !!!! !!!! !!!! !!!! !!!! !!!! gggg !!!! !!!! !!!! !!!! +/* ssss !!!! !!!! !!!! !!!! !!!! !!!! gggg !!!! !!!! !!!! !!!! */ xxxx,0xbd,xxxx,0x22,0x10,xxxx,0x02,0x57, 0x70,xxxx,0x7c,xxxx,0xe7,0x52,xxxx,0xa9, /* 10 */ -// !!!! !!!! !!!! ???? !!!! !!!! gggg +/* !!!! !!!! !!!! ???? !!!! !!!! gggg */ xxxx,xxxx,0xc6,0x06,0xa0,0xfe,0xcf,0x8e, 0x43,0x8f,0x2d,0x8c,0xd4,0x85,0x75,0xa2, /* 20 */ -// !!!! !!!! !!!! !!!! !!!! !!!! gggg !!!! !!!! +/* !!!! !!!! !!!! !!!! !!!! !!!! gggg !!!! !!!! */ 0x3d,xxxx,xxxx,0x38,0x7e,0x89,0xd1,0x80, 0x3b,0x72,0x07,xxxx,0x42,0x37,0x0a,0x18, /* 30 */ -// gggg !!!! ???? !!!! !!!! !!!! !!!! !!!! !!!! ssss !!!! +/* gggg !!!! ???? !!!! !!!! !!!! !!!! !!!! !!!! ssss !!!! */ 0x88,0xb4,0x98,0x8b,0xb9,0x9c,0xad,0x0e, 0x2b,xxxx,0xbf,xxxx,0x55,xxxx,0x56,0xb0, /* 40 */ -// !!!! pppp !!!! !!!! !!!! !!!! gggg !!!! !!!! !!!! !!!! +/* !!!! pppp !!!! !!!! !!!! !!!! gggg !!!! !!!! !!!! !!!! */ 0x93,0x91,xxxx,0xeb,xxxx,0x50,0x41,0x29, 0x47,xxxx,xxxx,0x60,xxxx,0xab,xxxx,xxxx, /* 50 */ -// pppp !!!! !!!! !!!! !!!! !!!! !!!! !!!! +/* pppp !!!! !!!! !!!! !!!! !!!! !!!! !!!! */ 0xc3,0xe2,0xd0,0xb2,0x11,0x79,xxxx,0x08, 0x82,0xfb,xxxx,0x2c,0x23,xxxx,0x28,0x0d, /* 60 */ -// !!!! !!!! !!!! !!!! gggg pppp !!!! !!!! +/* !!!! !!!! !!!! !!!! gggg pppp !!!! !!!! */ xxxx,xxxx,xxxx,0x83,0x3c,xxxx,0x1b,0x34, 0x5b,xxxx,0x40,xxxx,xxxx,0x04,0xfc,0xcd, /* 70 */ -// !!!! !!!! !!!! !!!! !!!! ssss +/* !!!! !!!! !!!! !!!! !!!! ssss */ 0xb1,0xf3,0x8a,xxxx,xxxx,0x87,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,0xbe,0x84,0x1f,0xe6, /* 80 */ -// !!!! !!!! !!!! !!!! !!!! +/* !!!! !!!! !!!! !!!! !!!! */ 0xff,xxxx,0x12,xxxx,0xb5,0x36,xxxx,0xb3, xxxx,xxxx,xxxx,0xd2,0x4e,xxxx,xxxx,xxxx, /* 90 */ -// !!!! !!!! !!!! +/* !!!! !!!! !!!! */ 0xa5,xxxx,xxxx,0xc7,xxxx,0x27,0x0b,xxxx, 0x20,xxxx,xxxx,xxxx,xxxx,xxxx,0x61,0x7d, /* A0 */ -// !!!! !!!! !!!! !!!! ???? +/* !!!! !!!! !!!! !!!! ???? */ 0x63,xxxx,0x86,0x0f,xxxx,0xb7,xxxx,0x4f, 0x13,xxxx,0xc0,0xfd,xxxx,0x39,xxxx,0x77, /* B0 */ -// ssss !!!! !!!! ???? !!!! !!!! !!!! +/* ssss !!!! !!!! ???? !!!! !!!! !!!! */ 0x05,0x3a,xxxx,0x48,0x92,0x71,0x3e,0x03, xxxx,0xf8,xxxx,0x59,0xa8,0x5f,0xf9,0xbb, /* C0 */ -// !!!! !!!! ???? !!!! !!!! !!!! !!!! !!!! +/* !!!! !!!! ???? !!!! !!!! !!!! !!!! !!!! */ 0x81,0xfa,0x9d,0xe9,0x2e,0xa1,0xc1,0x33, xxxx,0x78,xxxx,0x0c,xxxx,0x24,0xaa,0xac, /* D0 */ -// !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! gggg !!!! !!!! +/* !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! gggg !!!! !!!! */ xxxx,0xb6,xxxx,0xea,xxxx,0x73,0xe5,0x58, 0x00,0xf7,xxxx,0x74,xxxx,0x76,xxxx,0xa3, /* E0 */ -// !!!! gggg !!!! !!!! !!!! !!!! ???? !!!! +/* !!!! gggg !!!! !!!! !!!! !!!! ???? !!!! */ xxxx,0x5a,0xf6,0x32,0x46,0x2a,xxxx,xxxx, 0x53,0x4b,0x90,0x35,0x51,0x68,0x99,0x13, /* F0 */ -// !!!! !!!! !!!! !!!! !!!! !!!! ???? !!!! !!!! +/* !!!! !!!! !!!! !!!! !!!! !!!! ???? !!!! !!!! */ }; /* missing opcode: @@ -170,26 +170,26 @@ e5 -> 0x73 7f -> 0xcd (little machine in the game - 16058) b0 -> 0x63 (11479) */ -// 0x2c (0xd4) complete guess -// 0x2d (0x85) complete guess -// 0xc4 (0x92) guess -// 0xbb (0xfd) guess -// 0x46 (0xad) guess - risky challenge use same code -// 0x6e (0x28) guess -// 0x76 (0x1b) guess -// 0x8d (0x84) guess -// 0xa6 (0x0b) guess - risky challenge use same code -// 0xa8 (0x20) guess -// 0xbd (0x39) guess - risky challenge use same code -// 0xc3 (0x48) guess -// and our collection of conditional branches: -// 0x34 (0x7e) < or <= (seems more like <) | these two are used toghether -// 0xaf (0x7d) > or >= -// 0xed (0x76) <= or < (seems more like <=) -// 0x1a (0x7c) < ? | (rowscroll on pink screen on startup) -// 0xc5 (0x7a) completely in the dark (game start after car seelction) - -// uccops, dynablaster +/* 0x2c (0xd4) complete guess */ +/* 0x2d (0x85) complete guess */ +/* 0xc4 (0x92) guess */ +/* 0xbb (0xfd) guess */ +/* 0x46 (0xad) guess - risky challenge use same code */ +/* 0x6e (0x28) guess */ +/* 0x76 (0x1b) guess */ +/* 0x8d (0x84) guess */ +/* 0xa6 (0x0b) guess - risky challenge use same code */ +/* 0xa8 (0x20) guess */ +/* 0xbd (0x39) guess - risky challenge use same code */ +/* 0xc3 (0x48) guess */ +/* and our collection of conditional branches: */ +/* 0x34 (0x7e) < or <= (seems more like <) | these two are used toghether */ +/* 0xaf (0x7d) > or >= */ +/* 0xed (0x76) <= or < (seems more like <=) */ +/* 0x1a (0x7c) < ? | (rowscroll on pink screen on startup) */ +/* 0xc5 (0x7a) completely in the dark (game start after car seelction) */ + +/* uccops, dynablaster */ const UINT8 dynablaster_decryption_table[256] = { 0x1f,0x51,0x84,xxxx,0x3d,0x09,0x0d,xxxx, xxxx,0x57,xxxx,xxxx,xxxx,0x32,0x11,xxxx, /* 00 */ xxxx,0x9c,xxxx,xxxx,0x4b,xxxx,xxxx,0x03, xxxx,xxxx,xxxx,0x89,0xb0,xxxx,xxxx,xxxx, /* 10 */ @@ -208,23 +208,23 @@ const UINT8 dynablaster_decryption_table[256] = { 0x75,xxxx,0xb7,xxxx,0x23,xxxx, xxxx/*0xe2*/,0x8f, xxxx,xxxx,0x2c,xxxx,0x77,0x7e,xxxx,0x0f, /* e0 */ 0x0c,0xa0,0xbd,xxxx,xxxx,0x2d,0x29,0xea, xxxx,0x3b,0x73,xxxx,0xfb,0x20,xxxx,0x5a /* f0 */ }; -//double check 0x00/0xa0 AND. -//double check 0x8c (0x7d jg) -//double check 0xfd (0x20 AND) - 9d2 in code -//double check 0xd1 (0x41 INC cw) used in uccops and dynablaster (LOOKS GOOD) +/*double check 0x00/0xa0 AND. */ +/*double check 0x8c (0x7d jg) */ +/*double check 0xfd (0x20 AND) - 9d2 in code */ +/*double check 0xd1 (0x41 INC cw) used in uccops and dynablaster (LOOKS GOOD) */ -//AND fd (0x20) -//0x37 (91) guess from dynablaster title screen +/*AND fd (0x20) */ +/*0x37 (91) guess from dynablaster title screen */ -// BM - 0x61 NOT 82, but instead 0x80 verified in both Atomic Punk and UCCops -// 0x22 is 0x18 (SBB) verified from Gunforce -// 0x5b seems confirmed (previous commented out as 0x36) -// NS I expected 0x32 to be 0x1b (SBB) like in gunforce, but startup tests fail in bbmanw. -// therefore it seems to be 0x2b (SUB) -// NS010718 0xa0 was 0x00 (ADDB), verified to be 0x22 (ANDB) +/* BM - 0x61 NOT 82, but instead 0x80 verified in both Atomic Punk and UCCops */ +/* 0x22 is 0x18 (SBB) verified from Gunforce */ +/* 0x5b seems confirmed (previous commented out as 0x36) */ +/* NS I expected 0x32 to be 0x1b (SBB) like in gunforce, but startup tests fail in bbmanw. */ +/* therefore it seems to be 0x2b (SUB) */ +/* NS010718 0xa0 was 0x00 (ADDB), verified to be 0x22 (ANDB) */ /* note: mysticrib sound is identical revision to bbmanw sound code */ -// mysticri +/* mysticri */ const UINT8 mysticri_decryption_table[256] = { xxxx,0x57,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, 0xbf,0x43,xxxx,xxxx,0xb3,xxxx,0xfc,xxxx, /* 00 */ /*r*/ @@ -248,11 +248,11 @@ const UINT8 mysticri_decryption_table[256] = { 0x34,xxxx,0xd0,0x07,0xf8,xxxx,xxxx,xxxx, xxxx,0x46,xxxx,0xea,0xfe,0x78,xxxx,xxxx, /* F0 */ /*r*/ /*r*/ }; -// 0xd5 (0x18) opcode is right but arguments could be swapped -// 0x4e (0x2b) not sure, could be 0x1b -// 0x8b (0xb3) needed by mysticrib +/* 0xd5 (0x18) opcode is right but arguments could be swapped */ +/* 0x4e (0x2b) not sure, could be 0x1b */ +/* 0x8b (0xb3) needed by mysticrib */ -// majtitl2 +/* majtitl2 */ const UINT8 majtitl2_decryption_table[256] = { 0x87,xxxx,0x78,0xaa,xxxx,xxxx,xxxx,0x2c, 0x32,0x0a,0x0f,xxxx,0x5e,xxxx,0xc6,0x8a, /* 00 */ 0x33,xxxx,xxxx,xxxx,xxxx,0xea,xxxx,0x72, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0x24,0x55, /* 10 */ @@ -271,10 +271,10 @@ const UINT8 majtitl2_decryption_table[256] = { 0x23,xxxx,0xf3,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,0xd2,0x8b,0xba,xxxx,xxxx,xxxx,0x5b, /* E0 */ xxxx,xxxx,0x9c,xxxx,xxxx,xxxx,xxxx,0xfc, 0xbc,0xa2,0x2a,xxxx,xxxx,0x8e,0xbb,xxxx, /* F0 */ }; -// 0x7c (0x18) opcode is right but arguments could be swapped -// 0x70 (0x2b) not sure, could be 0x1b +/* 0x7c (0x18) opcode is right but arguments could be swapped */ +/* 0x70 (0x2b) not sure, could be 0x1b */ -// hook +/* hook */ const UINT8 hook_decryption_table[256] = { 0xb6,0x20,0x22,xxxx,0x0f,0x57,0x59,0xc6, 0xeb,xxxx,0xb0,0xbb,0x3b,xxxx,xxxx,xxxx, /* 00 */ 0x36,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,0xfe,xxxx,xxxx,xxxx,xxxx,xxxx,0xa0, /* 10 */ @@ -293,10 +293,10 @@ const UINT8 hook_decryption_table[256] = { 0x8b,xxxx,0xf3,0xea,0x04,0x2c,0xb5,xxxx, 0x0a,xxxx,0x51,xxxx,xxxx,0x3a,xxxx,0x9c, /* E0 */ xxxx,xxxx,0x78,xxxx,0xba,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,0xd0,0x56,xxxx,xxxx, /* F0 */ }; -// 0x87 (0x18) opcode is right but arguments could be swapped -// 0xbb (0x2b) not sure, could be 0x1b +/* 0x87 (0x18) opcode is right but arguments could be swapped */ +/* 0xbb (0x2b) not sure, could be 0x1b */ -// rtypeleo, firebarr +/* rtypeleo, firebarr */ const UINT8 rtypeleo_decryption_table[256] = { 0x5d,xxxx,0xc6,xxxx,xxxx,xxxx,0x2a,0x3a,xxxx,xxxx,xxxx,0x86,xxxx,0x22,xxxx,0xf3, /* 00 */ xxxx,xxxx,xxxx,xxxx,xxxx,0x38,0xf7,0x42,0x04,xxxx,xxxx,0x1f,0x4b,xxxx,xxxx,0x58, /* 10 */ @@ -314,14 +314,14 @@ const UINT8 rtypeleo_decryption_table[256] = { xxxx,xxxx,xxxx,xxxx,0x81,xxxx,0x79,xxxx,xxxx,0x24,0x23,xxxx,xxxx,0xb0,0x07,0xff, /* D0 */ xxxx,0xba,0xf6,0x51,xxxx,xxxx,xxxx,0xfe,xxxx,0x92,xxxx,xxxx,xxxx,xxxx,0xe9,xxxx, /* E0 */ xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0xe8,0xd2,xxxx,0x18,xxxx,xxxx,xxxx,0xd1,xxxx,xxxx, /* F0 */ -// ^^^^ +/* ^^^^ */ }; -// 0xf9 (0x18) opcode is right but arguments could be swapped -// 0x80 (0x2b) not sure, could be 0x1b -// fixed 0x16 = 0xf7 mapping -// 3d = correct +/* 0xf9 (0x18) opcode is right but arguments could be swapped */ +/* 0x80 (0x2b) not sure, could be 0x1b */ +/* fixed 0x16 = 0xf7 mapping */ +/* 3d = correct */ -// inthunt +/* inthunt */ const UINT8 inthunt_decryption_table[256] = { 0x1f,xxxx,0xbb,0x50,xxxx,0x58,0x42,0x57, xxxx,xxxx,0xe9,xxxx,xxxx,xxxx,xxxx,0x0b, /* 00 */ xxxx,xxxx,0x9d,0x9c,xxxx,xxxx,0x1e,xxxx, xxxx,0xb4,0x5b,xxxx,xxxx,xxxx,xxxx,xxxx, /* 10 */ @@ -340,43 +340,43 @@ const UINT8 inthunt_decryption_table[256] = { 0xfe,xxxx,xxxx,0x22,0x20,0x72,0xf6,0x80, 0x02,0x2e,xxxx,0x74,0x0f,xxxx,xxxx,xxxx, /* E0 */ xxxx,xxxx,xxxx,xxxx,0xbc,0x41,xxxx,0xfb, 0x73,xxxx,xxxx,xxxx,0x23,0xd2,xxxx,xxxx, /* F0 */ }; -// 0x77 (0x18) opcode is right but arguments could be swapped -// 0xb8 (0x2b) not sure, could be 0x1b +/* 0x77 (0x18) opcode is right but arguments could be swapped */ +/* 0xb8 (0x2b) not sure, could be 0x1b */ -// gussun +/* gussun */ const UINT8 gussun_decryption_table[256] = { 0x63,xxxx,xxxx,0x36,xxxx,0x52,0xb1,0x5b, 0x68,0xcd,xxxx,xxxx,xxxx,0xa8,xxxx,xxxx, /* 00 */ -// gggg gggg gggg gggg +/* gggg gggg gggg gggg */ xxxx,xxxx,0x75,0x24,0x08,0x83,0x32,0xe9, xxxx,0x79,xxxx,0x8f,0x22,xxxx,0xac,xxxx, /* 10 */ -// pppp pppp gggg +/* pppp pppp gggg */ 0x5d,0xa5,0x11,0x51,0x0a,0x29,xxxx,xxxx ,0xf8,0x98,0x91,0x40,0x28,0x00,0x03,0x5f, /* 20 */ -// gggg gggg gggg gggg gggg gggg pppp +/* gggg gggg gggg gggg gggg gggg pppp */ 0x26,xxxx,xxxx,0x8b,0x2f,0x02,xxxx,xxxx, 0x8e,0xab,xxxx,xxxx,0xbc,0x90,0xb3,xxxx, /* 30 */ -// gggg +/* gggg */ 0x09,xxxx,0xc6,xxxx,xxxx,0x3a,xxxx,xxxx, xxxx,0x74,0x61,xxxx,0x33,xxxx,xxxx,xxxx, /* 40 */ -// gggg +/* gggg */ xxxx,0x53,0xa0,0xc0,0xc3,0x41,0xfc,0xe7, xxxx,0x2c,0x7c,0x2b,xxxx,0x4f,0xba,0x2a, /* 50 */ -// gggg gggg gggg pppp gggg gggg +/* gggg gggg gggg pppp gggg gggg */ 0xb0,xxxx,0x21,0x7d,xxxx,xxxx,0xb5,0x07, 0xb9,xxxx,0x27,0x46,0xf9,xxxx,xxxx,xxxx, /* 60 */ -// pppp pppp gggg gggg +/* pppp pppp gggg gggg */ xxxx,0xea,0x72,0x73,0xad,0xd1,0x3b,0x5e, 0xe5,0x57,xxxx,0x0d,0xfd,xxxx,0x92,0x3c, /* 70 */ -// gggg pppp gggg gggg +/* gggg pppp gggg gggg */ xxxx,0x86,0x78,0x7f,0x30,0x25,0x2d,xxxx, 0x9a,0xeb,0x04,0x0b,0xa2,0xb8,0xf6,xxxx, /* 80 */ -// pppp gggg gggg pppp gggg +/* pppp gggg gggg pppp gggg */ xxxx,xxxx,0x9d,xxxx,0xbb,xxxx,xxxx,0xcb, 0xa9,0xcf,xxxx,0x60,0x43,0x56,xxxx,xxxx, /* 90 */ -// gggg gggg +/* gggg gggg */ xxxx,0xa3,xxxx,xxxx,0x12,xxxx,0xfa,0xb4, xxxx,0x81,0xe6,0x48,0x80,0x8c,0xd4,xxxx, /* a0 */ -// gggg gggg pppp gggg gggg +/* gggg gggg pppp gggg gggg */ 0x42,xxxx,0x84,0xb6,0x77,0x3d,0x3e,xxxx, xxxx,0x0c,0x4b,xxxx,0xa4,xxxx,xxxx,xxxx, /* b0 */ -// gggg gggg pppp gggg gggg pppp pppp gggg +/* gggg gggg pppp gggg gggg pppp pppp gggg */ xxxx,0xff,0x47,xxxx,0x55,0x1e,xxxx,0x59, 0x93,xxxx,xxxx,xxxx,0x88,0xc1,0x01,0xb2, /* c0 */ -// gggg +/* gggg */ 0x85,0x2e,0x06,0xc7,0x05,xxxx,0x8a,0x5a, 0x58,0xbe,xxxx,0x4e,xxxx,0x1f,0x23,xxxx, /* d0 */ -// gggg gggg +/* gggg gggg */ 0xe8,xxxx,0x89,0xa1,0xd0,xxxx,xxxx,0xe2, 0x38,0xfe,0x50,0x9c,xxxx,xxxx,xxxx,0x49, /* e0 */ -// gggg gggg +/* gggg gggg */ 0xfb,0x20,0xf3,xxxx,xxxx,0x0f,xxxx,xxxx, xxxx,0x76,0xf7,0xbd,0x39,0x7e,0xbf,xxxx, /* f0 */ -// pppp gggg gggg gggg +/* pppp gggg gggg gggg */ }; @@ -482,7 +482,7 @@ clc ret */ -// leagueman, wpksoc +/* leagueman, wpksoc */ const UINT8 leagueman_decryption_table[256] = { xxxx,xxxx,xxxx,0x55,0xbb,xxxx,0x23,0x79, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0x38,xxxx, /* 00 */ 0xf7,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, 0x3d,xxxx,xxxx,xxxx,0xba,xxxx,0x1e,xxxx, /* 10 */ @@ -501,10 +501,10 @@ const UINT8 leagueman_decryption_table[256] = { xxxx,xxxx,xxxx,0x8b,xxxx,xxxx,0x33,xxxx, xxxx,xxxx,xxxx,xxxx,0xfa,0x42,xxxx,xxxx, /* E0 */ xxxx,xxxx,xxxx,0xea,xxxx,0x52,xxxx,0x5d, xxxx,xxxx,xxxx,xxxx,0xbc,xxxx,xxxx,xxxx, /* F0 */ }; -// 0x25 (0x4b) guess -// fixed 0x10 = 0xf7 mapping +/* 0x25 (0x4b) guess */ +/* fixed 0x10 = 0xf7 mapping */ -// psoldier +/* psoldier */ const UINT8 psoldier_decryption_table[256] = { xxxx,xxxx,xxxx,0x8a,xxxx,0xaa,xxxx,xxxx, xxxx,0x20,0x23,0x55,xxxx,0xb5,0x0a,xxxx, /* 00 */ xxxx,0x46,xxxx,0xb6,xxxx,0x74,0x8b,xxxx, xxxx,0xba,0xf7,xxxx,xxxx,0x5a,0x86,0xfb, /* 10 */ @@ -523,10 +523,10 @@ const UINT8 psoldier_decryption_table[256] = { 0x3c,0xf6,xxxx,xxxx,xxxx,0x18,xxxx,xxxx, 0xb8,xxxx,xxxx,xxxx,0x2a,0x5d,0x5b,xxxx, /* E0 */ xxxx,0x43,0x32,xxxx,xxxx,xxxx,0xeb,xxxx, xxxx,xxxx,xxxx,xxxx,0x83,0x89,xxxx,xxxx, /* F0 */ }; -// 0x9e (0x4b) guess -// fixed 0x1a = 0xf7 mapping +/* 0x9e (0x4b) guess */ +/* fixed 0x1a = 0xf7 mapping */ -// dsoccr94 +/* dsoccr94 */ const UINT8 dsoccr94_decryption_table[256] = { xxxx,0xd1,xxxx,xxxx,xxxx,0x79,0x2e,xxxx, xxxx,xxxx,0x5a,0x0f,xxxx,xxxx,0x43,xxxx, /* 00 */ xxxx,xxxx,0xe8,0x50,xxxx,xxxx,xxxx,0xa0, 0x5d,0x22,xxxx,xxxx,0xb2,0x3a,xxxx,xxxx, /* 10 */ @@ -546,46 +546,46 @@ const UINT8 dsoccr94_decryption_table[256] = { 0xeb,xxxx,xxxx,xxxx,xxxx,xxxx,0x83,xxxx, 0x36,xxxx,xxxx,xxxx,xxxx,0xbd,0xfe,xxxx, /* F0 */ }; -// 0x95 (0x18) opcode is right but arguments could be swapped -// 0x2a (0x2b) not sure, could be 0x1b -// fixed 0x60 = 0xf7 mapping +/* 0x95 (0x18) opcode is right but arguments could be swapped */ +/* 0x2a (0x2b) not sure, could be 0x1b */ +/* fixed 0x60 = 0xf7 mapping */ /* preliminary table by Pierpaolo Prazzoli */ -// matchit2 +/* matchit2 */ const UINT8 matchit2_decryption_table[256] = { xxxx,0x86,0x0a,xxxx,0x32,0x01,0x81,0xbe, 0xea,xxxx,0xbb,xxxx,xxxx,xxxx,0xa5,0xf6, /* 00 */ -// new new new new new new new new new +/* new new new new new new new new new */ 0x5d,0x8c,0xf3,0xc4,0x42,0x5a,0x22,0x26, xxxx,0x58,xxxx,0xfd,0x59,0x53,0x80,0x09, /* 10 */ -// new new new new !!!! new !!!! new !!!! new new new !!!! +/* new new new new !!!! new !!!! new !!!! new new new !!!! */ xxxx,0x1e,0x48,0xe2,0x50,xxxx,0xc3,0x23, xxxx,xxxx,0xe9,xxxx,0x40,0x83,0xa3,0x46, /* 20 */ -// new new new new new new new new new new +/* new new new new new new new new new new */ 0x49,0xb4,0xa9,xxxx,0xd3,0x8b,0xe8,0xb8, 0xa0,xxxx,xxxx,xxxx,0x84,xxxx,xxxx,xxxx, /* 30 */ -// !!!! ???? new !!!! new new new new +/* !!!! ???? new !!!! new new new new */ xxxx,xxxx,xxxx,xxxx,0x14,xxxx,0x25,xxxx, xxxx,0x5e,xxxx,0x87,0x56,0xb9,0x4a,0x39, /* 40 */ -// new new new new new new new new +/* new new new new new new new new */ 0x89,xxxx,xxxx,xxxx,xxxx,0x1f,0xa4,xxxx, 0xf8,0x5f,0x21,0xb3,0x5b,xxxx,0x8d,xxxx, /* 50 */ -// new new !!!! new new !!!! new new +/* new new !!!! new new !!!! new new */ xxxx,0xc5,0x7c,0x07,xxxx,0x88,0xba,0x47, 0x35,0xfb,xxxx,0x7f,xxxx,xxxx,0xc6,0xeb, /* 60 */ -// new !!!! new new new new new new !!!! new +/* new !!!! new new new new new new !!!! new */ xxxx,0xc7,xxxx,xxxx,0xd2,0xa1,0x72,0x79, 0xfe,0x24,0xab,0x2a,0xbc,0x0d,0x8f,0x7e, /* 70 */ -// !!!! new new new new new new new new new !!!! +/* !!!! new new new new new new new new new !!!! */ xxxx,0x7d,xxxx,0xe7,0x2d,xxxx,xxxx,0x57, 0x0b,0xa2,xxxx,0x9d,xxxx,xxxx,0x74,0x85, /* 80 */ -// !!!! new new new new new new new new +/* !!!! new new new new new new new new */ 0xaf,0x2f,0x8a,0xe6,0x08,xxxx,0xff,xxxx, xxxx,0x1c,xxxx,xxxx,0x02,xxxx,xxxx,xxxx, /* 90 */ -// new !!!! new new new new !!!! new +/* new !!!! new new new new !!!! new */ 0x43,0x04,xxxx,xxxx,0xbf,0x3b,0x93,0x38, xxxx,xxxx,xxxx,0x77,xxxx,0xb0,xxxx,0x3a, /* A0 */ -// new new new new new new new new new +/* new new new new new new new new new */ 0xfc,xxxx,0xb5,xxxx,xxxx,xxxx,xxxx,0x05, 0x52,0x76,0x2b,0xe5,0xbd,xxxx,0x0e,0xb1, /* B0 */ -// new new new new new new new new new !!!! +/* new new new new new new new new new !!!! */ 0x73,xxxx,xxxx,0x45,0x92,0x99,xxxx,0xf7, 0x3d,0xd0,0xb6,0x36,0xf9,0xfa,0x0f,xxxx, /* C0 */ -// new new new new new new new !!!! new new +/* new new new new new new new !!!! new new */ 0x75,xxxx,0xaa,0x9c,xxxx,0x11,xxxx,xxxx, 0x27,0x4b,xxxx,0x2c,0x51,0x2e,0x4d,xxxx, /* D0 */ -// new !!!! new new new new new new new !!!! +/* new !!!! new new new new new new new !!!! */ 0x55,0x3c,xxxx,0xb7,xxxx,0xd1,0x8e,xxxx, 0xb2,xxxx,0x78,xxxx,0x12,xxxx,0x29,0x0c, /* E0 */ -// new new new ???? new new new new new new new +/* new new new ???? new new new new new new new */ 0x33,xxxx,0xf2,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,0x03,0x06,0xa8,xxxx,xxxx,0xcf,xxxx, /* F0 */ -// new new new new new new +/* new new new new new new */ }; /* Unknown (marked "????") diff --git a/src/machine/model1_machine.c b/src/machine/model1_machine.c index 847815905..aa041b2b7 100644 --- a/src/machine/model1_machine.c +++ b/src/machine/model1_machine.c @@ -103,7 +103,7 @@ static UINT32 fifoin_pop(void) static void fifoin_push(UINT32 data) { - // logerror("TGP FIFOIN write %08x (%x)\n", data, activecpu_get_pc()); + /* logerror("TGP FIFOIN write %08x (%x)\n", data, activecpu_get_pc()); */ fifoin_data[fifoin_wpos++] = data; if(fifoin_wpos == FIFO_SIZE) fifoin_wpos = 0; @@ -350,12 +350,12 @@ static void f14(void) float d = fifoin_pop_f(); int r = 0; logerror("TGP f14 %f, %f, %f, %f (%x)\n", a, b, c, d, activecpu_get_pc()); - // fprintf(stderr, "TGP f14 %f, %f, %f, %f (%x)\n", a, b, c, d, activecpu_get_pc()); + /* fprintf(stderr, "TGP f14 %f, %f, %f, %f (%x)\n", a, b, c, d, activecpu_get_pc()); */ switch(activecpu_get_pc()) { - case 0xc7eea: r=1; break; // stars - case 0xc7f19: r=2; break; // stars too, ties? - case 0xcac91: r=3; break; // visee??? + case 0xc7eea: r=1; break; /* stars */ + case 0xc7f19: r=2; break; /* stars too, ties? */ + case 0xcac91: r=3; break; /* visee??? */ case 0xc2ad0: r=4; break; } @@ -371,7 +371,7 @@ static void f14(void) static void f15_swa(void) { logerror("TGP f15_swa (%x)\n", activecpu_get_pc()); - // fprintf(stderr, "TGP f15_swa (%x)\n", activecpu_get_pc()); + /* fprintf(stderr, "TGP f15_swa (%x)\n", activecpu_get_pc()); */ next_fn(); } @@ -428,7 +428,7 @@ static void matrix_trans(void) logerror("TGP matrix_trans (%f, %f, %f) (%x)\n", a, b, c, activecpu_get_pc()); if(0 && activecpu_get_pc() == 0xfeeaa5) - // fprintf(stderr, "TGP matrix_trans (%f, %f, %f) (%x)\n", a, b, c, activecpu_get_pc()); + /* fprintf(stderr, "TGP matrix_trans (%f, %f, %f) (%x)\n", a, b, c, activecpu_get_pc()); */ a = 0; if(activecpu_get_pc() == 0x22f59) { @@ -693,7 +693,7 @@ static void f42(void) float b = fifoin_pop_f(); float c = fifoin_pop_f(); logerror("TGP f42 %f, %f, %f (%x)\n", a, b, c, activecpu_get_pc()); - // fifoout_push_f((mame_rand() % 1000) - 500); + /* fifoout_push_f((mame_rand() % 1000) - 500); */ fifoout_push_f(0); fifoout_push_f(0); fifoout_push_f(0); @@ -704,7 +704,7 @@ static void f42(void) } -// r = (x2 + y2 + z2)1/2, f = tan-1(y/(x2+z2)1/2), q = tan-1(z/x) +/* r = (x2 + y2 + z2)1/2, f = tan-1(y/(x2+z2)1/2), q = tan-1(z/x) */ static void xyz2rqf(void) { @@ -903,8 +903,8 @@ static void colbox_test(void) float c = fifoin_pop_f(); logerror("TGP colbox_test %f, %f, %f (%x)\n", a, b, c, activecpu_get_pc()); - // #### Wrong, need to check with the tgp_vr_cbox coordinates - // Game only test sign, negative = collision + /* #### Wrong, need to check with the tgp_vr_cbox coordinates */ + /* Game only test sign, negative = collision */ fifoout_push_f(-1); next_fn(); } @@ -1016,12 +1016,12 @@ static void track_lookup(void) behaviour = 0; height = 0.0; } else { - // Maybe it's doing some kind of interpolation, go figure + /* Maybe it's doing some kind of interpolation, go figure */ behaviour = tgp_data[offe+15]; height = u2f(tgp_data[offe+pt*3+1]); } - ram_data[0x0000] = 0; // non zero = still computing + ram_data[0x0000] = 0; /* non zero = still computing */ ram_data[0x8001] = f2u(height); ram_data[0x8002] = behaviour; @@ -1313,7 +1313,7 @@ static void matrix_unrot(void) static void f80(void) { logerror("TGP f80 (%x)\n", activecpu_get_pc()); - // cmat[9] = cmat[10] = cmat[11] = 0; + /* cmat[9] = cmat[10] = cmat[11] = 0; */ next_fn(); } @@ -1359,7 +1359,7 @@ static void groundbox_test(void) out_x = x < tgp_vf_xmin || x > tgp_vf_xmax; out_z = z < tgp_vf_zmin || z > tgp_vf_zmax; - out_y = 1; // Wrong, but untestable it seems. + out_y = 1; /* Wrong, but untestable it seems. */ fifoout_push(out_x); fifoout_push(out_y); @@ -1523,10 +1523,10 @@ static void f102(void) py = u2f(ram_data[ram_scanadr+0x17]); pz = u2f(ram_data[ram_scanadr+0x18]); - // memset(cmat, 0, sizeof(cmat)); - // cmat[0] = 1.0; - // cmat[4] = 1.0; - // cmat[8] = 1.0; + /* memset(cmat, 0, sizeof(cmat)); */ + /* cmat[0] = 1.0; */ + /* cmat[4] = 1.0; */ + /* cmat[8] = 1.0; */ px = c; py = d; @@ -1601,7 +1601,7 @@ static struct function ftab_vf[] = { { 38, acc_add, 1 }, { 39, acc_sub, 1 }, { 40, acc_mul, 1 }, - { 41, acc_div, 1 }, // not used ? + { 41, acc_div, 1 }, /* not used ? */ { 42, f42, 3 }, { 43, f43, 6 }, { 44, f44, 1 }, @@ -1642,10 +1642,10 @@ static struct function ftab_vf[] = { { 103, f103, 1 }, { 0, 0, 0 } }; -// Used in swa scene 1 and unemulated: -// f14 -// f49_swa -// f15_swa +/* Used in swa scene 1 and unemulated: */ +/* f14 */ +/* f49_swa */ +/* f15_swa */ static struct function ftab_swa[] = { { 0, fadd, 2 }, @@ -1684,7 +1684,7 @@ static struct function ftab_swa[] = { { 38, acc_add, 1 }, { 39, acc_sub, 1 }, { 40, acc_mul, 1 }, - { 41, acc_div, 1 }, // not used ? + { 41, acc_div, 1 }, /* not used ? */ { 42, xyz2rqf, 3 }, { 43, f43_swa, 3 }, { 44, matrix_sdir, 3 }, @@ -1729,7 +1729,7 @@ static void function_get_vf(void) if(fct->cb) { fifoin_cbcount = fct->count; fifoin_cb = fct->cb; - // logerror("TGP function %d request, %d parameters\n", f, fifoin_cbcount); + /* logerror("TGP function %d request, %d parameters\n", f, fifoin_cbcount); */ if(!fifoin_cbcount) fifoin_cb(); } else { @@ -1755,7 +1755,7 @@ static void function_get_swa(void) if(fct->cb) { fifoin_cbcount = fct->count; fifoin_cb = fct->cb; - // logerror("TGP function %d request, %d parameters\n", f, fifoin_cbcount); + /* logerror("TGP function %d request, %d parameters\n", f, fifoin_cbcount); */ if(!fifoin_cbcount) fifoin_cb(); } else { diff --git a/src/machine/namcoio_machine.c b/src/machine/namcoio_machine.c index 2fbb87063..e5a279a96 100644 --- a/src/machine/namcoio_machine.c +++ b/src/machine/namcoio_machine.c @@ -157,7 +157,7 @@ struct namcoio int coins_per_cred[2]; int creds_per_coin[2]; int in_count; - int mode,coincred_mode,remap_joy; // for 51XX + int mode,coincred_mode,remap_joy; /* for 51XX */ }; static struct namcoio io[MAX_NAMCOIO]; @@ -389,8 +389,8 @@ void namcoio_50XX_write(int chipnum,int data) case 0x68: /* 2P Score */ Player[chip] = 1; break; -// case 0x70: -// break; +/* case 0x70: */ +/* break; */ case 0x80: Score[Player[chip]][chip] += 5; break; @@ -581,10 +581,10 @@ void namcoio_51XX_write(int chip,int data) { switch (data) { - case 0: // nop + case 0: /* nop */ break; - case 1: // set coinage + case 1: /* set coinage */ io[chip].coincred_mode = 4; /* this is a good time to reset the credits counter */ io[chip].credits = 0; @@ -601,20 +601,20 @@ void namcoio_51XX_write(int chip,int data) } break; - case 2: // go in "credits" mode and enable start buttons + case 2: /* go in "credits" mode and enable start buttons */ io[chip].mode = 1; io[chip].in_count = 0; break; - case 3: // disable joystick remapping + case 3: /* disable joystick remapping */ io[chip].remap_joy = 0; break; - case 4: // enable joystick remapping + case 4: /* enable joystick remapping */ io[chip].remap_joy = 1; break; - case 5: // go in "switch" mode + case 5: /* go in "switch" mode */ io[chip].mode = 0; io[chip].in_count = 0; break; @@ -660,7 +660,7 @@ data8_t namcoio_51XX_read(int chip) default: case 0: return READ_PORT(0) | (READ_PORT(1) << 4); case 1: return READ_PORT(2) | (READ_PORT(3) << 4); - case 2: return 0; // nothing? + case 2: return 0; /* nothing? */ } } else /* credits mode */ @@ -668,7 +668,7 @@ data8_t namcoio_51XX_read(int chip) switch ((io[chip].in_count++) % 3) { default: - case 0: // number of credits in BCD format + case 0: /* number of credits in BCD format */ { int in,toggle; @@ -680,16 +680,16 @@ data8_t namcoio_51XX_read(int chip) { if (io[chip].credits >= 9) { - WRITE_PORT(1,1); // coin lockout + WRITE_PORT(1,1); /* coin lockout */ } else { - WRITE_PORT(1,0); // coin lockout + WRITE_PORT(1,0); /* coin lockout */ /* check if the user inserted a coin */ if (toggle & in & 0x10) { io[chip].coins[0]++; - WRITE_PORT(0,0x04); // coin counter + WRITE_PORT(0,0x04); /* coin counter */ WRITE_PORT(0,0x0c); if (io[chip].coins[0] >= io[chip].coins_per_cred[0]) { @@ -700,7 +700,7 @@ data8_t namcoio_51XX_read(int chip) if (toggle & in & 0x20) { io[chip].coins[1]++; - WRITE_PORT(0,0x08); // coin counter + WRITE_PORT(0,0x08); /* coin counter */ WRITE_PORT(0,0x0c); if (io[chip].coins[1] >= io[chip].coins_per_cred[1]) { @@ -714,18 +714,18 @@ data8_t namcoio_51XX_read(int chip) } } } - else io[chip].credits = 100; // free play + else io[chip].credits = 100; /* free play */ if (io[chip].mode == 1) { int on = (cpu_getcurrentframe() & 0x10) >> 4; if (io[chip].credits >= 2) - WRITE_PORT(0,0x0c | 3*on); // lamps + WRITE_PORT(0,0x0c | 3*on); /* lamps */ else if (io[chip].credits >= 1) - WRITE_PORT(0,0x0c | 2*on); // lamps + WRITE_PORT(0,0x0c | 2*on); /* lamps */ else - WRITE_PORT(0,0x0c); // lamps off + WRITE_PORT(0,0x0c); /* lamps off */ /* check for 1 player start button */ if (toggle & in & 0x04) @@ -734,7 +734,7 @@ data8_t namcoio_51XX_read(int chip) { io[chip].credits--; io[chip].mode = 2; - WRITE_PORT(0,0x0c); // lamps off + WRITE_PORT(0,0x0c); /* lamps off */ } } /* check for 2 players start button */ @@ -744,7 +744,7 @@ data8_t namcoio_51XX_read(int chip) { io[chip].credits -= 2; io[chip].mode = 2; - WRITE_PORT(0,0x0c); // lamps off + WRITE_PORT(0,0x0c); /* lamps off */ } } } @@ -813,9 +813,9 @@ static void handle_coins(int chip,int swap) int credit_sub = 0; int button; -//usrintf_showmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); +/*usrintf_showmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); */ - val = ~READ_PORT(0); // pins 38-41 + val = ~READ_PORT(0); /* pins 38-41 */ toggled = val ^ io[chip].lastcoins; io[chip].lastcoins = val; @@ -847,13 +847,13 @@ static void handle_coins(int chip,int swap) credit_add = 1; } - val = ~READ_PORT(3); // pins 30-33 + val = ~READ_PORT(3); /* pins 30-33 */ toggled = val ^ io[chip].lastbuttons; io[chip].lastbuttons = val; /* check start buttons, only if the game allows */ if (IORAM_READ(9) == 0) - // the other argument is IORAM_READ(10) = 1, meaning unknown + /* the other argument is IORAM_READ(10) = 1, meaning unknown */ { if (val & toggled & 0x04) { @@ -867,16 +867,16 @@ static void handle_coins(int chip,int swap) io[chip].credits += credit_add - credit_sub; - IORAM_WRITE(0 ^ swap, io[chip].credits / 10); // BCD credits - IORAM_WRITE(1 ^ swap, io[chip].credits % 10); // BCD credits - IORAM_WRITE(2 ^ swap, credit_add); // credit increment (coin inputs) - IORAM_WRITE(3 ^ swap, credit_sub); // credit decrement (start buttons) - IORAM_WRITE(4, ~READ_PORT(1)); // pins 22-25 + IORAM_WRITE(0 ^ swap, io[chip].credits / 10); /* BCD credits */ + IORAM_WRITE(1 ^ swap, io[chip].credits % 10); /* BCD credits */ + IORAM_WRITE(2 ^ swap, credit_add); /* credit increment (coin inputs) */ + IORAM_WRITE(3 ^ swap, credit_sub); /* credit decrement (start buttons) */ + IORAM_WRITE(4, ~READ_PORT(1)); /* pins 22-25 */ button = ((val & 0x05) << 1) | (val & toggled & 0x05); - IORAM_WRITE(5, button); // pins 30 & 32 normal and impulse - IORAM_WRITE(6, ~READ_PORT(2)); // pins 26-29 + IORAM_WRITE(5, button); /* pins 30 & 32 normal and impulse */ + IORAM_WRITE(6, ~READ_PORT(2)); /* pins 26-29 */ button = (val & 0x0a) | ((val & toggled & 0x0a) >> 1); - IORAM_WRITE(7, button); // pins 31 & 33 normal and impulse + IORAM_WRITE(7, button); /* pins 31 & 33 normal and impulse */ } @@ -889,52 +889,52 @@ static void namco_customio_56XX_run(int chip) switch (IORAM_READ(8)) { - case 0: // nop? + case 0: /* nop? */ break; - case 1: // read switch inputs - IORAM_WRITE(0, ~READ_PORT(0)); // pins 38-41 - IORAM_WRITE(1, ~READ_PORT(1)); // pins 22-25 - IORAM_WRITE(2, ~READ_PORT(2)); // pins 26-29 - IORAM_WRITE(3, ~READ_PORT(3)); // pins 30-33 + case 1: /* read switch inputs */ + IORAM_WRITE(0, ~READ_PORT(0)); /* pins 38-41 */ + IORAM_WRITE(1, ~READ_PORT(1)); /* pins 22-25 */ + IORAM_WRITE(2, ~READ_PORT(2)); /* pins 26-29 */ + IORAM_WRITE(3, ~READ_PORT(3)); /* pins 30-33 */ -//usrintf_showmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); +/*usrintf_showmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); */ - WRITE_PORT(0,IORAM_READ(9)); // output to pins 13-16 (motos, pacnpal, gaplus) - WRITE_PORT(1,IORAM_READ(10)); // output to pins 17-20 (gaplus) + WRITE_PORT(0,IORAM_READ(9)); /* output to pins 13-16 (motos, pacnpal, gaplus) */ + WRITE_PORT(1,IORAM_READ(10)); /* output to pins 17-20 (gaplus) */ break; - case 2: // initialize coinage settings + case 2: /* initialize coinage settings */ io[chip].coins_per_cred[0] = IORAM_READ(9); io[chip].creds_per_coin[0] = IORAM_READ(10); io[chip].coins_per_cred[1] = IORAM_READ(11); io[chip].creds_per_coin[1] = IORAM_READ(12); - // IORAM_READ(13) = 1; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) - // IORAM_READ(14) = 1; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) - // IORAM_READ(15) = 0; meaning unknown + /* IORAM_READ(13) = 1; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) */ + /* IORAM_READ(14) = 1; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) */ + /* IORAM_READ(15) = 0; meaning unknown */ break; - case 4: // druaga, digdug chip #1: read dip switches and inputs - // superpac chip #0: process coin and start inputs, read switch inputs + case 4: /* druaga, digdug chip #1: read dip switches and inputs */ + /* superpac chip #0: process coin and start inputs, read switch inputs */ handle_coins(chip,0); break; - case 7: // bootup check (liblrabl only) + case 7: /* bootup check (liblrabl only) */ { - // liblrabl chip #1: 9-15 = f 1 2 3 4 0 0, expects 2 = e - // liblrabl chip #2: 9-15 = 0 1 4 5 5 0 0, expects 7 = 6 + /* liblrabl chip #1: 9-15 = f 1 2 3 4 0 0, expects 2 = e */ + /* liblrabl chip #2: 9-15 = 0 1 4 5 5 0 0, expects 7 = 6 */ IORAM_WRITE(2,0xe); IORAM_WRITE(7,0x6); } break; - case 8: // bootup check + case 8: /* bootup check */ { int i,sum; - // superpac: 9-15 = f f f f f f f, expects 0-1 = 6 9. 0x69 = f+f+f+f+f+f+f. - // motos: 9-15 = f f f f f f f, expects 0-1 = 6 9. 0x69 = f+f+f+f+f+f+f. - // phozon: 9-15 = 1 2 3 4 5 6 7, expects 0-1 = 1 c. 0x1c = 1+2+3+4+5+6+7 + /* superpac: 9-15 = f f f f f f f, expects 0-1 = 6 9. 0x69 = f+f+f+f+f+f+f. */ + /* motos: 9-15 = f f f f f f f, expects 0-1 = 6 9. 0x69 = f+f+f+f+f+f+f. */ + /* phozon: 9-15 = 1 2 3 4 5 6 7, expects 0-1 = 1 c. 0x1c = 1+2+3+4+5+6+7 */ sum = 0; for (i = 9;i < 16;i++) sum += IORAM_READ(i); @@ -943,17 +943,17 @@ static void namco_customio_56XX_run(int chip) } break; - case 9: // read dip switches and inputs - WRITE_PORT(0,0); // set pin 13 = 0 - IORAM_WRITE(0, ~READ_PORT(0)); // pins 38-41, pin 13 = 0 - IORAM_WRITE(2, ~READ_PORT(1)); // pins 22-25, pin 13 = 0 - IORAM_WRITE(4, ~READ_PORT(2)); // pins 26-29, pin 13 = 0 - IORAM_WRITE(6, ~READ_PORT(3)); // pins 30-33, pin 13 = 0 - WRITE_PORT(0,1); // set pin 13 = 1 - IORAM_WRITE(1, ~READ_PORT(0)); // pins 38-41, pin 13 = 1 - IORAM_WRITE(3, ~READ_PORT(1)); // pins 22-25, pin 13 = 1 - IORAM_WRITE(5, ~READ_PORT(2)); // pins 26-29, pin 13 = 1 - IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33, pin 13 = 1 + case 9: /* read dip switches and inputs */ + WRITE_PORT(0,0); /* set pin 13 = 0 */ + IORAM_WRITE(0, ~READ_PORT(0)); /* pins 38-41, pin 13 = 0 */ + IORAM_WRITE(2, ~READ_PORT(1)); /* pins 22-25, pin 13 = 0 */ + IORAM_WRITE(4, ~READ_PORT(2)); /* pins 26-29, pin 13 = 0 */ + IORAM_WRITE(6, ~READ_PORT(3)); /* pins 30-33, pin 13 = 0 */ + WRITE_PORT(0,1); /* set pin 13 = 1 */ + IORAM_WRITE(1, ~READ_PORT(0)); /* pins 38-41, pin 13 = 1 */ + IORAM_WRITE(3, ~READ_PORT(1)); /* pins 22-25, pin 13 = 1 */ + IORAM_WRITE(5, ~READ_PORT(2)); /* pins 26-29, pin 13 = 1 */ + IORAM_WRITE(7, ~READ_PORT(3)); /* pins 30-33, pin 13 = 1 */ break; default: @@ -971,14 +971,14 @@ static void namco_customio_pacnpal_run(int chip) switch (IORAM_READ(8)) { - case 0: // nop? + case 0: /* nop? */ break; - case 3: // pacnpal chip #1: read dip switches and inputs - IORAM_WRITE(4, ~READ_PORT(0)); // pins 38-41, pin 13 = 0 ? - IORAM_WRITE(5, ~READ_PORT(2)); // pins 26-29 ? - IORAM_WRITE(6, ~READ_PORT(1)); // pins 22-25 ? - IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33 + case 3: /* pacnpal chip #1: read dip switches and inputs */ + IORAM_WRITE(4, ~READ_PORT(0)); /* pins 38-41, pin 13 = 0 ? */ + IORAM_WRITE(5, ~READ_PORT(2)); /* pins 26-29 ? */ + IORAM_WRITE(6, ~READ_PORT(1)); /* pins 22-25 ? */ + IORAM_WRITE(7, ~READ_PORT(3)); /* pins 30-33 */ break; default: @@ -996,49 +996,49 @@ static void namco_customio_58XX_run(int chip) switch (IORAM_READ(8)) { - case 0: // nop? + case 0: /* nop? */ break; - case 1: // read switch inputs - IORAM_WRITE(4, ~READ_PORT(0)); // pins 38-41 - IORAM_WRITE(5, ~READ_PORT(1)); // pins 22-25 - IORAM_WRITE(6, ~READ_PORT(2)); // pins 26-29 - IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33 + case 1: /* read switch inputs */ + IORAM_WRITE(4, ~READ_PORT(0)); /* pins 38-41 */ + IORAM_WRITE(5, ~READ_PORT(1)); /* pins 22-25 */ + IORAM_WRITE(6, ~READ_PORT(2)); /* pins 26-29 */ + IORAM_WRITE(7, ~READ_PORT(3)); /* pins 30-33 */ -//usrintf_showmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); +/*usrintf_showmessage("%x %x %x %x %x %x %x %x",IORAM_READ(8),IORAM_READ(9),IORAM_READ(10),IORAM_READ(11),IORAM_READ(12),IORAM_READ(13),IORAM_READ(14),IORAM_READ(15)); */ - WRITE_PORT(0,IORAM_READ(9)); // output to pins 13-16 (toypop) - WRITE_PORT(1,IORAM_READ(10)); // output to pins 17-20 (toypop) + WRITE_PORT(0,IORAM_READ(9)); /* output to pins 13-16 (toypop) */ + WRITE_PORT(1,IORAM_READ(10)); /* output to pins 17-20 (toypop) */ break; - case 2: // initialize coinage settings + case 2: /* initialize coinage settings */ io[chip].coins_per_cred[0] = IORAM_READ(9); io[chip].creds_per_coin[0] = IORAM_READ(10); io[chip].coins_per_cred[1] = IORAM_READ(11); io[chip].creds_per_coin[1] = IORAM_READ(12); - // IORAM_READ(13) = 1; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) - // IORAM_READ(14) = 0; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) - // IORAM_READ(15) = 0; meaning unknown + /* IORAM_READ(13) = 1; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) */ + /* IORAM_READ(14) = 0; meaning unknown - possibly a 3rd coin input? (there's a IPT_UNUSED bit in port A) */ + /* IORAM_READ(15) = 0; meaning unknown */ break; - case 3: // process coin and start inputs, read switch inputs + case 3: /* process coin and start inputs, read switch inputs */ handle_coins(chip,2); break; - case 4: // read dip switches and inputs - WRITE_PORT(0,0); // set pin 13 = 0 - IORAM_WRITE(0, ~READ_PORT(0)); // pins 38-41, pin 13 = 0 - IORAM_WRITE(2, ~READ_PORT(1)); // pins 22-25, pin 13 = 0 - IORAM_WRITE(4, ~READ_PORT(2)); // pins 26-29, pin 13 = 0 - IORAM_WRITE(6, ~READ_PORT(3)); // pins 30-33, pin 13 = 0 - WRITE_PORT(0,1); // set pin 13 = 1 - IORAM_WRITE(1, ~READ_PORT(0)); // pins 38-41, pin 13 = 1 - IORAM_WRITE(3, ~READ_PORT(1)); // pins 22-25, pin 13 = 1 - IORAM_WRITE(5, ~READ_PORT(2)); // pins 26-29, pin 13 = 1 - IORAM_WRITE(7, ~READ_PORT(3)); // pins 30-33, pin 13 = 1 + case 4: /* read dip switches and inputs */ + WRITE_PORT(0,0); /* set pin 13 = 0 */ + IORAM_WRITE(0, ~READ_PORT(0)); /* pins 38-41, pin 13 = 0 */ + IORAM_WRITE(2, ~READ_PORT(1)); /* pins 22-25, pin 13 = 0 */ + IORAM_WRITE(4, ~READ_PORT(2)); /* pins 26-29, pin 13 = 0 */ + IORAM_WRITE(6, ~READ_PORT(3)); /* pins 30-33, pin 13 = 0 */ + WRITE_PORT(0,1); /* set pin 13 = 1 */ + IORAM_WRITE(1, ~READ_PORT(0)); /* pins 38-41, pin 13 = 1 */ + IORAM_WRITE(3, ~READ_PORT(1)); /* pins 22-25, pin 13 = 1 */ + IORAM_WRITE(5, ~READ_PORT(2)); /* pins 26-29, pin 13 = 1 */ + IORAM_WRITE(7, ~READ_PORT(3)); /* pins 30-33, pin 13 = 1 */ break; - case 5: // bootup check + case 5: /* bootup check */ /* mode 5 values are checked against these numbers during power up mappy: 9-15 = 3 6 5 f a c e, expects 1-7 = 8 4 6 e d 9 d grobda: 9-15 = 2 3 4 5 6 7 8, expects 2 = f and 6 = c @@ -1069,7 +1069,7 @@ static void namco_customio_58XX_run(int chip) rng = seed; if (rng & 1) { n ^= ~IORAM_READ(11); } rng = NEXT(rng); - seed = rng; // save state for next loop + seed = rng; /* save state for next loop */ if (rng & 1) { n ^= ~IORAM_READ(10); } rng = NEXT(rng); if (rng & 1) { n ^= ~IORAM_READ(9); } @@ -1099,7 +1099,7 @@ static void namco_customio_58XX_run(int chip) READ_HANDLER( namcoio_r ) { - // RAM is 4-bit wide; Pac & Pal requires the | 0xf0 otherwise Easter egg doesn't work + /* RAM is 4-bit wide; Pac & Pal requires the | 0xf0 otherwise Easter egg doesn't work */ offset &= 0x3f; #if VERBOSE @@ -1112,7 +1112,7 @@ READ_HANDLER( namcoio_r ) WRITE_HANDLER( namcoio_w ) { offset &= 0x3f; - data &= 0x0f; // RAM is 4-bit wide + data &= 0x0f; /* RAM is 4-bit wide */ #if VERBOSE logerror("%04x: I/O write %d: offset %d = %02x\n", activecpu_get_pc(), offset / 16, offset & 0x0f, data); @@ -1242,9 +1242,9 @@ static data8_t namcoio_53XX_polepos_read(int chip) switch ((io[chip].in_count++) % 8) { - case 0: return READ_PORT(0) | (READ_PORT(1) << 4); // steering - case 4: return READ_PORT(2) | (READ_PORT(3) << 4); // dip switches - default: return 0xff; // polepos2 hangs if 0 is returned + case 0: return READ_PORT(0) | (READ_PORT(1) << 4); /* steering */ + case 4: return READ_PORT(2) | (READ_PORT(3) << 4); /* dip switches */ + default: return 0xff; /* polepos2 hangs if 0 is returned */ } } diff --git a/src/machine/neocrypt.c b/src/machine/neocrypt.c index 4d4dc8551..84eca9f10 100644 --- a/src/machine/neocrypt.c +++ b/src/machine/neocrypt.c @@ -596,14 +596,14 @@ static void neogeo_gfx_decrypt_for_mc50(int extra_xor) rom = memory_region(REGION_GFX3); - // Data xor + /* Data xor */ for (rpos = 0;rpos < rom_size/4;rpos++) { decrypt(buf+4*rpos+0, buf+4*rpos+3, rom[4*rpos+0], rom[4*rpos+3], type0_t03, type0_t12, type1_t03, rpos, (rpos>>8) & 1); decrypt(buf+4*rpos+1, buf+4*rpos+2, rom[4*rpos+1], rom[4*rpos+2], type0_t12, type0_t03, type1_t12, rpos, ((rpos>>16) ^ address_16_23_xor2[(rpos>>8) & 0xff]) & 1); } - // Address xor + /* Address xor */ for (rpos = 0;rpos < rom_size/4;rpos++) { int baser; @@ -706,7 +706,7 @@ void neogeo_cmc50_m1_decrypt( void ) UINT16 key=generate_cs16(rom,0x10000); - //printf("key %04x\n",key); + /*printf("key %04x\n",key); */ for (i=0; i>8)&0xff)^0xf3,7,6,0,4,3,2,1,5); -// data = datalow | datahigh<<8; -// COMBINE_DATA(&prom[offset & 0xFFFF]); -// decodechar(Machine->gfx[0], (offset&0xffff)/16, (UINT8 *)prom, &kof10th_layout); +/* S data should be written here... ?? scrambled?? */ +/* UINT16 *prom = (UINT16*)memory_region( REGION_GFX1 ); */ +/* UINT8 datalow = BITSWAP8((data&0xff)^0xf3,7,6,0,4,3,2,1,5); */ +/* UINT8 datahigh = BITSWAP8(((data>>8)&0xff)^0xf3,7,6,0,4,3,2,1,5); */ +/* data = datalow | datahigh<<8; */ +/* COMBINE_DATA(&prom[offset & 0xFFFF]); */ +/* decodechar(Machine->gfx[0], (offset&0xffff)/16, (UINT8 *)prom, &kof10th_layout); */ } } @@ -1252,7 +1252,7 @@ WRITE16_HANDLER( kof10th_custom_w ) static WRITE16_HANDLER( kof10th_bankswitch_w ) { if (offset >= 0x5F000) { - if (offset == 0x5FFF8) { // Standard bankswitch + if (offset == 0x5FFF8) { /* Standard bankswitch */ kof10thBankswitch(data); } else if (offset == 0x5FFFC && kof10thExtraRAMB[0xFFC] != data) { UINT8 *src = memory_region( REGION_CPU1 ); @@ -1260,7 +1260,7 @@ static WRITE16_HANDLER( kof10th_bankswitch_w ) } COMBINE_DATA(&kof10thExtraRAMB[offset & 0xFFF]); } else { - // Usually writes 0x8EF3 or 0x7DF3, sometimes writes 0x0003 to offset 0x25FFF0 + /* Usually writes 0x8EF3 or 0x7DF3, sometimes writes 0x0003 to offset 0x25FFF0 */ } } @@ -1279,7 +1279,7 @@ void decrypt_kof10th( void ) UINT8 *srm = memory_region( REGION_GFX1 ); if (dst) { - memcpy(dst + 0x000000, src + 0x600000, 0x100000); // Correct? + memcpy(dst + 0x000000, src + 0x600000, 0x100000); /* Correct? */ memcpy(dst + 0x100000, src + 0x000000, 0x800000); for (i = 0; i < 0x900000; i++) { j = (i&0xFFF000) + BITSWAP16(i&0xFFF,15,14,13,12,11,2,9,8,7,1,5,4,3,10,6,0); @@ -1288,15 +1288,15 @@ void decrypt_kof10th( void ) free(dst); } - // Altera protection chip patches these over P ROM - ((UINT16*)src)[0x0124/2] = 0x000d; // Enables XOR for RAM moves, forces SoftDIPs, and USA region + /* Altera protection chip patches these over P ROM */ + ((UINT16*)src)[0x0124/2] = 0x000d; /* Enables XOR for RAM moves, forces SoftDIPs, and USA region */ ((UINT16*)src)[0x0126/2] = 0xf7a8; - ((UINT16*)src)[0x8bf4/2] = 0x4ef9; // Run code to change "S" data + ((UINT16*)src)[0x8bf4/2] = 0x4ef9; /* Run code to change "S" data */ ((UINT16*)src)[0x8bf6/2] = 0x000d; ((UINT16*)src)[0x8bf8/2] = 0xf980; - for (i = 0; i < 0x10000; i++) { // Get S data, should be done on the fly + for (i = 0; i < 0x10000; i++) { /* Get S data, should be done on the fly */ srm[0x00000+(i^1)]=BITSWAP8(src[0x600000+i]^0xf3,7,6,0,4,3,2,1,5); srm[0x10000+(i^1)]=BITSWAP8(src[0x6d0000+i]^0xf3,7,6,0,4,3,2,1,5); } @@ -1326,12 +1326,12 @@ void decrypt_kf10thep(void) memcpy(src+0x0a0000,dst+0x140000,0x20000); memcpy(src+0x0c0000,dst+0x0c0000,0x20000); memcpy(src+0x0e0000,dst+0x1a0000,0x20000); - memcpy(src+0x0002e0,dst+0x0402e0,0x6a); // copy banked code to a new memory region - memcpy(src+0x0f92bc,dst+0x0492bc,0xb9e); // copy banked code to a new memory region + memcpy(src+0x0002e0,dst+0x0402e0,0x6a); /* copy banked code to a new memory region */ + memcpy(src+0x0f92bc,dst+0x0492bc,0xb9e); /* copy banked code to a new memory region */ for (i=0xf92bc/2;i < 0xf9e58/2 ;i++) { - if (rom[i+0] == 0x4eb9 && rom[i+1] == 0x0000) rom[i+1] = 0x000F; // correct JSR in moved code - if (rom[i+0] == 0x4ef9 && rom[i+1] == 0x0000) rom[i+1] = 0x000F; // correct JMP in moved code + if (rom[i+0] == 0x4eb9 && rom[i+1] == 0x0000) rom[i+1] = 0x000F; /* correct JSR in moved code */ + if (rom[i+0] == 0x4ef9 && rom[i+1] == 0x0000) rom[i+1] = 0x000F; /* correct JMP in moved code */ } rom[0x00342/2] = 0x000f; free(dst); @@ -1360,7 +1360,7 @@ static void kf2k5uni_px_decrypt( void ) } free(dst); - memcpy(src, src + 0x600000, 0x100000); // Seems to be the same as kof10th + memcpy(src, src + 0x600000, 0x100000); /* Seems to be the same as kof10th */ } static void kf2k5uni_sx_decrypt( void ) @@ -1455,7 +1455,7 @@ void pvc_prot1( void ) } -void pvc_prot2( void ) // on writes to e8/e9/ea/eb +void pvc_prot2( void ) /* on writes to e8/e9/ea/eb */ { unsigned char b1, b2, b3, b4; b1 = pvc_r8(0x1fe9); @@ -1705,19 +1705,19 @@ static WRITE16_HANDLER( garou_bankswitch_w ) int bankaddress; static int bankoffset[64] = { - 0x000000, 0x100000, 0x200000, 0x300000, // 00 - 0x280000, 0x380000, 0x2d0000, 0x3d0000, // 04 - 0x2f0000, 0x3f0000, 0x400000, 0x500000, // 08 - 0x420000, 0x520000, 0x440000, 0x540000, // 12 - 0x498000, 0x598000, 0x4a0000, 0x5a0000, // 16 - 0x4a8000, 0x5a8000, 0x4b0000, 0x5b0000, // 20 - 0x4b8000, 0x5b8000, 0x4c0000, 0x5c0000, // 24 - 0x4c8000, 0x5c8000, 0x4d0000, 0x5d0000, // 28 - 0x458000, 0x558000, 0x460000, 0x560000, // 32 - 0x468000, 0x568000, 0x470000, 0x570000, // 36 - 0x478000, 0x578000, 0x480000, 0x580000, // 40 - 0x488000, 0x588000, 0x490000, 0x590000, // 44 - 0x5d0000, 0x5d8000, 0x5e0000, 0x5e8000, // 48 + 0x000000, 0x100000, 0x200000, 0x300000, /* 00 */ + 0x280000, 0x380000, 0x2d0000, 0x3d0000, /* 04 */ + 0x2f0000, 0x3f0000, 0x400000, 0x500000, /* 08 */ + 0x420000, 0x520000, 0x440000, 0x540000, /* 12 */ + 0x498000, 0x598000, 0x4a0000, 0x5a0000, /* 16 */ + 0x4a8000, 0x5a8000, 0x4b0000, 0x5b0000, /* 20 */ + 0x4b8000, 0x5b8000, 0x4c0000, 0x5c0000, /* 24 */ + 0x4c8000, 0x5c8000, 0x4d0000, 0x5d0000, /* 28 */ + 0x458000, 0x558000, 0x460000, 0x560000, /* 32 */ + 0x468000, 0x568000, 0x470000, 0x570000, /* 36 */ + 0x478000, 0x578000, 0x480000, 0x580000, /* 40 */ + 0x488000, 0x588000, 0x490000, 0x590000, /* 44 */ + 0x5d0000, 0x5d8000, 0x5e0000, 0x5e8000, /* 48 */ 0x5f0000, 0x5f8000, 0x600000, /* rest not used? */ }; @@ -1782,22 +1782,22 @@ static WRITE16_HANDLER( garouo_bankswitch_w ) int bankaddress; static int bankoffset[64] = { - 0x000000, 0x100000, 0x200000, 0x300000, // 00 - 0x280000, 0x380000, 0x2d0000, 0x3d0000, // 04 - 0x2c8000, 0x3c8000, 0x400000, 0x500000, // 08 - 0x420000, 0x520000, 0x440000, 0x540000, // 12 - 0x598000, 0x698000, 0x5a0000, 0x6a0000, // 16 - 0x5a8000, 0x6a8000, 0x5b0000, 0x6b0000, // 20 - 0x5b8000, 0x6b8000, 0x5c0000, 0x6c0000, // 24 - 0x5c8000, 0x6c8000, 0x5d0000, 0x6d0000, // 28 - 0x458000, 0x558000, 0x460000, 0x560000, // 32 - 0x468000, 0x568000, 0x470000, 0x570000, // 36 - 0x478000, 0x578000, 0x480000, 0x580000, // 40 - 0x488000, 0x588000, 0x490000, 0x590000, // 44 - 0x5d8000, 0x6d8000, 0x5e0000, 0x6e0000, // 48 - 0x5e8000, 0x6e8000, 0x6e8000, 0x000000, // 52 - 0x000000, 0x000000, 0x000000, 0x000000, // 56 - 0x000000, 0x000000, 0x000000, 0x000000, // 60 + 0x000000, 0x100000, 0x200000, 0x300000, /* 00 */ + 0x280000, 0x380000, 0x2d0000, 0x3d0000, /* 04 */ + 0x2c8000, 0x3c8000, 0x400000, 0x500000, /* 08 */ + 0x420000, 0x520000, 0x440000, 0x540000, /* 12 */ + 0x598000, 0x698000, 0x5a0000, 0x6a0000, /* 16 */ + 0x5a8000, 0x6a8000, 0x5b0000, 0x6b0000, /* 20 */ + 0x5b8000, 0x6b8000, 0x5c0000, 0x6c0000, /* 24 */ + 0x5c8000, 0x6c8000, 0x5d0000, 0x6d0000, /* 28 */ + 0x458000, 0x558000, 0x460000, 0x560000, /* 32 */ + 0x468000, 0x568000, 0x470000, 0x570000, /* 36 */ + 0x478000, 0x578000, 0x480000, 0x580000, /* 40 */ + 0x488000, 0x588000, 0x490000, 0x590000, /* 44 */ + 0x5d8000, 0x6d8000, 0x5e0000, 0x6e0000, /* 48 */ + 0x5e8000, 0x6e8000, 0x6e8000, 0x000000, /* 52 */ + 0x000000, 0x000000, 0x000000, 0x000000, /* 56 */ + 0x000000, 0x000000, 0x000000, 0x000000, /* 60 */ }; /* unscramble bank number */ @@ -1861,18 +1861,18 @@ static WRITE16_HANDLER( mslug3_bankswitch_w ) int bankaddress; static int bankoffset[64] = { - 0x000000, 0x020000, 0x040000, 0x060000, // 00 - 0x070000, 0x090000, 0x0b0000, 0x0d0000, // 04 - 0x0e0000, 0x0f0000, 0x120000, 0x130000, // 08 - 0x140000, 0x150000, 0x180000, 0x190000, // 12 - 0x1a0000, 0x1b0000, 0x1e0000, 0x1f0000, // 16 - 0x200000, 0x210000, 0x240000, 0x250000, // 20 - 0x260000, 0x270000, 0x2a0000, 0x2b0000, // 24 - 0x2c0000, 0x2d0000, 0x300000, 0x310000, // 28 - 0x320000, 0x330000, 0x360000, 0x370000, // 32 - 0x380000, 0x390000, 0x3c0000, 0x3d0000, // 36 - 0x400000, 0x410000, 0x440000, 0x450000, // 40 - 0x460000, 0x470000, 0x4a0000, 0x4b0000, // 44 + 0x000000, 0x020000, 0x040000, 0x060000, /* 00 */ + 0x070000, 0x090000, 0x0b0000, 0x0d0000, /* 04 */ + 0x0e0000, 0x0f0000, 0x120000, 0x130000, /* 08 */ + 0x140000, 0x150000, 0x180000, 0x190000, /* 12 */ + 0x1a0000, 0x1b0000, 0x1e0000, 0x1f0000, /* 16 */ + 0x200000, 0x210000, 0x240000, 0x250000, /* 20 */ + 0x260000, 0x270000, 0x2a0000, 0x2b0000, /* 24 */ + 0x2c0000, 0x2d0000, 0x300000, 0x310000, /* 28 */ + 0x320000, 0x330000, 0x360000, 0x370000, /* 32 */ + 0x380000, 0x390000, 0x3c0000, 0x3d0000, /* 36 */ + 0x400000, 0x410000, 0x440000, 0x450000, /* 40 */ + 0x460000, 0x470000, 0x4a0000, 0x4b0000, /* 44 */ 0x4c0000, /* rest not used? */ }; @@ -1936,15 +1936,15 @@ static WRITE16_HANDLER( kof2000_bankswitch_w ) int bankaddress; static int bankoffset[64] = { - 0x000000, 0x100000, 0x200000, 0x300000, // 00 - 0x3f7800, 0x4f7800, 0x3ff800, 0x4ff800, // 04 - 0x407800, 0x507800, 0x40f800, 0x50f800, // 08 - 0x416800, 0x516800, 0x41d800, 0x51d800, // 12 - 0x424000, 0x524000, 0x523800, 0x623800, // 16 - 0x526000, 0x626000, 0x528000, 0x628000, // 20 - 0x52a000, 0x62a000, 0x52b800, 0x62b800, // 24 - 0x52d000, 0x62d000, 0x52e800, 0x62e800, // 28 - 0x618000, 0x619000, 0x61a000, 0x61a800, // 32 + 0x000000, 0x100000, 0x200000, 0x300000, /* 00 */ + 0x3f7800, 0x4f7800, 0x3ff800, 0x4ff800, /* 04 */ + 0x407800, 0x507800, 0x40f800, 0x50f800, /* 08 */ + 0x416800, 0x516800, 0x41d800, 0x51d800, /* 12 */ + 0x424000, 0x524000, 0x523800, 0x623800, /* 16 */ + 0x526000, 0x626000, 0x528000, 0x628000, /* 20 */ + 0x52a000, 0x62a000, 0x52b800, 0x62b800, /* 24 */ + 0x52d000, 0x62d000, 0x52e800, 0x62e800, /* 28 */ + 0x618000, 0x619000, 0x61a000, 0x61a800, /* 32 */ }; /* unscramble bank number */ @@ -2032,7 +2032,7 @@ WRITE16_HANDLER ( kof98_prot_w ) mem16[0x100/2] = 0x4e45; mem16[0x102/2] = 0x4f2d; break; - default: // 00aa is written, but not needed? + default: /* 00aa is written, but not needed? */ logerror ("%06x kof98 - unknown protection write %04x\n",activecpu_get_pc(), data); break; } @@ -2347,7 +2347,7 @@ void kf2k3pcb_decrypt_s1data( void ) int tx_size = memory_region_length( REGION_GFX1 ); int srom_size = memory_region_length( REGION_GFX3 ); - src = memory_region( REGION_GFX3 ) + srom_size - 0x1000000 - 0x80000; // Decrypt S + src = memory_region( REGION_GFX3 ) + srom_size - 0x1000000 - 0x80000; /* Decrypt S */ dst = memory_region( REGION_GFX1 ); for( i = 0; i < tx_size / 2; i++ ) @@ -2397,11 +2397,11 @@ void kof2003biosdecode(void) for (a=0;a<0x80000/2;a++) { - //data xor + /*data xor */ if (src[a] & 0x0004) src[a] ^= 0x0001; if (src[a] & 0x0010) src[a] ^= 0x0002; if (src[a] & 0x0020) src[a] ^= 0x0008; - //address xor + /*address xor */ addr = a & ~0xff; addr |= address[a & 0x7f]; if ( a & 0x00008) addr ^= 0x0008; @@ -2538,7 +2538,7 @@ void svcpcb_s1data_decrypt( void ) UINT8 *s1 = memory_region( REGION_GFX1 ); size_t s1_size = memory_region_length( REGION_GFX1 ); - for( i = 0; i < s1_size; i++ ) // Decrypt S + for( i = 0; i < s1_size; i++ ) /* Decrypt S */ { s1[ i ] = BITSWAP8( s1[ i ] ^ 0xd2, 4, 0, 7, 2, 5, 1, 6, 3 ); } diff --git a/src/machine/system16_machine.c b/src/machine/system16_machine.c index 05f54d710..c6ff983a0 100644 --- a/src/machine/system16_machine.c +++ b/src/machine/system16_machine.c @@ -1,8 +1,8 @@ #include "driver.h" #include "system16.h" -//int sys16_sh_shadowpal; -//int sys16_MaxShadowColors; +/*int sys16_sh_shadowpal; */ +/*int sys16_MaxShadowColors; */ data16_t *sys16_workingram; data16_t *sys16_workingram2; @@ -69,7 +69,7 @@ MACHINE_INIT( sys16_onetime ){ sys16_custom_irq=NULL; -// sys16_MaxShadowColors = NumOfShadowColors; +/* sys16_MaxShadowColors = NumOfShadowColors; */ #ifdef SPACEHARRIER_OFFSETS spaceharrier_patternoffsets=0; @@ -148,8 +148,8 @@ void system16_decode(data16_t *dest,data16_t *source,int size,unsigned short *de data^= decrypt_data[mask*256+decode_offset]; -// if(decrypt_data[mask*256+decode_offset] == 0xffff) -// log_cb(RETRO_LOG_DEBUG, LOGPRE "Decrypt Error: Offset=%5x\n",offset); +/* if(decrypt_data[mask*256+decode_offset] == 0xffff) */ +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "Decrypt Error: Offset=%5x\n",offset); */ dest[offset/2] = data; } @@ -160,7 +160,7 @@ void system16_decode(data16_t *dest,data16_t *source,int size,unsigned short *de ***********************************************************************************/ unsigned short enduroracer_decrypt_data[16][256]= { -{//table for address mask 0000: +{/*table for address mask 0000: */ 0xdc40,0xd448,0xd800,0xd008,0x5048,0x5840,0x5408,0x5c00,0xb400,0xbc08,0xb040,0xb848,0xa808,0xa000,0xac48,0xa440, 0xdc40,0xd448,0xd800,0xd008,0x5048,0x5840,0xffff,0x5c00,0xb400,0xbc08,0xb040,0xb848,0xffff,0xa000,0xffff,0xffff, 0x5440,0x5c48,0x5000,0x5808,0xd848,0xffff,0xffff,0xd400,0xb400,0xbc08,0xffff,0xb848,0xa808,0xa000,0xffff,0xffff, @@ -177,7 +177,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0xdc40,0xd448,0xd800,0xd008,0x5048,0xffff,0xffff,0x5c00,0xffff,0xa408,0xffff,0xffff,0xffff,0xffff,0xb448,0xffff, 0x5440,0x5c48,0x5000,0x5808,0xd848,0xd040,0xdc08,0xd400,0xac00,0xa408,0xa840,0xa048,0xffff,0xb800,0xffff,0xffff, 0xffff,0x5c48,0xffff,0xffff,0xffff,0xffff,0xffff,0xd400,0xac00,0xffff,0xffff,0xa048,0xb008,0xb800,0xb448,0xbc40}, -{//table for address mask 0001: +{/*table for address mask 0001: */ 0x6440,0x6048,0xc800,0x9440,0xa048,0xf440,0x0408,0xf848,0x4c08,0x0808,0x8008,0x8400,0x2000,0xc400,0x1400,0x4008, 0x3800,0x5c08,0x0408,0xc848,0x1440,0xe800,0x3008,0xffff,0x0848,0xdc48,0x3c48,0xc840,0xac48,0xffff,0xc000,0x3408, 0xb848,0x2c40,0x6440,0x2040,0xffff,0xffff,0x5800,0x3440,0x7840,0xffff,0x0408,0x9848,0xf440,0x8040,0xc840,0x6c48, @@ -194,7 +194,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x8800,0x8440,0xdc40,0x7848,0xffff,0xd848,0xb840,0x9c40,0xffff,0xffff,0xffff,0x9840,0xffff,0xd848,0xa808,0x9c00, 0xe848,0xffff,0xe448,0x6048,0x1400,0xd008,0xb048,0xc448,0xd800,0x8440,0xffff,0x3808,0xf408,0x3000,0xffff,0x0408, 0x9408,0xffff,0xffff,0xffff,0x5000,0x3408,0xffff,0xffff,0xffff,0xd848,0xffff,0x6448,0x7800,0x1440,0xf448,0xa040}, -{//table for address mask 0004: +{/*table for address mask 0004: */ 0x9440,0x9440,0xec40,0x7c40,0xac08,0xa048,0x1448,0x7808,0x8840,0x7840,0x6000,0xf040,0xc848,0x5448,0x4c48,0xb008, 0x4008,0xe008,0xa808,0x9808,0x7008,0x7008,0xffff,0x0808,0xcc08,0xffff,0x4408,0x8408,0x8400,0x1440,0x6c40,0x9c40, 0xd800,0xe840,0x9000,0x3000,0xffff,0x1800,0xffff,0xffff,0x3408,0x5848,0xffff,0x8008,0x8c40,0x4000,0x6800,0xffff, @@ -211,7 +211,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0xb448,0x1808,0x0c08,0xc048,0xcc00,0xd840,0xa040,0xffff,0xffff,0xffff,0xd040,0xffff,0x0400,0x9840,0xdc40,0x2000, 0xffff,0x2c08,0xc448,0x4c48,0xc440,0xffff,0xa400,0x1c00,0xffff,0xffff,0x3048,0x5048,0xe848,0xb848,0xffff,0xc048, 0xffff,0xf800,0xffff,0xffff,0xffff,0xffff,0xd408,0xf048,0xffff,0x0c00,0xffff,0xe400,0x2c48,0xe008,0x9408,0x3848}, -{//table for address mask 0005: +{/*table for address mask 0005: */ 0xb400,0x0c08,0x8808,0xf040,0x3800,0x1048,0x3008,0x0c00,0x9c08,0x4400,0xffff,0x7848,0xd008,0xc840,0xe800,0x8408, 0x9440,0x7c08,0x2c08,0xf400,0x5c48,0x6040,0x8000,0xa848,0x7840,0xffff,0xfc48,0x8400,0xffff,0xffff,0xffff,0x4000, 0x5048,0x8840,0x7440,0x9c08,0xffff,0xb440,0x2c40,0x0808,0x2c08,0xffff,0x7400,0x4848,0x4040,0xffff,0x6808,0x1040, @@ -228,7 +228,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x7400,0x5048,0x2c08,0xffff,0xc000,0x7808,0xffff,0xd800,0xffff,0xc800,0xec00,0xffff,0x2c40,0x1008,0x8448,0xffff, 0xffff,0xf008,0xf408,0xc800,0xffff,0xffff,0x7c40,0xc448,0xfc08,0xe840,0x9400,0xf408,0xffff,0xf000,0x8840,0x6008, 0xffff,0xa440,0x6040,0xffff,0xd448,0xffff,0xffff,0xb448,0xb040,0xdc48,0xffff,0xffff,0x3c40,0x8448,0xe408,0x9c40}, -{//table for address mask 0010: +{/*table for address mask 0010: */ 0x3c08,0xac00,0x4c48,0xcc48,0x8c08,0x0848,0x9400,0x6800,0x0c48,0x1448,0x7c40,0x6408,0xb400,0xb000,0xac40,0xc040, 0x9c40,0x5800,0x0c48,0x5000,0x4c40,0x0c48,0xffff,0x0448,0xbc08,0xffff,0x6440,0x0840,0xffff,0xd400,0x1c08,0x5c08, 0x1440,0xd008,0xc440,0xcc08,0x0c08,0xffff,0x6008,0xe440,0x7c00,0x0840,0x7c08,0xfc00,0x9c00,0x5c08,0xd840,0xffff, @@ -245,7 +245,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0xec48,0xa808,0x4040,0xc800,0xffff,0x4040,0x9808,0x9c48,0x5400,0xffff,0x5040,0x1048,0xffff,0xffff,0xffff,0xffff, 0xa440,0xc000,0xffff,0x0008,0xffff,0x8000,0x1800,0x1008,0x1c08,0x5040,0x1408,0xb808,0xb840,0xe808,0xb040,0x3040, 0xc040,0x0048,0x7000,0xffff,0x9408,0xffff,0xffff,0x1848,0xffff,0x1000,0x2840,0x2000,0x4c40,0x5848,0x7c08,0x6000}, -{//table for address mask 0011: +{/*table for address mask 0011: */ 0x9c40,0x5848,0x2000,0xfc08,0xcc08,0x4808,0x9848,0xf448,0xd400,0xc048,0x6840,0x6408,0xc008,0xc408,0x9448,0x7848, 0x0840,0x9440,0x6c00,0xffff,0x1c08,0x9000,0x0c08,0x0c40,0x4000,0xffff,0x6000,0xffff,0x1008,0xffff,0x2448,0xc440, 0xf840,0x6040,0xd800,0x5008,0xe048,0xffff,0xffff,0x9c40,0xffff,0x2c40,0x4000,0x5c08,0xc808,0xa000,0x1800,0xffff, @@ -262,7 +262,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x6800,0x2400,0x5808,0x9800,0x6c40,0x7408,0xdc40,0xb800,0xf000,0xffff,0x7048,0xd400,0xe040,0x7808,0xd040,0xffff, 0xc000,0x5040,0xfc40,0xc840,0xc840,0xffff,0xe000,0xe048,0x5800,0x5c40,0xffff,0xe000,0xffff,0xffff,0x6c00,0xec48, 0xffff,0xffff,0xffff,0xd400,0xffff,0xffff,0x9c08,0xb448,0x0808,0x8c40,0xd448,0xd800,0x0048,0x4048,0x5408,0xfc08}, -{//table for address mask 0014: +{/*table for address mask 0014: */ 0x1c00,0x5c48,0xa408,0x8440,0x1c00,0x5c48,0x5440,0x5c48,0xb040,0xb848,0x5c00,0x1c48,0xf400,0xfc08,0xac48,0xa440, 0x3808,0xc400,0x4008,0x1848,0x1c48,0xc400,0xffff,0x1800,0x6448,0xffff,0xffff,0x1040,0xffff,0xffff,0xffff,0x1008, 0xd448,0xa000,0x6800,0x8c00,0xd448,0x3c48,0x2008,0xffff,0xffff,0x3808,0x0008,0xf800,0xa048,0xa440,0x2800,0xdc40, @@ -279,7 +279,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x3848,0xffff,0xb400,0x5048,0xffff,0xffff,0xb400,0x1800,0xffff,0xec48,0x0040,0x9840,0x9c48,0xffff,0xffff,0xffff, 0xc440,0x2800,0x2c40,0xc448,0x7008,0xffff,0x6800,0xc448,0xfc48,0xffff,0x9400,0x3848,0xffff,0xa440,0x9400,0xffff, 0xffff,0xffff,0xffff,0x9c00,0xffff,0x1800,0xbc48,0x9c00,0xffff,0xbc00,0xffff,0xffff,0x2800,0x2008,0x4048,0x4840}, -{//table for address mask 0015: +{/*table for address mask 0015: */ 0xb800,0x1408,0x7840,0x5048,0x7040,0x7040,0x2c00,0x2c00,0x2840,0x6048,0x9800,0x9400,0xbc08,0x3808,0xa040,0x8448, 0x2840,0xa840,0x0808,0xe808,0x2c08,0xc000,0xffff,0x0848,0x8808,0x4008,0x2848,0xdc48,0xffff,0xffff,0xffff,0x5008, 0xc440,0x0040,0x3400,0x7000,0x9c08,0x3800,0x0048,0xcc48,0x4808,0xb408,0xa448,0x1448,0x7c40,0x4040,0x3c08,0xffff, @@ -296,7 +296,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0xb440,0xa048,0x4400,0x8c00,0xec00,0x0808,0xf840,0xd848,0xffff,0xdc08,0x2040,0x7048,0xf840,0xffff,0xf000,0x8808, 0xd440,0x2040,0xa800,0x2800,0x3408,0xffff,0xc040,0x2c48,0xec08,0x9c08,0x4048,0x8848,0xffff,0x9440,0xe400,0x2008, 0x9408,0xb000,0xd048,0xffff,0xb440,0xb840,0xe400,0xe800,0x0c40,0xffff,0xf808,0xbc00,0x4008,0x6800,0xf048,0x7848}, -{//table for address mask 0100: +{/*table for address mask 0100: */ 0x8448,0x0c00,0x6c08,0xf040,0x9440,0x7c48,0x4c40,0x2048,0xf008,0x4c08,0x6848,0x2408,0x2000,0x6c40,0xe840,0xa440, 0x0c48,0xd440,0xb448,0x7840,0x1000,0xd048,0x6440,0xffff,0x3408,0x9c48,0xfc08,0x5408,0xf408,0x5008,0xffff,0x3808, 0xc048,0x0040,0x7448,0xa040,0x7c00,0xf000,0xffff,0x6840,0x8400,0x4040,0x4c40,0x8840,0x6c48,0xf000,0xffff,0x0c40, @@ -313,7 +313,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x0c40,0x4000,0xc400,0x8800,0x6c08,0xffff,0x9c48,0x0c00,0xc008,0xffff,0xffff,0xa000,0xffff,0xffff,0xffff,0xffff, 0x3448,0x1408,0xfc48,0xdc48,0xec48,0xffff,0xffff,0x3848,0x1408,0xd400,0xffff,0x6000,0x1040,0xffff,0xec00,0xffff, 0xe848,0xffff,0xffff,0xffff,0xffff,0xffff,0x6000,0xa400,0xffff,0xffff,0x6c48,0xffff,0x1c00,0x7c08,0x4c00,0xa808}, -{//table for address mask 0101: +{/*table for address mask 0101: */ 0x2000,0xf448,0xac00,0x4c48,0x5c40,0x5000,0x3440,0x9800,0x4840,0x9c08,0x3040,0xd008,0xc000,0x3808,0xf848,0x5040, 0x3800,0xc840,0xd000,0x8440,0xffff,0x9000,0xffff,0xffff,0x3040,0xd040,0xd840,0x0c40,0xffff,0xffff,0x5008,0x6800, 0x9800,0xa008,0x6048,0x0840,0x5c40,0xe840,0xffff,0x9040,0xffff,0x7408,0x0848,0x5c08,0x1408,0xec00,0x2c40,0xffff, @@ -330,7 +330,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x5808,0xb808,0x4008,0x9408,0x9c00,0x0040,0x6400,0x5840,0x5400,0x6840,0xffff,0xffff,0xffff,0x6000,0x8c40,0xffff, 0xe848,0xffff,0xffff,0x7808,0xffff,0x8848,0xf008,0x0048,0xffff,0xc400,0xffff,0x6c00,0x3408,0x8008,0xffff,0xffff, 0x0c40,0xffff,0x9408,0x9c00,0x2400,0xffff,0xffff,0x4848,0xc400,0xffff,0xfc00,0xffff,0xe840,0x9808,0x3440,0x8008}, -{//table for address mask 0104: +{/*table for address mask 0104: */ 0x4440,0x2800,0x9848,0xb048,0x8808,0xb000,0x8c48,0xb440,0xa440,0xac48,0x3040,0x6800,0x5808,0x0448,0x2440,0x6c08, 0x3000,0x2800,0xdc00,0x4848,0xffff,0x2000,0xffff,0x4c40,0x7000,0x3c48,0x7408,0xf000,0xffff,0x0448,0x6008,0xf408, 0x4408,0xcc08,0xb448,0x3400,0xc008,0xf408,0xffff,0x3008,0x1c00,0xe840,0x3448,0xec48,0x9800,0xe040,0xffff,0xffff, @@ -347,7 +347,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x7808,0x3c40,0x9840,0x6000,0x2008,0x2840,0x9c48,0xffff,0xffff,0x9448,0x2008,0x8000,0x5440,0xffff,0xffff,0xffff, 0x6400,0x8440,0xffff,0x3448,0xffff,0xffff,0x2448,0x5800,0xbc48,0xffff,0xffff,0x7448,0xb840,0xffff,0x0000,0x2800, 0xd048,0xffff,0xf840,0x2440,0xd440,0xffff,0x5040,0xffff,0x0800,0xe000,0xffff,0x6440,0x0c08,0xf400,0xd408,0x3808}, -{//table for address mask 0105: +{/*table for address mask 0105: */ 0x8c08,0x7c08,0x3c48,0xe840,0x3008,0x3040,0x1400,0x5008,0x1c40,0x5c40,0x3848,0x7800,0x9040,0xc000,0x2000,0x7040, 0xa448,0x8040,0xcc48,0x9c08,0xd848,0x9840,0xffff,0x9400,0xc400,0x0008,0xac00,0xac48,0x8800,0xffff,0xffff,0x8448, 0xe840,0xb800,0xf000,0xd000,0xc008,0xd408,0x2c00,0xcc00,0xffff,0xffff,0x9040,0xd048,0xf408,0x8448,0xffff,0xfc48, @@ -364,7 +364,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0xffff,0xffff,0xd440,0xf440,0xd048,0xffff,0xc840,0x8c08,0xf840,0xffff,0xd408,0x9400,0xffff,0xffff,0xffff,0xcc40, 0xffff,0xa008,0x9848,0xc808,0xffff,0xdc08,0xc408,0x8408,0xa000,0xc040,0xa808,0xa840,0xac40,0x8c40,0x2440,0xd440, 0xffff,0xffff,0xffff,0xffff,0x3400,0xffff,0xffff,0xffff,0xffff,0xffff,0x7c40,0x6840,0xc440,0x9400,0xd048,0x8008}, -{//table for address mask 0110: +{/*table for address mask 0110: */ 0x9040,0x9448,0x9800,0x9c08,0xc400,0xc008,0xcc40,0xc848,0x8048,0x8440,0x8808,0x8c00,0x4408,0x4000,0x4c48,0x4840, 0x9040,0x9448,0x9800,0x9c08,0xc400,0xc008,0xcc40,0xc848,0xffff,0xffff,0xffff,0x8c00,0x4408,0xffff,0x4c48,0x4840, 0x9040,0x9448,0x9800,0x9c08,0xffff,0x4808,0x4440,0xffff,0xffff,0x8440,0x8808,0x8c00,0xcc08,0xc800,0xc448,0xc040, @@ -381,7 +381,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x8840,0x8c48,0x8000,0x8408,0xc400,0xc008,0xcc40,0xc848,0x9848,0x9c40,0x9008,0x9400,0xffff,0x4000,0xffff,0x4840, 0x8840,0x8c48,0x8000,0x8408,0x4c00,0xffff,0x4440,0x4048,0xffff,0xffff,0x9008,0x9400,0xcc08,0xc800,0xc448,0xc040, 0xffff,0xffff,0x8000,0xffff,0xffff,0xffff,0xffff,0x4048,0xffff,0x9c40,0xffff,0x9400,0xcc08,0xc800,0xc448,0xc040}, -{//table for address mask 0111: +{/*table for address mask 0111: */ 0x0848,0x3c00,0x2400,0x2c48,0x8008,0x3c48,0xb448,0x5408,0x9000,0x3c40,0x2c08,0x9448,0x6048,0x1400,0x9448,0x6400, 0x4408,0xd040,0x5840,0xf008,0x5448,0x0000,0x7400,0x1c48,0xf008,0xd448,0xc400,0xf440,0x1408,0x0c48,0x0800,0x9440, 0x8000,0x2c48,0x2800,0x0048,0x9c48,0xe008,0xffff,0xd848,0xa800,0x0040,0x1440,0x7000,0xffff,0xcc08,0x4c40,0xffff, @@ -398,7 +398,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0x4008,0xd448,0xfc48,0xa408,0xffff,0xffff,0xa448,0x2c08,0xec08,0xffff,0xffff,0xffff,0x5c40,0xffff,0x3800,0xffff, 0x1400,0x5048,0xffff,0x9448,0xffff,0xd440,0xc408,0x5840,0x0c08,0x5440,0xffff,0x7408,0xffff,0xffff,0xffff,0x5448, 0xfc08,0xffff,0xa408,0xffff,0xe448,0xf008,0xf440,0xf400,0xffff,0xffff,0xac00,0x6848,0xe000,0xf040,0xd440,0x9800}, -{//table for address mask 0114: +{/*table for address mask 0114: */ 0x6448,0x2040,0x4400,0x0008,0xe848,0xe008,0xc800,0xe448,0x9008,0x8408,0x9448,0xc440,0xdc00,0x9c40,0xd840,0x9800, 0x1800,0xb840,0x7048,0xd408,0x0400,0xb800,0x6c48,0xffff,0x3440,0xffff,0xac00,0x4040,0x1848,0xffff,0xffff,0x4000, 0x0000,0xc440,0x2c48,0x5048,0xffff,0x5808,0x7000,0x1c40,0xffff,0x3008,0xc000,0x3808,0xffff,0x7440,0x4448,0xb408, @@ -415,7 +415,7 @@ unsigned short enduroracer_decrypt_data[16][256]= 0xdc00,0x2840,0x0c08,0xb008,0x0448,0xa440,0x2000,0xffff,0xffff,0xffff,0x2048,0xcc40,0xffff,0x2808,0xffff,0xffff, 0x6000,0xffff,0xffff,0x3808,0xd440,0x8c40,0xffff,0xb408,0xc448,0xffff,0xa800,0xffff,0xffff,0x2408,0x8c40,0x1c48, 0xffff,0xec08,0x2848,0xffff,0xec48,0xf008,0xe808,0xb040,0xffff,0xffff,0xffff,0xffff,0x0000,0xffff,0x0440,0x7400}, -{//table for address mask 0115: +{/*table for address mask 0115: */ 0x0c48,0xb440,0x3040,0xe848,0x6440,0x2800,0x0848,0x6c00,0x6c48,0x2840,0x2848,0x2448,0x4c48,0x4408,0x3848,0xa008, 0x8848,0xc848,0x3c08,0x6848,0xe040,0xffff,0x5400,0x0408,0xb840,0x5448,0xffff,0xa448,0x9840,0x4008,0x2000,0xc800, 0x0000,0xa440,0x7840,0xa008,0x3808,0xb008,0xffff,0x8008,0xb400,0x3840,0x1448,0xcc08,0xffff,0xdc00,0xe400,0xffff, @@ -719,7 +719,7 @@ void endurob2_decode_data(data16_t *dest,data16_t *source,int size) } -// This seems generally correct, but there are errors. +/* This seems generally correct, but there are errors. */ void endurob2_decode_data2(data16_t *dest,data16_t *source,int size) { system16_decode(dest,source,size,(unsigned short *)enduroracer_decrypt_data2); @@ -729,7 +729,7 @@ void endurob2_decode_data2(data16_t *dest,data16_t *source,int size) /*********************************************************************************** Decryption Tables for Enduror ***********************************************************************************/ -// rom 7637/7641 +/* rom 7637/7641 */ unsigned short enduroracer_decrypt_data3[16][256]= { { @@ -1007,7 +1007,7 @@ unsigned short enduroracer_decrypt_data3[16][256]= }; -// rom 7638/7642 +/* rom 7638/7642 */ unsigned short enduroracer_decrypt_data4[16][256]= { { @@ -2151,13 +2151,13 @@ static void sound_cause_nmi( int chip ){ struct SEGAPCMinterface sys16_segapcm_interface_15k = { SEGAPCM_SAMPLE15K, BANK_256, - REGION_SOUND1, // memory region + REGION_SOUND1, /* memory region */ 50 }; struct SEGAPCMinterface sys16_segapcm_interface_15k_512 = { SEGAPCM_SAMPLE15K, BANK_512, - REGION_SOUND1, // memory region + REGION_SOUND1, /* memory region */ 50 }; struct SEGAPCMinterface sys16_segapcm_interface_32k = { diff --git a/src/machine/tnzs_machine.c b/src/machine/tnzs_machine.c index 0b094e05a..610a0f712 100644 --- a/src/machine/tnzs_machine.c +++ b/src/machine/tnzs_machine.c @@ -368,7 +368,7 @@ static READ_HANDLER( mcu_extrmatn_r ) { mcu_initializing = 3; return 0xee; /* tilt */ -/* return 0x64; // theres a reset input somewhere /*/ +/* return 0x64; /* theres a reset input somewhere */ } else return mcu_credits; } @@ -710,7 +710,7 @@ WRITE_HANDLER( tnzs_bankswitch_w ) { unsigned char *RAM = memory_region(REGION_CPU1); -// log_cb(RETRO_LOG_DEBUG, LOGPRE "PC %04x: writing %02x to bankswitch\n", activecpu_get_pc(),data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "PC %04x: writing %02x to bankswitch\n", activecpu_get_pc(),data); */ /* bit 4 resets the second CPU */ if (data & 0x10) @@ -726,7 +726,7 @@ WRITE_HANDLER( tnzs_bankswitch1_w ) { unsigned char *RAM = memory_region(REGION_CPU2); -// log_cb(RETRO_LOG_DEBUG, LOGPRE "PC %04x: writing %02x to bankswitch 1\n", activecpu_get_pc(),data); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "PC %04x: writing %02x to bankswitch 1\n", activecpu_get_pc(),data); */ switch (mcu_type) { diff --git a/src/machine/xevious_machine.c b/src/machine/xevious_machine.c index 076dd5b04..7ba78056d 100644 --- a/src/machine/xevious_machine.c +++ b/src/machine/xevious_machine.c @@ -139,8 +139,8 @@ WRITE_HANDLER( battles_customio_data3_w ) WRITE_HANDLER( battles_CPU4_coin_w ) { - set_led_status(0,data & 0x02); // Start 1 - set_led_status(1,data & 0x01); // Start 2 + set_led_status(0,data & 0x02); /* Start 1 */ + set_led_status(1,data & 0x01); /* Start 2 */ coin_counter_w(0,data & 0x20); coin_counter_w(1,data & 0x10); diff --git a/src/mame.c b/src/mame.c index 7d67c9185..ed90a57b6 100644 --- a/src/mame.c +++ b/src/mame.c @@ -447,7 +447,7 @@ static int run_machine(void) } ui_copyright_and_warnings(); - pause_action_start_emulator(); // this needs call before retrorun else serialization can fail on different sizes + pause_action_start_emulator(); /* this needs call before retrorun else serialization can fail on different sizes */ return 0; } diff --git a/src/mame2003/core_options.c b/src/mame2003/core_options.c index e6f199810..30321b6d6 100644 --- a/src/mame2003/core_options.c +++ b/src/mame2003/core_options.c @@ -1169,7 +1169,7 @@ void update_variables(bool first_time) int width = 0; int height = 0; sscanf(var.value, "%dx%d", &width, &height); - // if they are still 0, mame will set from driver resolution set + /* if they are still 0, mame will set from driver resolution set */ options.vector_width = width; options.vector_height = height; } diff --git a/src/mame2003/mame2003.c b/src/mame2003/mame2003.c index b28edab30..95e103cbc 100644 --- a/src/mame2003/mame2003.c +++ b/src/mame2003/mame2003.c @@ -271,7 +271,7 @@ bool retro_load_game(const struct retro_game_info *game) options.romset_filename_noext = driver_lookup; break; } - if(driverIndex == total_drivers -2) // we could fix the total drives in drivers c but the it pointless its taken into account here + if(driverIndex == total_drivers -2) /* we could fix the total drives in drivers c but the it pointless its taken into account here */ { log_cb(RETRO_LOG_ERROR, LOGPRE "Driver index counter: %d. Game driver not found for %s!\n", driverIndex, driver_lookup); return false; @@ -554,11 +554,11 @@ int osd_update_audio_stream(INT16 *buffer) } - //process next frame + /*process next frame */ if ( samples_per_frame != orig_samples_per_frame ) samples_per_frame = orig_samples_per_frame; - // dont drop any sample frames some games like mk will drift with time + /* dont drop any sample frames some games like mk will drift with time */ delta_samples += (Machine->sample_rate / Machine->drv->frames_per_second) - orig_samples_per_frame; if ( delta_samples >= 1.0f ) diff --git a/src/mame2003/video.c b/src/mame2003/video.c index c75ecba3b..7e54e0b3c 100644 --- a/src/mame2003/video.c +++ b/src/mame2003/video.c @@ -392,9 +392,9 @@ int osd_skip_this_frame(void) bool skip_frame = 0; - if (pause_action) return 0; // dont skip pause action hack (rendering mame info screens or you wont see them and not know to press a key) + if (pause_action) return 0; /* dont skip pause action hack (rendering mame info screens or you wont see them and not know to press a key) */ -//auto frame skip options +/*auto frame skip options */ if(options.frameskip >0 && options.frameskip >= 12) { if ( retro_audio_buff_active) @@ -422,13 +422,13 @@ int osd_skip_this_frame(void) } else { - auto_frameskip_counter = 0;// control will return 0 at the end + auto_frameskip_counter = 0;/* control will return 0 at the end */ skip_frame=0; } } } } - else //manual frameskip includes disabled check + else /*manual frameskip includes disabled check */ { skip_frame = frameskip_table[options.frameskip][frameskip_counter]; } diff --git a/src/ost_samples.c b/src/ost_samples.c index 654f680ee..feaeafd18 100644 --- a/src/ost_samples.c +++ b/src/ost_samples.c @@ -694,98 +694,98 @@ bool generate_ost_sound_contra(int data) schedule_default_sound = false; switch(data) { - // Stage 1 Jungle + /* Stage 1 Jungle */ case 0x40: fadingMusic = false; sa_volume = 100; ost_start_samples(0, 1, 1); break; - // Stage 3 Waterfalls + /* Stage 3 Waterfalls */ case 0x42: fadingMusic = false; sa_volume = 100; ost_start_samples(2, 3, 1); break; - // Stage 6 Energy Zone and Hangar + /* Stage 6 Energy Zone and Hangar */ case 0x43: fadingMusic = false; sa_volume = 100; ost_start_samples(4, 5, 1); break; - // Stage 2 The Base + /* Stage 2 The Base */ case 0x44: fadingMusic = false; sa_volume = 100; ost_start_samples(6, 7, 1); break; - // Ranking + /* Ranking */ case 0x45: fadingMusic = false; sa_volume = 100; ost_start_samples(8, 9, 0); break; - // Stage 5 Snowfield + /* Stage 5 Snowfield */ case 0x46: fadingMusic = false; sa_volume = 100; ost_start_samples(10, 11, 1); break; - // Boss + /* Boss */ case 0x47: fadingMusic = false; sa_volume = 100; ost_start_samples(12, 13, 1); break; - // Stage 8 Alien Base + /* Stage 8 Alien Base */ case 0x48: fadingMusic = false; sa_volume = 100; ost_start_samples(14, 15, 1); break; - // Credits + /* Credits */ case 0x49: fadingMusic = false; sa_volume = 100; ost_start_samples(16, 17, 0); break; - // Game Over + /* Game Over */ case 0x4A: fadingMusic = false; sa_volume = 100; ost_start_samples(18, 19, 0); break; - // Stage Clear - diddy - case 0x4B: // 1st boss + /* Stage Clear - diddy */ + case 0x4B: /* 1st boss */ fadingMusic = false; sa_volume = 100; ost_start_samples(20, 21, 0); break; - // Complete - destroyed the heart + /* Complete - destroyed the heart */ case 0x4C: fadingMusic = false; sa_volume = 100; ost_start_samples(22, 23, 0); break; - // Title + /* Title */ case 0x4D: fadingMusic = false; sa_volume = 100; ost_start_samples(24, 25, 0); break; - // Fade music + /* Fade music */ case 0x80: fadingMusic = true; schedule_default_sound = true; @@ -808,7 +808,7 @@ bool generate_ost_sound_ddragon(int data) sa_volume = 40; switch(data) { - // Return to title screen, stop music. + /* Return to title screen, stop music. */ case 0xFF: if(!ost_last_played(0, 1)) { ddragon_stage = 0; @@ -816,17 +816,17 @@ bool generate_ost_sound_ddragon(int data) } break; - // Title screen. + /* Title screen. */ case 0x1: if(!ost_last_played(0, 1) && ddragon_stage != 4) { ddragon_stage = 0; ost_start_samples(0, 1, 1); } - else if(ddragon_stage == 4) // Final boss fight. + else if(ddragon_stage == 4) /* Final boss fight. */ ost_start_samples(22, 23, 1); break; - // Coin inserted on the title screen, stop music. + /* Coin inserted on the title screen, stop music. */ case 0x2: schedule_default_sound = true; @@ -834,19 +834,19 @@ bool generate_ost_sound_ddragon(int data) ost_stop_samples(); break; - // Stage 1. + /* Stage 1. */ case 0x9: ddragon_stage = 1; ost_start_samples(2, 3, 1); break; - // Stage 2. + /* Stage 2. */ case 0x7: ddragon_stage = 2; ost_start_samples(4, 5, 1); break; - // Stage 3. + /* Stage 3. */ case 0xA: if(ddragon_stage != 3) { ddragon_stage = 3; @@ -856,29 +856,29 @@ bool generate_ost_sound_ddragon(int data) ost_start_samples(8, 9, 1); break; - // Stage 4. + /* Stage 4. */ case 0xD: ddragon_stage = 4; ost_start_samples(10, 11, 1); break; - // Credits. + /* Credits. */ case 0x6: ddragon_stage = 5; ost_start_samples(12, 13, 0); break; - // Level finished. + /* Level finished. */ case 0xE: ost_start_samples(14, 15, 0); break; - // Short diddy after boss battle. + /* Short diddy after boss battle. */ case 0xC: ost_start_samples(16, 17, 0); break; - // Boss battle music. + /* Boss battle music. */ case 0x3: if(ddragon_stage == 3) ost_start_samples(20, 21, 1); @@ -1044,35 +1044,35 @@ bool generate_ost_sound_ikari(int data) sa_volume = 100; switch (data) { - // Title Demo + /* Title Demo */ case 0x70: if (!ost_last_played(8, 9)) /* ignore if playing Victory */ ost_start_samples(0, 1, 0); break; - // Force landing - it's up to you + /* Force landing - it's up to you */ case 0xA5: schedule_default_sound = true; ost_start_samples(2, 3, 0); break; - // Theme of Ikari + /* Theme of Ikari */ case 0x41: ost_start_samples(4, 5, 1); break; - // Gate + /* Gate */ case 0x48: ost_start_samples(6, 7, 1); break; - // Victory + /* Victory */ case 0x68: if (!ost_last_played(8, 9)) /* prevent restarting Victory - glitch if invincibility is active */ ost_start_samples(8, 9, 0); break; - // Game Over and Glory + /* Game Over and Glory */ case 0x60: if (!ost_last_played(8, 9)) /* ignore if playing Victory */ ost_start_samples(10, 11, 0); @@ -1276,61 +1276,61 @@ bool generate_ost_sound_moonwalker(int data) sa_volume = 100; switch (data) { - // Reset music. Title screen. + /* Reset music. Title screen. */ case 0x0: ost_stop_samples(); moon_diddy = false; break; - // Title screen stuff. + /* Title screen stuff. */ case 0x85: ost_start_samples(10, 11, 0); break; - // Title screen magic. + /* Title screen magic. */ case 0x86: case 0x87: /* do nothing */ break; - // Stage 1 and Stage 5. Bad. + /* Stage 1 and Stage 5. Bad. */ case 0x81: if(!ost_last_played(0, 1)) ost_start_samples(0, 1, 1); break; - // Stage 2. Smooth Criminal. + /* Stage 2. Smooth Criminal. */ case 0x82: if(!ost_last_played(2, 3)) ost_start_samples(2, 3, 1); break; - // Stage 3. Beat It. + /* Stage 3. Beat It. */ case 0x84: if(!ost_last_played(4, 5)) ost_start_samples(4, 5, 1); break; - // Stage 4. Thriller. + /* Stage 4. Thriller. */ case 0x8A: if(!ost_last_played(6, 7)) ost_start_samples(6, 7, 1); break; - // Ending. Billie Jean. + /* Ending. Billie Jean. */ case 0x89: if(!ost_last_played(8, 9)) ost_start_samples(8, 9, 1); break; - // Boss music + /* Boss music */ case 0x8B: /* First */ case 0x83: /* Second */ case 0x8E: /* Third */ /* do nothing */ break; - // Special move music diddy. + /* Special move music diddy. */ case 0xFA: case 0xFB: case 0xF6: @@ -1338,7 +1338,7 @@ bool generate_ost_sound_moonwalker(int data) moon_diddy = true; break; - // Special move "owww" sound effect. This plays after the special move has always finished. + /* Special move "owww" sound effect. This plays after the special move has always finished. */ case 0xC3: schedule_default_sound = true; moon_diddy = false; /* return volume back to 100%. */ @@ -1465,7 +1465,7 @@ bool generate_ost_sound_outrun(int data) ost_start_samples(0, 1, 1); switch (data) { - // --> Title screen + /* --> Title screen */ case 0x0: if(outrun_start_counter == 0) if(!ost_last_played(0, 1)) @@ -1480,34 +1480,34 @@ bool generate_ost_sound_outrun(int data) outrun_start_counter = 0; break; - // --> Passing breeze + /* --> Passing breeze */ case 0x81: ost_start_samples(8, 9, 1); break; - // --> Splash wave + /* --> Splash wave */ case 0x82: ost_start_samples(10, 11, 1); break; - // --> Magical sound shower + /* --> Magical sound shower */ case 0x85: ost_start_samples(6, 7, 1); break; - // --> Last Wave + /* --> Last Wave */ case 0x93: if(!ost_last_played(4, 5)) ost_start_samples(4, 5, 1); break; - // --> Are You Ready + /* --> Are You Ready */ case 0x9F: schedule_default_sound = true; outrun_start_counter = 0; break; - // --> Enter Highscore + /* --> Enter Highscore */ case 0xA5: /* do nothing */ break; @@ -1529,62 +1529,62 @@ bool generate_ost_sound_robocop(int data) sa_volume = 100; switch (data) { - // Visor open and close + /* Visor open and close */ case 0x30: ost_stop_samples(); break; - // Title + /* Title */ case 0x31: ost_start_samples(0, 1, 0); break; - // Opening + /* Opening */ case 0x32: ost_start_samples(2, 3, 0); break; - // Main Theme + /* Main Theme */ case 0x33: ost_start_samples(4, 5, 1); break; - // Crime Field BGM 2 + /* Crime Field BGM 2 */ case 0x35: ost_start_samples(6, 7, 1); break; - // Last Battle BGM 3 + /* Last Battle BGM 3 */ case 0x37: ost_start_samples(8, 9, 1); break; - // Stage Boss + /* Stage Boss */ case 0x38: ost_start_samples(10, 11, 1); break; - // Final Boss + /* Final Boss */ case 0x39: ost_start_samples(12, 13, 1); break; - // Bonus Shoot + /* Bonus Shoot */ case 0x3A: ost_start_samples(14, 15, 1); break; - // Stage Clear + /* Stage Clear */ case 0x3B: ost_start_samples(16, 17, 0); break; - // Game Over + /* Game Over */ case 0x3C: ost_start_samples(18, 19, 0); break; - // Name Entry + /* Name Entry */ case 0x3D: ost_start_samples(20, 21, 0); break; @@ -1609,87 +1609,87 @@ bool generate_ost_sound_sf1(int data) ost_start_samples(0, 1, 1); switch (data) { - // Retsu + /* Retsu */ case 0x28: ost_start_samples(0, 1, 1); break; - // Geki + /* Geki */ case 0x29: ost_start_samples(2, 3, 1); break; - // Joe + /* Joe */ case 0x2A: ost_start_samples(4, 5, 1); break; - // Mike + /* Mike */ case 0x2B: ost_start_samples(6, 7, 1); break; - // Birdie + /* Birdie */ case 0x2C: ost_start_samples(8, 9, 1); break; - // Eagle + /* Eagle */ case 0x2D: ost_start_samples(10, 11, 1); break; - // Lee + /* Lee */ case 0x2E: ost_start_samples(12, 13, 1); break; - // Gen + /* Gen */ case 0x2F: ost_start_samples(14, 15, 1); break; - // Adon + /* Adon */ case 0x30: ost_start_samples(16, 17, 1); break; - // Sagat + /* Sagat */ case 0x31: ost_start_samples(18, 19, 1); break; - // Ending + /* Ending */ case 0x32: ost_start_samples(20, 21, 0); break; - // VS + /* VS */ case 0x33: ost_start_samples(22, 23, 1); break; - // Stage Select + /* Stage Select */ case 0x34: ost_start_samples(24, 25, 1); break; - // Bonus 1 + /* Bonus 1 */ case 0x3A: ost_start_samples(26, 27, 1); break; - // Bonus 2 + /* Bonus 2 */ case 0x3B: ost_start_samples(28, 29, 1); break; - // Score + /* Score */ case 0x3C: ost_start_samples(30, 31, 1); break; - // Won + /* Won */ case 0x37: ost_start_samples(32, 33, 0); break; @@ -1712,322 +1712,322 @@ bool generate_ost_sound_sf2(int data) switch (data) { case 0x1: - // ryu music slow + /* ryu music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(0, 1, 1); break; case 0x2: - // e honda music slow + /* e honda music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(12, 13, 1); break; case 0x3: - // blanka music slow + /* blanka music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(4, 5, 1); break; case 0x4: - // ken music slow + /* ken music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(52, 53, 1); break; case 0x5: - // guile music slow + /* guile music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(16, 17, 1); break; case 0x6: - // chun li music slow + /* chun li music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(8, 9, 1); break; case 0x7: - // zangief music slow + /* zangief music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(56, 57, 1); break; case 0x8: - // dhalsim music slow + /* dhalsim music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(20, 21, 1); break; case 0x9: - // balrog music slow + /* balrog music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(24, 25, 1); break; case 0xa: - // vega music slow + /* vega music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(60, 61, 1); break; case 0xb: - // sagat music slow + /* sagat music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(28, 29, 1); break; case 0xc: - // m. bison music slow + /* m. bison music slow */ fadingMusic = false; sa_volume = 100; ost_start_samples(32, 33, 1); break; case 0xd: - // bonus stage music + /* bonus stage music */ fadingMusic = false; sa_volume = 100; ost_start_samples(64, 65, 1); break; case 0xe: - // character select stage + /* character select stage */ fadingMusic = false; sa_volume = 100; ost_start_samples(48, 49, 1); break; case 0xf: - // versus screen ditty + /* versus screen ditty */ fadingMusic = false; sa_volume = 100; ost_start_samples(36, 37, 0); break; case 0x10: - // end of fight dialog/resolution screen + /* end of fight dialog/resolution screen */ fadingMusic = false; sa_volume = 100; ost_start_samples(38, 39, 0); break; case 0x11: - // continue music, loop for ending credits + /* continue music, loop for ending credits */ fadingMusic = false; sa_volume = 100; ost_start_samples(40, 41, 1); break; case 0x13: - // game over + /* game over */ fadingMusic = false; sa_volume = 100; ost_start_samples(50, 51, 0); break; case 0x14: - // high score screen + /* high score screen */ fadingMusic = false; sa_volume = 100; ost_start_samples(42, 43, 0); break; case 0x15: - // player joined music + /* player joined music */ fadingMusic = false; sa_volume = 100; ost_start_samples(46, 47, 0); break; case 0x16: - // intro music + /* intro music */ fadingMusic = false; sa_volume = 100; ost_start_samples(44, 45, 1); break; case 0x18: - // ryu ending music + /* ryu ending music */ fadingMusic = false; sa_volume = 100; ost_start_samples(82, 83, 0); break; case 0x19: - // e.honda ending music + /* e.honda ending music */ fadingMusic = false; sa_volume = 100; ost_start_samples(72, 73, 1); break; case 0x1a: - // blanka ending music + /* blanka ending music */ fadingMusic = false; sa_volume = 100; ost_start_samples(74, 75, 1); break; case 0x1b: - // guile ending music + /* guile ending music */ fadingMusic = false; sa_volume = 100; ost_start_samples(76, 77, 1); break; case 0x1c: - // ken ending music + /* ken ending music */ fadingMusic = false; sa_volume = 100; ost_start_samples(68, 69, 1); break; case 0x1d: - // chun li ending music? + /* chun li ending music? */ fadingMusic = false; sa_volume = 100; ost_start_samples(86, 87, 1); break; case 0x1e: - // zangief ending music + /* zangief ending music */ fadingMusic = false; sa_volume = 100; ost_start_samples(78, 79, 1); break; case 0x1f: - // dhalsim ending music + /* dhalsim ending music */ fadingMusic = false; sa_volume = 100; ost_start_samples(84, 85, 1); break; case 0x34: - // wedding music -- ken ending + /* wedding music -- ken ending */ fadingMusic = false; sa_volume = 100; ost_start_samples(70, 71, 1); break; case 0x35: - // chun li ending #2 + /* chun li ending #2 */ fadingMusic = false; sa_volume = 100; ost_start_samples(88, 89, 1); break; case 0x79: - // ryu music fast + /* ryu music fast */ fadingMusic = false; sa_volume = 100; ost_start_samples(2, 3, 1); break; case 0x7a: - // e. honda music fast + /* e. honda music fast */ fadingMusic = false; sa_volume = 100; ost_start_samples(14, 15, 1); break; case 0x7b: - // blanka music fast + /* blanka music fast */ fadingMusic = false; sa_volume = 100; ost_start_samples(6, 7, 1); break; case 0x7c: - // guile music fast + /* guile music fast */ fadingMusic = false; sa_volume = 100; ost_start_samples(18, 19, 1); break; case 0x7d: - // ken music fast + /* ken music fast */ fadingMusic = false; sa_volume = 100; ost_start_samples(54, 55, 1); break; case 0x7e: - // fast chun li music + /* fast chun li music */ fadingMusic = false; sa_volume = 100; ost_start_samples(10, 11, 1); break; case 0x7f: - // zangief music fast + /* zangief music fast */ fadingMusic = false; sa_volume = 100; ost_start_samples(58, 59, 1); break; case 0x80: - // dhalsim music fast + /* dhalsim music fast */ fadingMusic = false; sa_volume = 100; ost_start_samples(22, 23, 1); break; case 0x81: - // fast balrog music + /* fast balrog music */ fadingMusic = false; sa_volume = 100; ost_start_samples(26, 27, 1); break; case 0x82: - // fast vega music + /* fast vega music */ fadingMusic = false; sa_volume = 100; ost_start_samples(62, 63, 1); break; case 0x83: - // fast sagat music + /* fast sagat music */ fadingMusic = false; sa_volume = 100; ost_start_samples(30, 31, 1); break; case 0x84: - // fast m. bison music + /* fast m. bison music */ fadingMusic = false; sa_volume = 100; ost_start_samples(34, 35, 1); break; case 0x8c: - // m. bison ending + /* m. bison ending */ fadingMusic = false; sa_volume = 100; ost_start_samples(66, 67, 1); break; case 0x8d: - // special ending + /* special ending */ fadingMusic = false; sa_volume = 100; ost_start_samples(80, 81, 1); break; case 0xf9: - // fade music + /* fade music */ fadingMusic = true; schedule_default_sound = true; break; diff --git a/src/palette.c b/src/palette.c index 68c62aaa1..a5581704c 100644 --- a/src/palette.c +++ b/src/palette.c @@ -1012,10 +1012,10 @@ static void palette_reset(void) -//------------------------------------------------- -// normalize_range - normalize a range of palette -// entries -//------------------------------------------------- +/*------------------------------------------------- */ +/* normalize_range - normalize a range of palette */ +/* entries */ +/*------------------------------------------------- */ void palette_normalize_range( UINT32 start, UINT32 end, int lum_min, int lum_max) { @@ -1024,7 +1024,7 @@ void palette_normalize_range( UINT32 start, UINT32 end, int lum_min, int lum_max UINT8 col[3]; end = MIN(end, palette_get_total_colors() -1); - // find the minimum and maximum brightness of all the colors in the range + /* find the minimum and maximum brightness of all the colors in the range */ ymin = 1000 * 255, ymax = 0; for (index = start; index <= end; index++) { @@ -1034,11 +1034,11 @@ void palette_normalize_range( UINT32 start, UINT32 end, int lum_min, int lum_max ymax = MAX(ymax, temp); } - // determine target minimum/maximum + /* determine target minimum/maximum */ tmin = (lum_min < 0) ? ((ymin + 500) / 1000) : lum_min; tmax = (lum_max < 0) ? ((ymax + 500) / 1000) : lum_max; - // now normalize the palette + /* now normalize the palette */ for (index = start; index <= end; index++) { palette_get_color(index, &col[0], &col[1], &col[2]); diff --git a/src/sndhrdw/8080bw_sndhrdw.c b/src/sndhrdw/8080bw_sndhrdw.c index 64588a75d..6452b1787 100644 --- a/src/sndhrdw/8080bw_sndhrdw.c +++ b/src/sndhrdw/8080bw_sndhrdw.c @@ -1303,7 +1303,7 @@ static WRITE_HANDLER( lupin3_sh_port5_w ) if (rising_bits & 0x02) sample_start(1, 2, 0); /* Deposit money, start intermission, end game */ if (rising_bits & 0x04) sample_start(2, 5, 0); /* Deposit money, start intermission, Slides down rope */ if (rising_bits & 0x08) sample_start(3, 0, 0); /* Start intermission, end game */ - //if (rising_bits & 0x10) sample_start(3, 9, 0); /* Dog barking */ + /*if (rising_bits & 0x10) sample_start(3, 9, 0); /* Dog barking */ c8080bw_flip_screen_w(data & 0x20); @@ -1362,7 +1362,7 @@ static WRITE_HANDLER( invrvnge_sh_port3_w ) static WRITE_HANDLER( invrvnge_sh_port5_w ) { - // No operations + /* No operations */ } @@ -1425,11 +1425,11 @@ static WRITE_HANDLER( yosakdon_sh_port5_w ) MACHINE_INIT( rollingc ) { - install_port_write_handler(0, 0x00, 0x00, rollingc_sh_port0_w); // Rolling Crash - // Note Rolling Crash also uses some of the sounds from Moon Base. - // Though we basically use the Invaders sounds for Moon Base. - install_port_write_handler(0, 0x03, 0x03, invaders_sh_port3_w); // Moon Base - install_port_write_handler(0, 0x05, 0x05, invaders_sh_port5_w); // Moon Base + install_port_write_handler(0, 0x00, 0x00, rollingc_sh_port0_w); /* Rolling Crash */ + /* Note Rolling Crash also uses some of the sounds from Moon Base. */ + /* Though we basically use the Invaders sounds for Moon Base. */ + install_port_write_handler(0, 0x03, 0x03, invaders_sh_port3_w); /* Moon Base */ + install_port_write_handler(0, 0x05, 0x05, invaders_sh_port5_w); /* Moon Base */ SN76477_envelope_1_w(0, 1); SN76477_envelope_2_w(0, 0); @@ -1448,7 +1448,7 @@ static WRITE_HANDLER( rollingc_sh_port0_w ) if (rising_bits & 0x04) sample_start(0, 1, 0); /* Collision */ if (rising_bits & 0x10) sample_start(1, 8, 0); /* Computer car is starting to move */ - // Note sound of hitting a dot seem to come from Moon Base port handlers. + /* Note sound of hitting a dot seem to come from Moon Base port handlers. */ last = data; } @@ -1465,7 +1465,7 @@ static WRITE_HANDLER( rollingc_sh_port0_w ) MACHINE_INIT( astropal ) { install_port_write_handler(0, 0x03, 0x03, astropal_sh_port3_w); - // Can use invaders handler for port 0x05 + /* Can use invaders handler for port 0x05 */ install_port_write_handler(0, 0x05, 0x05, invaders_sh_port5_w); SN76477_envelope_1_w(0, 1); @@ -1479,12 +1479,12 @@ MACHINE_INIT( astropal ) static WRITE_HANDLER( astropal_sh_port3_w ) { static unsigned char last = 0; - static int exploding = 0; // Work around to stop exploding sound repeating + static int exploding = 0; /* Work around to stop exploding sound repeating */ UINT8 rising_bits = data & ~last; if (rising_bits & 0x02) { sample_start (0, 0, 0); /* Shot Sound */ - exploding = 0; // Use this to reset exploding sound + exploding = 0; /* Use this to reset exploding sound */ } if (rising_bits & 0x04 && !exploding) { @@ -1538,8 +1538,8 @@ static WRITE_HANDLER( galactic_sh_port3_w ) if (rising_bits & 0x04) sample_start (1, 1, 0); /* Your ship hit */ - //if (data & 0x08) - //sample_start (1, 6, 0); /* Background continual? */ + /*if (data & 0x08) */ + /*sample_start (1, 6, 0); /* Background continual? */ if (rising_bits & 0x10) sample_start (2, 8, 0); /* Bonus Man? */ @@ -1554,10 +1554,10 @@ static WRITE_HANDLER( galactic_sh_port5_w ) static unsigned char last = 0; UINT8 rising_bits = data & ~last; - // These are meant to be a deep base background. - // Can simulate by changing "rising_bits" to "data" - // But the result sounds rough, and your explosion - // cuts out. + /* These are meant to be a deep base background. */ + /* Can simulate by changing "rising_bits" to "data" */ + /* But the result sounds rough, and your explosion */ + /* cuts out. */ if (rising_bits & 0x01) sample_start (1, 3, 0); /* Background beat */ diff --git a/src/sndhrdw/ataridis_sndhrdw.c b/src/sndhrdw/ataridis_sndhrdw.c index 9ba94f4be..59cb82a8b 100644 --- a/src/sndhrdw/ataridis_sndhrdw.c +++ b/src/sndhrdw/ataridis_sndhrdw.c @@ -26,87 +26,87 @@ const struct discrete_lfsr_desc firetrk_lfsr={ const struct discrete_dac_r1_ladder firetrk_motor_v_dac = { - 4, // size of ladder - {2200000, 1000000, 470000, 220000, 0,0,0,0}, // R24, R23, R22, R21 - 4.4, // 5V - diode junction (0.6V) - 68000, // R25 - 0, // no rGnd - 1e-5 // C24 + 4, /* size of ladder */ + {2200000, 1000000, 470000, 220000, 0,0,0,0}, /* R24, R23, R22, R21 */ + 4.4, /* 5V - diode junction (0.6V) */ + 68000, /* R25 */ + 0, /* no rGnd */ + 1e-5 /* C24 */ }; const struct discrete_555_cc_desc firetrk_motor_vco = { DISC_555_OUT_DC | DISC_555_OUT_SQW, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2 / 3, // threshold - 5.0 /3, // trigger - 5, // B+ voltage of the Constant Current source - 0.7 // Q2 junction voltage + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2 / 3, /* threshold */ + 5.0 /3, /* trigger */ + 5, /* B+ voltage of the Constant Current source */ + 0.7 /* Q2 junction voltage */ }; const struct discrete_dac_r1_ladder firetrk_motor_out_dac = { - 2, // size of ladder - {10000, 10000, 0,0,0,0,0,0}, // R74, R73 - 3.4, // TTL high voltage - 0, // no rBias - 0, // no rGnd - 1e-7 // C43 + 2, /* size of ladder */ + {10000, 10000, 0,0,0,0,0,0}, /* R74, R73 */ + 3.4, /* TTL high voltage */ + 0, /* no rBias */ + 0, /* no rGnd */ + 1e-7 /* C43 */ }; const struct discrete_dac_r1_ladder firetrk_siren_cv_dac = { - 4, // size of ladder - {2200000, 1000000, 470000, 220000, 0,0,0,0}, // R46, R47, R45, R48 - 5, // 5V - 100000, // R49 - 390000, // R44 - 1e-5 // C30 + 4, /* size of ladder */ + {2200000, 1000000, 470000, 220000, 0,0,0,0}, /* R46, R47, R45, R48 */ + 5, /* 5V */ + 100000, /* R49 */ + 390000, /* R44 */ + 1e-5 /* C30 */ }; const struct discrete_555_astbl_desc firetrk_siren_555 = { DISC_555_OUT_SQW | DISC_555_OUT_DC, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2.0 /3.0, // normally 2/3 of v555 - 5.0 / 3.0 // normally 1/3 of v555 + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2.0 /3.0, /* normally 2/3 of v555 */ + 5.0 / 3.0 /* normally 1/3 of v555 */ }; const struct discrete_dac_r1_ladder firetrk_bang_dac = { - 4, // size of ladder - {8200, 3900, 2200, 1000, 0,0,0,0}, // R37, R35, R36, R34 - 0, // no vBias - 0, // no rBias - 0, // no rGnd - 0 // no smoothing cap + 4, /* size of ladder */ + {8200, 3900, 2200, 1000, 0,0,0,0}, /* R37, R35, R36, R34 */ + 0, /* no vBias */ + 0, /* no rBias */ + 0, /* no rGnd */ + 0 /* no smoothing cap */ }; const struct discrete_schmitt_osc_desc firetrk_screech_osc = { - 2200, // R29 - 330, // R16 - 2.2e-6, // C8 - 1.6, // Rise Threshold of 74LS14 - 0.8, // Fall Threshold of 74LS14 - 3.4, // Output high voltage of 74LS14 + 2200, /* R29 */ + 330, /* R16 */ + 2.2e-6, /* C8 */ + 1.6, /* Rise Threshold of 74LS14 */ + 0.8, /* Fall Threshold of 74LS14 */ + 3.4, /* Output high voltage of 74LS14 */ DISC_SCHMITT_OSC_IN_IS_LOGIC | DISC_SCHMITT_OSC_ENAB_IS_NOR }; const struct discrete_mixer_desc firetrk_mixer = { DISC_MIXER_IS_OP_AMP, - 7, // 7 inputs - {4700, 22000, 31333, 33000, 10545.6, 32000, 150000, 0}, // R54, R55, R72||(R70+R71), R53, R56 + R37||R35||R36||R34, R58 + R73||R74, R52 - {0,0,0,0,0,0,0,0}, // No variable resistor nodes - {2.2e-7, 2.2e-7, 1e-8, 2.2e-7, 2.2e-7, 0, 2.2e-7, 0}, // C34, C32, C44, C35, C33, NA, C31 - 0, // No rI - 22000, // R43 - 0, // No Filter - 1e-5, // C12 - 5.0 * 820 / (270 + 820), // vBias = 5V * R51/(R41+R51) + 7, /* 7 inputs */ + {4700, 22000, 31333, 33000, 10545.6, 32000, 150000, 0}, /* R54, R55, R72||(R70+R71), R53, R56 + R37||R35||R36||R34, R58 + R73||R74, R52 */ + {0,0,0,0,0,0,0,0}, /* No variable resistor nodes */ + {2.2e-7, 2.2e-7, 1e-8, 2.2e-7, 2.2e-7, 0, 2.2e-7, 0}, /* C34, C32, C44, C35, C33, NA, C31 */ + 0, /* No rI */ + 22000, /* R43 */ + 0, /* No Filter */ + 1e-5, /* C12 */ + 5.0 * 820 / (270 + 820), /* vBias = 5V * R51/(R41+R51) */ 3400 }; @@ -154,29 +154,29 @@ DISCRETE_SOUND_START(firetrk_sound_interface) /* summed as the output of the circuit. */ /************************************************/ DISCRETE_ADJUSTMENT(NODE_20, 1, - 10000, // R26 + R27 @ min - 260000, // R26 + R27 @ max + 10000, /* R26 + R27 @ min */ + 260000, /* R26 + R27 @ max */ DISC_LOGADJ, 8) - DISCRETE_DAC_R1(NODE_21, 1, // base of Q1 - FIRETRUCK_MOTOR_DATA, // IC F8, pins 2,5,6,9 - 3.4, // TTL ON level + DISCRETE_DAC_R1(NODE_21, 1, /* base of Q1 */ + FIRETRUCK_MOTOR_DATA, /* IC F8, pins 2,5,6,9 */ + 3.4, /* TTL ON level */ &firetrk_motor_v_dac) - DISCRETE_555_CC(NODE_22, 1, // IC B9 pin 3, always enabled - NODE_21, // vIn - NODE_20, // current adjust - 1.e-8, // C25 - 1000000, 0, 0, // R28, no rGnd, no rDis + DISCRETE_555_CC(NODE_22, 1, /* IC B9 pin 3, always enabled */ + NODE_21, /* vIn */ + NODE_20, /* current adjust */ + 1.e-8, /* C25 */ + 1000000, 0, 0, /* R28, no rGnd, no rDis */ &firetrk_motor_vco) - DISCRETE_COUNTER(NODE_23, 1, FIRETRUCK_ATTRACT_EN, // IC A9, QB-QD - NODE_22, // from IC B9, pin 3 - 5, 1, 0, 1) // /6 counter on rising edge - DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") // IC A9, pin 8 - DISCRETE_COUNTER(NODE_25, 1, FIRETRUCK_ATTRACT_EN, // IC A9, pin 12 - NODE_24, // from IC A9, pin 8 - 1, 1, 0, 1) // /2 counter on rising edge - DISCRETE_TRANSFORM3(NODE_26, 1, NODE_24, NODE_25, 2, "12*0+") // Mix the mess together in binary + DISCRETE_COUNTER(NODE_23, 1, FIRETRUCK_ATTRACT_EN, /* IC A9, QB-QD */ + NODE_22, /* from IC B9, pin 3 */ + 5, 1, 0, 1) /* /6 counter on rising edge */ + DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") /* IC A9, pin 8 */ + DISCRETE_COUNTER(NODE_25, 1, FIRETRUCK_ATTRACT_EN, /* IC A9, pin 12 */ + NODE_24, /* from IC A9, pin 8 */ + 1, 1, 0, 1) /* /2 counter on rising edge */ + DISCRETE_TRANSFORM3(NODE_26, 1, NODE_24, NODE_25, 2, "12*0+") /* Mix the mess together in binary */ DISCRETE_DAC_R1(FIRETRUCK_MOTORSND, 1, NODE_26, - 3.4, // TTL ON level + 3.4, /* TTL ON level */ &firetrk_motor_out_dac) /************************************************/ @@ -194,15 +194,15 @@ DISCRETE_SOUND_START(firetrk_sound_interface) /* 0000 = 666Hz with 35% duty cycle */ /* 1111 = 526Hz with 63% duty cycle */ /************************************************/ - DISCRETE_DAC_R1(NODE_40, 1, // IC E9, pin 7 - FIRETRUCK_SIREN_DATA, // IC F8, pins 15,16,12,19 - 3.4, // TTL ON level + DISCRETE_DAC_R1(NODE_40, 1, /* IC E9, pin 7 */ + FIRETRUCK_SIREN_DATA, /* IC F8, pins 15,16,12,19 */ + 3.4, /* TTL ON level */ &firetrk_siren_cv_dac) DISCRETE_555_ASTABLE(FIRETRUCK_SIRENSND, FIRETRUCK_ATTRACT_INV, - 2200, // R60 - 10000, // R59 - 1e-7, // C37 - NODE_40, // CV is straight from DAC because op-amp E9 is just x1 buffer + 2200, /* R60 */ + 10000, /* R59 */ + 1e-7, /* C37 */ + NODE_40, /* CV is straight from DAC because op-amp E9 is just x1 buffer */ &firetrk_siren_555) /************************************************/ @@ -216,11 +216,11 @@ DISCRETE_SOUND_START(firetrk_sound_interface) /************************************************/ DISCRETE_LFSR_NOISE(FIRETRUCK_NOISE, FIRETRUCK_ATTRACT_INV, FIRETRUCK_ATTRACT_INV, 15750.0/4, 1.0, 0, 0.5, &firetrk_lfsr) - DISCRETE_SWITCH(NODE_50, 1, FIRETRUCK_NOISE, 0, // Enable gate K9 - FIRETRUCK_CRASH_DATA) // IC K9, pins 3,6,11,8 - DISCRETE_DAC_R1(FIRETRUCK_BANGSND, 1, // Bang - NODE_50, // from enable gates K9 - 3.4, // TTL ON level + DISCRETE_SWITCH(NODE_50, 1, FIRETRUCK_NOISE, 0, /* Enable gate K9 */ + FIRETRUCK_CRASH_DATA) /* IC K9, pins 3,6,11,8 */ + DISCRETE_DAC_R1(FIRETRUCK_BANGSND, 1, /* Bang */ + NODE_50, /* from enable gates K9 */ + 3.4, /* TTL ON level */ &firetrk_bang_dac) /************************************************/ @@ -235,17 +235,17 @@ DISCRETE_SOUND_START(firetrk_sound_interface) /* counter. */ /************************************************/ DISCRETE_RCDISC2(NODE_70, FIRETRUCK_BELL_EN, - 4.4, 10, // Q3 instantally charges C42 - 0, 33000, // discharges thru R66 - 1e-5) // C42 + 4.4, 10, /* Q3 instantally charges C42 */ + 0, 33000, /* discharges thru R66 */ + 1e-5) /* C42 */ DISCRETE_TRANSFORM2(NODE_71, 1, NODE_70, - 5.0 * 680 / (10000 + 680), // vRef = 5V * R64 / (R65 + R64) - "01<") // Output is low until vIn drops below vRef - DISCRETE_COUNTER_FIX(NODE_72, 1, NODE_71, 15750, 15, 1, 0) // IC B10 + 5.0 * 680 / (10000 + 680), /* vRef = 5V * R64 / (R65 + R64) */ + "01<") /* Output is low until vIn drops below vRef */ + DISCRETE_COUNTER_FIX(NODE_72, 1, NODE_71, 15750, 15, 1, 0) /* IC B10 */ DISCRETE_TRANSFORM4(FIRETRUCK_BELLSND, 1, NODE_72, - 8, // count 0-7 allow cap voltage to output. 8-15 ground output. - NODE_70, // scale logic to cap voltage - 47000.0 / (47000 + 47000 + 47000), // to drop voltage per divider R72 / (R70+R71+R72) + 8, /* count 0-7 allow cap voltage to output. 8-15 ground output. */ + NODE_70, /* scale logic to cap voltage */ + 47000.0 / (47000 + 47000 + 47000), /* to drop voltage per divider R72 / (R70+R71+R72) */ "01<2*3*") /************************************************/ @@ -270,68 +270,68 @@ DISCRETE_SOUND_END const struct discrete_dac_r1_ladder superbug_motor_v_dac = { - 4, // size of ladder - {2200000, 1000000, 470000, 220000, 0,0,0,0}, // R8, R9, R6, R7 - 4.4, // 5V - diode junction (0.6V) - 68000, // R10 - 0, // no rGnd - 1e-5 // C20 + 4, /* size of ladder */ + {2200000, 1000000, 470000, 220000, 0,0,0,0}, /* R8, R9, R6, R7 */ + 4.4, /* 5V - diode junction (0.6V) */ + 68000, /* R10 */ + 0, /* no rGnd */ + 1e-5 /* C20 */ }; const struct discrete_555_cc_desc superbug_motor_vco = { DISC_555_OUT_DC | DISC_555_OUT_SQW, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2 / 3, // threshold - 5.0 /3, // trigger - 5, // B+ voltage of the Constant Current source - 0.7 // Q1 junction voltage + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2 / 3, /* threshold */ + 5.0 /3, /* trigger */ + 5, /* B+ voltage of the Constant Current source */ + 0.7 /* Q1 junction voltage */ }; const struct discrete_dac_r1_ladder superbug_motor_out_dac = { - 2, // size of ladder - {10000, 10000, 0,0,0,0,0,0}, // R32, R34 - 3.4, // TTL high voltage - 0, // no rBias - 0, // no rGnd - 1e-7 // C26 + 2, /* size of ladder */ + {10000, 10000, 0,0,0,0,0,0}, /* R32, R34 */ + 3.4, /* TTL high voltage */ + 0, /* no rBias */ + 0, /* no rGnd */ + 1e-7 /* C26 */ }; const struct discrete_dac_r1_ladder superbug_bang_dac = { - 4, // size of ladder - {8200, 3900, 2200, 1000, 0,0,0,0}, // R28, R28, R27, R26 - 0, // no vBias - 0, // no rBias - 0, // no rGnd - 1e-7 // C25 + 4, /* size of ladder */ + {8200, 3900, 2200, 1000, 0,0,0,0}, /* R28, R28, R27, R26 */ + 0, /* no vBias */ + 0, /* no rBias */ + 0, /* no rGnd */ + 1e-7 /* C25 */ }; const struct discrete_schmitt_osc_desc superbug_screech_osc = { - 2200, // R30 - 330, // R52 - 2.2e-6, // C27 - 1.7, // Rise Threshold of 7414 - 0.9, // Fall Threshold of 7414 - 3.4, // Output high voltage of 7414 + 2200, /* R30 */ + 330, /* R52 */ + 2.2e-6, /* C27 */ + 1.7, /* Rise Threshold of 7414 */ + 0.9, /* Fall Threshold of 7414 */ + 3.4, /* Output high voltage of 7414 */ DISC_SCHMITT_OSC_IN_IS_LOGIC | DISC_SCHMITT_OSC_ENAB_IS_NOR }; const struct discrete_mixer_desc superbug_mixer = { DISC_MIXER_IS_RESISTOR, - 4, // 4 inputs - {15000, 10545.6, 33000, 47000, 0,0,0,0}, // R54, R55, R72||(R70+R71), R53, R56 + R37||R35||R36||R34, R58 + R73||R74, R52 - {0,0,0,0,0,0,0,0}, // No variable resistor nodes - {0, 0, 0, 0, 0,0,0,0}, // No caps - 0, // No rI - 5000, // R63 - 0, // No Filter - 1e-7, // C35 - 0, // not used in resistor network + 4, /* 4 inputs */ + {15000, 10545.6, 33000, 47000, 0,0,0,0}, /* R54, R55, R72||(R70+R71), R53, R56 + R37||R35||R36||R34, R58 + R73||R74, R52 */ + {0,0,0,0,0,0,0,0}, /* No variable resistor nodes */ + {0, 0, 0, 0, 0,0,0,0}, /* No caps */ + 0, /* No rI */ + 5000, /* R63 */ + 0, /* No Filter */ + 1e-7, /* C35 */ + 0, /* not used in resistor network */ 33000 }; @@ -369,31 +369,31 @@ DISCRETE_SOUND_START(superbug_sound_interface) /* drive a modulo 12 counter. */ /************************************************/ DISCRETE_ADJUSTMENT(NODE_20, 1, - 10000, // R12 + R62 @ min - 260000, // R12 + R62 @ max + 10000, /* R12 + R62 @ min */ + 260000, /* R12 + R62 @ max */ DISC_LOGADJ, 8) - DISCRETE_DAC_R1(NODE_21, 1, // base of Q1 - SUPERBUG_SPEED_DATA, // IC B5, pins 3, 14, 6, 11 - 3.4, // TTL ON level + DISCRETE_DAC_R1(NODE_21, 1, /* base of Q1 */ + SUPERBUG_SPEED_DATA, /* IC B5, pins 3, 14, 6, 11 */ + 3.4, /* TTL ON level */ &superbug_motor_v_dac) - DISCRETE_555_CC(NODE_22, 1, // IC A6 pin 3, always enabled - NODE_21, // vIn - NODE_20, // current adjust - 1.e-8, // C21 - 3300000, 0, 0, // R11, no rGnd, no rDis + DISCRETE_555_CC(NODE_22, 1, /* IC A6 pin 3, always enabled */ + NODE_21, /* vIn */ + NODE_20, /* current adjust */ + 1.e-8, /* C21 */ + 3300000, 0, 0, /* R11, no rGnd, no rDis */ &superbug_motor_vco) - DISCRETE_COUNTER(NODE_23, 1, SUPERBUG_ATTRACT_EN, // IC A7, QB-QD - NODE_22, // from IC A6, pin 3 - 5, 1, 0, 1) // /6 counter on rising edge - DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") // IC A7, pin 8-QD - DISCRETE_TRANSFORM3(NODE_25, 1, NODE_23, 1, 4, "01=02=|") // IC A7, pin 11-QB - DISCRETE_LOGIC_XOR(NODE_26, 1, NODE_24, NODE_25) // Gate A9, pin 8 - DISCRETE_COUNTER(NODE_27, 1, SUPERBUG_ATTRACT_EN, // IC A7, pin 12-QA - NODE_26, // from IC A9, pin 8 - 1, 1, 0, 1) // /2 counter on rising edge - DISCRETE_TRANSFORM3(NODE_28, 1, NODE_24, NODE_27, 2, "12*0+") // Mix the mess together in binary + DISCRETE_COUNTER(NODE_23, 1, SUPERBUG_ATTRACT_EN, /* IC A7, QB-QD */ + NODE_22, /* from IC A6, pin 3 */ + 5, 1, 0, 1) /* /6 counter on rising edge */ + DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") /* IC A7, pin 8-QD */ + DISCRETE_TRANSFORM3(NODE_25, 1, NODE_23, 1, 4, "01=02=|") /* IC A7, pin 11-QB */ + DISCRETE_LOGIC_XOR(NODE_26, 1, NODE_24, NODE_25) /* Gate A9, pin 8 */ + DISCRETE_COUNTER(NODE_27, 1, SUPERBUG_ATTRACT_EN, /* IC A7, pin 12-QA */ + NODE_26, /* from IC A9, pin 8 */ + 1, 1, 0, 1) /* /2 counter on rising edge */ + DISCRETE_TRANSFORM3(NODE_28, 1, NODE_24, NODE_27, 2, "12*0+") /* Mix the mess together in binary */ DISCRETE_DAC_R1(SUPERBUG_MOTORSND, 1, NODE_28, - 3.4, // TTL ON level + 3.4, /* TTL ON level */ &superbug_motor_out_dac) /************************************************/ @@ -405,13 +405,13 @@ DISCRETE_SOUND_START(superbug_sound_interface) /* Output is binary weighted with 4 bits of */ /* crash volume. */ /************************************************/ - DISCRETE_LFSR_NOISE(SUPERBUG_NOISE, SUPERBUG_ATTRACT_INV, SUPERBUG_ATTRACT_INV, 15750.0/4, 1.0, 0, 0.5, &firetrk_lfsr) // Same as firetrk + DISCRETE_LFSR_NOISE(SUPERBUG_NOISE, SUPERBUG_ATTRACT_INV, SUPERBUG_ATTRACT_INV, 15750.0/4, 1.0, 0, 0.5, &firetrk_lfsr) /* Same as firetrk */ - DISCRETE_SWITCH(NODE_40, 1, SUPERBUG_NOISE, 0, // Enable gate C8 - SUPERBUG_CRASH_DATA) // IC D8, pins 3,14,6,11 - DISCRETE_DAC_R1(SUPERBUG_BANGSND, 1, // Bang - NODE_40, // from enable gates C8 - 3.4, // TTL ON level + DISCRETE_SWITCH(NODE_40, 1, SUPERBUG_NOISE, 0, /* Enable gate C8 */ + SUPERBUG_CRASH_DATA) /* IC D8, pins 3,14,6,11 */ + DISCRETE_DAC_R1(SUPERBUG_BANGSND, 1, /* Bang */ + NODE_40, /* from enable gates C8 */ + 3.4, /* TTL ON level */ &superbug_bang_dac) /************************************************/ @@ -443,82 +443,82 @@ DISCRETE_SOUND_END /* Both cars use same parts for v_dac, vco and out_dac */ const struct discrete_dac_r1_ladder montecar_motor_v_dac = { - 4, // size of ladder - {2200000, 1000000, 470000, 220000, 0,0,0,0}, // R44, R43, R46, R45 - 4.4, // 5V - diode junction (0.6V) - 68000, // R80 - 0, // no rGnd - 4.7e-6 // C77 + 4, /* size of ladder */ + {2200000, 1000000, 470000, 220000, 0,0,0,0}, /* R44, R43, R46, R45 */ + 4.4, /* 5V - diode junction (0.6V) */ + 68000, /* R80 */ + 0, /* no rGnd */ + 4.7e-6 /* C77 */ }; const struct discrete_555_cc_desc montecar_motor_vco = { DISC_555_OUT_DC | DISC_555_OUT_SQW, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2 / 3, // threshold - 5.0 /3, // trigger - 5, // B+ voltage of the Constant Current source - 0.7 // Q1 junction voltage + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2 / 3, /* threshold */ + 5.0 /3, /* trigger */ + 5, /* B+ voltage of the Constant Current source */ + 0.7 /* Q1 junction voltage */ }; const struct discrete_dac_r1_ladder montecar_motor_out_dac = { - 3, // size of ladder - {10000, 10000, 10000, 0,0,0,0,0}, // R31, R30, R29 - 3.4, // TTL high voltage - 0, // no rBias - 0, // no rGnd - 1e-7 // C53 + 3, /* size of ladder */ + {10000, 10000, 10000, 0,0,0,0,0}, /* R31, R30, R29 */ + 3.4, /* TTL high voltage */ + 0, /* no rBias */ + 0, /* no rGnd */ + 1e-7 /* C53 */ }; const struct discrete_comp_adder_table montecar_drone_vol_res = { DISC_COMP_P_RESISTOR, - 0, // no default - 4, // # of resistors - {100250, 47250, 22250, 10250, 0,0,0,0} // R105, R104, R103, R102 (250 added to all for 4066 resistance) + 0, /* no default */ + 4, /* # of resistors */ + {100250, 47250, 22250, 10250, 0,0,0,0} /* R105, R104, R103, R102 (250 added to all for 4066 resistance) */ }; const struct discrete_dac_r1_ladder montecar_bang_dac = { - 4, // size of ladder - {8200, 3900, 2200, 1000, 0,0,0,0}, // R39, R42, R41, R40 - 0, // no vBias - 0, // no rBias - 0, // no rGnd - 0 // no cSmoothing + 4, /* size of ladder */ + {8200, 3900, 2200, 1000, 0,0,0,0}, /* R39, R42, R41, R40 */ + 0, /* no vBias */ + 0, /* no rBias */ + 0, /* no rGnd */ + 0 /* no cSmoothing */ }; const struct discrete_schmitt_osc_desc montecar_screech_osc = { - 2200, // R54 - 330, // R53 - 2.2e-6, // C57 - 1.6, // Rise Threshold of 74LS14 - 0.8, // Fall Threshold of 74LS14 - 3.4, // Output high voltage of 74LS14 + 2200, /* R54 */ + 330, /* R53 */ + 2.2e-6, /* C57 */ + 1.6, /* Rise Threshold of 74LS14 */ + 0.8, /* Fall Threshold of 74LS14 */ + 3.4, /* Output high voltage of 74LS14 */ DISC_SCHMITT_OSC_IN_IS_LOGIC | DISC_SCHMITT_OSC_ENAB_IS_NOR }; const struct discrete_mixer_desc montecar_mixer = { DISC_MIXER_IS_OP_AMP, - 5, // 5 inputs - {15000, 33000, 10000, 10000, 13333.3, 0,0,0}, // R93, R97, R96, variable , R95 + R31||R30||R29 - {0,0,0,NODE_30,0,0,0,0}, // Only drone has variable node - {2.2e-7, 2.2e-7, 2.2e-7, 1e-6, 1e-6, 0,0,0}, // C83, C84, C85, C88, C47 - 27000, // R92 - 82000, // R98 - 0, // No Filter - 2.2e-7, // C6 - 5, // vRef + 5, /* 5 inputs */ + {15000, 33000, 10000, 10000, 13333.3, 0,0,0}, /* R93, R97, R96, variable , R95 + R31||R30||R29 */ + {0,0,0,NODE_30,0,0,0,0}, /* Only drone has variable node */ + {2.2e-7, 2.2e-7, 2.2e-7, 1e-6, 1e-6, 0,0,0}, /* C83, C84, C85, C88, C47 */ + 27000, /* R92 */ + 82000, /* R98 */ + 0, /* No Filter */ + 2.2e-7, /* C6 */ + 5, /* vRef */ 8000 }; /* Nodes - Inputs */ -#define MONTECAR_MOTOR_DATA NODE_01 // Motor1 - Motor4 -#define MONTECAR_DRONE_MOTOR_DATA NODE_02 // Motor5 - Motor8 +#define MONTECAR_MOTOR_DATA NODE_01 /* Motor1 - Motor4 */ +#define MONTECAR_DRONE_MOTOR_DATA NODE_02 /* Motor5 - Motor8 */ #define MONTECAR_CRASH_DATA NODE_03 #define MONTECAR_SKID_EN NODE_04 #define MONTECAR_DRONE_LOUD_DATA NODE_05 @@ -527,9 +527,9 @@ const struct discrete_mixer_desc montecar_mixer = #define MONTECAR_ATTRACT_INV NODE_08 /* Nodes - Sounds */ #define MONTECAR_NOISE NODE_15 -#define MONTECAR_MOTORSND NODE_10 // MotorAud1 +#define MONTECAR_MOTORSND NODE_10 /* MotorAud1 */ #define MONTECAR_BEEPSND NODE_11 -#define MONTECAR_DRONE_MOTORSND NODE_12 // MotorAud2 +#define MONTECAR_DRONE_MOTORSND NODE_12 /* MotorAud2 */ #define MONTECAR_BANGSND NODE_13 #define MONTECAR_SCREECHSND NODE_14 @@ -556,31 +556,31 @@ DISCRETE_SOUND_START(montecar_sound_interface) /* summed as the output of the circuit. */ /************************************************/ DISCRETE_ADJUSTMENT(NODE_20, 1, - 10000, // R87 + R89 @ min - 260000, // R87 + R89 @ max + 10000, /* R87 + R89 @ min */ + 260000, /* R87 + R89 @ max */ DISC_LOGADJ, 8) - DISCRETE_DAC_R1(NODE_21, 1, // base of Q7 - MONTECAR_MOTOR_DATA, // IC H8, pins 5, 2, 9, 6 - 3.4, // TTL ON level + DISCRETE_DAC_R1(NODE_21, 1, /* base of Q7 */ + MONTECAR_MOTOR_DATA, /* IC H8, pins 5, 2, 9, 6 */ + 3.4, /* TTL ON level */ &montecar_motor_v_dac) - DISCRETE_555_CC(NODE_22, 1, // IC C9 pin 9 - NODE_21, // vIn - NODE_20, // current adjust - 1.e-8, // C81 - 1000000, 0, 0, // R86, no rGnd, no rDis + DISCRETE_555_CC(NODE_22, 1, /* IC C9 pin 9 */ + NODE_21, /* vIn */ + NODE_20, /* current adjust */ + 1.e-8, /* C81 */ + 1000000, 0, 0, /* R86, no rGnd, no rDis */ &montecar_motor_vco) - DISCRETE_COUNTER(NODE_23, 1, MONTECAR_ATTRACT_EN, // IC B/C9, QB-QD - NODE_22, // from IC C9, pin 9 - 5, 1, 0, 1) // /6 counter on rising edge - DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") // IC B/C9, pin 8-QD - DISCRETE_TRANSFORM3(NODE_25, 1, NODE_23, 1, 4, "01=02=|") // IC B/C9, pin 11-QB - DISCRETE_LOGIC_XOR(NODE_26, 1, NODE_24, NODE_25) // Gate A9, pin 11 - DISCRETE_COUNTER(NODE_27, 1, MONTECAR_ATTRACT_EN, // IC B/C9, pin 12-QA - NODE_26, // from IC A9, pin 11 - 1, 1, 0, 1) // /2 counter on rising edge - DISCRETE_TRANSFORM5(NODE_28, 1, NODE_27, NODE_25, NODE_24, 2, 4, "13*24*+0+") // Mix the mess together in binary + DISCRETE_COUNTER(NODE_23, 1, MONTECAR_ATTRACT_EN, /* IC B/C9, QB-QD */ + NODE_22, /* from IC C9, pin 9 */ + 5, 1, 0, 1) /* /6 counter on rising edge */ + DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") /* IC B/C9, pin 8-QD */ + DISCRETE_TRANSFORM3(NODE_25, 1, NODE_23, 1, 4, "01=02=|") /* IC B/C9, pin 11-QB */ + DISCRETE_LOGIC_XOR(NODE_26, 1, NODE_24, NODE_25) /* Gate A9, pin 11 */ + DISCRETE_COUNTER(NODE_27, 1, MONTECAR_ATTRACT_EN, /* IC B/C9, pin 12-QA */ + NODE_26, /* from IC A9, pin 11 */ + 1, 1, 0, 1) /* /2 counter on rising edge */ + DISCRETE_TRANSFORM5(NODE_28, 1, NODE_27, NODE_25, NODE_24, 2, 4, "13*24*+0+") /* Mix the mess together in binary */ DISCRETE_DAC_R1(MONTECAR_MOTORSND, 1, NODE_28, - 3.4, // TTL ON level + 3.4, /* TTL ON level */ &montecar_motor_out_dac) /************************************************/ @@ -589,34 +589,34 @@ DISCRETE_SOUND_START(montecar_sound_interface) /* Also I shifted the frequencies up for it to */ /* sound different from the player's car. */ /************************************************/ - DISCRETE_COMP_ADDER(NODE_30, 1, MONTECAR_DRONE_LOUD_DATA, &montecar_drone_vol_res) // make sure to change the node value in the mixer table if you change this node number + DISCRETE_COMP_ADDER(NODE_30, 1, MONTECAR_DRONE_LOUD_DATA, &montecar_drone_vol_res) /* make sure to change the node value in the mixer table if you change this node number */ DISCRETE_ADJUSTMENT(NODE_40, 1, - 10000, // R85 + R88 @ min - 260000, // R85 + R88 @ max + 10000, /* R85 + R88 @ min */ + 260000, /* R85 + R88 @ max */ DISC_LOGADJ, 9) - DISCRETE_DAC_R1(NODE_41, 1, // base of Q7 - MONTECAR_DRONE_MOTOR_DATA, // IC H8, pins 19, 16, 12, 15 - 3.4, // TTL ON level + DISCRETE_DAC_R1(NODE_41, 1, /* base of Q7 */ + MONTECAR_DRONE_MOTOR_DATA, /* IC H8, pins 19, 16, 12, 15 */ + 3.4, /* TTL ON level */ &montecar_motor_v_dac) - DISCRETE_555_CC(NODE_42, 1, // IC C9 pin 5 - NODE_41, // vIn - NODE_40, // current adjust - 1.e-8, // C80 - 1000000, 0, 0, // R81, no rGnd, no rDis + DISCRETE_555_CC(NODE_42, 1, /* IC C9 pin 5 */ + NODE_41, /* vIn */ + NODE_40, /* current adjust */ + 1.e-8, /* C80 */ + 1000000, 0, 0, /* R81, no rGnd, no rDis */ &montecar_motor_vco) - DISCRETE_COUNTER(NODE_43, 1, MONTECAR_ATTRACT_EN, // IC A/B9, QB-QD - NODE_42, // from IC C9, pin 5 - 5, 1, 0, 1) // /6 counter on rising edge - DISCRETE_TRANSFORM2(NODE_44, 1, NODE_43, 2, "01>") // IC A/B9, pin 8-QD - DISCRETE_TRANSFORM3(NODE_45, 1, NODE_43, 1, 4, "01=02=|") // IC A/B9, pin 11-QB - DISCRETE_LOGIC_XOR(NODE_46, 1, NODE_44, NODE_45) // Gate A9, pin 6 - DISCRETE_COUNTER(NODE_47, 1, MONTECAR_ATTRACT_EN, // IC A/B9, pin 12-QA - NODE_46, // from IC A9, pin 6 - 1, 1, 0, 1) // /2 counter on rising edge - DISCRETE_TRANSFORM5(NODE_48, 1, NODE_47, NODE_45, NODE_44, 2, 4, "13*24*+0+") // Mix the mess together in binary + DISCRETE_COUNTER(NODE_43, 1, MONTECAR_ATTRACT_EN, /* IC A/B9, QB-QD */ + NODE_42, /* from IC C9, pin 5 */ + 5, 1, 0, 1) /* /6 counter on rising edge */ + DISCRETE_TRANSFORM2(NODE_44, 1, NODE_43, 2, "01>") /* IC A/B9, pin 8-QD */ + DISCRETE_TRANSFORM3(NODE_45, 1, NODE_43, 1, 4, "01=02=|") /* IC A/B9, pin 11-QB */ + DISCRETE_LOGIC_XOR(NODE_46, 1, NODE_44, NODE_45) /* Gate A9, pin 6 */ + DISCRETE_COUNTER(NODE_47, 1, MONTECAR_ATTRACT_EN, /* IC A/B9, pin 12-QA */ + NODE_46, /* from IC A9, pin 6 */ + 1, 1, 0, 1) /* /2 counter on rising edge */ + DISCRETE_TRANSFORM5(NODE_48, 1, NODE_47, NODE_45, NODE_44, 2, 4, "13*24*+0+") /* Mix the mess together in binary */ DISCRETE_DAC_R1(MONTECAR_DRONE_MOTORSND, 1, NODE_48, - 3.4, // TTL ON level + 3.4, /* TTL ON level */ &montecar_motor_out_dac) /************************************************/ @@ -630,13 +630,13 @@ DISCRETE_SOUND_START(montecar_sound_interface) /* */ /* TO DO: add filtering !!!!!!!!!!!!!!!!!!!!!!! */ /************************************************/ - DISCRETE_LFSR_NOISE(MONTECAR_NOISE, MONTECAR_ATTRACT_INV, MONTECAR_ATTRACT_INV, 15750.0/4, 1.0, 0, 0.5, &firetrk_lfsr) // Same as firetrk + DISCRETE_LFSR_NOISE(MONTECAR_NOISE, MONTECAR_ATTRACT_INV, MONTECAR_ATTRACT_INV, 15750.0/4, 1.0, 0, 0.5, &firetrk_lfsr) /* Same as firetrk */ - DISCRETE_SWITCH(NODE_50, 1, MONTECAR_NOISE, 0, // Enable gate A9 - MONTECAR_CRASH_DATA) // IC J8, pins 3,6,11,14 - DISCRETE_DAC_R1(MONTECAR_BANGSND, 1, // Bang - NODE_50, // from enable gates A9 - 3.4, // TTL ON level + DISCRETE_SWITCH(NODE_50, 1, MONTECAR_NOISE, 0, /* Enable gate A9 */ + MONTECAR_CRASH_DATA) /* IC J8, pins 3,6,11,14 */ + DISCRETE_DAC_R1(MONTECAR_BANGSND, 1, /* Bang */ + NODE_50, /* from enable gates A9 */ + 3.4, /* TTL ON level */ &montecar_bang_dac) /************************************************/ diff --git a/src/sndhrdw/cinemat_sndhrdw.c b/src/sndhrdw/cinemat_sndhrdw.c index 31a14f897..78b4b92f6 100644 --- a/src/sndhrdw/cinemat_sndhrdw.c +++ b/src/sndhrdw/cinemat_sndhrdw.c @@ -198,7 +198,7 @@ void tailg_sound_w(UINT8 sound_val, UINT8 bits_changed) outDiff = outReg ^ OldOutReg; /* get bits that have changed state */ outLow = outDiff & ~outReg; /* get bits that have just gone low */ - //logerror ("xrDiff %d XRreg %d \n",xrDiff,XRreg); + /*logerror ("xrDiff %d XRreg %d \n",xrDiff,XRreg); */ if (outLow & 0x10) { diff --git a/src/sndhrdw/dcs.c b/src/sndhrdw/dcs.c index 2ef890432..fbc3d2bd5 100644 --- a/src/sndhrdw/dcs.c +++ b/src/sndhrdw/dcs.c @@ -15,7 +15,7 @@ #define LOG_BUFFER_FILLING (0) -bool activate_dcs_speedhack = 1; // this is core maintaniers choice to always be active dont change +bool activate_dcs_speedhack = 1; /* this is core maintaniers choice to always be active dont change */ /*************************************************************************** CONSTANTS diff --git a/src/sndhrdw/irem.c b/src/sndhrdw/irem.c index 10f576e84..c4894eda5 100644 --- a/src/sndhrdw/irem.c +++ b/src/sndhrdw/irem.c @@ -96,10 +96,10 @@ static WRITE_HANDLER( irem_analog_w ) if (data > 0) { - if (data & 0x01) sample_start(2, 2, 0); // TR606 - Kick - if (data & 0x02) sample_start(1, 1, 0); // TR606 - Snare - if (data & 0x04) sample_start(3, 3, 0); // TR606 - Open Hat - if (data & 0x08) sample_start(0, 0, 0); // TR606 - Hat + if (data & 0x01) sample_start(2, 2, 0); /* TR606 - Kick */ + if (data & 0x02) sample_start(1, 1, 0); /* TR606 - Snare */ + if (data & 0x04) sample_start(3, 3, 0); /* TR606 - Open Hat */ + if (data & 0x08) sample_start(0, 0, 0); /* TR606 - Hat */ } } diff --git a/src/sndhrdw/triplhnt.c b/src/sndhrdw/triplhnt.c index 68433bcee..e72320d16 100644 --- a/src/sndhrdw/triplhnt.c +++ b/src/sndhrdw/triplhnt.c @@ -42,68 +42,68 @@ const struct discrete_lfsr_desc triplhnt_lfsr={ const struct discrete_dac_r1_ladder triplhnt_bear_roar_v_dac = { - 4, // size of ladder - {1000000, 470000, 220000, 2200000, 0,0,0,0}, // R47, R50, R48, R51 - 5, // vBias - 68000, // R44 - 0, // no rGnd - 0 // no smoothing cap + 4, /* size of ladder */ + {1000000, 470000, 220000, 2200000, 0,0,0,0}, /* R47, R50, R48, R51 */ + 5, /* vBias */ + 68000, /* R44 */ + 0, /* no rGnd */ + 0 /* no smoothing cap */ }; const struct discrete_dac_r1_ladder triplhnt_bear_roar_out_dac = { - 3, // size of ladder - {100000, 33000, 100000, 0,0,0,0,0}, // R56, R58, R57 - 0, // no vBias - 0, // no rBias - 0, // no rGnd - 0 // no smoothing cap + 3, /* size of ladder */ + {100000, 33000, 100000, 0,0,0,0,0}, /* R56, R58, R57 */ + 0, /* no vBias */ + 0, /* no rBias */ + 0, /* no rGnd */ + 0 /* no smoothing cap */ }; const struct discrete_dac_r1_ladder triplhnt_shot_dac = { - 4, // size of ladder - {8200, 3900, 2200, 1000, 0,0,0,0}, // R53, R54, R55, R52 - 0, // no vBias - 0, // no rBias - 0, // no rGnd - 0 // no smoothing cap + 4, /* size of ladder */ + {8200, 3900, 2200, 1000, 0,0,0,0}, /* R53, R54, R55, R52 */ + 0, /* no vBias */ + 0, /* no rBias */ + 0, /* no rGnd */ + 0 /* no smoothing cap */ }; const struct discrete_555_cc_desc triplhnt_bear_roar_vco = { DISC_555_OUT_DC | DISC_555_OUT_SQW, - 5, // B+ voltage of 555 - 5.0 - 1.7, // High output voltage of 555 (Usually v555 - 1.7) - 5.0 * 2 / 3, // threshold - 5.0 /3, // trigger - 5, // B+ voltage of the Constant Current source - 0.7 // Q2 junction voltage + 5, /* B+ voltage of 555 */ + 5.0 - 1.7, /* High output voltage of 555 (Usually v555 - 1.7) */ + 5.0 * 2 / 3, /* threshold */ + 5.0 /3, /* trigger */ + 5, /* B+ voltage of the Constant Current source */ + 0.7 /* Q2 junction voltage */ }; const struct discrete_schmitt_osc_desc triplhnt_screech_osc = { - 2200, // R84 - 330, // R85 - 1.e-6, // C59 - 1.7, // Rise Threshold of 7414 - 0.9, // Fall Threshold of 7414 - 3.4, // Output high voltage of 7414 - 1 // invert output using 7400 gate E7 + 2200, /* R84 */ + 330, /* R85 */ + 1.e-6, /* C59 */ + 1.7, /* Rise Threshold of 7414 */ + 0.9, /* Fall Threshold of 7414 */ + 3.4, /* Output high voltage of 7414 */ + 1 /* invert output using 7400 gate E7 */ }; const struct discrete_mixer_desc triplhnt_mixer = { DISC_MIXER_IS_RESISTOR, - 3, // 3 inputs - {3300 + 19879.5, 47000, 27000 + 545.6, 0,0,0,0,0}, // R59 + (R56||R57||R58), R60 + (R52||R53||R54||R55), R61 - {0,0,0,0,0,0,0,0}, // No variable resistor nodes - {0, 0, 0, 0, 0,0,0,0}, // No caps - 0, // No rI - 1000, // R78 - 1e-7, // C72 - 1e-7, // C44 - 0, // vBias not used for resistor network + 3, /* 3 inputs */ + {3300 + 19879.5, 47000, 27000 + 545.6, 0,0,0,0,0}, /* R59 + (R56||R57||R58), R60 + (R52||R53||R54||R55), R61 */ + {0,0,0,0,0,0,0,0}, /* No variable resistor nodes */ + {0, 0, 0, 0, 0,0,0,0}, /* No caps */ + 0, /* No rI */ + 1000, /* R78 */ + 1e-7, /* C72 */ + 1e-7, /* C44 */ + 0, /* vBias not used for resistor network */ 150000 }; @@ -121,58 +121,58 @@ DISCRETE_SOUND_START(triplhnt_discrete_interface) /* NODE ADDR MASK GAIN OFFSET INIT */ DISCRETE_INPUT(TRIPLHNT_BEAR_ROAR_DATA, 0x00, 0x000f, 15.0) DISCRETE_INPUT(TRIPLHNT_BEAR_EN, 0x01, 0x000f, 1.0) - DISCRETE_INPUT(TRIPLHNT_SHOT_DATA, 0x02, 0x000f, 0.0) // should init to 15 when hooked up + DISCRETE_INPUT(TRIPLHNT_SHOT_DATA, 0x02, 0x000f, 0.0) /* should init to 15 when hooked up */ DISCRETE_INPUT(TRIPLHNT_SCREECH_EN, 0x03, 0x000f, 0.0) DISCRETE_INPUT(TRIPLHNT_LAMP_EN, 0x04, 0x000f, 1.0) /************************************************/ - DISCRETE_LFSR_NOISE(TRIPLHNT_NOISE, // Output A7 pin 13 - TRIPLHNT_LAMP_EN, TRIPLHNT_LAMP_EN, // From gate A8 pin 10 - 12096000.0/2/256, // 256H signal - 3.4, 0, 3.4/2, &triplhnt_lfsr) // TTL voltage level + DISCRETE_LFSR_NOISE(TRIPLHNT_NOISE, /* Output A7 pin 13 */ + TRIPLHNT_LAMP_EN, TRIPLHNT_LAMP_EN, /* From gate A8 pin 10 */ + 12096000.0/2/256, /* 256H signal */ + 3.4, 0, 3.4/2, &triplhnt_lfsr) /* TTL voltage level */ /************************************************/ /* Bear Roar is a VCO with noise mixed in. */ /************************************************/ DISCRETE_ADJUSTMENT(NODE_20, 1, - 10000, // R86 + R88 @ 0 - 260000, // R86 + R88 @ max + 10000, /* R86 + R88 @ 0 */ + 260000, /* R86 + R88 @ max */ DISC_LOGADJ, 10) - DISCRETE_DAC_R1(NODE_21, 1, // base of Q2 - TRIPLHNT_BEAR_ROAR_DATA, // IC B10, Q0-Q3 - 3.4, // TTL ON level + DISCRETE_DAC_R1(NODE_21, 1, /* base of Q2 */ + TRIPLHNT_BEAR_ROAR_DATA, /* IC B10, Q0-Q3 */ + 3.4, /* TTL ON level */ &triplhnt_bear_roar_v_dac) - DISCRETE_555_CC(NODE_22, 1, // IC C11 pin 3, always enabled - NODE_21, // vIn - NODE_20, // current adjust - 1.e-8, // C58 - 0, 390000, 0, // no rBias, R87, no rDis + DISCRETE_555_CC(NODE_22, 1, /* IC C11 pin 3, always enabled */ + NODE_21, /* vIn */ + NODE_20, /* current adjust */ + 1.e-8, /* C58 */ + 0, 390000, 0, /* no rBias, R87, no rDis */ &triplhnt_bear_roar_vco) - DISCRETE_COUNTER(NODE_23, 1, TRIPLHNT_BEAR_EN, // IC B6, QB-QD - NODE_22, // from IC C11, pin 3 - 5, 1, 0, 1) // /6 counter on rising edge - DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") // IC B6, pin 8 - DISCRETE_LOGIC_INVERT(NODE_25, 1, NODE_22) // IC D9, pin 3 - DISCRETE_LOGIC_NAND(NODE_26, 1, NODE_25, TRIPLHNT_NOISE) // IC D9, pin 11 - DISCRETE_LOGIC_XOR(NODE_27, 1, NODE_24, NODE_26) // IC B8, pin 6 - DISCRETE_COUNTER(NODE_28, 1, TRIPLHNT_BEAR_EN, // IC B6, pin 12 - NODE_27, // from IC B8, pin 6 - 1, 1, 0, 1) // /2 counter on rising edge - DISCRETE_TRANSFORM5(NODE_29, 1, NODE_24, NODE_28, NODE_26, 2, 4, "13*24*+0+") // Mix the mess together in binary + DISCRETE_COUNTER(NODE_23, 1, TRIPLHNT_BEAR_EN, /* IC B6, QB-QD */ + NODE_22, /* from IC C11, pin 3 */ + 5, 1, 0, 1) /* /6 counter on rising edge */ + DISCRETE_TRANSFORM2(NODE_24, 1, NODE_23, 2, "01>") /* IC B6, pin 8 */ + DISCRETE_LOGIC_INVERT(NODE_25, 1, NODE_22) /* IC D9, pin 3 */ + DISCRETE_LOGIC_NAND(NODE_26, 1, NODE_25, TRIPLHNT_NOISE) /* IC D9, pin 11 */ + DISCRETE_LOGIC_XOR(NODE_27, 1, NODE_24, NODE_26) /* IC B8, pin 6 */ + DISCRETE_COUNTER(NODE_28, 1, TRIPLHNT_BEAR_EN, /* IC B6, pin 12 */ + NODE_27, /* from IC B8, pin 6 */ + 1, 1, 0, 1) /* /2 counter on rising edge */ + DISCRETE_TRANSFORM5(NODE_29, 1, NODE_24, NODE_28, NODE_26, 2, 4, "13*24*+0+") /* Mix the mess together in binary */ DISCRETE_DAC_R1(TRIPLHNT_BEAR_ROAR_SND, 1, NODE_29, - 3.4, // TTL ON level + 3.4, /* TTL ON level */ &triplhnt_bear_roar_out_dac) /************************************************/ /* Shot is just the noise amplitude modulated */ /* by an R1 DAC. */ /************************************************/ - DISCRETE_SWITCH(NODE_40, 1, // Gate A9, pins 6, 8, 11, 3 - TRIPLHNT_NOISE, // noise enables the data which is then inverted - 1, TRIPLHNT_SHOT_DATA) // the data has been previously inverted for ease of use + DISCRETE_SWITCH(NODE_40, 1, /* Gate A9, pins 6, 8, 11, 3 */ + TRIPLHNT_NOISE, /* noise enables the data which is then inverted */ + 1, TRIPLHNT_SHOT_DATA) /* the data has been previously inverted for ease of use */ DISCRETE_DAC_R1(TRIPLHNT_SHOT_SND, 1, NODE_40, - 3.4, // TTL ON level + 3.4, /* TTL ON level */ &triplhnt_shot_dac) /************************************************/ diff --git a/src/sound/disc_dev.c b/src/sound/disc_dev.c index ea0511a73..b5e179c6b 100644 --- a/src/sound/disc_dev.c +++ b/src/sound/disc_dev.c @@ -17,34 +17,34 @@ struct dsd_555_astbl_context { - int flip_flop; // 555 flip/flop output state - double vCap; // voltage on cap - double step; // time for sampling rate + int flip_flop; /* 555 flip/flop output state */ + double vCap; /* voltage on cap */ + double step; /* time for sampling rate */ double threshold; double trigger; }; struct dsd_555_cc_context { - unsigned int type; // type of 555cc circuit - unsigned int state[2]; // keeps track of excess flip_flop changes during the current step - int flip_flop; // 555 flip/flop output state - double vCap; // voltage on cap - double step; // time for sampling rate + unsigned int type; /* type of 555cc circuit */ + unsigned int state[2]; /* keeps track of excess flip_flop changes during the current step */ + int flip_flop; /* 555 flip/flop output state */ + double vCap; /* voltage on cap */ + double step; /* time for sampling rate */ }; struct dsd_566_context { - unsigned int state[2]; // keeps track of excess flip_flop changes during the current step - int flip_flop; // 566 flip/flop output state - double vCap; // voltage on cap - double step; // time for sampling rate - double vDiff; // voltage difference between vPlus and vNeg - double vSqrLow; // voltage for a squarewave at low - double vSqrHigh; // voltage for a squarewave at high - double thresholdLow; // falling threshold - double thresholdHigh; // rising threshold - double triOffset; // used to shift a triangle to AC + unsigned int state[2]; /* keeps track of excess flip_flop changes during the current step */ + int flip_flop; /* 566 flip/flop output state */ + double vCap; /* voltage on cap */ + double step; /* time for sampling rate */ + double vDiff; /* voltage difference between vPlus and vNeg */ + double vSqrLow; /* voltage for a squarewave at low */ + double vSqrHigh; /* voltage for a squarewave at high */ + double thresholdLow; /* falling threshold */ + double thresholdHigh; /* rising threshold */ + double triOffset; /* used to shift a triangle to AC */ }; @@ -75,10 +75,10 @@ void dsd_555_astbl_step(struct node_description *node) const struct discrete_555_astbl_desc *info = node->custom; struct dsd_555_astbl_context *context = node->context; - double dt; // change in time - double tRC; // RC time constant - double vC; // Current voltage on capacitor, before dt - double vCnext = 0; // Voltage on capacitor, after dt + double dt; /* change in time */ + double tRC; /* RC time constant */ + double vC; /* Current voltage on capacitor, before dt */ + double vCnext = 0; /* Voltage on capacitor, after dt */ if(DSD_555_ASTBL_RESET) { @@ -97,7 +97,7 @@ void dsd_555_astbl_step(struct node_description *node) } /* Calculate future capacitor voltage. - * ref@ http://www.physics.rutgers.edu/ugrad/205/capacitance.html + * ref@ http://www.physics.rutgers.edu/ugrad/205/capacitance.html * The formulas from the ref pages have been modified to reflect that we are stepping the change. * dt = time of sample (1/sample frequency) * VC = Voltage across capacitor @@ -242,18 +242,18 @@ void dsd_555_cc_step(struct node_description *node) const struct discrete_555_cc_desc *info = node->custom; struct dsd_555_cc_context *context = node->context; - double i; // Charging current created by vIn - double rC = 0; // Equivalent charging resistor - double rD = 0; // Equivalent discharging resistor - double vi = 0; // Equivalent voltage from current source - double vB = 0; // Equivalent voltage from bias voltage - double v = 0; // Equivalent voltage total from current source and bias circuit if used - double dt; // change in time - double tRC; // RC time constant - double vC; // Current voltage on capacitor, before dt - double vCnext = 0; // Voltage on capacitor, after dt - double viLimit; // vIn and the junction voltage limit the max charging voltage from i - double rTemp; // play thing + double i; /* Charging current created by vIn */ + double rC = 0; /* Equivalent charging resistor */ + double rD = 0; /* Equivalent discharging resistor */ + double vi = 0; /* Equivalent voltage from current source */ + double vB = 0; /* Equivalent voltage from bias voltage */ + double v = 0; /* Equivalent voltage total from current source and bias circuit if used */ + double dt; /* change in time */ + double tRC; /* RC time constant */ + double vC; /* Current voltage on capacitor, before dt */ + double vCnext = 0; /* Voltage on capacitor, after dt */ + double viLimit; /* vIn and the junction voltage limit the max charging voltage from i */ + double rTemp; /* play thing */ if (DSD_555_CC_RESET) @@ -267,13 +267,13 @@ void dsd_555_cc_step(struct node_description *node) } else { - dt = context->step; // Change in time - vC = context->vCap; // Set to voltage before change - viLimit = DSD_555_CC_VIN + info->vCCjunction; // the max vC can be and still be charged by i + dt = context->step; /* Change in time */ + vC = context->vCap; /* Set to voltage before change */ + viLimit = DSD_555_CC_VIN + info->vCCjunction; /* the max vC can be and still be charged by i */ /* Calculate charging current */ i = (info->vCCsource - viLimit) / DSD_555_CC_R; - switch (context->type) // see dsd_555_cc_reset for descriptions + switch (context->type) /* see dsd_555_cc_reset for descriptions */ { case 1: rD = DSD_555_CC_RDIS; @@ -305,7 +305,7 @@ void dsd_555_cc_step(struct node_description *node) rTemp = DSD_555_CC_RBIAS + DSD_555_CC_RDIS; rC = (rTemp * DSD_555_CC_RGND) / (rTemp + DSD_555_CC_RGND); rTemp += DSD_555_CC_RGND; - rTemp = DSD_555_CC_RGND / rTemp; // now has voltage divider ratio, not resistance + rTemp = DSD_555_CC_RGND / rTemp; /* now has voltage divider ratio, not resistance */ vi = i * DSD_555_CC_RBIAS * rTemp; vB = info->v555 * rTemp; rD = (DSD_555_CC_RGND * DSD_555_CC_RDIS) / (DSD_555_CC_RGND + DSD_555_CC_RDIS); @@ -371,7 +371,7 @@ void dsd_555_cc_step(struct node_description *node) context->state[1] = (context->state[1] + 1) & 0x03; } } - else // Immediate discharge. No change in dt. + else /* Immediate discharge. No change in dt. */ { vC = info->trigger555; context->flip_flop = 1; @@ -427,7 +427,7 @@ void dsd_555_cc_step(struct node_description *node) context->state[1] = (context->state[1] + 1) & 0x03; } } - else // Immediate discharge. No change in dt. + else /* Immediate discharge. No change in dt. */ { vC = info->trigger555; context->flip_flop = 1; @@ -616,15 +616,15 @@ void dsd_566_step(struct node_description *node) const struct discrete_566_desc *info = node->custom; struct dsd_566_context *context = node->context; - double i; // Charging current created by vIn - double dt; // change in time - double vC; // Current voltage on capacitor, before dt - double vCnext = 0; // Voltage on capacitor, after dt + double i; /* Charging current created by vIn */ + double dt; /* change in time */ + double vC; /* Current voltage on capacitor, before dt */ + double vCnext = 0; /* Voltage on capacitor, after dt */ if (DSD_566_ENABLE) { - dt = context->step; // Change in time - vC = context->vCap; // Set to voltage before change + dt = context->step; /* Change in time */ + vC = context->vCap; /* Set to voltage before change */ /* Calculate charging current */ i = (context->vDiff - DSD_566_VMOD) / DSD_566_R; diff --git a/src/sound/disc_flt.c b/src/sound/disc_flt.c index dd45d0d3a..dfc019639 100644 --- a/src/sound/disc_flt.c +++ b/src/sound/disc_flt.c @@ -1,5 +1,5 @@ #include -//fix for android +/*fix for android */ #ifndef PI #define PI 3.14159265358979323846 #endif @@ -42,24 +42,24 @@ struct dss_filter2_context struct dst_op_amp_filt_context { - int type; // What kind of filter - int is_norton; // 1 = Norton op-amps - double rTotal; // All input resistance in parallel. - double iFixed; // Current supplied by rP & rN if used. + int type; /* What kind of filter */ + int is_norton; /* 1 = Norton op-amps */ + double rTotal; /* All input resistance in parallel. */ + double iFixed; /* Current supplied by rP & rN if used. */ double exponentC1; double exponentC2; - double rRatio; // divide ratio of rTotal & rF - double vC1; // Charge on C1 - double vC1b; // Charge on C1, part of C1 charge if needed - double vC2; // Charge on C2 - double vF_last; // Last output voltage relative to vRef. - double gain; // Gain of the filter + double rRatio; /* divide ratio of rTotal & rF */ + double vC1; /* Charge on C1 */ + double vC1b; /* Charge on C1, part of C1 charge if needed */ + double vC2; /* Charge on C2 */ + double vF_last; /* Last output voltage relative to vRef. */ + double gain; /* Gain of the filter */ }; struct dst_rcdisc_context { int state; - double t; // time + double t; /* time */ double step; double exponent0; double exponent1; @@ -318,7 +318,7 @@ void dst_op_amp_filt_step(struct node_description *node) * From here I get lost. */ -// Test stuff +/* Test stuff */ v=1; context->vF_last=-3; /* First we need to work out the passive components. */ @@ -369,10 +369,10 @@ context->vF_last=-3; * v >--/\/\/\----||------' * >>>>>>I2>>>>>> */ - node->output = -((v - context->vC2) / context->rTotal // I1 - + (context->vF_last - context->vC2 - context->vC1b) / info->rF) // I2 + node->output = -((v - context->vC2) / context->rTotal /* I1 */ + + (context->vF_last - context->vC2 - context->vC1b) / info->rF) /* I2 */ * info->rF + info->vRef; -// Test stuff +/* Test stuff */ node->output=context->vC2; break; @@ -402,7 +402,7 @@ void dst_op_amp_filt_reset(struct node_description *node) if (context->type == DISC_OP_AMP_FILTER_IS_BAND_PASS_1M) context->type = DISC_OP_AMP_FILTER_IS_BAND_PASS_1; /* Work out the input resistance. It is all input and bias resistors in parallel. */ - context->rTotal = 1.0 / info->r1; // There has to be an R1. Otherwise the table is wrong. + context->rTotal = 1.0 / info->r1; /* There has to be an R1. Otherwise the table is wrong. */ if (info->r2 != 0) context->rTotal += 1.0 / info->r2; if (info->rP != 0) context->rTotal += 1.0 / info->rP; if (info->rN != 0) context->rTotal += 1.0 / info->rN; diff --git a/src/sound/disc_mth.c b/src/sound/disc_mth.c index f9a69c314..ab64a082b 100644 --- a/src/sound/disc_mth.c +++ b/src/sound/disc_mth.c @@ -35,9 +35,9 @@ struct dst_dac_r1_context { - double iBias; // current of the bias circuit - double exponent; // smoothing curve - double rTotal; // all resistors in parallel + double iBias; /* current of the bias circuit */ + double exponent; /* smoothing curve */ + double rTotal; /* all resistors in parallel */ }; struct dst_dflipflop_context @@ -51,14 +51,14 @@ struct dst_mixer_context { int type; double rTotal; - struct node_description* rNode[DISC_MIXER_MAX_INPS]; // Either pointer to input node OR NULL - double exponent_rc[DISC_MIXER_MAX_INPS]; // For high pass filtering cause by cIn - double vCap[DISC_MIXER_MAX_INPS]; // cap voltage of each input - double exponent_cF; // Low pass on mixed inputs - double exponent_cAmp; // Final high pass caused by out cap and amp input impedance - double vCapF; // cap voltage of cF - double vCapAmp; // cap voltage of cAmp - double gain; // used for DISC_MIXER_IS_OP_AMP_WITH_RI + struct node_description* rNode[DISC_MIXER_MAX_INPS]; /* Either pointer to input node OR NULL */ + double exponent_rc[DISC_MIXER_MAX_INPS]; /* For high pass filtering cause by cIn */ + double vCap[DISC_MIXER_MAX_INPS]; /* cap voltage of each input */ + double exponent_cF; /* Low pass on mixed inputs */ + double exponent_cAmp; /* Final high pass caused by out cap and amp input impedance */ + double vCapF; /* cap voltage of cF */ + double vCapAmp; /* cap voltage of cAmp */ + double gain; /* used for DISC_MIXER_IS_OP_AMP_WITH_RI */ }; struct dst_oneshot_context @@ -164,7 +164,7 @@ void dst_comp_adder_step(struct node_description *node) /************************************************************************/ void dst_clamp_step(struct node_description *node) { -// struct dss_ramp_context *context = node->context; +/* struct dss_ramp_context *context = node->context; */ if(node->input[0]) { @@ -592,7 +592,7 @@ void dst_mixer_step(struct node_description *node) struct dst_mixer_context *context = node->context; double v, vTemp, rTotal, rTemp, rTemp2 = 0; - double i = 0; // total current of inputs + double i = 0; /* total current of inputs */ int bit, connected; if (DSTMIXER_ENABLE) @@ -711,7 +711,7 @@ void dst_mixer_reset(struct node_description *node) if (info->rNode[bit]) { context->type = context->type | DISC_MIXER_HAS_R_NODE; - context->rNode[bit] = discrete_find_node(info->rNode[bit]); // get node pointers + context->rNode[bit] = discrete_find_node(info->rNode[bit]); /* get node pointers */ } else context->rNode[bit] = NULL; @@ -896,7 +896,7 @@ void dst_ramp_step(struct node_description *node) else { context->last_en = 0; - // Disabled so clamp to output + /* Disabled so clamp to output */ node->output=node->input[5]; } } @@ -1013,7 +1013,7 @@ void dst_switch_step(struct node_description *node) double dst_transform_pop(double *stack,int *pointer) { double value; - //decrement THEN read + /*decrement THEN read */ if(*pointer>0) (*pointer)--; value=stack[*pointer]; return value; @@ -1021,7 +1021,7 @@ double dst_transform_pop(double *stack,int *pointer) double dst_transform_push(double *stack,int *pointer,double value) { - //Store THEN increment + /*Store THEN increment */ if(*pointer': // Logical > + case '>': /* Logical > */ number2=dst_transform_pop(trans_stack,&trans_stack_ptr); number1=dst_transform_pop(trans_stack,&trans_stack_ptr); result=number1 > number2; dst_transform_push(trans_stack,&trans_stack_ptr,result); break; - case '<': // Logical < + case '<': /* Logical < */ number2=dst_transform_pop(trans_stack,&trans_stack_ptr); number1=dst_transform_pop(trans_stack,&trans_stack_ptr); result=number1 < number2; dst_transform_push(trans_stack,&trans_stack_ptr,result); break; - case '&': // Bitwise AND + case '&': /* Bitwise AND */ number2=dst_transform_pop(trans_stack,&trans_stack_ptr); number1=dst_transform_pop(trans_stack,&trans_stack_ptr); result=(int)number1 & (int)number2; dst_transform_push(trans_stack,&trans_stack_ptr,result); break; - case '|': // Bitwise OR + case '|': /* Bitwise OR */ number2=dst_transform_pop(trans_stack,&trans_stack_ptr); number1=dst_transform_pop(trans_stack,&trans_stack_ptr); result=(int)number1 | (int)number2; dst_transform_push(trans_stack,&trans_stack_ptr,result); break; - case '^': // Bitwise XOR + case '^': /* Bitwise XOR */ number2=dst_transform_pop(trans_stack,&trans_stack_ptr); number1=dst_transform_pop(trans_stack,&trans_stack_ptr); result=(int)number1 ^ (int)number2; diff --git a/src/sound/disc_wav.c b/src/sound/disc_wav.c index 65434d641..67b6ba216 100644 --- a/src/sound/disc_wav.c +++ b/src/sound/disc_wav.c @@ -1,5 +1,5 @@ #include -//fix for android +/*fix for android */ #ifndef PI #define PI 3.14159265358979323846 #endif @@ -35,14 +35,14 @@ struct dss_adsr_context struct dss_counter_context { - int last; // Last clock state + int last; /* Last clock state */ }; struct dss_counterfix_context { - double sampleStep; // time taken up by 1 audio sample - double tCycle; // time period of selected frequency - double tLeft; // time left sampling current frequency cycle + double sampleStep; /* time taken up by 1 audio sample */ + double tCycle; /* time period of selected frequency */ + double tLeft; /* time left sampling current frequency cycle */ }; struct dss_lfsr_context @@ -60,20 +60,20 @@ struct dss_noise_context struct dss_op_amp_osc_context { - int flip_flop; // flip/flop output state - int flip_flopXOR; // flip_flop ^ flip_flopXOR, 0 = discharge, 1 = charge + int flip_flop; /* flip/flop output state */ + int flip_flopXOR; /* flip_flop ^ flip_flopXOR, 0 = discharge, 1 = charge */ int type; int is_squarewave; - double thresholdLow; // falling threshold - double thresholdHigh; // rising threshold - double iCharge[2]; // charge/discharge currents - double vCap; // current capacitor voltage - double rTotal; // all input resistors in parallel - double iFixed; // fixed current athe the input + double thresholdLow; /* falling threshold */ + double thresholdHigh; /* rising threshold */ + double iCharge[2]; /* charge/discharge currents */ + double vCap; /* current capacitor voltage */ + double rTotal; /* all input resistors in parallel */ + double iFixed; /* fixed current athe the input */ double step; - double temp1; // Multi purpose - double temp2; // Multi purpose - double temp3; // Multi purpose + double temp1; /* Multi purpose */ + double temp2; /* Multi purpose */ + double temp3; /* Multi purpose */ }; struct dss_sawtoothwave_context @@ -84,12 +84,12 @@ struct dss_sawtoothwave_context struct dss_schmitt_osc_context { - double ratioIn; // ratio of total charging voltage that comes from the input - double ratioFeedback; // ratio of total charging voltage that comes from the feedback - double vCap; // current capacitor voltage - double rc; // r*c + double ratioIn; /* ratio of total charging voltage that comes from the input */ + double ratioFeedback; /* ratio of total charging voltage that comes from the feedback */ + double vCap; /* current capacitor voltage */ + double rc; /* r*c */ double exponent; - int state; // state of the ouput + int state; /* state of the ouput */ }; struct dss_sinewave_context @@ -149,7 +149,7 @@ void dss_counter_step(struct node_description *node) if (node->input[6] == clock) { /* Proper edge */ - node->output += node->input[4] ? 1 : -1; // up/down + node->output += node->input[4] ? 1 : -1; /* up/down */ if (node->output < 0) node->output = node->input[3]; if (node->output > node->input[3]) node->output = 0; } @@ -198,7 +198,7 @@ void dss_counterfix_step(struct node_description *node) */ if (node->input[0]) { - node->output += node->input[4] ? 1 : -1; // up/down + node->output += node->input[4] ? 1 : -1; /* up/down */ if (node->output < 0) node->output = node->input[3]; if (node->output > node->input[3]) node->output = 0; } @@ -449,14 +449,14 @@ void dss_op_amp_osc_step(struct node_description *node) struct dss_op_amp_osc_context *context = node->context; - double i; // Charging current created by vIn - double v = 0; // all input voltages mixed - double dt; // change in time - double vC; // Current voltage on capacitor, before dt - double vCnext = 0; // Voltage on capacitor, after dt + double i; /* Charging current created by vIn */ + double v = 0; /* all input voltages mixed */ + double dt; /* change in time */ + double vC; /* Current voltage on capacitor, before dt */ + double vCnext = 0; /* Voltage on capacitor, after dt */ - dt = context->step; // Change in time - vC = context->vCap; // Set to voltage before change + dt = context->step; /* Change in time */ + vC = context->vCap; /* Set to voltage before change */ /* work out the charge currents for the VCOs. */ switch (context->type) @@ -485,7 +485,7 @@ void dss_op_amp_osc_step(struct node_description *node) case DISC_OP_AMP_OSCILLATOR_VCO_1: /* Work out the charge rates. */ - i = DSS_OP_AMP_OSC_VMOD1 * context->temp1; // i is not a current. It is being used as a temp variable. + i = DSS_OP_AMP_OSC_VMOD1 * context->temp1; /* i is not a current. It is being used as a temp variable. */ context->iCharge[0] = (DSS_OP_AMP_OSC_VMOD1 - i) / info->r1; context->iCharge[1] = (i - (DSS_OP_AMP_OSC_VMOD1 * context->temp2)) / context->temp3; break; @@ -534,7 +534,7 @@ void dss_op_amp_osc_step(struct node_description *node) } } } while(dt); -// } while(0); +/* } while(0); */ context->vCap = vCnext; @@ -570,8 +570,8 @@ void dss_op_amp_osc_reset(struct node_description *node) const struct discrete_op_amp_osc_info *info = node->custom; struct dss_op_amp_osc_context *context = node->context; - double i1 = 0; // inverting input current - double i2 = 0; // non-inverting input current + double i1 = 0; /* inverting input current */ + double i2 = 0; /* non-inverting input current */ context->is_squarewave = (info->type & DISC_OP_AMP_OSCILLATOR_OUT_SQW) * (info->vP - OP_AMP_NORTON_VBE); context->type = info->type & DISC_OP_AMP_OSCILLATOR_TYPE_MASK; @@ -630,9 +630,9 @@ void dss_op_amp_osc_reset(struct node_description *node) /* There is no charge on the cap so the schmitt goes high at init. */ context->flip_flop = 1; /* Setup some commonly used stuff */ - context->temp1 = info->r5 / (info->r2 + info->r5); // voltage ratio across r5 - context->temp2 = info->r6 / (info->r1 + info->r6); // voltage ratio across r6 - context->temp3 = 1.0 / (1.0 / info->r1 + 1.0 / info->r6); // input resistance when r6 switched in + context->temp1 = info->r5 / (info->r2 + info->r5); /* voltage ratio across r5 */ + context->temp2 = info->r6 / (info->r1 + info->r6); /* voltage ratio across r6 */ + context->temp3 = 1.0 / (1.0 / info->r1 + 1.0 / info->r6); /* input resistance when r6 switched in */ break; } @@ -1129,7 +1129,7 @@ void dss_trianglewave_reset(struct node_description *node) /************************************************************************/ void dss_adsrenv_step(struct node_description *node) { -// struct dss_adsr_context *context = node->context; +/* struct dss_adsr_context *context = node->context; */ if(node->input[0]) { diff --git a/src/sound/discrete.h b/src/sound/discrete.h index 33d05df8a..c51e8aaf6 100644 --- a/src/sound/discrete.h +++ b/src/sound/discrete.h @@ -1827,14 +1827,14 @@ #define DISC_MIXER_IS_RESISTOR 0 #define DISC_MIXER_IS_OP_AMP 1 -#define DISC_MIXER_IS_OP_AMP_WITH_RI 2 // Used only internally. Use DISC_MIXER_IS_OP_AMP -#define DISC_MIXER_TYPE_MASK 3 // Used only internally. -#define DISC_MIXER_HAS_R_NODE 4 // Used only internally. +#define DISC_MIXER_IS_OP_AMP_WITH_RI 2 /* Used only internally. Use DISC_MIXER_IS_OP_AMP */ +#define DISC_MIXER_TYPE_MASK 3 /* Used only internally. */ +#define DISC_MIXER_HAS_R_NODE 4 /* Used only internally. */ /* Common Op Amp Flags and values */ #define DISC_OP_AMP_IS_NORTON 0x01 -#define OP_AMP_NORTON_VBE 0.5 // This is the norton junction voltage. Used only internally. -#define OP_AMP_VP_RAIL_OFFSET 1.5 // This is how close an op-amp can get to the vP rail. Used only internally. +#define OP_AMP_NORTON_VBE 0.5 /* This is the norton junction voltage. Used only internally. */ +#define OP_AMP_VP_RAIL_OFFSET 1.5 /* This is how close an op-amp can get to the vP rail. Used only internally. */ /* Op Amp Filter Options */ #define DISC_OP_AMP_FILTER_IS_LOW_PASS_1 0x00 @@ -1842,7 +1842,7 @@ #define DISC_OP_AMP_FILTER_IS_BAND_PASS_1 0x20 #define DISC_OP_AMP_FILTER_IS_BAND_PASS_1M 0x30 -#define DISC_OP_AMP_FILTER_TYPE_MASK 0xf0 // Used only internally. +#define DISC_OP_AMP_FILTER_TYPE_MASK 0xf0 /* Used only internally. */ /* Op Amp Oscillator Flags */ #define DISC_OP_AMP_OSCILLATOR_1 0x00 @@ -1850,8 +1850,8 @@ #define DISC_OP_AMP_OSCILLATOR_OUT_CAP 0x00 #define DISC_OP_AMP_OSCILLATOR_OUT_SQW 0x02 -#define DISC_OP_AMP_OSCILLATOR_TYPE_MASK (0xf0 | DISC_OP_AMP_IS_NORTON) // Used only internally. -#define DISC_OP_AMP_OSCILLATOR_VCO_MASK 0x80 // Used only internally. +#define DISC_OP_AMP_OSCILLATOR_TYPE_MASK (0xf0 | DISC_OP_AMP_IS_NORTON) /* Used only internally. */ +#define DISC_OP_AMP_OSCILLATOR_VCO_MASK 0x80 /* Used only internally. */ /* Schmitt Oscillator Options */ #define DISC_SCHMITT_OSC_IN_IS_LOGIC 0x00 @@ -2001,7 +2001,7 @@ struct discrete_op_amp_osc_info double r7; double r8; double c; - double vP; // Op amp B+ + double vP; /* Op amp B+ */ }; struct discrete_schmitt_osc_desc @@ -2009,30 +2009,30 @@ struct discrete_schmitt_osc_desc double rIn; double rFeedback; double c; - double trshRise; // voltage that triggers the gate input to go high (vGate) on rise - double trshFall; // voltage that triggers the gate input to go low (0V) on fall - double vGate; // the ouput high voltage of the gate that gets fedback through rFeedback - int options; // bitmaped options + double trshRise; /* voltage that triggers the gate input to go high (vGate) on rise */ + double trshFall; /* voltage that triggers the gate input to go low (0V) on fall */ + double vGate; /* the ouput high voltage of the gate that gets fedback through rFeedback */ + int options; /* bitmaped options */ }; struct discrete_comp_adder_table { int type; - double cDefault; // Default componet. 0 if not used. + double cDefault; /* Default componet. 0 if not used. */ int length; - double c[DISC_LADDER_MAXRES]; // Componet table + double c[DISC_LADDER_MAXRES]; /* Componet table */ }; struct discrete_dac_r1_ladder { - int ladderLength; // 2 to DISC_LADDER_MAXRES. 1 would be useless. - double r[DISC_LADDER_MAXRES]; // Don't use 0 for valid resistors. That is a short. - double vBias; // Voltage Bias resistor is tied to (0 = not used) - double rBias; // Additional resistor tied to vBias (0 = not used) - double rGnd; // Resistor tied to ground (0 = not used) - double cFilter; // Filtering cap (0 = not used) + int ladderLength; /* 2 to DISC_LADDER_MAXRES. 1 would be useless. */ + double r[DISC_LADDER_MAXRES]; /* Don't use 0 for valid resistors. That is a short. */ + double vBias; /* Voltage Bias resistor is tied to (0 = not used) */ + double rBias; /* Additional resistor tied to vBias (0 = not used) */ + double rGnd; /* Resistor tied to ground (0 = not used) */ + double cFilter; /* Filtering cap (0 = not used) */ }; @@ -2041,15 +2041,15 @@ struct discrete_mixer_desc { int type; int mixerLength; - double r[DISC_MAX_MIXER_INPUTS]; // static input resistance values. These are in series with rNode, if used. - int rNode[DISC_MAX_MIXER_INPUTS]; // variable resistance nodes, if needed. 0 if not used. + double r[DISC_MAX_MIXER_INPUTS]; /* static input resistance values. These are in series with rNode, if used. */ + int rNode[DISC_MAX_MIXER_INPUTS]; /* variable resistance nodes, if needed. 0 if not used. */ double c[DISC_MAX_MIXER_INPUTS]; double rI; double rF; double cF; double cAmp; double vRef; - double gain; // Scale value to get output close to +/- 32767 + double gain; /* Scale value to get output close to +/- 32767 */ }; @@ -2070,31 +2070,31 @@ struct discrete_op_amp_filt_info struct discrete_555_astbl_desc { - int options; // bit mapped options - double v555; // B+ voltage of 555 - double v555high; // High output voltage of 555 (Usually v555 - 1.7) - double threshold555; // normally 2/3 of v555 - double trigger555; // normally 1/3 of v555 + int options; /* bit mapped options */ + double v555; /* B+ voltage of 555 */ + double v555high; /* High output voltage of 555 (Usually v555 - 1.7) */ + double threshold555; /* normally 2/3 of v555 */ + double trigger555; /* normally 1/3 of v555 */ }; struct discrete_555_cc_desc { - int options; // bit mapped options - double v555; // B+ voltage of 555 - double v555high; // High output voltage of 555 (Usually v555 - 1.7) - double threshold555; // normally 2/3 of v555 - double trigger555; // normally 1/3 of v555 - double vCCsource; // B+ voltage of the Constant Current source - double vCCjunction; // The voltage drop of the Constant Current source transitor (0 if Op Amp) + int options; /* bit mapped options */ + double v555; /* B+ voltage of 555 */ + double v555high; /* High output voltage of 555 (Usually v555 - 1.7) */ + double threshold555; /* normally 2/3 of v555 */ + double trigger555; /* normally 1/3 of v555 */ + double vCCsource; /* B+ voltage of the Constant Current source */ + double vCCjunction; /* The voltage drop of the Constant Current source transitor (0 if Op Amp) */ }; struct discrete_566_desc { - int options; // bit mapped options - double vPlus; // B+ voltage of 566 - double vNeg; // B- voltage of 566 + int options; /* bit mapped options */ + double vPlus; /* B+ voltage of 566 */ + double vNeg; /* B- voltage of 566 */ }; @@ -2224,7 +2224,7 @@ enum DST_MIXER, /* Final Mixing Stage */ DST_VCA, /* IC Voltage controlled amplifiers */ DST_VCA_OP_AMP, /* Op Amp Voltage controlled amplifier circuits */ -// DST_DELAY, /* Phase shift/Delay line */ +/* DST_DELAY, Phase shift/Delay line */ /* from disc_flt.c */ /* generic modules */ @@ -2249,7 +2249,7 @@ enum DSD_566, /* NE566 Emulation */ /* Custom */ -// DST_CUSTOM, /* whatever you want someday */ +/* DST_CUSTOM, whatever you want someday */ /* Output Node -- this must be the last entry in this enum! */ DSO_OUTPUT /* The final output node */ diff --git a/src/sound/fm.c b/src/sound/fm.c index cbe98c000..727acd7d7 100644 --- a/src/sound/fm.c +++ b/src/sound/fm.c @@ -307,7 +307,7 @@ O(18),O(18),O(18),O(18),O(18),O(18),O(18),O(18), /* rates 00-11 */ O( 18),O( 18),O( 0),O( 0), -O( 0),O( 0),O( 2),O( 2), // Nemesis's tests +O( 0),O( 0),O( 2),O( 2), /* Nemesis's tests */ O( 0),O( 1),O( 2),O( 3), O( 0),O( 1),O( 2),O( 3), @@ -1342,7 +1342,7 @@ static void advance_eg_channel(FM_OPN *OPN, FM_SLOT *SLOT) out = SLOT->tl + ((UINT32)SLOT->volume); if ((SLOT->ssg&0x08) && (SLOT->ssgn&2) && (SLOT->state != EG_OFF)) /* negate output (changes come from alternate bit, init comes from attack bit) */ - out ^= 511; // was ((1<>2)]; -// log_cb(RETRO_LOG_DEBUG, LOGPRE "FMOPL.C: sin1[%4i]= %4i (tl_tab value=%5i)\n", i, sin_tab[1*SIN_LEN+i], tl_tab[sin_tab[1*SIN_LEN+i]] ); -// log_cb(RETRO_LOG_DEBUG, LOGPRE "FMOPL.C: sin2[%4i]= %4i (tl_tab value=%5i)\n", i, sin_tab[2*SIN_LEN+i], tl_tab[sin_tab[2*SIN_LEN+i]] ); -// log_cb(RETRO_LOG_DEBUG, LOGPRE "FMOPL.C: sin3[%4i]= %4i (tl_tab value=%5i)\n", i, sin_tab[3*SIN_LEN+i], tl_tab[sin_tab[3*SIN_LEN+i]] ); +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "FMOPL.C: sin1[%4i]= %4i (tl_tab value=%5i)\n", i, sin_tab[1*SIN_LEN+i], tl_tab[sin_tab[1*SIN_LEN+i]] ); */ +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "FMOPL.C: sin2[%4i]= %4i (tl_tab value=%5i)\n", i, sin_tab[2*SIN_LEN+i], tl_tab[sin_tab[2*SIN_LEN+i]] ); */ +/* log_cb(RETRO_LOG_DEBUG, LOGPRE "FMOPL.C: sin3[%4i]= %4i (tl_tab value=%5i)\n", i, sin_tab[3*SIN_LEN+i], tl_tab[sin_tab[3*SIN_LEN+i]] ); */ } log_cb(RETRO_LOG_DEBUG, LOGPRE "FMOPL.C: ENV_QUIET= %08x (dec*8=%i)\n", ENV_QUIET, ENV_QUIET*8 ); diff --git a/src/sound/namco.c b/src/sound/namco.c index 1fc1ddc89..5e235e597 100644 --- a/src/sound/namco.c +++ b/src/sound/namco.c @@ -557,10 +557,10 @@ WRITE_HANDLER( polepos_sound_w ) case 0x02: case 0x03: voice->volume[0] = voice->volume[1] = 0; - // front speakers ? + /* front speakers ? */ voice->volume[0] += namco_soundregs[ch * 4 + 0x03] >> 4; voice->volume[1] += namco_soundregs[ch * 4 + 0x03] & 0x0f; - // rear speakers ? + /* rear speakers ? */ voice->volume[0] += namco_soundregs[ch * 4 + 0x23] >> 4; voice->volume[1] += namco_soundregs[ch * 4 + 0x02] >> 4; @@ -596,7 +596,7 @@ WRITE_HANDLER( polepos_sound_w ) */ -WRITE_HANDLER( mappy_sound_enable_w ) //remove this when drivers are updated this is so our old drivers work +WRITE_HANDLER( mappy_sound_enable_w ) /*remove this when drivers are updated this is so our old drivers work */ { sound_enable = offset; } diff --git a/src/sound/namco52.c b/src/sound/namco52.c index f5981618d..35da6ad3f 100644 --- a/src/sound/namco52.c +++ b/src/sound/namco52.c @@ -97,7 +97,7 @@ void namcoio_52XX_write(int data) { data &= 0x0f; -//logerror("%04x: custom 52XX write %02x\n",activecpu_get_pc(),data); +/*logerror("%04x: custom 52XX write %02x\n",activecpu_get_pc(),data); */ if (Machine->sample_rate == 0) return; diff --git a/src/sound/namco54.c b/src/sound/namco54.c index 2e7db28a6..792223352 100644 --- a/src/sound/namco54.c +++ b/src/sound/namco54.c @@ -54,7 +54,7 @@ void namcoio_54XX_write(int data) static UINT8 config1[4],config2[4],config3[5]; -//logerror("%04x: custom 54XX write %02x\n",activecpu_get_pc(),data); +/*logerror("%04x: custom 54XX write %02x\n",activecpu_get_pc(),data); */ if (fetch) { @@ -78,33 +78,33 @@ void namcoio_54XX_write(int data) { switch (data & 0xf0) { - case 0x00: // nop + case 0x00: /* nop */ break; - case 0x10: // output sound on pins 4-7 only + case 0x10: /* output sound on pins 4-7 only */ if (memcmp(config1,"\x40\x00\x02\xdf",4) == 0) - // bosco - // galaga - // xevious + /* bosco */ + /* galaga */ + /* xevious */ sample_start(0, 0, 0); else if (memcmp(config1,"\x10\x00\x80\xff",4) == 0) - // xevious + /* xevious */ sample_start(0, 1, 0); else if (memcmp(config1,"\x80\x80\x01\xff",4) == 0) - // xevious + /* xevious */ sample_start(0, 2, 0); break; - case 0x20: // output sound on pins 8-11 only + case 0x20: /* output sound on pins 8-11 only */ if (memcmp(config2,"\x40\x40\x01\xff",4) == 0) - // xevious + /* xevious */ sample_start(1, 3, 0); else if (memcmp(config2,"\x30\x30\x03\xdf",4) == 0) - // bosco - // galaga + /* bosco */ + /* galaga */ sample_start(1, 1, 0); else if (memcmp(config2,"\x60\x30\x03\x66",4) == 0) - // polepos + /* polepos */ sample_start( 0, 0, 0 ); break; @@ -118,9 +118,9 @@ void namcoio_54XX_write(int data) fetchmode = 2; break; - case 0x50: // output sound on pins 17-20 only + case 0x50: /* output sound on pins 17-20 only */ if (memcmp(config3,"\x08\x04\x21\x00\xf1",5) == 0) - // bosco + /* bosco */ sample_start(2, 2, 0); break; @@ -130,7 +130,7 @@ void namcoio_54XX_write(int data) break; case 0x70: - // polepos + /* polepos */ /* 0x7n = Screech sound. n = pitch (if 0 then no sound) */ /* followed by 0x60 command? */ if (( data & 0x0f ) == 0) diff --git a/src/sound/namcona.c b/src/sound/namcona.c index f1c4e07f0..e701710a0 100644 --- a/src/sound/namcona.c +++ b/src/sound/namcona.c @@ -473,7 +473,7 @@ UpdateSequence( struct sequence *pSequence ) MapArgs( pSequence, bCommon, IgnoreUnknownOp ); break; - case 0x19: // one loop? + case 0x19: /* one loop? */ if (pSequence->count3 == 0) { pSequence->addr = ReadMetaDataWord(pSequence->addr); @@ -486,11 +486,11 @@ UpdateSequence( struct sequence *pSequence ) } break; - case 0x1b: // ? + case 0x1b: /* ? */ pSequence->addr += 2; break; - case 0x1c: // ? + case 0x1c: /* ? */ pSequence->addr += 2; break; @@ -542,7 +542,7 @@ UpdateSequence( struct sequence *pSequence ) break; default: - //printf( "? 0x%x\n", code&0x3f ); + /*printf( "? 0x%x\n", code&0x3f ); */ *pStatus &= 0xff7f; /* clear "sequence-is-playing" flag */ break; } @@ -664,11 +664,11 @@ DumpSampleTable( FILE *f, int table, unsigned char *special ) { fprintf( f, "%04x(%02x): %04x %04x %04x %04x %04x (len=%d)\n", i, (i-iStart)/10, - ReadMetaDataWord(i+0*2), // flags - ReadMetaDataWord(i+1*2), // start - ReadMetaDataWord(i+2*2), // end - ReadMetaDataWord(i+3*2), // loop - ReadMetaDataWord(i+4*2), // freq + ReadMetaDataWord(i+0*2), /* flags */ + ReadMetaDataWord(i+1*2), /* start */ + ReadMetaDataWord(i+2*2), /* end */ + ReadMetaDataWord(i+3*2), /* loop */ + ReadMetaDataWord(i+4*2), /* freq */ ReadMetaDataWord(i+2*2)-ReadMetaDataWord(i+1*2) ); i+=5*2; if( special[i] || special[i+1] ) break; diff --git a/src/sound/samples.c b/src/sound/samples.c index 7afdaf649..d24c1bfee 100644 --- a/src/sound/samples.c +++ b/src/sound/samples.c @@ -29,7 +29,7 @@ void sample_start(int channel,int samplenum,int loop) { if (Machine->samples->sample[samplenum]->b_decoded == 0) { - // Lets decode this sample before playing it. + /* Lets decode this sample before playing it. */ readsample(Machine->samples->sample[samplenum], samplenum, Machine->samples, 1); } @@ -77,7 +77,7 @@ void sample_set_freq(int channel,int freq) mixer_set_sample_frequency(channel + firstchannel,freq); } -// Set sample volume by speaker. +/* Set sample volume by speaker. */ void sample_set_stereo_volume(int channel,int volume_left, int volume_right) { if (Machine->sample_rate == 0) return; @@ -122,14 +122,14 @@ void sample_stop(int channel) mixer_stop_sample(channel + firstchannel); - //respect samples being disabled + /*respect samples being disabled */ if ( !options.use_samples ) return; if ( (!options.use_alt_sound) || (!options.content_flags[CONTENT_ALT_SOUND]) ) return; - if ( ( channel != 0) || (channel !=1) ) return; // return normally if not matching ost channel specs + if ( ( channel != 0) || (channel !=1) ) return; /* return normally if not matching ost channel specs */ if (Machine->samples->sample[c_sample] != NULL) { if (Machine->samples->sample[c_sample]->b_decoded == 1) { - // A non pre loaded sample, lets free from memory. Useful for devices with limited amount of RAM using large sample files. + /* A non pre loaded sample, lets free from memory. Useful for devices with limited amount of RAM using large sample files. */ if (Machine->samples->sample[c_sample]->length > GAME_SAMPLE_LARGE) readsample(Machine->samples->sample[c_sample], c_sample, Machine->samples, 0); diff --git a/src/sound/ymf271.c b/src/sound/ymf271.c index a91c5f95d..24e63a8b7 100644 --- a/src/sound/ymf271.c +++ b/src/sound/ymf271.c @@ -405,10 +405,10 @@ static void ymf271_write_timer(int chipnum, int data) chip->timerA |= data; break; -// case 0x11: -// chip->timerA &= ~0x300; -// chip->timerA |= (data & 0x3)<<8; -// break; +/* case 0x11: */ +/* chip->timerA &= ~0x300; */ +/* chip->timerA |= (data & 0x3)<<8; */ +/* break; */ case 0x12: chip->timerB = data; diff --git a/src/sound/ymf278b.c b/src/sound/ymf278b.c index e2244ce9a..b575afa2f 100644 --- a/src/sound/ymf278b.c +++ b/src/sound/ymf278b.c @@ -277,7 +277,7 @@ static void ymf278b_pcm_update(int num, INT16 **outputs, int length) if(slot->stepptr >= slot->endaddr) { slot->stepptr = slot->stepptr - slot->endaddr + slot->loopaddr; - // If the step is bigger than the loop, finish the sample forcibly + /* If the step is bigger than the loop, finish the sample forcibly */ if(slot->stepptr >= slot->endaddr) { slot->env_vol = 256U<<23; diff --git a/src/usrintrf.c b/src/usrintrf.c index 75874c107..9cb780aae 100644 --- a/src/usrintrf.c +++ b/src/usrintrf.c @@ -2813,7 +2813,7 @@ static int displayhistory (struct mame_bitmap *bitmap, int selected) static char *buf = 0; int maxcols,maxrows; int sel; - int bufsize = 256 * 1024; // 256KB of history.dat buffer, enough for everything + int bufsize = 256 * 1024; /* 256KB of history.dat buffer, enough for everything */ sel = selected - 1; @@ -3043,8 +3043,8 @@ void setup_menu_init(void) { menu_item[menu_total] = ui_getstring (UI_inputgeneral); menu_action[menu_total++] = UI_DEFCODE; menu_item[menu_total] = ui_getstring (UI_inputspecific); menu_action[menu_total++] = UI_CODE; - //menu_item[menu_total] = ui_getstring (UI_flush_current_cfg); menu_action[menu_total++] = UI_FLUSH_CURRENT_CFG; - //menu_item[menu_total] = ui_getstring (UI_flush_all_cfg); menu_action[menu_total++] = UI_FLUSH_ALL_CFG; + /*menu_item[menu_total] = ui_getstring (UI_flush_current_cfg); menu_action[menu_total++] = UI_FLUSH_CURRENT_CFG; */ + /*menu_item[menu_total] = ui_getstring (UI_flush_all_cfg); menu_action[menu_total++] = UI_FLUSH_ALL_CFG; */ } /* Determine if there are any dip switches */ diff --git a/src/vidhrdw/8080bw_vidhrdw.c b/src/vidhrdw/8080bw_vidhrdw.c index 3df033b0b..afd59d830 100644 --- a/src/vidhrdw/8080bw_vidhrdw.c +++ b/src/vidhrdw/8080bw_vidhrdw.c @@ -78,15 +78,15 @@ static void plot_pixel_8080(int x, int y, int col); /* so that overlays are not so contrasted */ #define OVERLAY_RED MAKE_ARGB(0x04,0xff,0x20,0x20) #define OVERLAY_GREEN MAKE_ARGB(0x04,0x20,0xff,0x20) -// Original blue is too dark so is replaced with crayola blue -// https://en.wikipedia.org/wiki/Shades_of_blue#Blue_(Crayola) -//#define OVERLAY_BLUE MAKE_ARGB(0x04,0x20,0x20,0xff) +/* Original blue is too dark so is replaced with crayola blue */ +/* https://en.wikipedia.org/wiki/Shades_of_blue#Blue_(Crayola) */ +/*#define OVERLAY_BLUE MAKE_ARGB(0x04,0x20,0x20,0xff) */ #define OVERLAY_BLUE MAKE_ARGB(0x04,0x1f,0x75,0xfe) #define OVERLAY_YELLOW MAKE_ARGB(0x04,0xff,0xff,0x20) #define OVERLAY_CYAN MAKE_ARGB(0x04,0x20,0xff,0xff) -// Light blue originally used is more purple, so is replaced -// https://en.wikipedia.org/wiki/Shades_of_blue#Light_blue -//#define OVERLAY_LT_BLUE MAKE_ARGB(0x04,0xa0,0xa0,0xff) +/* Light blue originally used is more purple, so is replaced */ +/* https://en.wikipedia.org/wiki/Shades_of_blue#Light_blue */ +/*#define OVERLAY_LT_BLUE MAKE_ARGB(0x04,0xa0,0xa0,0xff) */ #define OVERLAY_LT_BLUE MAKE_ARGB(0x04,0xad,0xd8,0xe6) #define OVERLAY_ORANGE MAKE_ARGB(0x04,0xff,0xa5,0x00) #define OVERLAY_PURPLE MAKE_ARGB(0x04,0xff,0x00,0xff) @@ -106,16 +106,16 @@ static void plot_pixel_8080(int x, int y, int col); /* So I've made a variant to handle this so both players */ /* get the same look from either angle. */ OVERLAY_START( cosmicmo_overlay ) - // Common to both upright and cocktail + /* Common to both upright and cocktail */ OVERLAY_RECT( 0, 0, 40, 224, OVERLAY_YELLOW ) OVERLAY_RECT( 40, 0, 56, 224, OVERLAY_GREEN ) OVERLAY_RECT( 56, 0, 184, 224, OVERLAY_PURPLE ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 216, 0, 240, 224, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 184, 0, 216, 224, OVERLAY_CYAN ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 200, 0, 240, 224, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 184, 0, 200, 224, OVERLAY_GREEN ) OVERLAY_END @@ -153,12 +153,12 @@ OVERLAY_END /* which ensures the same look no matter which side of the */ /* machine the player is on. */ OVERLAY_START( invaders_overlay ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 10, 0, 56, 224, OVERLAY_GREEN ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 0, 18, 8, 134, OVERLAY_GREEN ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 200, 0, 216, 224, OVERLAY_RED ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 0, 0, 32, 224, OVERLAY_GREEN ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 32, 0, 56, 224, OVERLAY_ORANGE ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 56, 0, 96, 224, OVERLAY_BLUE ) @@ -222,7 +222,7 @@ OVERLAY_END /* cocktail varient; just blue and yellow. This is used in cocktail */ /* mode, though cocktail mode implementation is broken currently. */ OVERLAY_START( sstrangr_overlay ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 0, 0, 16, 224, OVERLAY_BLUE ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 16, 0, 40, 224, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 40, 0, 56, 224, OVERLAY_ORANGE ) @@ -232,7 +232,7 @@ OVERLAY_START( sstrangr_overlay ) OVERLAY_RECT_TAG( UPRIGHT_ONLY,216, 68, 240, 148, OVERLAY_GREEN ) OVERLAY_RECT_TAG( UPRIGHT_ONLY,216, 148, 240, 224, OVERLAY_BLUE ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 0, 0, 40, 224, OVERLAY_BLUE ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 40, 0, 200, 224, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( COCKTAIL_ONLY,200, 0, 240, 224, OVERLAY_BLUE ) @@ -246,7 +246,7 @@ OVERLAY_END /* upside down mode. */ /* Also works for ozmawar2, solfight and spaceph. */ OVERLAY_START( ozmawars_overlay ) - // Common to both upright and cocktail + /* Common to both upright and cocktail */ OVERLAY_RECT( 200, 0, 224, 224, OVERLAY_PURPLE ) OVERLAY_RECT( 175, 0, 200, 224, OVERLAY_BLUE ) OVERLAY_RECT( 148, 0, 175, 224, OVERLAY_YELLOW ) @@ -256,7 +256,7 @@ OVERLAY_START( ozmawars_overlay ) OVERLAY_RECT( 32, 0, 56, 224, OVERLAY_ORANGE ) OVERLAY_RECT( 16, 0, 32, 224, OVERLAY_CYAN ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 224, 74, 240, 148, OVERLAY_BLUE ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 224, 148, 240, 224, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 224, 0, 240, 74, OVERLAY_CYAN ) @@ -264,7 +264,7 @@ OVERLAY_START( ozmawars_overlay ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 0, 192, 16, 224, OVERLAY_CYAN ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 0, 144, 16, 192, OVERLAY_PURPLE ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 224, 0, 240, 224, OVERLAY_CYAN ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 0, 0, 16, 224, OVERLAY_PURPLE ) OVERLAY_END @@ -362,21 +362,21 @@ OVERLAY_END /* A slight variant is used in cocktail mode (less colourful */ /* scores. */ OVERLAY_START( galxwars_overlay ) - // Common to both upright and cocktail + /* Common to both upright and cocktail */ OVERLAY_RECT( 184, 0, 224, 224, OVERLAY_CYAN ) OVERLAY_RECT( 144, 0, 184, 224, OVERLAY_PURPLE ) OVERLAY_RECT( 96, 0, 144, 224, OVERLAY_RED ) OVERLAY_RECT( 56, 0, 96, 224, OVERLAY_GREEN ) OVERLAY_RECT( 13, 0, 56, 224, OVERLAY_CYAN ) - // Upright overlay + /* Upright overlay */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 224, 0, 240, 80, OVERLAY_CYAN ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 224, 80, 240, 144, OVERLAY_BLUE ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 224, 144, 240, 224, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 10, 0, 13, 224, OVERLAY_RED ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 0, 0, 10, 224, OVERLAY_CYAN ) - // Cocktail overlay + /* Cocktail overlay */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 224, 0, 240, 224, OVERLAY_CYAN ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 0, 0, 13, 224, OVERLAY_CYAN ) OVERLAY_END @@ -398,16 +398,16 @@ OVERLAY_END /* Can't find any sources for an overlay for cocktail */ /* mode, so a simple one has been added. */ OVERLAY_START( galactic_overlay ) - // Common + /* Common */ OVERLAY_RECT(240, 0, 256, 224, OVERLAY_BLUE ) - // Upright + /* Upright */ OVERLAY_RECT_TAG( UPRIGHT_ONLY, 200, 0, 240, 224, OVERLAY_RED ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 136, 0, 200, 224, OVERLAY_ORANGE ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 48, 0, 136, 224, OVERLAY_YELLOW ) OVERLAY_RECT_TAG( UPRIGHT_ONLY, 0, 0, 48, 224, OVERLAY_GREEN ) - // Cocktail + /* Cocktail */ OVERLAY_RECT_TAG( COCKTAIL_ONLY, 208, 0, 240, 224, OVERLAY_GREEN ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 48, 0, 208, 224, OVERLAY_ORANGE ) OVERLAY_RECT_TAG( COCKTAIL_ONLY, 16, 0, 48, 224, OVERLAY_GREEN ) @@ -1130,12 +1130,12 @@ PALETTE_INIT( sflush ) palette_set_color(i,r,g,b); } - // Original colour used was way too purple. The colour should be a - // medium blue, as confirmed from screen shots here: - // https://flyers.arcade-museum.com/?page=flyer&db=videodb&id=1088&image=1 - // Other colours seem to be more accurate. - //palette_set_color(0,0x80,0x80,0xff); // Too purple - palette_set_color(0,0x1f,0x75,0xfe); // Blue matching OVERLAY_BLUE + /* Original colour used was way too purple. The colour should be a */ + /* medium blue, as confirmed from screen shots here: */ + /* https://flyers.arcade-museum.com/?page=flyer&db=videodb&id=1088&image=1 */ + /* Other colours seem to be more accurate. */ + /*palette_set_color(0,0x80,0x80,0xff); // Too purple */ + palette_set_color(0,0x1f,0x75,0xfe); /* Blue matching OVERLAY_BLUE */ } diff --git a/src/vidhrdw/bankp_vidhrdw.c b/src/vidhrdw/bankp_vidhrdw.c index b668e6382..2ce315471 100644 --- a/src/vidhrdw/bankp_vidhrdw.c +++ b/src/vidhrdw/bankp_vidhrdw.c @@ -204,7 +204,7 @@ VIDEO_UPDATE( bankp ) switch (priority) { case 0: /* combat hawk uses this */ - tilemap_draw(bitmap, &Machine->visible_area, bg_tilemap, TILEMAP_IGNORE_TRANSPARENCY, 0); // just a guess + tilemap_draw(bitmap, &Machine->visible_area, bg_tilemap, TILEMAP_IGNORE_TRANSPARENCY, 0); /* just a guess */ tilemap_draw(bitmap, &Machine->visible_area, fg_tilemap, 0, 0); break; case 1: @@ -216,7 +216,7 @@ VIDEO_UPDATE( bankp ) tilemap_draw(bitmap, &Machine->visible_area, bg_tilemap, 0, 0); break; case 3: - tilemap_draw(bitmap, &Machine->visible_area, fg_tilemap, TILEMAP_IGNORE_TRANSPARENCY, 0); // just a guess + tilemap_draw(bitmap, &Machine->visible_area, fg_tilemap, TILEMAP_IGNORE_TRANSPARENCY, 0); /* just a guess */ tilemap_draw(bitmap, &Machine->visible_area, bg_tilemap, 0, 0); break; } diff --git a/src/vidhrdw/bosco_vidhrdw.c b/src/vidhrdw/bosco_vidhrdw.c index e78324bba..b89ab031d 100644 --- a/src/vidhrdw/bosco_vidhrdw.c +++ b/src/vidhrdw/bosco_vidhrdw.c @@ -102,7 +102,7 @@ PALETTE_INIT( bosco ) for (i = 0;i < 4;i++) { COLOR(2,i) = 31-i; - COLOR(2,i+4) = 0; // transparent + COLOR(2,i+4) = 0; /* transparent */ } /* now the stars */ diff --git a/src/vidhrdw/digdug_vidhrdw.c b/src/vidhrdw/digdug_vidhrdw.c index 3ec0f0d83..77792f0ea 100644 --- a/src/vidhrdw/digdug_vidhrdw.c +++ b/src/vidhrdw/digdug_vidhrdw.c @@ -329,7 +329,7 @@ static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cl int sprite = spriteram[offs]; int color = spriteram[offs+1] & 0x3f; int sx = spriteram_2[offs+1] - 40+1; - int sy = 256 - spriteram_2[offs] + 1; // sprites are buffered and delayed by one scanline + int sy = 256 - spriteram_2[offs] + 1; /* sprites are buffered and delayed by one scanline */ int flipx = (spriteram_3[offs] & 0x01); int flipy = (spriteram_3[offs] & 0x02) >> 1; int size = (sprite & 0x80) >> 7; @@ -345,7 +345,7 @@ static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cl } sy -= 16 * size; - sy = (sy & 0xff) - 32; // fix wraparound + sy = (sy & 0xff) - 32; /* fix wraparound */ for (y = 0;y <= size;y++) { diff --git a/src/vidhrdw/dkong_vidhrdw.c b/src/vidhrdw/dkong_vidhrdw.c index 9d1ee43c9..e127c025c 100644 --- a/src/vidhrdw/dkong_vidhrdw.c +++ b/src/vidhrdw/dkong_vidhrdw.c @@ -189,7 +189,7 @@ static const res_net_info dkong3_net_info = darlington. The blue channel has a pulldown resistor (R8, 0M15) as well. */ -#define TRS_J1 (1) // (1) = Closed (0) = Open +#define TRS_J1 (1) /* (1) = Closed (0) = Open */ static const res_net_info radarscp_net_info = { @@ -305,9 +305,9 @@ PALETTE_INIT( radarscp ) color_prom++; } - // Now treat tri-state black background generation + /* Now treat tri-state black background generation */ for (i = 0; i < 256; i++) - if ((/*m_vidhw != DKONG_RADARSCP_CONVERSION*/ 1) && ((i & 0x03) == 0x00)) // NOR => CS=1 => Tristate => real black + if ((/*m_vidhw != DKONG_RADARSCP_CONVERSION*/ 1) && ((i & 0x03) == 0x00)) /* NOR => CS=1 => Tristate => real black */ { r = compute_res_net(1, 0, &radarscp_net_bck_info); g = compute_res_net(1, 1, &radarscp_net_bck_info); @@ -315,13 +315,13 @@ PALETTE_INIT( radarscp ) palette_set_color(i,r,g,b); } - // Star color + /* Star color */ palette_set_color(RADARSCP_STAR_COL, compute_res_net(1, 0, &radarscp_stars_net_info), compute_res_net(0, 1, &radarscp_stars_net_info), compute_res_net(0, 2, &radarscp_stars_net_info)); - // Oscillating background + /* Oscillating background */ for (i = 0; i < 256; i++) { r = compute_res_net(0, 0, &radarscp_blue_net_info); @@ -331,7 +331,7 @@ PALETTE_INIT( radarscp ) palette_set_color(RADARSCP_BCK_COL_OFFSET + i, r, g, b); } - // Grid + /* Grid */ for (i = 0; i < 8; i++) { r = compute_res_net(BIT(i, 0), 0, &radarscp_grid_net_info); @@ -344,8 +344,8 @@ PALETTE_INIT( radarscp ) palette_normalize_range(0, RADARSCP_GRID_COL_OFFSET+7, 0, 255); color_prom += 256; - // color_prom now points to the beginning of the character color codes - color_codes = color_prom; // we'll need it later + /* color_prom now points to the beginning of the character color codes */ + color_codes = color_prom; /* we'll need it later */ } /*************************************************************************** @@ -670,13 +670,13 @@ void radarscp_step(int line_cnt) vo = (vg3 - vc17); vo = vo + 20.0 / (20.0+10.0) * 5; - // Transistor is marked as OMIT in TRS-02 schems. - //vo = vo - 0.7; + /* Transistor is marked as OMIT in TRS-02 schems. */ + /*vo = vo - 0.7; */ - //double vo = (vg3o - vg3)/4.7 + 5.0/16.0; - //vo = vo / (1.0 / 4.7 + 1.0 / 16.0 + 1.0 / 30.0 ); - //printf("%f %f\n", vg3, vc17); + /*double vo = (vg3o - vg3)/4.7 + 5.0/16.0; */ + /*vo = vo / (1.0 / 4.7 + 1.0 / 16.0 + 1.0 / 30.0 ); */ + /*printf("%f %f\n", vg3, vc17); */ blue_level = (int)(vo/5.0*255); /* printf("%d\n", m_blue_level); */ @@ -818,7 +818,7 @@ VIDEO_UPDATE( radarscp ) tilemap_draw(bitmap, &Machine->visible_area, bg_tilemap, 0, 0); draw_sprites(bitmap, 0x40, 1); - //for (i=VTOTAL; i > 0; i--) + /*for (i=VTOTAL; i > 0; i--) */ for (i=0; i < VTOTAL; i++) radarscp_scanline(i); diff --git a/src/vidhrdw/gaelco2_vidhrdw.c b/src/vidhrdw/gaelco2_vidhrdw.c index dd1bc2ec8..b2dca5407 100644 --- a/src/vidhrdw/gaelco2_vidhrdw.c +++ b/src/vidhrdw/gaelco2_vidhrdw.c @@ -539,7 +539,7 @@ VIDEO_UPDATE( gaelco2_dual ) { int i; - int xoff0 = 0x14; // intro scenes align better with 0x13, but test screen is definitely 0x14 + int xoff0 = 0x14; /* intro scenes align better with 0x13, but test screen is definitely 0x14 */ int xoff1 = xoff0 - 4; int yoff0 = 0x01; int yoff1 = 0x01; @@ -592,7 +592,7 @@ VIDEO_UPDATE( gaelco2_dual ) { int i; - int xoff0 = 0x14; // intro scenes align better with 0x13, but test screen is definitely 0x14 + int xoff0 = 0x14; /* intro scenes align better with 0x13, but test screen is definitely 0x14 */ int xoff1 = xoff0 - 4; int yoff0 = 0x01; int yoff1 = 0x01; diff --git a/src/vidhrdw/galaga_vidhrdw.c b/src/vidhrdw/galaga_vidhrdw.c index da3e19faa..eed0ab22e 100644 --- a/src/vidhrdw/galaga_vidhrdw.c +++ b/src/vidhrdw/galaga_vidhrdw.c @@ -68,7 +68,7 @@ struct star }; static struct star stars[MAX_STARS]; static int total_stars; -static int galaga_gfxbank; // used by catsbee +static int galaga_gfxbank; /* used by catsbee */ static struct tilemap *tx_tilemap; @@ -309,7 +309,7 @@ static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cl int sprite = spriteram[offs] & 0x7f; int color = spriteram[offs+1] & 0x3f; int sx = spriteram_2[offs+1] - 40 + 0x100*(spriteram_3[offs+1] & 3); - int sy = 256 - spriteram_2[offs] + 1; // sprites are buffered and delayed by one scanline + int sy = 256 - spriteram_2[offs] + 1; /* sprites are buffered and delayed by one scanline */ int flipx = (spriteram_3[offs] & 0x01); int flipy = (spriteram_3[offs] & 0x02) >> 1; int sizex = (spriteram_3[offs] & 0x04) >> 2; @@ -323,7 +323,7 @@ static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cl } sy -= 16 * sizey; - sy = (sy & 0xff) - 32; // fix wraparound + sy = (sy & 0xff) - 32; /* fix wraparound */ for (y = 0;y <= sizey;y++) { diff --git a/src/vidhrdw/gaplus_vidhrdw.c b/src/vidhrdw/gaplus_vidhrdw.c index 9b80268fb..1c5f85b62 100644 --- a/src/vidhrdw/gaplus_vidhrdw.c +++ b/src/vidhrdw/gaplus_vidhrdw.c @@ -308,7 +308,7 @@ static void gaplus_draw_sprites( struct mame_bitmap *bitmap, const struct rectan } sy -= 16 * sizey; - sy = (sy & 0xff) - 32; // fix wraparound + sy = (sy & 0xff) - 32; /* fix wraparound */ for (y = 0;y <= sizey;y++) { diff --git a/src/vidhrdw/geebee_vidhrdw.c b/src/vidhrdw/geebee_vidhrdw.c index 7f421323e..6f454881b 100644 --- a/src/vidhrdw/geebee_vidhrdw.c +++ b/src/vidhrdw/geebee_vidhrdw.c @@ -108,7 +108,7 @@ VIDEO_START( kaitein ) if( video_start_generic() ) return 1; - // No change in overlay, as this is always in cocktail mode + /* No change in overlay, as this is always in cocktail mode */ artwork_show(COCKTAIL_ONLY, true); artwork_show(UPRIGHT_ONLY, false); diff --git a/src/vidhrdw/ladybug_vidhrdw.c b/src/vidhrdw/ladybug_vidhrdw.c index 8c4688f6a..a9e7e9de3 100644 --- a/src/vidhrdw/ladybug_vidhrdw.c +++ b/src/vidhrdw/ladybug_vidhrdw.c @@ -251,7 +251,7 @@ WRITE_HANDLER( ladybug_flipscreen_w ) } } -//////////////////////////////////////////////// +/*////////////////////////////////////////////// */ /* All this should probably go somewhere else */ /* Sound comm between CPU's */ @@ -322,7 +322,7 @@ WRITE_HANDLER( sraider_misc_w ) } } -//////////////////////////////////////////////////// +/*////////////////////////////////////////////////// */ static UINT8 gridline[256]; diff --git a/src/vidhrdw/m90_vidhrdw.c b/src/vidhrdw/m90_vidhrdw.c index 470fb0991..f6a27f360 100644 --- a/src/vidhrdw/m90_vidhrdw.c +++ b/src/vidhrdw/m90_vidhrdw.c @@ -254,7 +254,7 @@ VIDEO_UPDATE( m90 ) if (pf2_enable) { - // use the playfield 2 y-offset table for each scanline + /* use the playfield 2 y-offset table for each scanline */ if (m90_video_control_data[0xc] & 0x40) { int line; @@ -293,7 +293,7 @@ VIDEO_UPDATE( m90 ) if (pf1_enable) { - // use the playfield 1 y-offset table for each scanline + /* use the playfield 1 y-offset table for each scanline */ if (m90_video_control_data[0xa] & 0x40) { int line; diff --git a/src/vidhrdw/mappy_vidhrdw.c b/src/vidhrdw/mappy_vidhrdw.c index fab1674a2..7bbbbfa7b 100644 --- a/src/vidhrdw/mappy_vidhrdw.c +++ b/src/vidhrdw/mappy_vidhrdw.c @@ -195,7 +195,7 @@ static UINT32 mappy_tilemap_scan(UINT32 col,UINT32 row,UINT32 num_cols,UINT32 nu mapping from logical to hardware coordinates, which is true to the hardware. Not doing it that way would cause missing tiles in motos and todruaga */ if (row & 0x20) - offs = 0x7ff; // outside visible area + offs = 0x7ff; /* outside visible area */ else offs = ((row + 2) & 0x0f) + (row & 0x10) + ((col & 3) << 5) + 0x780; } @@ -384,7 +384,7 @@ void mappy_draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cli int sprite = spriteram[offs]; int color = spriteram[offs+1]; int sx = spriteram_2[offs+1] + 0x100 * (spriteram_3[offs+1] & 1) - 40 + xoffs; - int sy = 256 - spriteram_2[offs] + yoffs + 1; // sprites are buffered and delayed by one scanline + int sy = 256 - spriteram_2[offs] + yoffs + 1; /* sprites are buffered and delayed by one scanline */ int flipx = (spriteram_3[offs] & 0x01); int flipy = (spriteram_3[offs] & 0x02) >> 1; int sizex = (spriteram_3[offs] & 0x04) >> 2; @@ -401,7 +401,7 @@ void mappy_draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cli } sy -= 16 * sizey; - sy = (sy & 0xff) - 32; // fix wraparound + sy = (sy & 0xff) - 32; /* fix wraparound */ for (y = 0;y <= sizey;y++) { @@ -454,7 +454,7 @@ static void phozon_draw_sprites( struct mame_bitmap *bitmap, const struct rectan } sy -= 8 * sizey; - sy = (sy & 0xff) - 32; // fix wraparound + sy = (sy & 0xff) - 32; /* fix wraparound */ for (y = 0;y <= sizey;y++) { diff --git a/src/vidhrdw/mario_vidhrdw.c b/src/vidhrdw/mario_vidhrdw.c index c95e47dcc..11fc40efb 100644 --- a/src/vidhrdw/mario_vidhrdw.c +++ b/src/vidhrdw/mario_vidhrdw.c @@ -16,13 +16,13 @@ static struct tilemap *bg_tilemap; static const res_net_decode_info mario_decode_info = { - 1, // there may be two proms needed to construct color - 0, // start at 0 - 255, // end at 255 - // R, G, B - { 0, 0, 0}, // offsets - { 5, 2, 0}, // shifts - {0x07,0x07,0x03} // masks + 1, /* there may be two proms needed to construct color */ + 0, /* start at 0 */ + 255, /* end at 255 */ + /* R, G, B */ + { 0, 0, 0}, /* offsets */ + { 5, 2, 0}, /* shifts */ + {0x07,0x07,0x03} /* masks */ }; static const res_net_info mario_net_info = @@ -31,7 +31,7 @@ static const res_net_info mario_net_info = { { RES_NET_AMP_DARLINGTON, 470, 0, 3, { 1000, 470, 220 } }, { RES_NET_AMP_DARLINGTON, 470, 0, 3, { 1000, 470, 220 } }, - { RES_NET_AMP_EMITTER, 680, 0, 2, { 470, 220, 0 } } // dkong + { RES_NET_AMP_EMITTER, 680, 0, 2, { 470, 220, 0 } } /* dkong */ } }; @@ -41,7 +41,7 @@ static const res_net_info mario_net_info_std = { { RES_NET_AMP_DARLINGTON, 470, 0, 3, { 1000, 470, 220 } }, { RES_NET_AMP_DARLINGTON, 470, 0, 3, { 1000, 470, 220 } }, - { RES_NET_AMP_EMITTER, 680, 0, 2, { 470, 220, 0 } } // dkong + { RES_NET_AMP_EMITTER, 680, 0, 2, { 470, 220, 0 } } /* dkong */ } }; @@ -118,7 +118,7 @@ static void get_bg_tile_info(int tile_index) int color = ((videoram[tile_index] >> 2) & 0x38) | 0x40 | (palette_bank<<7) | (monitor<<8); color = color >> 2; -// int color = (videoram[tile_index] >> 5) + 8 * palette_bank; +/* int color = (videoram[tile_index] >> 5) + 8 * palette_bank; */ SET_TILE_INFO(0, code, color, 0) } @@ -155,7 +155,7 @@ static void mario_draw_sprites( struct mame_bitmap *bitmap ) VIDEO_UPDATE( mario ) { - //tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); + /*tilemap_mark_all_tiles_dirty(ALL_TILEMAPS); */ tilemap_draw(bitmap, &Machine->visible_area, bg_tilemap, 0, 0); mario_draw_sprites(bitmap); diff --git a/src/vidhrdw/model1_vidhrdw.c b/src/vidhrdw/model1_vidhrdw.c index 4ee9ae6c3..51a932257 100644 --- a/src/vidhrdw/model1_vidhrdw.c +++ b/src/vidhrdw/model1_vidhrdw.c @@ -18,7 +18,7 @@ UINT16 *model1_color_xlat; static UINT16 listctl[2]; static UINT16 *glist; -// Model 1 geometrizer TGP and rasterizer simulation +/* Model 1 geometrizer TGP and rasterizer simulation */ enum { FRAC_SHIFT = 16 }; static int render_done; @@ -488,21 +488,21 @@ static UINT16 scale_color(UINT16 color, float level) return (r<<10)|(g<<5)|b; } -// xe = xc + (x/z * zm + tx) -// xe < x1 => xc + (x/z * zm + tx) < x1 -// => x/z < (x1-xc-tx)/zm -// => x < z*(x1-xc-tx)/zm +/* xe = xc + (x/z * zm + tx) */ +/* xe < x1 => xc + (x/z * zm + tx) < x1 */ +/* => x/z < (x1-xc-tx)/zm */ +/* => x < z*(x1-xc-tx)/zm */ -// ye = yc - (y/z * zm + ty) -// ye < y1 => yc - (y/z * zm + ty) < y1 -// => -y/z < (y1-yc+ty)/zm -// => y > -z*(y1-yc+ty)/zm +/* ye = yc - (y/z * zm + ty) */ +/* ye < y1 => yc - (y/z * zm + ty) < y1 */ +/* => -y/z < (y1-yc+ty)/zm */ +/* => y > -z*(y1-yc+ty)/zm */ -// xf = zf*a -// xx = x1*t+x2(1-t); zz = z1*t+z2(1-t) -// => x1*t+x2(1-t) = z1*t*a+z2*(1-t)*a -// => t*(x1-x2+a*(z2-z1) = -x2+a*z2 -// => t = (z2*a-x2)/((z2-z1)*a-(x2-x1)) +/* xf = zf*a */ +/* xx = x1*t+x2(1-t); zz = z1*t+z2(1-t) */ +/* => x1*t+x2(1-t) = z1*t*a+z2*(1-t)*a */ +/* => t*(x1-x2+a*(z2-z1) = -x2+a*z2 */ +/* => t = (z2*a-x2)/((z2-z1)*a-(x2-x1)) */ static void recompute_frustrum(void) { @@ -623,7 +623,7 @@ static void fclip_push_quad(int level, struct quad *q) logerror(" (%f, %f, %f, %d)", q->p[i]->x, q->p[i]->y, q->p[i]->z, is_out[i]); logerror("\n"); - // No clipping + /* No clipping */ if(!is_out[0] && !is_out[1] && !is_out[2] && !is_out[3]) { fclip_push_quad(level+1, q); return; @@ -631,11 +631,11 @@ static void fclip_push_quad(int level, struct quad *q) fclip_point = clipfn[level].clip; - // Full clipping + /* Full clipping */ if(is_out[0] && is_out[1] && is_out[2] && is_out[3]) return; - // Find n so that point n is clipped and n-1 isn't + /* Find n so that point n is clipped and n-1 isn't */ for(i=0; i<4; i++) if(is_out[i] && !is_out[(i-1)&3]) break; @@ -645,22 +645,22 @@ static void fclip_push_quad(int level, struct quad *q) is_out2[j] = is_out[(i+j)&3]; } - // At this point, pt[0] is clipped out and pt[3] isn't. Test for the 4 possible cases + /* At this point, pt[0] is clipped out and pt[3] isn't. Test for the 4 possible cases */ if(is_out2[1]) if(is_out2[2]) { - // pt 0,1,2 clipped out, one triangle left + /* pt 0,1,2 clipped out, one triangle left */ pi1 = fclip_point(pt[2], pt[3]); pi2 = fclip_point(pt[3], pt[0]); fclip_push_quad_next(level, q, pi1, pt[3], pi2, pi2); } else { - // pt 0,1 clipped out, one quad left + /* pt 0,1 clipped out, one quad left */ pi1 = fclip_point(pt[1], pt[2]); pi2 = fclip_point(pt[3], pt[0]); fclip_push_quad_next(level, q, pi1, pt[2], pt[3], pi2); } else if(is_out2[2]) { - // pt 0,2 clipped out, shouldn't happen, two triangles + /* pt 0,2 clipped out, shouldn't happen, two triangles */ pi1 = fclip_point(pt[0], pt[1]); pi2 = fclip_point(pt[1], pt[2]); fclip_push_quad_next(level, q, pi1, pt[1], pi2, pi2); @@ -668,7 +668,7 @@ static void fclip_push_quad(int level, struct quad *q) pi2 = fclip_point(pt[3], pt[0]); fclip_push_quad_next(level, q, pi1, pt[3], pi2, pi2); } else { - // pt 0 clipped out, one decagon left, split in quad+tri + /* pt 0 clipped out, one decagon left, split in quad+tri */ pi1 = fclip_point(pt[0], pt[1]); pi2 = fclip_point(pt[3], pt[0]); fclip_push_quad_next(level, q, pi1, pt[1], pt[2], pt[3]); @@ -709,7 +709,7 @@ static float compute_specular(struct vector *normal, struct vector *light,float int i; float sv=lightparams[lmode].s; - //This is how it should be according to model2 geo program, but doesn't work fine + /*This is how it should be according to model2 geo program, but doesn't work fine */ s=2*(diffuse*normal->z-light->z); for(i=0;i>0x0)&0x1f; int g=(color>>0x5)&0x1f; int b=(color>>0xA)&0x1f; - lumval>>=2; //there must be a luma translation table somewhere + lumval>>=2; /*there must be a luma translation table somewhere */ if(lumval>0x3f) lumval=0x3f; r=(model1_color_xlat[(r<<8)|lumval|0x0]>>3)&0x1f; @@ -963,8 +963,8 @@ static UINT16 *push_direct(UINT16 *list) old_p0->x, old_p0->y, old_p0->z, old_p1->x, old_p1->y, old_p1->z); -// transform_point(old_p0); -// transform_point(old_p1); +/* transform_point(old_p0); */ +/* transform_point(old_p1); */ if(old_p0->z > 0) project_point_direct(old_p0); else @@ -986,9 +986,9 @@ static UINT16 *push_direct(UINT16 *list) if(flags & 0x00001000) tex_adr ++; - // list+2 is luminosity - // list+4 is 0? - // list+12 is z? + /* list+2 is luminosity */ + /* list+4 is 0? */ + /* list+12 is z? */ p0 = pointpt++; p1 = pointpt++; @@ -1023,8 +1023,8 @@ static UINT16 *push_direct(UINT16 *list) link = (flags >> 8) & 3; -// transform_point(p0); -// transform_point(p1); +/* transform_point(p0); */ +/* transform_point(p1); */ if(p0->z > 0) project_point_direct(p0); if(p1->z > 0) @@ -1060,7 +1060,7 @@ static UINT16 *push_direct(UINT16 *list) int r=(color>>0x0)&0x1f; int g=(color>>0x5)&0x1f; int b=(color>>0xA)&0x1f; - lumval>>=2; //there must be a luma translation table somewhere + lumval>>=2; /*there must be a luma translation table somewhere */ if(lumval>0x3f) lumval=0x3f; r=(model1_color_xlat[(r<<8)|lumval|0x0]>>3)&0x1f; @@ -1068,7 +1068,7 @@ static UINT16 *push_direct(UINT16 *list) b=(model1_color_xlat[(b<<8)|lumval|0x4000]>>3)&0x1f; cquad.col=(r<<10)|(g<<5)|(b<<0); } - //cquad.col = scale_color(Machine->pens[0x1000|(tgp_ram[tex_adr-0x40000] & 0x3ff)],((float) (lum>>24)) / 128.0); + /*cquad.col = scale_color(Machine->pens[0x1000|(tgp_ram[tex_adr-0x40000] & 0x3ff)],((float) (lum>>24)) / 128.0); */ if(flags & 0x00002000) cquad.col |= MOIRE; @@ -1197,12 +1197,12 @@ static void tgp_render(struct mame_bitmap *bitmap, const struct rectangle *clipr list += 2; break; case 1: - // 1 = plane 1 - // 2 = ?? draw object (413d3, 17c4c, e) - // 3 = plane 2 - // 4 = ?? draw object (408a8, a479, 9) - // 5 = decor - // 6 = ?? draw object (57bd4, 387460, 2ad) + /* 1 = plane 1 */ + /* 2 = ?? draw object (413d3, 17c4c, e) */ + /* 3 = plane 2 */ + /* 4 = ?? draw object (408a8, a479, 9) */ + /* 5 = decor */ + /* 6 = ?? draw object (57bd4, 387460, 2ad) */ if(1 || zz >= 666) push_object(readi(list+2), readi(list+4), readi(list+6)); @@ -1345,7 +1345,7 @@ static void tgp_scan(void) #endif if(!render_done && (listctl[1] & 0x1f) == 0x1f) { UINT16 *list = get_list(); - // Skip everything but the data uploads + /* Skip everything but the data uploads */ logerror("VIDEO: scan list %d\n", get_list_number()); for(;;) { int type = (list[1]<<16)|list[0]; @@ -1388,7 +1388,7 @@ static void tgp_scan(void) int adr = readi(list+2); int len = readi(list+4); int i; - //logerror("VIDEO: upload data, adr=%x, len=%x\n", adr, len); + /*logerror("VIDEO: upload data, adr=%x, len=%x\n", adr, len); */ for(i=0;i>8)&0xff))/255.0; lightparams[i+adr].s=((float) ((v>>16)&0xff))/255.0; lightparams[i+adr].p=(v>>24)&0xff; - //logerror(" %02X\n",v); + /*logerror(" %02X\n",v); */ } list += 6+len*2; break; diff --git a/src/vidhrdw/polepos_vidhrdw.c b/src/vidhrdw/polepos_vidhrdw.c index f90b83e60..c1b659e56 100644 --- a/src/vidhrdw/polepos_vidhrdw.c +++ b/src/vidhrdw/polepos_vidhrdw.c @@ -502,7 +502,7 @@ static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cl for (i = 0; i < 64; i++, posmem += 2, sizmem += 2) { int sx = (posmem[1] & 0x3ff) - 0x40 + 4; - int sy = 512 - (posmem[0] & 0x1ff) + 1; // sprites are buffered and delayed by one scanline + int sy = 512 - (posmem[0] & 0x1ff) + 1; /* sprites are buffered and delayed by one scanline */ int sizex = (sizmem[1] & 0x3f00) >> 8; int sizey = (sizmem[0] & 0x3f00) >> 8; int code = sizmem[0] & 0x7f; diff --git a/src/vidhrdw/res_net.h b/src/vidhrdw/res_net.h index cafbc3bc4..4bf273ad0 100644 --- a/src/vidhrdw/res_net.h +++ b/src/vidhrdw/res_net.h @@ -39,10 +39,10 @@ /* Amplifier stage per channel but may be specified globally as default */ #define RES_NET_AMP_USE_GLOBAL 0x0000 -#define RES_NET_AMP_NONE 0x0001 //Out0 -#define RES_NET_AMP_DARLINGTON 0x0002 //Out1 -#define RES_NET_AMP_EMITTER 0x0003 //Out2 -#define RES_NET_AMP_CUSTOM 0x0004 //Out3 +#define RES_NET_AMP_NONE 0x0001 /*Out0 */ +#define RES_NET_AMP_DARLINGTON 0x0002 /*Out1 */ +#define RES_NET_AMP_EMITTER 0x0003 /*Out2 */ +#define RES_NET_AMP_CUSTOM 0x0004 /*Out3 */ #define RES_NET_AMP_MASK 0x0007 /* VCC prebuilds - Global */ @@ -69,12 +69,12 @@ /* Monitor options */ -// Just invert the signal +/* Just invert the signal */ #define RES_NET_MONITOR_INVERT 0x1000 -// SANYO_EZV20 / Nintendo with inverter circuit +/* SANYO_EZV20 / Nintendo with inverter circuit */ #define RES_NET_MONITOR_SANYO_EZV20 0x2000 -// Electrohome G07 Series -// 5.6k input impedance +/* Electrohome G07 Series */ +/* 5.6k input impedance */ #define RES_NET_MONITOR_ELECTROHOME_G07 0x3000 #define RES_NET_MONITOR_MASK 0x3000 @@ -95,49 +95,49 @@ typedef struct _res_net_channel_info res_net_channel_info; struct _res_net_channel_info { - // per channel options + /* per channel options */ UINT32 options; - // Pullup resistor value in Ohms + /* Pullup resistor value in Ohms */ double rBias; - // Pulldown resistor value in Ohms + /* Pulldown resistor value in Ohms */ double rGnd; - // Number of inputs connected to resistors + /* Number of inputs connected to resistors */ int num; - // Resistor values - // - Least significant bit first + /* Resistor values */ + /* - Least significant bit first */ double R[8]; - // Minimum output voltage - // - Applicable if output is routed through a complimentary - // - darlington circuit - // - typical value ~ 0.9V + /* Minimum output voltage */ + /* - Applicable if output is routed through a complimentary */ + /* - darlington circuit */ + /* - typical value ~ 0.9V */ double minout; - // Cutoff output voltage - // - Applicable if output is routed through 1:1 transistor amplifier - // - Typical value ~ 0.7V + /* Cutoff output voltage */ + /* - Applicable if output is routed through 1:1 transistor amplifier */ + /* - Typical value ~ 0.7V */ double cut; - // Voltage at the pullup resistor - // - Typical voltage ~5V + /* Voltage at the pullup resistor */ + /* - Typical voltage ~5V */ double vBias; }; typedef struct _res_net_info res_net_info; struct _res_net_info { - // global options + /* global options */ UINT32 options; - // The three color channels + /* The three color channels */ res_net_channel_info rgb[3]; - // Supply Voltage - // - Typical value 5V + /* Supply Voltage */ + /* - Typical value 5V */ double vcc; - // High Level output voltage - // - TTL : 3.40V - // - CMOS: 4.95V (@5v vcc) + /* High Level output voltage */ + /* - TTL : 3.40V */ + /* - CMOS: 4.95V (@5v vcc) */ double vOL; - // Low Level output voltage - // - TTL : 0.35V - // - CMOS: 0.05V (@5v vcc) + /* Low Level output voltage */ + /* - TTL : 0.35V */ + /* - CMOS: 0.05V (@5v vcc) */ double vOH; - // Open Collector flag + /* Open Collector flag */ UINT8 OpenCol; }; diff --git a/src/vidhrdw/resnet.c b/src/vidhrdw/resnet.c index e4f01cb8b..8cc60bd5d 100644 --- a/src/vidhrdw/resnet.c +++ b/src/vidhrdw/resnet.c @@ -112,7 +112,7 @@ double compute_resistor_weights( /* parameters validity check */ if (count > MAX_RES_PER_NET) { - //zerror("compute_resistor_weights(): too many resistors in net #%i. The maximum allowed is %i, the number requested was: %i\n",n, MAX_RES_PER_NET, count); + /*zerror("compute_resistor_weights(): too many resistors in net #%i. The maximum allowed is %i, the number requested was: %i\n",n, MAX_RES_PER_NET, count); */ log_cb(RETRO_LOG_ERROR,"compute_resistor_weights(): too many resistors in net #%i. The maximum allowed is %i, the number requested was: %i\n",n, MAX_RES_PER_NET, count); exit(0); } @@ -132,7 +132,7 @@ double compute_resistor_weights( } if (networks_no < 1) { - //fatalerror("compute_resistor_weights(): no input data\n"); + /*fatalerror("compute_resistor_weights(): no input data\n"); */ log_cb(RETRO_LOG_ERROR, "compute_resistor_weights(): no input data\n"); exit(0); } @@ -303,7 +303,7 @@ double compute_resistor_net_outputs( /* parameters validity check */ if (count > MAX_RES_PER_NET) { - //fatalerror("compute_resistor_net_outputs(): too many resistors in net #%i. The maximum allowed is %i, the number requested was: %i\n",n, MAX_RES_PER_NET, count); + /*fatalerror("compute_resistor_net_outputs(): too many resistors in net #%i. The maximum allowed is %i, the number requested was: %i\n",n, MAX_RES_PER_NET, count); */ log_cb(RETRO_LOG_ERROR,"compute_resistor_net_outputs(): too many resistors in net #%i. The maximum allowed is %i, the number requested was: %i\n",n, MAX_RES_PER_NET, count); exit(0); } @@ -323,7 +323,7 @@ double compute_resistor_net_outputs( if (networks_no<1) { - //fatalerror("compute_resistor_net_outputs(): no input data\n"); + /*fatalerror("compute_resistor_net_outputs(): no input data\n"); */ log_cb(RETRO_LOG_ERROR,"compute_resistor_net_outputs(): no input data\n"); exit(0); } @@ -503,7 +503,7 @@ int compute_res_net(int inputs, int channel, const res_net_info *di) /* Fall through */ break; default: - //fatalerror("compute_res_net: Unknown amplifier type"); + /*fatalerror("compute_res_net: Unknown amplifier type"); */ log_cb(RETRO_LOG_ERROR,"compute_res_net: Unknown amplifier type"); exit(0); } @@ -517,7 +517,7 @@ int compute_res_net(int inputs, int channel, const res_net_info *di) /* Fall through */ break; default: - //fatalerror("compute_res_net: Unknown vcc type"); + /*fatalerror("compute_res_net: Unknown vcc type"); */ log_cb(RETRO_LOG_ERROR,"compute_res_net: Unknown vcc type"); exit(0); @@ -538,7 +538,7 @@ int compute_res_net(int inputs, int channel, const res_net_info *di) /* Fall through */ break; default: - //fatalerror("compute_res_net: Unknown vcc type"); + /*fatalerror("compute_res_net: Unknown vcc type"); */ log_cb(RETRO_LOG_ERROR,"compute_res_net: Unknown vcc type"); exit(0); } @@ -567,7 +567,7 @@ int compute_res_net(int inputs, int channel, const res_net_info *di) /* Fall through */ break; default: - //fatalerror("compute_res_net: Unknown vin type"); + /*fatalerror("compute_res_net: Unknown vin type"); */ log_cb(RETRO_LOG_ERROR,"compute_res_net: Unknown vin type"); exit(0); @@ -596,7 +596,7 @@ int compute_res_net(int inputs, int channel, const res_net_info *di) /* Fall through */ break; default: - //fatalerror("compute_res_net: Unknown amplifier type"); + /*fatalerror("compute_res_net: Unknown amplifier type"); */ log_cb(RETRO_LOG_ERROR,"compute_res_net: Unknown amplifier type"); exit(0); @@ -617,7 +617,7 @@ int compute_res_net(int inputs, int channel, const res_net_info *di) /* Fall through */ break; default: - //fatalerror("compute_res_net: Unknown vcc type"); + /*fatalerror("compute_res_net: Unknown vcc type"); */ log_cb(RETRO_LOG_ERROR,"compute_res_net: Unknown vcc type"); exit(0); diff --git a/src/vidhrdw/suna8_vidhrdw.c b/src/vidhrdw/suna8_vidhrdw.c index 5fd7ae59a..365b15dd3 100644 --- a/src/vidhrdw/suna8_vidhrdw.c +++ b/src/vidhrdw/suna8_vidhrdw.c @@ -81,8 +81,8 @@ data8_t suna8_unknown; /* Functions defined in vidhrdw: */ -WRITE_HANDLER( suna8_spriteram_w ); // for debug -WRITE_HANDLER( suna8_banked_spriteram_w ); // for debug +WRITE_HANDLER( suna8_spriteram_w ); /* for debug */ +WRITE_HANDLER( suna8_banked_spriteram_w ); /* for debug */ VIDEO_START( suna8 ); VIDEO_UPDATE( suna8 ); @@ -218,7 +218,7 @@ VIDEO_START( suna8_textdim12 ) { return suna8_vh_start_common(12); } void suna8_draw_normal_sprites(struct mame_bitmap *bitmap,const struct rectangle *cliprect) { int i; - int mx = 0; // multisprite x counter + int mx = 0; /* multisprite x counter */ int max_x = Machine->drv->screen_width - 8; int max_y = Machine->drv->screen_height - 8; @@ -276,7 +276,7 @@ void suna8_draw_normal_sprites(struct mame_bitmap *bitmap,const struct rectangle gfxbank = bank & 0x1f; srcpg = (code >> 4) & 3; break; -// hardhea2: fire code=52/54 bank=a4; player code=02/04/06 bank=08; arrow:code=16 bank=27 +/* hardhea2: fire code=52/54 bank=a4; player code=02/04/06 bank=08; arrow:code=16 bank=27 */ case 0x40: dimx = 4; dimy = 4; srcx = (code & 0xe) * 2; @@ -284,7 +284,7 @@ void suna8_draw_normal_sprites(struct mame_bitmap *bitmap,const struct rectangle flipy = bank & 0x10; srcy = (((bank & 0x80)>>4) + (bank & 0x04) + ((~bank >> 4)&2)) * 2; srcpg = (code >> 4) & 7; - gfxbank = (bank & 0x3) + (srcpg & 4); // brickzn: 06,a6,a2,b2->6. starfigh: 01->01,4->0 + gfxbank = (bank & 0x3) + (srcpg & 4); /* brickzn: 06,a6,a2,b2->6. starfigh: 01->01,4->0 */ colorbank = (bank & 8) >> 3; break; case 0x00: @@ -336,7 +336,7 @@ void suna8_draw_normal_sprites(struct mame_bitmap *bitmap,const struct rectangle drawgfx( bitmap,Machine->gfx[0], tile + (attr & 0x3)*0x100 + gfxbank, - ((attr >> 2) & 0xf) | colorbank, // hardhea2 player2 + ((attr >> 2) & 0xf) | colorbank, /* hardhea2 player2 */ tile_flipx, tile_flipy, sx, sy, cliprect,TRANSPARENCY_PEN,15); diff --git a/src/vidhrdw/suprnova_vidhrdw.c b/src/vidhrdw/suprnova_vidhrdw.c index 5434ab40d..b7965196b 100644 --- a/src/vidhrdw/suprnova_vidhrdw.c +++ b/src/vidhrdw/suprnova_vidhrdw.c @@ -20,8 +20,8 @@ Tilemap flip flags were reversed extern data32_t *skns_tilemapA_ram, *skns_tilemapB_ram, *skns_v3slc_ram; extern data32_t *skns_palette_ram, *skns_v3t_ram, *skns_main_ram, *skns_cache_ram; extern data32_t *skns_pal_regs, *skns_v3_regs, *skns_spc_regs; -extern data32_t skns_v3t_dirty[0x4000]; // allocate this elsewhere? -extern data32_t skns_v3t_4bppdirty[0x8000]; // allocate this elsewhere? +extern data32_t skns_v3t_dirty[0x4000]; /* allocate this elsewhere? */ +extern data32_t skns_v3t_4bppdirty[0x8000]; /* allocate this elsewhere? */ extern int skns_v3t_somedirty,skns_v3t_4bpp_somedirty; void skns_palette_update(void); @@ -286,58 +286,58 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr int sprite_flip; int sprite_x_scroll; int sprite_y_scroll; - int disabled = skns_spc_regs[0x04/4] & 0x08; // RWR1 + int disabled = skns_spc_regs[0x04/4] & 0x08; /* RWR1 */ int xsize,ysize, size, xpos=0,ypos=0, pri=0, romoffset, colour=0, xflip,yflip, joint; int sx,sy; int endromoffs=0; int grow; - //UINT16 zoomx, zoomy; + /*UINT16 zoomx, zoomy; */ UINT16 zoomx_m, zoomx_s, zoomy_m, zoomy_s; - buffer_spriteram32_w(0,0,0); //hack + buffer_spriteram32_w(0,0,0); /*hack */ if (!disabled){ - group_enable = (skns_spc_regs[0x00/4] & 0x0040) >> 6; // RWR0 + group_enable = (skns_spc_regs[0x00/4] & 0x0040) >> 6; /* RWR0 */ /* Sengekis uses global flip */ - sprite_flip = (skns_spc_regs[0x04/4] & 0x03); // RWR1 - - sprite_y_scroll = ((skns_spc_regs[0x08/4] & 0x7fc0) >> 6); // RWR2 - sprite_x_scroll = ((skns_spc_regs[0x10/4] & 0x7fc0) >> 6); // RWR4 - if (sprite_y_scroll&0x100) sprite_y_scroll -= 0x200; // Signed - if (sprite_x_scroll&0x100) sprite_x_scroll -= 0x200; // Signed - - group_x_offset[0] = (skns_spc_regs[0x18/4] & 0xffc0) >> 6; // RWR6 - group_y_offset[0] = (skns_spc_regs[0x1c/4] & 0xffc0) >> 6; // RWR7 - if (group_x_offset[0]&0x200) group_x_offset[0] -= 0x400; // Signed - if (group_y_offset[0]&0x200) group_y_offset[0] -= 0x400; // Signed - - group_x_offset[1] = (skns_spc_regs[0x20/4] & 0xffc0) >> 6; // RWR8 - group_y_offset[1] = (skns_spc_regs[0x24/4] & 0xffc0) >> 6; // RWR9 - if (group_x_offset[1]&0x200) group_x_offset[1] -= 0x400; // Signed - if (group_y_offset[1]&0x200) group_y_offset[1] -= 0x400; // Signed - - group_x_offset[2] = (skns_spc_regs[0x28/4] & 0xffc0) >> 6; // RWR10 - group_y_offset[2] = (skns_spc_regs[0x2c/4] & 0xffc0) >> 6; // RWR11 - if (group_x_offset[2]&0x200) group_x_offset[2] -= 0x400; // Signed - if (group_y_offset[2]&0x200) group_y_offset[2] -= 0x400; // Signed - - group_x_offset[3] = (skns_spc_regs[0x30/4] & 0xffc0) >> 6; // RWR12 - group_y_offset[3] = (skns_spc_regs[0x34/4] & 0xffc0) >> 6; // RWR13 - if (group_x_offset[3]&0x200) group_x_offset[3] -= 0x400; // Signed - if (group_y_offset[3]&0x200) group_y_offset[3] -= 0x400; // Signed - - // usrintf_showmessage ("x %08x y %08x x2 %08x y2 %08x",sprite_x_scroll, sprite_y_scroll,group_x_offset[1], group_y_offset[1]); - // usrintf_showmessage("%d %d %d %d A:%d B:%d", sprite_kludge_x, sprite_kludge_y, sprite_x_scroll, sprite_y_scroll, (skns_pal_regs[0x00/4] & 0x7000) >> 12, (skns_pal_regs[0x10/4] & 0x7000) >> 12); - // if (keyboard_pressed(KEYCODE_Q)) sprite_kludge_x++; - // if (keyboard_pressed(KEYCODE_W)) sprite_kludge_x--; - // if (keyboard_pressed(KEYCODE_E)) sprite_kludge_y++; - // if (keyboard_pressed(KEYCODE_D)) sprite_kludge_y--; - - // Tilemap Pri/enables - // usrintf_showmessage("A: %x %x B: %x %x", skns_v3_regs[0x10/4]>>3, skns_v3_regs[0x10/4]&7, skns_v3_regs[0x34/4]>>3, skns_v3_regs[0x34/4]&7); + sprite_flip = (skns_spc_regs[0x04/4] & 0x03); /* RWR1 */ + + sprite_y_scroll = ((skns_spc_regs[0x08/4] & 0x7fc0) >> 6); /* RWR2 */ + sprite_x_scroll = ((skns_spc_regs[0x10/4] & 0x7fc0) >> 6); /* RWR4 */ + if (sprite_y_scroll&0x100) sprite_y_scroll -= 0x200; /* Signed */ + if (sprite_x_scroll&0x100) sprite_x_scroll -= 0x200; /* Signed */ + + group_x_offset[0] = (skns_spc_regs[0x18/4] & 0xffc0) >> 6; /* RWR6 */ + group_y_offset[0] = (skns_spc_regs[0x1c/4] & 0xffc0) >> 6; /* RWR7 */ + if (group_x_offset[0]&0x200) group_x_offset[0] -= 0x400; /* Signed */ + if (group_y_offset[0]&0x200) group_y_offset[0] -= 0x400; /* Signed */ + + group_x_offset[1] = (skns_spc_regs[0x20/4] & 0xffc0) >> 6; /* RWR8 */ + group_y_offset[1] = (skns_spc_regs[0x24/4] & 0xffc0) >> 6; /* RWR9 */ + if (group_x_offset[1]&0x200) group_x_offset[1] -= 0x400; /* Signed */ + if (group_y_offset[1]&0x200) group_y_offset[1] -= 0x400; /* Signed */ + + group_x_offset[2] = (skns_spc_regs[0x28/4] & 0xffc0) >> 6; /* RWR10 */ + group_y_offset[2] = (skns_spc_regs[0x2c/4] & 0xffc0) >> 6; /* RWR11 */ + if (group_x_offset[2]&0x200) group_x_offset[2] -= 0x400; /* Signed */ + if (group_y_offset[2]&0x200) group_y_offset[2] -= 0x400; /* Signed */ + + group_x_offset[3] = (skns_spc_regs[0x30/4] & 0xffc0) >> 6; /* RWR12 */ + group_y_offset[3] = (skns_spc_regs[0x34/4] & 0xffc0) >> 6; /* RWR13 */ + if (group_x_offset[3]&0x200) group_x_offset[3] -= 0x400; /* Signed */ + if (group_y_offset[3]&0x200) group_y_offset[3] -= 0x400; /* Signed */ + + /* usrintf_showmessage ("x %08x y %08x x2 %08x y2 %08x",sprite_x_scroll, sprite_y_scroll,group_x_offset[1], group_y_offset[1]); */ + /* usrintf_showmessage("%d %d %d %d A:%d B:%d", sprite_kludge_x, sprite_kludge_y, sprite_x_scroll, sprite_y_scroll, (skns_pal_regs[0x00/4] & 0x7000) >> 12, (skns_pal_regs[0x10/4] & 0x7000) >> 12); */ + /* if (keyboard_pressed(KEYCODE_Q)) sprite_kludge_x++; */ + /* if (keyboard_pressed(KEYCODE_W)) sprite_kludge_x--; */ + /* if (keyboard_pressed(KEYCODE_E)) sprite_kludge_y++; */ + /* if (keyboard_pressed(KEYCODE_D)) sprite_kludge_y--; */ + + /* Tilemap Pri/enables */ + /* usrintf_showmessage("A: %x %x B: %x %x", skns_v3_regs[0x10/4]>>3, skns_v3_regs[0x10/4]&7, skns_v3_regs[0x34/4]>>3, skns_v3_regs[0x34/4]&7); */ /* Seems that sprites are consistently off by a fixed no. of pixels in different games (Patterns emerge through Manufacturer/Date/Orientation) */ @@ -367,7 +367,7 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr xpos = (source[2] & 0x0000ffc0) >> 6; ypos = (source[3] & 0x0000ffc0) >> 6; - xpos += sprite_x_scroll; // Global offset + xpos += sprite_x_scroll; /* Global offset */ ypos += sprite_y_scroll; if (group_enable) @@ -442,12 +442,12 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr { - // sengekis uses this on sprites which are shrinking as they head towards the ground - // it's also used on the input test of Gals Panic S2 - // - // it appears to offer a higher precision 'shrink' mode (although I'm not entirely - // convinced this implementation is correct because we simply end up ignoring - // part of the data) + /* sengekis uses this on sprites which are shrinking as they head towards the ground */ + /* it's also used on the input test of Gals Panic S2 */ + /* */ + /* it appears to offer a higher precision 'shrink' mode (although I'm not entirely */ + /* convinced this implementation is correct because we simply end up ignoring */ + /* part of the data) */ zoomx_m = 0; zoomx_s = (source[2] >> 24)&0x00fc; zoomy_m = 0; @@ -456,22 +456,22 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr } - //zoomx = source[2] >> 16; - //zoomy = source[3] >> 16; + /*zoomx = source[2] >> 16; */ + /*zoomy = source[3] >> 16; */ romoffset &= memory_region_length (REGION_GFX1)-1; endromoffs = skns_rle_decode ( romoffset, size ); - // PriTest -// if(!( (keyboard_pressed(KEYCODE_Q)&&(pri==0)) || (keyboard_pressed(KEYCODE_W)&&(pri==1)) || (keyboard_pressed(KEYCODE_E)&&(pri==2)) || (keyboard_pressed(KEYCODE_D)&&(pri==3)) )) -// if( !(keyboard_pressed(KEYCODE_Q) && ((source[0] & 0x00800000)>>24)) ) + /* PriTest */ +/* if(!( (keyboard_pressed(KEYCODE_Q)&&(pri==0)) || (keyboard_pressed(KEYCODE_W)&&(pri==1)) || (keyboard_pressed(KEYCODE_E)&&(pri==2)) || (keyboard_pressed(KEYCODE_D)&&(pri==3)) )) */ +/* if( !(keyboard_pressed(KEYCODE_Q) && ((source[0] & 0x00800000)>>24)) ) */ { int NewColour = colour*256; if(zoomx_m || zoomx_s || zoomy_m || zoomy_s) { - //blit_z[ (xflip<<1) | yflip ](bitmap, cliprect, decodebuffer, sx, sy, xsize, ysize, zoomx, zoomy, NewColour); + /*blit_z[ (xflip<<1) | yflip ](bitmap, cliprect, decodebuffer, sx, sy, xsize, ysize, zoomx, zoomy, NewColour); */ blit_z[ (xflip<<1) | yflip ](bitmap, cliprect, decodebuffer, sx, sy, xsize, ysize, zoomx_m, zoomx_s, zoomy_m, zoomy_s, NewColour); } else @@ -489,7 +489,7 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr { int pix; pix = decodebuffer[xsize*yy+xx]; - if (pix) plot_pixel( bitmap, sx+xx, sy+yy, pix+ NewColour ); // change later + if (pix) plot_pixel( bitmap, sx+xx, sy+yy, pix+ NewColour ); /* change later */ } } } @@ -508,7 +508,7 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr { int pix; pix = decodebuffer[xsize*yy+xx]; - if (pix) plot_pixel( bitmap, sx+xx, sy+(ysize-1-yy), pix+ NewColour ); // change later + if (pix) plot_pixel( bitmap, sx+xx, sy+(ysize-1-yy), pix+ NewColour ); /* change later */ } } } @@ -527,7 +527,7 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr { int pix; pix = decodebuffer[xsize*yy+xx]; - if (pix) plot_pixel( bitmap, sx+(xsize-1-xx), sy+yy, pix+ NewColour ); // change later + if (pix) plot_pixel( bitmap, sx+(xsize-1-xx), sy+yy, pix+ NewColour ); /* change later */ } } } @@ -547,14 +547,14 @@ void skns_drawsprites( struct mame_bitmap *bitmap, const struct rectangle *clipr { int pix; pix = decodebuffer[xsize*yy+xx]; - if (pix) plot_pixel( bitmap, sx+(xsize-1-xx), sy+(ysize-1-yy), pix+ NewColour ); // change later + if (pix) plot_pixel( bitmap, sx+(xsize-1-xx), sy+(ysize-1-yy), pix+ NewColour ); /* change later */ } } } } } } - }//End PriTest + }/*End PriTest */ source+=4; } @@ -568,7 +568,7 @@ static void get_tilemap_A_tile_info(int tile_index) { int code = ((skns_tilemapA_ram[tile_index] & 0x001fffff) >> 0 ); int colr = ((skns_tilemapA_ram[tile_index] & 0x3f000000) >> 24 ); -// int pri = ((skns_tilemapA_ram[tile_index] & 0x00e00000) >> 21 ); +/* int pri = ((skns_tilemapA_ram[tile_index] & 0x00e00000) >> 21 ); */ int depth = (skns_v3_regs[0x0c/4] & 0x0001) << 1; tile_info.flags = 0; @@ -580,7 +580,7 @@ static void get_tilemap_A_tile_info(int tile_index) code, 0x40+colr, tile_info.flags) -// tile_info.priority = pri; +/* tile_info.priority = pri; */ } WRITE32_HANDLER ( skns_tilemapA_w ) @@ -593,7 +593,7 @@ static void get_tilemap_B_tile_info(int tile_index) { int code = ((skns_tilemapB_ram[tile_index] & 0x001fffff) >> 0 ); int colr = ((skns_tilemapB_ram[tile_index] & 0x3f000000) >> 24 ); -// int pri = ((skns_tilemapA_ram[tile_index] & 0x00e00000) >> 21 ); +/* int pri = ((skns_tilemapA_ram[tile_index] & 0x00e00000) >> 21 ); */ int depth = (skns_v3_regs[0x0c/4] & 0x0100) >> 7; tile_info.flags = 0; @@ -605,7 +605,7 @@ static void get_tilemap_B_tile_info(int tile_index) code, 0x40+colr, tile_info.flags) -// tile_info.priority = pri; +/* tile_info.priority = pri; */ } WRITE32_HANDLER ( skns_tilemapB_w ) @@ -657,18 +657,18 @@ static void supernova_draw_a( struct mame_bitmap *bitmap, const struct rectangle if (enable_a) { startx = skns_v3_regs[0x1c/4]; - incyy = skns_v3_regs[0x30/4]; // was xx, changed for sarukani + incyy = skns_v3_regs[0x30/4]; /* was xx, changed for sarukani */ incyx = skns_v3_regs[0x2c/4]; starty = skns_v3_regs[0x20/4]; incxy = skns_v3_regs[0x28/4]; - incxx = skns_v3_regs[0x24/4]; // was yy, changed for sarukani + incxx = skns_v3_regs[0x24/4]; /* was yy, changed for sarukani */ - if( (incxx == 1<<8) && !incxy & !incyx && (incyy == 1<<8) ) // No Roz, only scroll. + if( (incxx == 1<<8) && !incxy & !incyx && (incyy == 1<<8) ) /* No Roz, only scroll. */ { int columnscroll_a = (skns_v3_regs[0x0c/4] >> 1) & 0x0001; int offs; - startx >>= 8; // Lose Floating point + startx >>= 8; /* Lose Floating point */ starty >>= 8; if(columnscroll_a) { @@ -715,7 +715,7 @@ static void supernova_draw_b( struct mame_bitmap *bitmap, const struct rectangle incxy = skns_v3_regs[0x4c/4]; incxx = skns_v3_regs[0x48/4]; - if( (incxx == 1<<8) && !incxy & !incyx && (incyy == 1<<8) ) // No Roz, only scroll. + if( (incxx == 1<<8) && !incxy & !incyx && (incyy == 1<<8) ) /* No Roz, only scroll. */ { int columnscroll_b = (skns_v3_regs[0x0c/4] >> 9) & 0x0001; int offs; @@ -763,7 +763,7 @@ VIDEO_UPDATE(skns) btiles = memory_region (REGION_GFX3); -// if (!(skns_v3_regs[0x0c/4] & 0x0100)); // if tilemap b is in 8bpp mode +/* if (!(skns_v3_regs[0x0c/4] & 0x0100));*/ /* if tilemap b is in 8bpp mode */ { if (skns_v3t_somedirty) { @@ -789,7 +789,7 @@ VIDEO_UPDATE(skns) } } -// if (skns_v3_regs[0x0c/4] & 0x0100); // if tilemap b is in 4bpp mode +/* if (skns_v3_regs[0x0c/4] & 0x0100); */ /* if tilemap b is in 4bpp mode */ { if (skns_v3t_4bpp_somedirty) { diff --git a/src/vidhrdw/sys16spr.c b/src/vidhrdw/sys16spr.c index 757d309a4..c563947e1 100644 --- a/src/vidhrdw/sys16spr.c +++ b/src/vidhrdw/sys16spr.c @@ -51,10 +51,10 @@ int sys16_sprite_shinobi( struct sys16_sprite_attributes *sprite, const UINT16 * UINT16 width = source[2]; int top = ypos&0xff; int bottom = ypos>>8; - if(width & 0x8000) return 1; // End of list bit set - if(width & 0x4000) return 0; // Hide this sprite bit set - if(top >= bottom || top >= 0xe0) return 0; // Invalid height or off-screen - if(bottom >= 0xe0) bottom = 0xe0; // Clip bottom of sprite + if(width & 0x8000) return 1; /* End of list bit set */ + if(width & 0x4000) return 0; /* Hide this sprite bit set */ + if(top >= bottom || top >= 0xe0) return 0; /* Invalid height or off-screen */ + if(bottom >= 0xe0) bottom = 0xe0; /* Clip bottom of sprite */ { UINT16 attributes = source[4]; @@ -62,12 +62,12 @@ int sys16_sprite_shinobi( struct sys16_sprite_attributes *sprite, const UINT16 * UINT16 zoomx = source[5] & 0x1F; UINT16 zoomy = (source[5] >> 5) & 0x1F; - // Rest of rendering code expects zoom to be 10 bits + /* Rest of rendering code expects zoom to be 10 bits */ zoomx <<= 5; zoomy <<= 5; - // Having zoomy set to zoomx when zoomy is zero heavily distorts the multi-sprite opponents in hwchamp - //if( zoomy==0 || source[6]==0xffff ) zoomy = zoomx; /* if zoomy is 0, use zoomx instead */ + /* Having zoomy set to zoomx when zoomy is zero heavily distorts the multi-sprite opponents in hwchamp */ + /*if( zoomy==0 || source[6]==0xffff ) zoomy = zoomx; */ /* if zoomy is 0, use zoomx instead */ sprite->x = source[1] + sys16_sprxoffset; sprite->y = top; @@ -82,7 +82,7 @@ int sys16_sprite_shinobi( struct sys16_sprite_attributes *sprite, const UINT16 * sprite->zoomx = zoomx; sprite->zoomy = zoomy; sprite->pitch = source[2]&0xff; - sprite->gfx = ( source[3] + (sys16_obj_bank[(attributes>>8)&0xf]<<(16+sys16_wwfix)) ) << 1; //* + sprite->gfx = ( source[3] + (sys16_obj_bank[(attributes>>8)&0xf]<<(16+sys16_wwfix)) ) << 1; } return 0; } @@ -128,16 +128,16 @@ int sys16_sprite_passshot( struct sys16_sprite_attributes *sprite, const UINT16 sprite->flags = SYS16_SPR_VISIBLE; if( number & 0x8000 ) sprite->flags |= SYS16_SPR_FLIPX; #ifdef TRANSPARENT_SHADOWS - if (((attributes>>8)&0x3f)==0x3f) // shadow sprite + if (((attributes>>8)&0x3f)==0x3f) /* shadow sprite */ sprite->flags|= SYS16_SPR_SHADOW; #endif sprite->pitch = width&0xff; if( sprite->flags&SYS16_SPR_FLIPX ){ bank = (bank-1) & 0xf; /* ? */ } - sprite->gfx = ((number-(short)width)*4 + (sys16_obj_bank[bank] << 17))/2; //* + sprite->gfx = ((number-(short)width)*4 + (sys16_obj_bank[bank] << 17))/2; sprite->x = xpos; - sprite->y = top+2; //* + sprite->y = top+2; sprite->zoomx = sprite->zoomy = zoom; } return 0; @@ -175,7 +175,7 @@ int sys16_sprite_fantzone( struct sys16_sprite_attributes *sprite, const UINT16 sprite->flags ^= SYS16_SPR_FLIPX; } sprite->screen_height = bottom-top; - //top++; bottom++; + /*top++; bottom++; */ sprite->x = source[1] + sys16_sprxoffset; if( sprite->x > 0x140 ) sprite->x -= 0x200; sprite->y = top; @@ -204,7 +204,7 @@ int sys16_sprite_quartet2( struct sys16_sprite_attributes *sprite, const UINT16 int top = (ypos&0xff) + 1; int bottom = (ypos>>8) + 1; - // Fixes sprite issues with shinobl + /* Fixes sprite issues with shinobl */ if (!strcmp(Machine->gamedrv->name,"shinobl")) { top--; bottom--; @@ -222,21 +222,21 @@ int sys16_sprite_quartet2( struct sys16_sprite_attributes *sprite, const UINT16 tsource[2]=source[2]; tsource[3]=source[3]; #ifndef TRANSPARENT_SHADOWS - if( pal==0x3f ) pal = (bank<<1); // shadow sprite + if( pal==0x3f ) pal = (bank<<1); /* shadow sprite */ #endif if((tsource[3] & 0x7f80) == 0x7f80){ bank=(bank-1)&0xf; tsource[3]^=0x8000; } tsource[2] &= 0x00ff; - if (tsource[3]&0x8000){ // reverse + if (tsource[3]&0x8000){ /* reverse */ tsource[2] |= 0x0100; tsource[3] &= 0x7fff; } gfx = tsource[3]*4; width = tsource[2]; - //top++; - //bottom++; + /*top++; */ + /*bottom++; */ sprite->x = source[1] + sys16_sprxoffset; if(sprite->x > 0x140) sprite->x-=0x200; sprite->y = top; @@ -247,7 +247,7 @@ int sys16_sprite_quartet2( struct sys16_sprite_attributes *sprite, const UINT16 sprite->flags = SYS16_SPR_VISIBLE; if( width&0x100 ) sprite->flags |= SYS16_SPR_FLIPX; #ifdef TRANSPARENT_SHADOWS - if( pal==0x3f ) sprite->flags|= SYS16_SPR_SHADOW; // shadow sprite + if( pal==0x3f ) sprite->flags|= SYS16_SPR_SHADOW; /* shadow sprite */ #endif sprite->gfx = ((gfx &0x3ffff) + (sys16_obj_bank[bank] << 17))/2; } @@ -284,7 +284,7 @@ int sys16_sprite_hangon( struct sys16_sprite_attributes *sprite, const UINT16 *s bank=(bank-1)&0xf; tsource[3]^=0x8000; } - if (tsource[3]&0x8000){ // reverse + if (tsource[3]&0x8000){ /* reverse */ tsource[2] |= 0x0100; tsource[3] &= 0x7fff; } @@ -299,8 +299,8 @@ int sys16_sprite_hangon( struct sys16_sprite_attributes *sprite, const UINT16 *s sprite->pitch = width&0xff; sprite->flags = SYS16_SPR_VISIBLE; if( width&0x100 ) sprite->flags |= SYS16_SPR_FLIPX; -// sprite->flags|= SYS16_SPR_PARTIAL_SHADOW; -// sprite->shadow_pen=10; +/* sprite->flags|= SYS16_SPR_PARTIAL_SHADOW; */ +/* sprite->shadow_pen=10; */ sprite->zoomx = zoomx; sprite->zoomy = zoomy; sprite->gfx = ((gfx &0x3ffff) + (sys16_obj_bank[bank] << 17))/2; @@ -329,7 +329,7 @@ int sys16_sprite_sharrier( struct sys16_sprite_attributes *sprite, const UINT16 sprite->zoomx = (source[4]&0x3f)*(1024/64); sprite->zoomy = (1024*sprite->zoomx)/(2048-sprite->zoomx); #ifndef TRANSPARENT_SHADOWS -// if (pal==0x3f) pal=(bank<<1); // shadow sprite +/* if (pal==0x3f) pal=(bank<<1);*/ /* shadow sprite */ #endif sprite->x = ((source[1] & 0x3ff) + sys16_sprxoffset); if(sprite->x >= 0x200) sprite->x-=0x200; @@ -340,15 +340,15 @@ int sys16_sprite_sharrier( struct sys16_sprite_attributes *sprite, const UINT16 sprite->flags = SYS16_SPR_VISIBLE; if( source[3]&0x8000 ) sprite->flags |= SYS16_SPR_FLIPX; #ifdef TRANSPARENT_SHADOWS - if (sys16_sh_shadowpal == 0){ // space harrier + if (sys16_sh_shadowpal == 0){ /* space harrier */ if( ((source[2]>>8)&0x3f)==sys16_sh_shadowpal ) sprite->flags|= SYS16_SPR_SHADOW; } - else { // enduro + else { /* enduro */ sprite->flags|= SYS16_SPR_PARTIAL_SHADOW; sprite->shadow_pen=10; } #endif - sprite->gfx = ((bank<<15)|(source[3]&0x7fff))*4;// + (sys16_obj_bank[bank] << 17); + sprite->gfx = ((bank<<15)|(source[3]&0x7fff))*4;/* + (sys16_obj_bank[bank] << 17); */ } return 0; } @@ -370,7 +370,7 @@ int sys16_sprite_outrun( struct sys16_sprite_attributes *sprite, const UINT16 *s else if( source[0]&0x4000 ){ /* hidden sprite */ return 0; } - else {//if (!(source[0]&0x4000)){ + else {/*if (!(source[0]&0x4000)){ */ int zoomx = source[3]; int zoomy = source[4]; int x = (source[2]&0x1ff); @@ -394,7 +394,7 @@ int sys16_sprite_outrun( struct sys16_sprite_attributes *sprite, const UINT16 *s sprite->zoomy = zoomy; sprite->gfx = gfx; #ifdef TRANSPARENT_SHADOWS - //if( (source[5]&0x7f)==0 ) sprite->flags|= SYS16_SPR_SHADOW; + /*if( (source[5]&0x7f)==0 ) sprite->flags|= SYS16_SPR_SHADOW; */ /*else*/ if( source[3]&0x4000 ){ sprite->flags|= SYS16_SPR_PARTIAL_SHADOW; sprite->shadow_pen=10; @@ -459,15 +459,15 @@ int sys16_sprite_fantzn2x( struct sys16_sprite_attributes *sprite, const UINT16 6 -------- -------- 7 -------- -------- */ - extern int sys16_wwfix; //* + extern int sys16_wwfix; UINT16 ypos = source[0]; UINT16 width = source[2]; int top = ypos&0xff; int bottom = ypos>>8; - if(width & 0x8000) return 1; // End of list bit set - if(width & 0x4000) return 0; // Hide this sprite bit set - if(top >= bottom || top >= 0xe0) return 0; // Invalid height or off-screen - if(bottom >= 0xe0) bottom = 0xe0; // Clip bottom of sprite + if(width & 0x8000) return 1; /* End of list bit set */ + if(width & 0x4000) return 0; /* Hide this sprite bit set */ + if(top >= bottom || top >= 0xe0) return 0; /* Invalid height or off-screen */ + if(bottom >= 0xe0) bottom = 0xe0; /* Clip bottom of sprite */ { UINT16 attributes = source[4]; @@ -475,12 +475,12 @@ int sys16_sprite_fantzn2x( struct sys16_sprite_attributes *sprite, const UINT16 UINT16 zoomx = source[5] & 0x1F; UINT16 zoomy = (source[5] >> 5) & 0x1F; - // Rest of rendering code expects zoom to be 10 bits + /* Rest of rendering code expects zoom to be 10 bits */ zoomx <<= 5; zoomy <<= 5; - // Having zoomy set to zoomx when zoomy is zero heavily distorts the multi-sprite opponents in hwchamp - //if( zoomy==0 || source[6]==0xffff ) zoomy = zoomx; /* if zoomy is 0, use zoomx instead */ + /* Having zoomy set to zoomx when zoomy is zero heavily distorts the multi-sprite opponents in hwchamp */ + /*if( zoomy==0 || source[6]==0xffff ) zoomy = zoomx;*/ /* if zoomy is 0, use zoomx instead */ sprite->x = ((source[1] & 0x1ff) + sys16_sprxoffset); sprite->y = top; @@ -495,7 +495,7 @@ int sys16_sprite_fantzn2x( struct sys16_sprite_attributes *sprite, const UINT16 sprite->zoomx = zoomx; sprite->zoomy = zoomy; sprite->pitch = source[2]&0xff; - sprite->gfx = ( source[3] + (sys16_obj_bank[(attributes>>8)&0xf]<<(16+sys16_wwfix)) ) << 1; //* + sprite->gfx = ( source[3] + (sys16_obj_bank[(attributes>>8)&0xf]<<(16+sys16_wwfix)) ) << 1; } return 0; } diff --git a/src/vidhrdw/system16_vidhrdw.c b/src/vidhrdw/system16_vidhrdw.c index cb3f47b01..7d7ace135 100644 --- a/src/vidhrdw/system16_vidhrdw.c +++ b/src/vidhrdw/system16_vidhrdw.c @@ -150,7 +150,7 @@ int sys16_textlayer_lo_min; int sys16_textlayer_lo_max; int sys16_textlayer_hi_min; int sys16_textlayer_hi_max; -int sys16_bg1_trans; // alien syn + sys18 +int sys16_bg1_trans; /* alien syn + sys18 */ int sys16_bg_priority_mode; int sys16_fg_priority_mode; int sys16_bg_priority_value; @@ -364,7 +364,7 @@ static void draw_sprites_new(struct mame_bitmap *bitmap, const struct rectangle -static void draw_sprite( //* +static void draw_sprite( struct mame_bitmap *bitmap, const struct rectangle *cliprect, const unsigned char *addr, int pitch, @@ -389,7 +389,7 @@ static void draw_sprite( //* unsigned pen, data; priority = 1<gamedrv->name,"sonicbom")) flipy^=0x80; // temp hack until we fix drawing + if (!strcmp(Machine->gamedrv->name,"sonicbom")) flipy^=0x80; /* temp hack until we fix drawing */ if( flipy ){ dy = -1; @@ -506,7 +506,7 @@ static void draw_sprite( //* } } -static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cliprect, int b3d ) //* +static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cliprect, int b3d ) { const pen_t *base_pal = Machine->gfx[0]->colortable; const unsigned char *base_gfx = memory_region(REGION_GFX2); @@ -538,7 +538,7 @@ static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cl width <<= 2; eos = 0; - if( b3d ) // outrun/aburner + if( b3d ) /* outrun/aburner */ { if (b3d == 2) eos = 1; if (xpos < 0 && flipx) continue; @@ -576,16 +576,16 @@ static void draw_sprites( struct mame_bitmap *bitmap, const struct rectangle *cl } else { - if (!width) { width = 512; eos = 1; } // used by fantasy zone for laser + if (!width) { width = 512; eos = 1; } /* used by fantasy zone for laser */ screen_width = width; logical_height = sprite.screen_height; if (sprite.zoomy) logical_height = logical_height*(0x400 + sprite.zoomy)/0x400 - 1; if (sprite.zoomx) screen_width = screen_width*(0x800 - sprite.zoomx)/0x800 + 2; -// fix, 5-bit zoom field -// if (sprite.zoomy) logical_height = logical_height*(0x20 + sprite.zoomy)/0x20 - 1; -// if (sprite.zoomx) screen_width = screen_width*(0x40 - sprite.zoomx)/0x40 + 2; +/* fix, 5-bit zoom field */ +/* if (sprite.zoomy) logical_height = logical_height*(0x20 + sprite.zoomy)/0x20 - 1; */ +/* if (sprite.zoomx) screen_width = screen_width*(0x40 - sprite.zoomx)/0x40 + 2; */ if (flipx && flipy) { mod_h = -logical_height-1; mod_x = 2; } else if (flipx) { mod_h = 0; mod_x = 2; } @@ -789,13 +789,13 @@ static void get_bg_tile_info( int offset ){ } switch(sys16_bg_priority_mode) { - case 1: // Alien Syndrome + case 1: /* Alien Syndrome */ tile_info.priority = (data&0x8000)?1:0; break; - case 2: // Body Slam / wrestwar + case 2: /* Body Slam / wrestwar */ tile_info.priority = ((data&0xff00) >= sys16_bg_priority_value)?1:0; break; - case 3: // sys18 games + case 3: /* sys18 games */ if( data&0x8000 ){ tile_info.priority = 2; } @@ -833,7 +833,7 @@ static void get_fg_tile_info( int offset ){ 0) } switch(sys16_fg_priority_mode){ - case 1: // alien syndrome + case 1: /* alien syndrome */ tile_info.priority = (data&0x8000)?1:0; break; @@ -1074,7 +1074,7 @@ VIDEO_START( system16 ){ sys16_fg_priority_mode=0; sys16_tilebank_switch=0x1000; - // Defaults for sys16 games + /* Defaults for sys16 games */ sys16_textlayer_lo_min=0; sys16_textlayer_lo_max=0x7f; sys16_textlayer_hi_min=0x80; @@ -1264,22 +1264,22 @@ static void sys16_vh_refresh_helper( void ){ static void sys18_vh_screenrefresh_helper( void ){ int i; - if( sys18_splittab_bg_x ){ // screenwise rowscroll? + if( sys18_splittab_bg_x ){ /* screenwise rowscroll? */ int offset,offset2, scroll,scroll2,orig_scroll; - offset = 32+((sys16_bg_scrolly&0x1f8) >> 3); // 0x00..0x3f - offset2 = 32+((sys16_bg2_scrolly&0x1f8) >> 3); // 0x00..0x3f + offset = 32+((sys16_bg_scrolly&0x1f8) >> 3); /* 0x00..0x3f */ + offset2 = 32+((sys16_bg2_scrolly&0x1f8) >> 3); /* 0x00..0x3f */ for( i=0;i<29;i++ ){ orig_scroll = scroll2 = scroll = sys18_splittab_bg_x[i]; if((sys16_bg_scrollx &0xff00) != 0x8000) scroll = sys16_bg_scrollx; if((sys16_bg2_scrollx &0xff00) != 0x8000) scroll2 = sys16_bg2_scrollx; - if(orig_scroll&0x8000){ // background2 + if(orig_scroll&0x8000){ /* background2 */ tilemap_set_scrollx( background , (i+offset)&0x3f, TILE_LINE_DISABLED ); tilemap_set_scrollx( background2, (i+offset2)&0x3f, -320-(scroll2&0x3ff)+sys16_bgxoffset ); } - else{ // background + else{ /* background */ tilemap_set_scrollx( background , (i+offset)&0x3f, -320-(scroll&0x3ff)+sys16_bgxoffset ); tilemap_set_scrollx( background2, (i+offset2)&0x3f, TILE_LINE_DISABLED ); } @@ -1343,15 +1343,15 @@ VIDEO_UPDATE( system16 ){ tilemap_draw( bitmap,cliprect, background, TILEMAP_IGNORE_TRANSPARENCY, 0x00 ); if(sys16_bg_priority_mode) tilemap_draw( bitmap,cliprect, background, TILEMAP_IGNORE_TRANSPARENCY | 1, 0x00 ); -// sprite_draw(sprite_list,3); // needed for Aurail - if( sys16_bg_priority_mode==2 ) tilemap_draw( bitmap,cliprect, background, 1, 0x01 );// body slam (& wrestwar??) -// sprite_draw(sprite_list,2); - else if( sys16_bg_priority_mode==1 ) tilemap_draw( bitmap,cliprect, background, 1, 0x03 );// alien syndrome / aurail +/* sprite_draw(sprite_list,3);*/ /* needed for Aurail */ + if( sys16_bg_priority_mode==2 ) tilemap_draw( bitmap,cliprect, background, 1, 0x01 );/* body slam (& wrestwar??) */ +/* sprite_draw(sprite_list,2); */ + else if( sys16_bg_priority_mode==1 ) tilemap_draw( bitmap,cliprect, background, 1, 0x03 );/* alien syndrome / aurail */ tilemap_draw( bitmap,cliprect, foreground, 0, 0x03 ); -// sprite_draw(sprite_list,1); +/* sprite_draw(sprite_list,1); */ tilemap_draw( bitmap,cliprect, foreground, 1, 0x07 ); - if( sys16_textlayer_lo_max!=0 ) tilemap_draw( bitmap,cliprect, text_layer, 1, 7 );// needed for Body Slam -// sprite_draw(sprite_list,0); + if( sys16_textlayer_lo_max!=0 ) tilemap_draw( bitmap,cliprect, text_layer, 1, 7 );/* needed for Body Slam */ +/* sprite_draw(sprite_list,0); */ tilemap_draw( bitmap,cliprect, text_layer, 0, 0xf ); if (!sys16_sprite_draw) @@ -1379,22 +1379,22 @@ VIDEO_UPDATE( system18 ){ fillbitmap(bitmap,Machine->pens[0],cliprect); tilemap_draw( bitmap,cliprect, background, TILEMAP_IGNORE_TRANSPARENCY, 0 ); - tilemap_draw( bitmap,cliprect, background, TILEMAP_IGNORE_TRANSPARENCY | 1, 0 ); //?? - tilemap_draw( bitmap,cliprect, background, TILEMAP_IGNORE_TRANSPARENCY | 2, 0 ); //?? + tilemap_draw( bitmap,cliprect, background, TILEMAP_IGNORE_TRANSPARENCY | 1, 0 ); + tilemap_draw( bitmap,cliprect, background, TILEMAP_IGNORE_TRANSPARENCY | 2, 0 ); -// sprite_draw(sprite_list,3); +/* sprite_draw(sprite_list,3); */ tilemap_draw( bitmap,cliprect, background, 1, 0x1 ); -// sprite_draw(sprite_list,2); +/* sprite_draw(sprite_list,2); */ tilemap_draw( bitmap,cliprect, background, 2, 0x3 ); if(sys18_fg2_active) tilemap_draw( bitmap,cliprect, foreground2, 0, 0x3 ); tilemap_draw( bitmap,cliprect, foreground, 0, 0x3 ); -// sprite_draw(sprite_list,1); +/* sprite_draw(sprite_list,1); */ if(sys18_fg2_active) tilemap_draw( bitmap,cliprect, foreground2, 1, 0x7 ); tilemap_draw( bitmap,cliprect, foreground, 1, 0x7 ); tilemap_draw( bitmap,cliprect, text_layer, 1, 0x7 ); -// sprite_draw(sprite_list,0); +/* sprite_draw(sprite_list,0); */ tilemap_draw( bitmap,cliprect, text_layer, 0, 0xf ); if (!sys16_sprite_draw) @@ -1466,7 +1466,7 @@ if( keyboard_pressed( KEYCODE_S ) ){ if((ver_data & 0x500) == 0x100 || (ver_data & 0x300) == 0x200) { - // fill line + /* fill line */ for(j=cliprect->min_x;j<=cliprect->max_x;j++) { line16=(UINT16 *)bitmap->line[j]+ypos; @@ -1475,7 +1475,7 @@ if( keyboard_pressed( KEYCODE_S ) ){ } else { - // copy line + /* copy line */ ver_data=ver_data & 0x00ff; colorflip = (sys16_gr_flip[ver_data] >> 3) & 1; @@ -1489,12 +1489,12 @@ if( keyboard_pressed( KEYCODE_S ) ){ if(hor_pos & 0xf000) { - // reverse + /* reverse */ hor_pos=((0-((hor_pos&0x7ff)^7))+0x9f8)&0x3ff; } else { - // normal + /* normal */ hor_pos=(hor_pos+0x200) & 0x3ff; } @@ -1549,7 +1549,7 @@ if( keyboard_pressed( KEYCODE_S ) ){ } } else { - // copy line + /* copy line */ line16 = (UINT16 *)bitmap->line[ypos]+xoff; /* dest for drawing */ ver_data &= 0xff; @@ -1560,10 +1560,10 @@ if( keyboard_pressed( KEYCODE_S ) ){ colors[4] = paldata2[ sys16_gr_colorflip[colorflip][3] ]; hor_pos = sys16_gr_hor[ver_data]; - if( hor_pos & 0xf000 ){ // reverse (precalculated) + if( hor_pos & 0xf000 ){ /* reverse (precalculated) */ hor_pos=((0-((hor_pos&0x7ff)^7))+0x9f8)&0x3ff; } - else { // normal + else { /* normal */ hor_pos=(hor_pos+0x200) & 0x3ff; } @@ -1655,7 +1655,7 @@ static void render_grv2(struct mame_bitmap *bitmap,const struct rectangle *clipr if(ver_data & 0x800) /* disable */ { colors[0] = paldata1[ ver_data&0x3f ]; - // fill line + /* fill line */ for(j=cliprect->min_x;j<=cliprect->max_x;j++) { line16=(UINT16 *)bitmap->line[j]+ypos; @@ -1664,11 +1664,11 @@ static void render_grv2(struct mame_bitmap *bitmap,const struct rectangle *clipr } else { - // copy line - ver_data=ver_data & 0x01ff; //??? + /* copy line */ + ver_data=ver_data & 0x01ff; /*??? */ colorflip_info = sys16_gr_flip[ver_data]; - colors[0] = paldata2[ ((colorflip_info >> 8) & 0x1f) + 0x20 ]; //?? + colors[0] = paldata2[ ((colorflip_info >> 8) & 0x1f) + 0x20 ]; colorflip = (colorflip_info >> 3) & 1; @@ -1728,18 +1728,18 @@ static void render_grv2(struct mame_bitmap *bitmap,const struct rectangle *clipr if((ver_data & 0x800) == priority){ if(ver_data & 0x800){ colors[0] = paldata1[ ver_data&0x3f ]; - // fill line + /* fill line */ line16 = (UINT16 *)bitmap->line[ypos]; for(j=cliprect->min_x;j<=cliprect->max_x;j++){ *line16++ = colors[0]; } } else { - // copy line + /* copy line */ line16 = (UINT16 *)bitmap->line[ypos]+xoff; - ver_data &= 0x01ff; //??? + ver_data &= 0x01ff; /*??? */ colorflip_info = sys16_gr_flip[ver_data]; - colors[0] = paldata2[ ((colorflip_info >> 8) & 0x1f) + 0x20 ]; //?? + colors[0] = paldata2[ ((colorflip_info >> 8) & 0x1f) + 0x20 ]; /*?? */ colorflip = (colorflip_info >> 3) & 1; colors[1] = paldata2[ sys16_gr_colorflip[colorflip][0] ]; colors[2] = paldata2[ sys16_gr_colorflip[colorflip][1] ]; @@ -1963,7 +1963,7 @@ static void aburner_draw_road( struct mame_bitmap *bitmap, const struct rectangl else if( page&0xc0 ){ /* road */ const UINT8 *source = aburner_backdrop+(line&0xff)*512 + 512*256*(page&1); UINT16 xscroll = (512-320)/2; - // 040d 04b0 0552: normal: sky,horizon,sea + /* 040d 04b0 0552: normal: sky,horizon,sea */ UINT16 flip = vreg[0x600+sy]; int clut[5]; @@ -2059,19 +2059,19 @@ static void sys16_aburner_vh_screenrefresh_helper( void ){ { int offset,offset2, scroll,scroll2,orig_scroll; - offset = 32+((sys16_bg_scrolly >>3)&0x3f ); // screenwise rowscroll - offset2 = 32+((sys16_bg2_scrolly>>3)&0x3f ); // screenwise rowscroll + offset = 32+((sys16_bg_scrolly >>3)&0x3f ); /* screenwise rowscroll */ + offset2 = 32+((sys16_bg2_scrolly>>3)&0x3f ); /* screenwise rowscroll */ for( i=0;i<29;i++ ){ orig_scroll = scroll2 = scroll = sys18_splittab_bg_x[i]; if((sys16_bg_scrollx &0xff00) != 0x8000) scroll = sys16_bg_scrollx; if((sys16_bg2_scrollx &0xff00) != 0x8000) scroll2 = sys16_bg2_scrollx; - if( orig_scroll&0x8000 ){ // background2 + if( orig_scroll&0x8000 ){ /* background2 */ tilemap_set_scrollx( background , (i+offset)&0x3f, TILE_LINE_DISABLED ); tilemap_set_scrollx( background2, (i+offset2)&0x3f, -320-(scroll2&0x3ff)+sys16_bgxoffset ); } - else{ // background1 + else{ /* background1 */ tilemap_set_scrollx( background , (i+offset)&0x3f, -320-(scroll&0x3ff)+sys16_bgxoffset ); tilemap_set_scrollx( background2, (i+offset2)&0x3f, TILE_LINE_DISABLED ); } @@ -2083,8 +2083,8 @@ static void sys16_aburner_vh_screenrefresh_helper( void ){ { int offset,offset2, scroll,scroll2,orig_scroll; - offset = 32+((sys16_fg_scrolly >>3)&0x3f ); // screenwise rowscroll - offset2 = 32+((sys16_fg2_scrolly>>3)&0x3f ); // screenwise rowscroll + offset = 32+((sys16_fg_scrolly >>3)&0x3f ); /* screenwise rowscroll */ + offset2 = 32+((sys16_fg2_scrolly>>3)&0x3f ); /* screenwise rowscroll */ for( i=0;i<29;i++ ){ orig_scroll = scroll2 = scroll = sys18_splittab_fg_x[i]; @@ -2092,11 +2092,11 @@ static void sys16_aburner_vh_screenrefresh_helper( void ){ if( (sys16_fg2_scrollx &0xff00) != 0x8000 ) scroll2 = sys16_fg2_scrollx; - if( orig_scroll&0x8000 ){ // foreground2 + if( orig_scroll&0x8000 ){ /* foreground2 */ tilemap_set_scrollx( foreground , (i+offset)&0x3f, TILE_LINE_DISABLED ); tilemap_set_scrollx( foreground2, (i+offset2)&0x3f, -320-(scroll2&0x3ff)+sys16_fgxoffset ); } - else { // foreground + else { /* foreground */ tilemap_set_scrollx( foreground , (i+offset)&0x3f, -320-(scroll&0x3ff)+sys16_fgxoffset ); tilemap_set_scrollx( foreground2 , (i+offset2)&0x3f, TILE_LINE_DISABLED ); } @@ -2115,8 +2115,8 @@ VIDEO_UPDATE( aburner ){ aburner_draw_road( bitmap,cliprect ); -// tilemap_draw( bitmap,cliprect, background2, 0, 7 ); -// tilemap_draw( bitmap,cliprect, background2, 1, 7 ); +/* tilemap_draw( bitmap,cliprect, background2, 0, 7 ); */ +/* tilemap_draw( bitmap,cliprect, background2, 1, 7 ); */ /* speed indicator, high score header */ tilemap_draw( bitmap,cliprect, background, 0, 7 ); @@ -2139,5 +2139,5 @@ VIDEO_UPDATE( aburner ){ else draw_sprites_new( bitmap,cliprect); -// debug_draw( bitmap,cliprect, 8,8,sys16_roadram[0x1000] ); +/* debug_draw( bitmap,cliprect, 8,8,sys16_roadram[0x1000] ); */ } diff --git a/src/vidhrdw/taito_f3_vidhrdw.c b/src/vidhrdw/taito_f3_vidhrdw.c index 43d00d31c..ef89d6498 100644 --- a/src/vidhrdw/taito_f3_vidhrdw.c +++ b/src/vidhrdw/taito_f3_vidhrdw.c @@ -253,8 +253,8 @@ static const struct F3config f3_config_table[] = { PBOBBLE4, 0, 0, 0, 1, 1/**/}, { POPNPOP, 1, 0, -23, 0, 1/**/}, { LANDMAKR, 1, 0, -23, 0, 1/**/}, - { RECALH, 1, 1, -23, 0, 1/**/}, // not verified - { COMMANDW, 1, 0, -23, 0, 1/**/}, // not verified + { RECALH, 1, 1, -23, 0, 1/**/}, /* not verified */ + { COMMANDW, 1, 0, -23, 0, 1/**/}, /* not verified */ {0} }; diff --git a/src/vidhrdw/toypop_vidhrdw.c b/src/vidhrdw/toypop_vidhrdw.c index 0e05eef64..4c9d78d4d 100644 --- a/src/vidhrdw/toypop_vidhrdw.c +++ b/src/vidhrdw/toypop_vidhrdw.c @@ -34,19 +34,19 @@ PALETTE_INIT( toypop ) { int bit0,bit1,bit2,bit3,r,g,b; - // red component + /* red component */ bit0 = (color_prom[i] >> 0) & 0x01; bit1 = (color_prom[i] >> 1) & 0x01; bit2 = (color_prom[i] >> 2) & 0x01; bit3 = (color_prom[i] >> 3) & 0x01; r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - // green component + /* green component */ bit0 = (color_prom[i+0x100] >> 0) & 0x01; bit1 = (color_prom[i+0x100] >> 1) & 0x01; bit2 = (color_prom[i+0x100] >> 2) & 0x01; bit3 = (color_prom[i+0x100] >> 3) & 0x01; g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3; - // blue component + /* blue component */ bit0 = (color_prom[i+0x200] >> 0) & 0x01; bit1 = (color_prom[i+0x200] >> 1) & 0x01; bit2 = (color_prom[i+0x200] >> 2) & 0x01; @@ -57,10 +57,10 @@ PALETTE_INIT( toypop ) for (i = 0;i < 256;i++) { - // characters + /* characters */ colortable[i] = (color_prom[i + 0x300] & 0x0f) | 0x70; colortable[i+256] = (color_prom[i + 0x300] & 0x0f) | 0xf0; - // sprites + /* sprites */ colortable[i+512] = color_prom[i + 0x500]; } } @@ -153,7 +153,7 @@ READ16_HANDLER( toypop_merged_background_r ) { int data1, data2; - // 0x0a0b0c0d is read as 0xabcd + /* 0x0a0b0c0d is read as 0xabcd */ data1 = toypop_bg_image[2*offset]; data2 = toypop_bg_image[2*offset + 1]; return ((data1 & 0xf00) << 4) | ((data1 & 0xf) << 8) | ((data2 & 0xf00) >> 4) | (data2 & 0xf); @@ -161,7 +161,7 @@ READ16_HANDLER( toypop_merged_background_r ) WRITE16_HANDLER( toypop_merged_background_w ) { - // 0xabcd is written as 0x0a0b0c0d in the background image + /* 0xabcd is written as 0x0a0b0c0d in the background image */ if (ACCESSING_MSB) toypop_bg_image[2*offset] = ((data & 0xf00) >> 8) | ((data & 0xf000) >> 4); @@ -174,7 +174,7 @@ static void draw_background(struct mame_bitmap *bitmap) register int offs, x, y; UINT8 scanline[288]; - // copy the background image from RAM (0x190200-0x19FDFF) to bitmap + /* copy the background image from RAM (0x190200-0x19FDFF) to bitmap */ if (bitmapflip) { offs = 0xFDFE/2; diff --git a/src/vidhrdw/triplhnt_vidhrdw.c b/src/vidhrdw/triplhnt_vidhrdw.c index aacc968cf..57f87a2f7 100644 --- a/src/vidhrdw/triplhnt_vidhrdw.c +++ b/src/vidhrdw/triplhnt_vidhrdw.c @@ -155,6 +155,6 @@ VIDEO_UPDATE( triplhnt ) draw_crosshair(1, bitmap, cross_x, cross_y, cliprect); - //discrete_sound_w(0/*TRIPLHNT_BEAR_ROAR_DATA*/, triplhnt_playfield_ram[0xfa] & 15); - //discrete_sound_w(2/*TRIPLHNT_SHOT_DATA*/, triplhnt_playfield_ram[0xfc] & 15); + /*discrete_sound_w(0/*TRIPLHNT_BEAR_ROAR_DATA*/ /*, triplhnt_playfield_ram[0xfa] & 15); */ + /*discrete_sound_w(2/*TRIPLHNT_SHOT_DATA*/ /*, triplhnt_playfield_ram[0xfc] & 15); */ } diff --git a/src/vidhrdw/tryout_vidhrdw.c b/src/vidhrdw/tryout_vidhrdw.c index 02dc2b98f..9ae976254 100644 --- a/src/vidhrdw/tryout_vidhrdw.c +++ b/src/vidhrdw/tryout_vidhrdw.c @@ -60,7 +60,7 @@ static void get_bg_tile_info(int tile_index) READ_HANDLER( tryout_vram_r ) { - return tryout_vram[offset]; // debug only + return tryout_vram[offset]; /* debug only */ } WRITE_HANDLER( tryout_videoram_w ) @@ -159,12 +159,12 @@ static UINT32 get_fg_memory_offset( UINT32 col, UINT32 row, UINT32 num_cols, UIN static UINT32 get_bg_memory_offset( UINT32 col, UINT32 row, UINT32 num_cols, UINT32 num_rows ) { int a; -// if (col&0x20) -// a= (7 - (row & 7)) + ((0x8 - (row & 0x8)) << 4) + ((col & 0xf) << 3) + (( ( 0x10 - (col & 0x10) ) ) << 4) + ((( (col & 0x20))) << 4); -// else +/* if (col&0x20) */ +/* a= (7 - (row & 7)) + ((0x8 - (row & 0x8)) << 4) + ((col & 0xf) << 3) + (( ( 0x10 - (col & 0x10) ) ) << 4) + ((( (col & 0x20))) << 4); */ +/* else */ a= (7 - (row & 7)) + ((0x8 - (row & 0x8)) << 4) + ((col & 0xf) << 3) + (( ( (col & 0x10) ) ) << 4) + ((( (col & 0x20))) << 4); -// printf("%d %d -> %d\n",col,row, a); +/* printf("%d %d -> %d\n",col,row, a); */ return a; } @@ -264,5 +264,5 @@ VIDEO_UPDATE( tryout ) draw_sprites(bitmap,cliprect); } -// usrintf_showmessage("%02x %02x %02x %02x",tryout_gfx_control[0],tryout_gfx_control[1],tryout_gfx_control[2],scrollx); +/* usrintf_showmessage("%02x %02x %02x %02x",tryout_gfx_control[0],tryout_gfx_control[1],tryout_gfx_control[2],scrollx); */ } diff --git a/src/vidhrdw/tumblep_vidhrdw.c b/src/vidhrdw/tumblep_vidhrdw.c index d31d1763d..74d9b9b94 100644 --- a/src/vidhrdw/tumblep_vidhrdw.c +++ b/src/vidhrdw/tumblep_vidhrdw.c @@ -117,7 +117,7 @@ static void jumpkids_drawsprites(struct mame_bitmap *bitmap,const struct rectang y = 240 - y; x = 304 - x; - // sprite &= ~multi; /* Todo: I bet TumblePop bootleg doesn't do this either */ + /* sprite &= ~multi;*/ /* Todo: I bet TumblePop bootleg doesn't do this either */ if (fy) inc = -1; else @@ -142,7 +142,7 @@ static void jumpkids_drawsprites(struct mame_bitmap *bitmap,const struct rectang sprite - multi * inc, colour, fx,fy, - x-1,y + mult * multi, // x-1 for bcstory .. realign other layers? + x-1,y + mult * multi, /* x-1 for bcstory .. realign other layers? */ cliprect,TRANSPARENCY_PEN,0); multi--; @@ -179,7 +179,7 @@ static void fncywld_drawsprites(struct mame_bitmap *bitmap,const struct rectangl y = 240 - y; x = 304 - x; - // sprite &= ~multi; /* Todo: I bet TumblePop bootleg doesn't do this either */ + /* sprite &= ~multi;*/ /* Todo: I bet TumblePop bootleg doesn't do this either */ if (fy) inc = -1; else @@ -233,7 +233,7 @@ WRITE16_HANDLER( chokchok_tilebank_w ) WRITE16_HANDLER( suprtrio_tilebank_w ) { - bcstory_tilebank = data<<14; // shift it here, makes using bcstory_tilebank easier + bcstory_tilebank = data<<14; /* shift it here, makes using bcstory_tilebank easier */ tilemap_mark_all_tiles_dirty(pf1_tilemap); tilemap_mark_all_tiles_dirty(pf1_alt_tilemap); tilemap_mark_all_tiles_dirty(pf2_tilemap); @@ -603,12 +603,12 @@ VIDEO_UPDATE( sdfight ) flipscreen=tumblep_control_0[0]&0x80; tilemap_set_flip(ALL_TILEMAPS,flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); offs=-1; - offs2=-5; // foreground scroll.. + offs2=-5; /* foreground scroll.. */ /* sprites need an offset too */ tilemap_set_scrollx( pf1_tilemap,0, tumblep_control_0[1]+offs2 ); - tilemap_set_scrolly( pf1_tilemap,0, tumblep_control_0[2]-16 ); // needed for the ground ... + tilemap_set_scrolly( pf1_tilemap,0, tumblep_control_0[2]-16 ); /* needed for the ground ... */ tilemap_set_scrollx( pf1_alt_tilemap,0, tumblep_control_0[1]+offs2 ); tilemap_set_scrolly( pf1_alt_tilemap,0, tumblep_control_0[2]-16 ); tilemap_set_scrollx( pf2_tilemap,0, tumblep_control_0[3]+offs ); @@ -650,7 +650,7 @@ VIDEO_UPDATE( fncywld ) VIDEO_UPDATE( jumppop ) { -// fillbitmap(bitmap, get_black_pen(), cliprect); +/* fillbitmap(bitmap, get_black_pen(), cliprect); */ tilemap_set_scrollx( pf1_tilemap,0, jumppop_control[2]-0x3a0 ); tilemap_set_scrolly( pf1_tilemap,0, jumppop_control[3] ); @@ -671,7 +671,7 @@ VIDEO_UPDATE( jumppop ) else tilemap_draw(bitmap,cliprect,pf1_tilemap,0,0); -//ui_popup("%04x %04x %04x %04x %04x %04x %04x %04x", jumppop_control[0],jumppop_control[1],jumppop_control[2],jumppop_control[3],jumppop_control[4],jumppop_control[5],jumppop_control[6],jumppop_control[7]); +/*ui_popup("%04x %04x %04x %04x %04x %04x %04x %04x", jumppop_control[0],jumppop_control[1],jumppop_control[2],jumppop_control[3],jumppop_control[4],jumppop_control[5],jumppop_control[6],jumppop_control[7]); */ jumpkids_drawsprites(bitmap,cliprect); } diff --git a/src/vidhrdw/xmen_vidhrdw.c b/src/vidhrdw/xmen_vidhrdw.c index 8aa3ef5b0..194104b6d 100644 --- a/src/vidhrdw/xmen_vidhrdw.c +++ b/src/vidhrdw/xmen_vidhrdw.c @@ -142,7 +142,7 @@ VIDEO_UPDATE( xmen6p ) int x,y; /* update every other frame ...help prevent screens lagging (although it still does..).. but maybe the hw has its own buffering hence the extra ram */ -// if (xmen_current_frame&0x8000) /* actually don't bother */ +/* if (xmen_current_frame&0x8000)*/ /* actually don't bother */ { for(y=0;y<32*8;y++) @@ -190,7 +190,7 @@ VIDEO_EOF( xmen6p ) */ for (offset=0;offset<(0xc000/2);offset++) { -// K052109_lsb_w +/* K052109_lsb_w */ if (offset != 0x1c80 && offset != 0x1e80) { if (xmen6p_tilemap_select) @@ -214,7 +214,7 @@ VIDEO_EOF( xmen6p ) */ for (offset=0;offset<(0xc000/2);offset++) { -// K052109_lsb_w +/* K052109_lsb_w */ { if (xmen6p_tilemap_select) {