From b96aa2fb5c79372b71b4d06c245eb9272c61a7ca Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 28 Feb 2008 06:20:19 +0000 Subject: Spacing and version bump. --- src/build/verinfo.c | 6 ++-- src/emu/cpu/upd7810/7810dasm.c | 48 ++++++++++++------------- src/emu/cpu/upd7810/7810tbl.c | 12 +++---- src/emu/cpu/upd7810/upd7810.c | 2 +- src/emu/info.c | 2 +- src/emu/inptport.c | 2 +- src/emu/inptport.h | 10 +++--- src/emu/mconfig.c | 82 +++++++++++++++++++++--------------------- src/emu/mconfig.h | 14 ++++---- src/emu/sound.c | 2 +- src/emu/video/generic.c | 8 ++--- src/mame/drivers/amspdwy.c | 4 +-- src/mame/drivers/appoooh.c | 2 +- src/mame/drivers/astinvad.c | 2 +- src/mame/drivers/astrocde.c | 12 +++---- src/mame/drivers/asuka.c | 12 +++---- src/mame/drivers/backfire.c | 2 +- src/mame/drivers/bionicc.c | 8 ++--- src/mame/drivers/calomega.c | 4 +-- src/mame/drivers/dkong.c | 20 +++++------ src/mame/drivers/funworld.c | 2 +- src/mame/drivers/omegrace.c | 8 ++--- src/mame/includes/dkong.h | 2 +- src/mame/machine/irem_cpu.c | 4 +-- src/version.c | 2 +- 25 files changed, 136 insertions(+), 136 deletions(-) diff --git a/src/build/verinfo.c b/src/build/verinfo.c index 99621f691fc..998c246afc7 100644 --- a/src/build/verinfo.c +++ b/src/build/verinfo.c @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) memset(&v, 0, sizeof(v)); build = BUILD_WINDOWS; - + // validate parameters opt = 1; while (opt < argc && *argv[opt] == '-') @@ -213,7 +213,7 @@ int main(int argc, char *argv[]) return usage(argv[0]); opt++; } - + if (opt != argc-1 ) { return usage(argv[0]); @@ -271,7 +271,7 @@ int main(int argc, char *argv[]) v.internal_name = "MAMEUI"; v.original_filename = "MAMEUI"; v.product_name = "MAMEUI"; - } + } else { // MAME diff --git a/src/emu/cpu/upd7810/7810dasm.c b/src/emu/cpu/upd7810/7810dasm.c index a200601046a..fcb8014e096 100644 --- a/src/emu/cpu/upd7810/7810dasm.c +++ b/src/emu/cpu/upd7810/7810dasm.c @@ -3962,7 +3962,7 @@ static const struct dasm_s dasmXX_7807[256] = * uPD7801 * *********************************************************/ - + static const struct dasm_s dasm48_7801[256] = { /* 0x00 - 0x3F */ { SKIT, "F0" }, { SKIT, "FT" }, { SKIT, "F1" }, { SKIT, "F2" }, @@ -4567,43 +4567,43 @@ static const struct dasm_s dasm74_7801[256] = { static const struct dasm_s dasmXX_7801[256] = { /* 0x00 - 0x3F */ - { NOP, 0 }, { HALT, 0 }, { INX, "SP" }, { DCX, "SP" }, - { LXI, "SP,%w" }, { ANIW, "%a,%b" }, { illegal, 0 }, { ANI, "A,%b" }, - { RET, 0 }, { SIO, 0 }, { MOV, "A,B" }, { MOV, "A,C" }, - { MOV, "A,D" }, { MOV, "A,E" }, { MOV, "A,H" }, { MOV, "A,L" }, + { NOP, 0 }, { HALT, 0 }, { INX, "SP" }, { DCX, "SP" }, + { LXI, "SP,%w" }, { ANIW, "%a,%b" }, { illegal, 0 }, { ANI, "A,%b" }, + { RET, 0 }, { SIO, 0 }, { MOV, "A,B" }, { MOV, "A,C" }, + { MOV, "A,D" }, { MOV, "A,E" }, { MOV, "A,H" }, { MOV, "A,L" }, - { EX, 0 }, { EXX, 0 }, { INX, "BC" }, { DCX, "BC" }, + { EX, 0 }, { EXX, 0 }, { INX, "BC" }, { DCX, "BC" }, { LXI, "BC,%w" }, { ORIW, "%a,%b" }, { XRI, "A,%b" }, { ORI, "A,%b" }, { RETS, 0 }, { STM, 0 }, { MOV, "B,A" }, { MOV, "C,A" }, { MOV, "D,A" }, { MOV, "E,A" }, { MOV, "H,A" }, { MOV, "L,A" }, - { INRW, "%a" }, { TABLE, 0 }, { INX, "DE" }, { DCX, "DE" }, + { INRW, "%a" }, { TABLE, 0 }, { INX, "DE" }, { DCX, "DE" }, { LXI, "DE,%w" }, { GTIW, "%a,%b" }, { ADINC, "A,%b" }, { GTI, "A,%b" }, { LDAW, "%a" }, { LDAX, "BC" }, { LDAX, "DE" }, { LDAX, "HL" }, { LDAX, "DE+" }, { LDAX, "HL+" }, { LDAX, "DE-" }, { LDAX, "HL-" }, - { DCRW, "%a" }, { BLOCK, 0 }, { INX, "HL" }, { DCX, "HL" }, + { DCRW, "%a" }, { BLOCK, 0 }, { INX, "HL" }, { DCX, "HL" }, { LXI, "HL,%w" }, { LTIW, "%a,%b" }, { SUINB, "A,%b" }, { LTI, "A,%b" }, { STAW, "%a" }, { STAX, "BC" }, { STAX, "DE" }, { STAX, "HL" }, { STAX, "DE+" }, { STAX, "HL+" }, { STAX, "DE-" }, { STAX, "HL-" }, /* 0x40 - 0x7F */ - { illegal, 0 }, { INR, "A" }, { INR, "B" }, { INR, "C" }, + { illegal, 0 }, { INR, "A" }, { INR, "B" }, { INR, "C" }, { CALL, "%w" }, { ONIW, "%a,%b" }, { ADI, "A,%b" }, { ONI, "A,%b" }, { 0, dasm48_7801 }, { MVIX, "BC,%b" }, { MVIX, "DE,%b" }, { MVIX, "HL,%b" }, { 0, dasm4c_7801 }, { 0, dasm4d_7801 }, { JRE, "%d" }, { JRE, "%d" }, - { illegal, 0 }, { DCR, "A" }, { DCR, "B" }, { DCR, "C" }, + { illegal, 0 }, { DCR, "A" }, { DCR, "B" }, { DCR, "C" }, { JMP, "%w" }, { OFFIW, "%a,%b" }, { ACI, "A,%b" }, { OFFI, "A,%b" }, { BIT, "0,%a" }, { BIT, "1,%a" }, { BIT," 2,%a" }, { BIT, "3,%a" }, { BIT, "4,%a" }, { BIT, "5,%a" }, { BIT, "6,%a" }, { BIT, "7,%a" }, - { 0, dasm60_7801 }, { DAA, 0 }, { RETI, 0 }, { CALB, 0 }, + { 0, dasm60_7801 }, { DAA, 0 }, { RETI, 0 }, { CALB, 0 }, { 0, dasm64_7801 }, { NEIW, "%a,%b" }, { SUI, "A,%b" }, { NEI, "A,%b" }, { MVI, "V,%b?" }, { MVI, "A,%b" }, { MVI, "B,%b" }, { MVI, "C,%b" }, { MVI, "D,%b" }, { MVI, "E,%b" }, { MVI, "H,%b" }, { MVI, "L,%b" }, - { 0, dasm70_7801 }, { MVIW, "%a,%b" }, { SOFTI, 0 }, { JB, 0 }, + { 0, dasm70_7801 }, { MVIW, "%a,%b" }, { SOFTI, 0 }, { JB, 0 }, { 0, dasm74_7801 }, { EQIW, "%a,%b" }, { SBI, "A,%b" }, { EQI, "A,%b" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, @@ -4656,7 +4656,7 @@ static const struct dasm_s dasmXX_7801[256] = { * uPD7801 * *********************************************************/ - + static const struct dasm_s dasm48_78c05[256] = { /* 0x00 - 0x3F */ { SKIT, "F0" }, { SKIT, "FT" }, { SKIT, "F1" }, { illegal, 0 }, /* TODO: PDF doesn't mention SKIT and SK */ @@ -5261,43 +5261,43 @@ static const struct dasm_s dasm74_78c05[256] = { static const struct dasm_s dasmXX_78c05[256] = { /* 0x00 - 0x3F */ - { NOP, 0 }, { HALT, 0 }, { INX, "SP" }, { DCX, "SP" }, - { LXI, "SP,%w" }, { ANIW, "%a,%b" }, { illegal, 0 }, { ANI, "A,%b" }, - { RET, 0 }, { SIO, 0 }, { MOV, "A,B" }, { MOV, "A,C" }, - { MOV, "A,D" }, { MOV, "A,E" }, { MOV, "A,H" }, { MOV, "A,L" }, + { NOP, 0 }, { HALT, 0 }, { INX, "SP" }, { DCX, "SP" }, + { LXI, "SP,%w" }, { ANIW, "%a,%b" }, { illegal, 0 }, { ANI, "A,%b" }, + { RET, 0 }, { SIO, 0 }, { MOV, "A,B" }, { MOV, "A,C" }, + { MOV, "A,D" }, { MOV, "A,E" }, { MOV, "A,H" }, { MOV, "A,L" }, - { illegal, 0 }, { illegal, 0 }, { INX, "BC" }, { DCX, "BC" }, + { illegal, 0 }, { illegal, 0 }, { INX, "BC" }, { DCX, "BC" }, { LXI, "BC,%w" }, { ORIW, "%a,%b" }, { XRI, "A,%b" }, { ORI, "A,%b" }, { RETS, 0 }, { STM, 0 }, { MOV, "B,A" }, { MOV, "C,A" }, { MOV, "D,A" }, { MOV, "E,A" }, { MOV, "H,A" }, { MOV, "L,A" }, - { INRW, "%a" }, { illegal, 0 }, { INX, "DE" }, { DCX, "DE" }, + { INRW, "%a" }, { illegal, 0 }, { INX, "DE" }, { DCX, "DE" }, { LXI, "DE,%w" }, { GTIW, "%a,%b" }, { ADINC, "A,%b" }, { GTI, "A,%b" }, { LDAW, "%a" }, { LDAX, "BC" }, { LDAX, "DE" }, { LDAX, "HL" }, { LDAX, "DE+" }, { LDAX, "HL+" }, { LDAX, "DE-" }, { LDAX, "HL-" }, - { DCRW, "%a" }, { illegal, 0 }, { INX, "HL" }, { DCX, "HL" }, + { DCRW, "%a" }, { illegal, 0 }, { INX, "HL" }, { DCX, "HL" }, { LXI, "HL,%w" }, { LTIW, "%a,%b" }, { SUINB, "A,%b" }, { LTI, "A,%b" }, { STAW, "%a" }, { STAX, "BC" }, { STAX, "DE" }, { STAX, "HL" }, { STAX, "DE+" }, { STAX, "HL+" }, { STAX, "DE-" }, { STAX, "HL-" }, /* 0x40 - 0x7F */ - { illegal, 0 }, { INR, "A" }, { INR, "B" }, { INR, "C" }, + { illegal, 0 }, { INR, "A" }, { INR, "B" }, { INR, "C" }, { CALL, "%w" }, { ONIW, "%a,%b" }, { ADI, "A,%b" }, { ONI, "A,%b" }, { 0, dasm48_78c05 }, { illegal, 0 }, { illegal, 0 }, { illegal, 0 }, { 0, dasm4c_78c05 }, { 0, dasm4d_78c05 }, { JRE, "%d" }, { JRE, "%d" }, - { illegal, 0 }, { DCR, "A" }, { DCR, "B" }, { DCR, "C" }, + { illegal, 0 }, { DCR, "A" }, { DCR, "B" }, { DCR, "C" }, { JMP, "%w" }, { OFFIW, "%a,%b" }, { ACI, "A,%b" }, { OFFI, "A,%b" }, { illegal, 0 }, { illegal, 0 }, { illegal, 0 }, { illegal, 0 }, { illegal, 0 }, { illegal, 0 }, { illegal, 0 }, { illegal, 0 }, - { 0, dasm60_78c05 }, { DAA, 0 }, { RETI, 0 }, { CALB, 0 }, + { 0, dasm60_78c05 }, { DAA, 0 }, { RETI, 0 }, { CALB, 0 }, { 0, dasm64_78c05 }, { NEIW, "%a,%b" }, { SUI, "A,%b" }, { NEI, "A,%b" }, { illegal, 0 }, { MVI, "A,%b" }, { MVI, "B,%b" }, { MVI, "C,%b" }, { MVI, "D,%b" }, { MVI, "E,%b" }, { MVI, "H,%b" }, { MVI, "L,%b" }, - { 0, dasm70_78c05 }, { MVIW, "%a,%b" }, { SOFTI, 0 }, { JB, 0 }, + { 0, dasm70_78c05 }, { MVIW, "%a,%b" }, { SOFTI, 0 }, { JB, 0 }, { 0, dasm74_78c05 }, { EQIW, "%a,%b" }, { SBI, "A,%b" }, { EQI, "A,%b" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, { CALF, "%f" }, diff --git a/src/emu/cpu/upd7810/7810tbl.c b/src/emu/cpu/upd7810/7810tbl.c index d2f343ea506..fe4517de44f 100644 --- a/src/emu/cpu/upd7810/7810tbl.c +++ b/src/emu/cpu/upd7810/7810tbl.c @@ -3538,7 +3538,7 @@ static const struct opcode_s opXX_7807[256] = * uPD7801 * **********************************************************************/ - + static const struct opcode_s op48_7801[256] = { /* 0x00 - 0x1F */ @@ -3645,7 +3645,7 @@ static const struct opcode_s op48_7801[256] = {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, - + {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, @@ -4896,7 +4896,7 @@ static const struct opcode_s op48_78c05[256] = {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, - + {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, @@ -5022,7 +5022,7 @@ static const struct opcode_s op4C_78c05[256] = {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, - + /* 0x80 - 0x9F */ {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, {illegal2, 2, 8, 8,L0|L1}, @@ -6146,7 +6146,7 @@ static const struct opcode_s op48_78c06[256] = {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, - + {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, @@ -6272,7 +6272,7 @@ static const struct opcode_s op4C_78c06[256] = {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, - + /* 0x80 - 0x9F */ {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, {illegal2, 2,12,12,L0|L1}, diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index 759149f97ff..a0b3048ef34 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -1522,7 +1522,7 @@ static void upd78c05_timers(int cycles) if (upd7810.config.io_callback) (*upd7810.config.io_callback)(UPD7810_TO,TO); } - + while ( upd7810.ovc0 <= 0 ) { upd7810.ovc0 += ( ( TMM & 0x04 ) ? 16 * 8 : 8 ) * TM0; } diff --git a/src/emu/info.c b/src/emu/info.c index 2c9be82fe82..72d77c1acb8 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -744,7 +744,7 @@ static void print_game_display(FILE *out, const game_driver *game, const machine /* and had raw parameters specified */ if ((scrconfig->type != SCREEN_TYPE_VECTOR) && !scrconfig->defstate.oldstyle_vblank_supplied) { - int pixclock = scrconfig->defstate.width * scrconfig->defstate.height + int pixclock = scrconfig->defstate.width * scrconfig->defstate.height * ATTOSECONDS_TO_HZ(scrconfig->defstate.refresh); fprintf(out, " pixclock=\"%d\"", pixclock); diff --git a/src/emu/inptport.c b/src/emu/inptport.c index 3d9b4eaec83..6077c128e48 100644 --- a/src/emu/inptport.c +++ b/src/emu/inptport.c @@ -1935,7 +1935,7 @@ static void input_port_detokenize(input_port_init_params *param, const input_por while (entrytype != INPUT_TOKEN_END) { UINT32 mask, defval, type, val; - + /* unpack the token from the first entry */ TOKEN_GET_UINT32_UNPACK1(ipt, entrytype, 8); switch (entrytype) diff --git a/src/emu/inptport.h b/src/emu/inptport.h index b06bd20fbe0..183a942a555 100644 --- a/src/emu/inptport.h +++ b/src/emu/inptport.h @@ -791,13 +791,13 @@ struct _ext_inp_header #define PORT_DIPSETTING(_default,_name) \ TOKEN_UINT64_PACK2(INPUT_TOKEN_DIPSETTING, 8, _default, 32), \ - TOKEN_STRING(_name), + TOKEN_STRING(_name), /* physical location, of the form: name:[!]sw,[name:][!]sw,... */ /* note that these are specified LSB-first */ #define PORT_DIPLOCATION(_location) \ TOKEN_UINT32_PACK1(INPUT_TOKEN_DIPLOCATION, 8), \ - TOKEN_STRING(_location), + TOKEN_STRING(_location), /* conditionals for dip switch settings */ #define PORT_CONDITION(_tag,_mask,_condition,_value) \ @@ -808,7 +808,7 @@ struct _ext_inp_header /* analog adjuster definition */ #define PORT_ADJUSTER(_default,_name) \ TOKEN_UINT64_PACK2(INPUT_TOKEN_ADJUSTER, 8, _default, 32), \ - TOKEN_STRING(_name), + TOKEN_STRING(_name), /* config definition */ #define PORT_CONFNAME(_mask,_default,_name) \ @@ -818,7 +818,7 @@ struct _ext_inp_header #define PORT_CONFSETTING(_default,_name) \ TOKEN_UINT64_PACK2(INPUT_TOKEN_CONFSETTING, 8, _default, 32), \ - TOKEN_STRING(_name), + TOKEN_STRING(_name), #ifdef MESS /* keyboard chars */ @@ -836,7 +836,7 @@ struct _ext_inp_header #define PORT_CATEGORY_ITEM(_default,_name) \ TOKEN_UINT64_PACK2(INPUT_TOKEN_CATEGORY_SETTING, 8, _default, 32), \ - TOKEN_STRING(_name), + TOKEN_STRING(_name), #endif /* MESS */ diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index 3461f714837..ec88aced202 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -35,13 +35,13 @@ static void machine_config_detokenize(machine_config *config, const machine_conf machine_config *machine_config_alloc(const machine_config_token *tokens) { machine_config *config; - + /* allocate a new configuration object */ config = malloc_or_die(sizeof(*config)); if (config == NULL) return NULL; memset(config, 0, sizeof(*config)); - + /* parse tokens into the config */ machine_config_detokenize(config, tokens); return config; @@ -203,7 +203,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf device_config *device = NULL; cpu_config *cpu = NULL; sound_config *sound = NULL; - + /* loop over tokens until we hit the end */ while (entrytype != MCONFIG_TOKEN_END) { @@ -212,7 +212,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf int size, offset, type, bits; UINT32 data32, clock, gain; UINT64 data64; - + /* unpack the token from the first entry */ TOKEN_GET_UINT32_UNPACK1(tokens, entrytype, 8); switch (entrytype) @@ -220,19 +220,19 @@ static void machine_config_detokenize(machine_config *config, const machine_conf /* end */ case MCONFIG_TOKEN_END: break; - + /* including */ case MCONFIG_TOKEN_INCLUDE: machine_config_detokenize(config, TOKEN_GET_PTR(tokens, tokenptr)); break; - + /* device management */ case MCONFIG_TOKEN_DEVICE_ADD: devtype = TOKEN_GET_PTR(tokens, devtype); tag = TOKEN_GET_STRING(tokens); device = device_list_add(&config->devicelist, devtype, tag); break; - + case MCONFIG_TOKEN_DEVICE_REMOVE: devtype = TOKEN_GET_PTR(tokens, devtype); tag = TOKEN_GET_STRING(tokens); @@ -247,12 +247,12 @@ static void machine_config_detokenize(machine_config *config, const machine_conf if (device == NULL) fatalerror("Unable to find device: type=%s tag=%s\n", devtype_name(devtype), tag); break; - + case MCONFIG_TOKEN_DEVICE_CONFIG: assert(device != NULL); device->static_config = TOKEN_GET_PTR(tokens, voidptr); break; - + case MCONFIG_TOKEN_DEVICE_CONFIG_DATA32: assert(device != NULL); TOKEN_UNGET_UINT32(tokens); @@ -265,7 +265,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf case 4: *(UINT32 *)((UINT8 *)device->inline_config + offset) = data32; break; } break; - + case MCONFIG_TOKEN_DEVICE_CONFIG_DATA64: assert(device != NULL); TOKEN_UNGET_UINT32(tokens); @@ -303,7 +303,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf case 8: *(double *)((UINT8 *)device->inline_config + offset) = (double)(INT64)data64 / (double)((UINT64)1 << bits); break; } break; - + /* add/modify/remove/replace CPUs */ case MCONFIG_TOKEN_CPU_ADD: @@ -312,7 +312,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf tag = TOKEN_GET_STRING(tokens); cpu = machine_config_add_cpu(config, tag, type, clock); break; - + case MCONFIG_TOKEN_CPU_MODIFY: tag = TOKEN_GET_STRING(tokens); cpu = machine_config_find_cpu(config, tag); @@ -341,37 +341,37 @@ static void machine_config_detokenize(machine_config *config, const machine_conf TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, cpu->flags, 24); break; - + case MCONFIG_TOKEN_CPU_CONFIG: assert(cpu != NULL); cpu->reset_param = TOKEN_GET_PTR(tokens, voidptr); break; - + case MCONFIG_TOKEN_CPU_PROGRAM_MAP: assert(cpu != NULL); cpu->construct_map[ADDRESS_SPACE_PROGRAM][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); cpu->construct_map[ADDRESS_SPACE_PROGRAM][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; - + case MCONFIG_TOKEN_CPU_DATA_MAP: assert(cpu != NULL); cpu->construct_map[ADDRESS_SPACE_DATA][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); cpu->construct_map[ADDRESS_SPACE_DATA][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; - + case MCONFIG_TOKEN_CPU_IO_MAP: assert(cpu != NULL); cpu->construct_map[ADDRESS_SPACE_IO][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); cpu->construct_map[ADDRESS_SPACE_IO][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; - + case MCONFIG_TOKEN_CPU_VBLANK_INT: assert(cpu != NULL); TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, cpu->vblank_interrupts_per_frame, 24); cpu->vblank_interrupt = TOKEN_GET_PTR(tokens, interrupt); break; - + case MCONFIG_TOKEN_CPU_PERIODIC_INT: assert(cpu != NULL); TOKEN_UNGET_UINT32(tokens); @@ -379,94 +379,94 @@ static void machine_config_detokenize(machine_config *config, const machine_conf cpu->timed_interrupt_period = HZ_TO_ATTOSECONDS(data32); cpu->timed_interrupt = TOKEN_GET_PTR(tokens, interrupt); break; - + /* core parameters */ case MCONFIG_TOKEN_DRIVER_DATA: TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->driver_data_size, 24); break; - + case MCONFIG_TOKEN_INTERLEAVE: TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->cpu_slices_per_frame, 24); break; - + case MCONFIG_TOKEN_WATCHDOG_VBLANK: TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->watchdog_vblank_count, 24); break; - + case MCONFIG_TOKEN_WATCHDOG_TIME: TOKEN_EXTRACT_UINT64(tokens, data64); config->watchdog_time = UINT64_ATTOTIME_TO_ATTOTIME(data64); break; - + /* core functions */ case MCONFIG_TOKEN_MACHINE_START: config->machine_start = TOKEN_GET_PTR(tokens, machine_start); break; - + case MCONFIG_TOKEN_MACHINE_RESET: config->machine_reset = TOKEN_GET_PTR(tokens, machine_reset); break; - + case MCONFIG_TOKEN_NVRAM_HANDLER: config->nvram_handler = TOKEN_GET_PTR(tokens, nvram_handler); break; - + case MCONFIG_TOKEN_MEMCARD_HANDLER: config->memcard_handler = TOKEN_GET_PTR(tokens, memcard_handler); break; - + /* core video parameters */ case MCONFIG_TOKEN_VIDEO_ATTRIBUTES: TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->video_attributes, 24); break; - + case MCONFIG_TOKEN_GFXDECODE: config->gfxdecodeinfo = TOKEN_GET_PTR(tokens, gfxdecode); break; - + case MCONFIG_TOKEN_PALETTE_LENGTH: TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT32_UNPACK2(tokens, entrytype, 8, config->total_colors, 24); break; - + case MCONFIG_TOKEN_DEFAULT_LAYOUT: config->default_layout = TOKEN_GET_STRING(tokens); break; - + /* core video functions */ case MCONFIG_TOKEN_PALETTE_INIT: config->init_palette = TOKEN_GET_PTR(tokens, palette_init); break; - + case MCONFIG_TOKEN_VIDEO_START: config->video_start = TOKEN_GET_PTR(tokens, video_start); break; - + case MCONFIG_TOKEN_VIDEO_RESET: config->video_reset = TOKEN_GET_PTR(tokens, video_reset); break; - + case MCONFIG_TOKEN_VIDEO_EOF: config->video_eof = TOKEN_GET_PTR(tokens, video_eof); break; - + case MCONFIG_TOKEN_VIDEO_UPDATE: config->video_update = TOKEN_GET_PTR(tokens, video_update); break; - + /* core sound functions */ case MCONFIG_TOKEN_SOUND_START: config->sound_start = TOKEN_GET_PTR(tokens, sound_start); break; - + case MCONFIG_TOKEN_SOUND_RESET: config->sound_reset = TOKEN_GET_PTR(tokens, sound_reset); break; - + /* add/remove/replace sounds */ case MCONFIG_TOKEN_SOUND_ADD: TOKEN_UNGET_UINT32(tokens); @@ -478,7 +478,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf case MCONFIG_TOKEN_SOUND_REMOVE: machine_config_remove_sound(config, TOKEN_GET_STRING(tokens)); break; - + case MCONFIG_TOKEN_SOUND_MODIFY: tag = TOKEN_GET_STRING(tokens); sound = machine_config_find_sound(config, tag); @@ -486,12 +486,12 @@ static void machine_config_detokenize(machine_config *config, const machine_conf fatalerror("Unable to find sound: tag=%s\n", tag); sound->routes = 0; break; - + case MCONFIG_TOKEN_SOUND_CONFIG: assert(sound != NULL); sound->config = TOKEN_GET_PTR(tokens, voidptr); break; - + case MCONFIG_TOKEN_SOUND_REPLACE: TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT64_UNPACK3(tokens, entrytype, 8, type, 24, clock, 32); diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 83d01fabe5b..95957292e93 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -28,7 +28,7 @@ enum MCONFIG_TOKEN_INVALID, MCONFIG_TOKEN_END, MCONFIG_TOKEN_INCLUDE, - + MCONFIG_TOKEN_DEVICE_ADD, MCONFIG_TOKEN_DEVICE_REMOVE, MCONFIG_TOKEN_DEVICE_MODIFY, @@ -49,31 +49,31 @@ enum MCONFIG_TOKEN_CPU_IO_MAP, MCONFIG_TOKEN_CPU_VBLANK_INT, MCONFIG_TOKEN_CPU_PERIODIC_INT, - + MCONFIG_TOKEN_DRIVER_DATA, MCONFIG_TOKEN_INTERLEAVE, MCONFIG_TOKEN_WATCHDOG_VBLANK, MCONFIG_TOKEN_WATCHDOG_TIME, - + MCONFIG_TOKEN_MACHINE_START, MCONFIG_TOKEN_MACHINE_RESET, MCONFIG_TOKEN_NVRAM_HANDLER, MCONFIG_TOKEN_MEMCARD_HANDLER, - + MCONFIG_TOKEN_VIDEO_ATTRIBUTES, MCONFIG_TOKEN_GFXDECODE, MCONFIG_TOKEN_PALETTE_LENGTH, MCONFIG_TOKEN_DEFAULT_LAYOUT, - + MCONFIG_TOKEN_PALETTE_INIT, MCONFIG_TOKEN_VIDEO_START, MCONFIG_TOKEN_VIDEO_RESET, MCONFIG_TOKEN_VIDEO_EOF, MCONFIG_TOKEN_VIDEO_UPDATE, - + MCONFIG_TOKEN_SOUND_START, MCONFIG_TOKEN_SOUND_RESET, - + MCONFIG_TOKEN_SOUND_ADD, MCONFIG_TOKEN_SOUND_REMOVE, MCONFIG_TOKEN_SOUND_MODIFY, diff --git a/src/emu/sound.c b/src/emu/sound.c index 213fb38dee6..9d60b2cc997 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -788,7 +788,7 @@ static void mixer_update(void *param, stream_sample_t **inputs, stream_sample_t static void *speaker_output_start(running_machine *machine, const char *tag, const void *static_config, const void *inline_config) { speaker_info *info; - + /* allocate memory for the speaker information */ info = auto_malloc(sizeof(*info)); memset(info, 0, sizeof(*info)); diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c index 8f425058f20..3977182c7bf 100644 --- a/src/emu/video/generic.c +++ b/src/emu/video/generic.c @@ -495,10 +495,10 @@ void flip_screen_set(int on) void flip_screen_set_no_update(int on) { /* flip_screen_y is not updated on purpose - * this function is for drivers which - * where writing to flip_screen_x to - * bypass update_flip - */ + * this function is for drivers which + * where writing to flip_screen_x to + * bypass update_flip + */ flip_screen_x = on; } diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index aa44d37356c..9ebff9b639a 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -78,7 +78,7 @@ static ADDRESS_MAP_START( amspdwy_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_READWRITE(MRA8_RAM, amspdwy_videoram_w) AM_BASE(&videoram) // Layer, mirrored? AM_RANGE(0x9800, 0x9bff) AM_READWRITE(MRA8_RAM, amspdwy_colorram_w) AM_BASE(&colorram) // Layer AM_RANGE(0x9c00, 0x9fff) AM_RAM // Unused? -// AM_RANGE(0xa000, 0xa000) AM_WRITENOP // ? +// AM_RANGE(0xa000, 0xa000) AM_WRITENOP // ? AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r) // DSW 1 AM_RANGE(0xa400, 0xa400) AM_READWRITE(input_port_1_r, amspdwy_flipscreen_w) // DSW 2 + Toggle Flip Screen? AM_RANGE(0xa800, 0xa800) AM_READ(amspdwy_wheel_0_r) // Player 1 @@ -112,7 +112,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( amspdwy_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM -// AM_RANGE(0x8000, 0x8000) AM_WRITENOP // ? Written with 0 at the start +// AM_RANGE(0x8000, 0x8000) AM_WRITENOP // ? Written with 0 at the start AM_RANGE(0x9000, 0x9000) AM_READ(soundlatch_r) // From Main CPU AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w) // YM2151 AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2151_data_port_0_w) // diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index 81e5bc8027d..3d054d5e794 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -92,7 +92,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xdfff) AM_ROMBANK(1) AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_RANGE(0xe800, 0xefff) AM_RAM /* RAM ? */ - + AM_RANGE(0xf000, 0xf01f) AM_BASE(&spriteram) AM_RANGE(0xf020, 0xf3ff) AM_WRITE(appoooh_fg_videoram_w) AM_BASE(&appoooh_fg_videoram) AM_RANGE(0xf420, 0xf7ff) AM_WRITE(appoooh_fg_colorram_w) AM_BASE(&appoooh_fg_colorram) diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 840b7a2a0fe..7be09c31923 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -12,7 +12,7 @@ Space Intruder emulation by Lee Taylor (lee@defender.demon.co.uk), December 1998. DIP locations verified for: - - astinvad (manual) + - astinvad (manual) ***************************************************************************/ diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index e5b505ca2a6..84d509da005 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -100,12 +100,12 @@ **************************************************************************** - DIP locations verified for: - - seawolf2 (manual) - - wow (manual) - - gorf (manual) - - robby (manual) - - profpac (manual) + DIP locations verified for: + - seawolf2 (manual) + - wow (manual) + - gorf (manual) + - robby (manual) + - profpac (manual) ****************************************************************************/ diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 93ac7adadab..a84a8ba4938 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -203,11 +203,11 @@ Eto: $76d0 might be a protection check? It reads to and writes from the prog rom. Doesn't seem to cause problems though. DIP locations verified for: - - bonzeadv (manual) - - cadash (manual) - - asuka (manual) - - mofflott (manual) - - galmedes (manual) + - bonzeadv (manual) + - cadash (manual) + - asuka (manual) + - mofflott (manual) + - galmedes (manual) ***************************************************************************/ @@ -396,7 +396,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0x8fff) AM_RAM AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w) AM_RANGE(0x9001, 0x9001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w) -// AM_RANGE(0x9002, 0x9100) AM_READ(MRA8_RAM) +// AM_RANGE(0x9002, 0x9100) AM_READ(MRA8_RAM) AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w) AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w) AM_RANGE(0xb000, 0xb000) AM_WRITE(asuka_msm5205_address_w) diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index dfb3db9c466..3b1cb6c0084 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -93,7 +93,7 @@ static VIDEO_START(backfire) static void draw_sprites(running_machine *machine,mame_bitmap *bitmap,const rectangle *cliprect, UINT32 *backfire_spriteram32, int region) { int offs; - + flip_screen_set_no_update(1); for (offs = (0x1400/4)-4;offs >= 0;offs -= 4) // 0x1400 for charlien diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index 20bd57d6422..366e1821ac1 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -353,10 +353,10 @@ static MACHINE_DRIVER_START( bionicc ) MDRV_CPU_ADD(Z80, EXO3_F0_CLK / 4) /* EXO3 C,B=GND, A=5V ==> Divisor 2^2 */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) /* FIXME: interrupt timing - * schematics indicate that nmi_line is set on M680000 access with AB1=1 - * and IOCS=0 (active low), see pages A-1/10, A-4/10 in schematics - */ - MDRV_CPU_VBLANK_INT(nmi_line_pulse,4) + * schematics indicate that nmi_line is set on M680000 access with AB1=1 + * and IOCS=0 (active low), see pages A-1/10, A-4/10 in schematics + */ + MDRV_CPU_VBLANK_INT(nmi_line_pulse,4) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index 0e07bbd3319..5af7d573538 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -178,7 +178,7 @@ * 903d | System 903 Diag.PROM | 903 | unknown | any | unknown | any | unknown | Testing H/W | Yes | OK | Yes * 905d | System 905 Diag.PROM | 905 | unknown | any | unknown | any | unknown | Testing H/W | Yes | OK | Yes - + (*) Not in the original list. @@ -411,7 +411,7 @@ Game 24.6 (Hotline) Game 27.2 (Keno, amusement) Game 27.2 (Keno, gaming) - System 903 Diag.PROM + System 903 Diag.PROM System 905 Diag.PROM Jackpot Joker Poker (set 1) Jackpot Joker Poker (set 2) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index f5048ab73ce..8eaffb62a5a 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -97,8 +97,8 @@ Done: At a later stage, a TKG2-02 will be added as well. Mike Haaland provided the following information on startup sounds: - - For both of these boards [dkong, dkongjr], only the jump sound + + For both of these boards [dkong, dkongjr], only the jump sound is distinguishable. I don't hear the pound of walk sound. Donkey Kong and Donkey Kong Jr. memory map (preliminary) (DKong 3 follows) @@ -721,9 +721,9 @@ static WRITE8_HANDLER( dkong3_2a03_reset_w ) static ADDRESS_MAP_START( dkong_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_ROM AM_RANGE(0x6000, 0x6bff) AM_RAM - AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) + AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) AM_RANGE(0x7800, 0x780f) AM_READWRITE(dma8257_0_r, dma8257_0_w) /* P8257 control registers */ AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_WRITE(dkong_sh_tuneselect_w) /* IN0, sound CPU intf */ @@ -743,9 +743,9 @@ static ADDRESS_MAP_START( dkongjr_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x6bff) AM_RAM AM_RANGE(0x6c00, 0x6fff) AM_RAM /* DK3 bootleg only */ - AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) + AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) AM_RANGE(0x7800, 0x780f) AM_READWRITE(dma8257_0_r, dma8257_0_w) /* P8257 control registers */ AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_WRITE(dkongjr_sh_tuneselect_w) @@ -769,9 +769,9 @@ static ADDRESS_MAP_START( dkong3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x5fff) AM_ROM AM_RANGE(0x6000, 0x67ff) AM_RAM AM_RANGE(0x6800, 0x6fff) AM_RAM - AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) + AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* sprite set 1 */ - AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x7400, 0x77ff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("IN0") AM_WRITE(soundlatch_w) AM_RANGE(0x7c80, 0x7c80) AM_READ_PORT("IN1") AM_WRITE(soundlatch2_w) @@ -804,7 +804,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hunchbkd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x0fff) AM_ROM - AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) + AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_MEMBER(dkong_state, sprite_ram) AM_SIZE_MEMBER(dkong_state, sprite_ram_size) /* 0x7000 */ AM_RANGE(0x1400, 0x1400) AM_READ_PORT("IN0") AM_WRITE(dkong_sh_tuneselect_w) AM_RANGE(0x1480, 0x1480) AM_READ_PORT("IN1") @@ -817,7 +817,7 @@ static ADDRESS_MAP_START( hunchbkd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1585, 0x1585) AM_WRITE(p8257_drq_w) /* P8257 ==> /DRQ0 /DRQ1 */ AM_RANGE(0x1586, 0x1587) AM_WRITE(dkong_palettebank_w) AM_RANGE(0x1600, 0x17ff) AM_RAM /* 0x6400 spriteram location */ - AM_RANGE(0x1800, 0x1bff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) + AM_RANGE(0x1800, 0x1bff) AM_READWRITE(MRA8_RAM, dkong_videoram_w) AM_BASE_MEMBER(dkong_state, video_ram) /* 0x7400 */ AM_RANGE(0x1C00, 0x1f7f) AM_RAM /* 0x6000 */ AM_RANGE(0x1f80, 0x1f8f) AM_READWRITE(dma8257_0_r, dma8257_0_w) /* P8257 control registers */ diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index 1116973aac3..0878078da5c 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -188,7 +188,7 @@ Impera made 2 graphics sets for this game. One of them is encrypted, and meant for the TAB blue board. This board has two HY18CV85 (electrically-erasable PLD) that handle the encryption. - In another hand, the sound has some weird things, but is confirmed that happen in the real thing. + In another hand, the sound has some weird things, but is confirmed that happen in the real thing. - Jolly Joker (Impera, 50bet) diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c index f86174ce210..27da8af56e2 100644 --- a/src/mame/drivers/omegrace.c +++ b/src/mame/drivers/omegrace.c @@ -573,10 +573,10 @@ static DRIVER_INIT( omegrace ) UINT8 *prom = memory_region(REGION_USER1); /* Omega Race has two pairs of the state PROM output - * lines swapped before going into the decoder. - * Since all other avg/dvg games connect the PROM - * in a consistent way to the decoder, we swap the bits - * here. */ + * lines swapped before going into the decoder. + * Since all other avg/dvg games connect the PROM + * in a consistent way to the decoder, we swap the bits + * here. */ for (i=0; i 08 (2097b 20980 - routine from 2097a) (08 30) to handle the player number -> probably 08 ab -> 4f?(19570 - routine from 194e1 to 19619) (when the water go up) b3 -> 19 (216b6 - 216cf - 16663 (when you rotate a piece) - 175f1 - 17d2a - 17d36 -b9 -> b7 (21210 - routine from 2117e to ) 2 bytes - +b9 -> b7 (21210 - routine from 2117e to ) 2 bytes - rz probably: 19 -> 79 (1df45 routine from 1df27 / 2282f - routine from 2281f to 22871) no 70,78,7a,7b,7c,7e,7f(ok) ok 79,7d @@ -386,7 +386,7 @@ rz guess: 73 -> 73 (1d4f7 - routine from 1d4df to 1d539) -> (no 70,71,72,74,75,76,77,78,79,7a,7b,7c,7d,7e,7f) - ok 73 7c -> fd 7e -> 92 (1e095 - routine from 1e073 to 1e0cf) -83 -> 7f (194cd - routine from) no 70,78,79,7a,7b,7c,7d,7e ok 77(no) ok 7f +83 -> 7f (194cd - routine from) no 70,78,79,7a,7b,7c,7d,7e ok 77(no) ok 7f 84 -> 08 (1d8f1 - routine from 1d8c7 to 1d8fc) - three bytes (ok 30) (sprite animation) -> 30 88 -> 9a 92 -> 9d diff --git a/src/version.c b/src/version.c index f6cf5c3ed15..99443bcb722 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.123u2 ("__DATE__")"; +const char build_version[] = "0.123u3 ("__DATE__")"; -- cgit v1.2.3