diff options
Diffstat (limited to 'src/emu')
-rw-r--r-- | src/emu/cpu/upd7810/7810dasm.c | 48 | ||||
-rw-r--r-- | src/emu/cpu/upd7810/7810tbl.c | 12 | ||||
-rw-r--r-- | src/emu/cpu/upd7810/upd7810.c | 2 | ||||
-rw-r--r-- | src/emu/info.c | 2 | ||||
-rw-r--r-- | src/emu/inptport.c | 2 | ||||
-rw-r--r-- | src/emu/inptport.h | 10 | ||||
-rw-r--r-- | src/emu/mconfig.c | 82 | ||||
-rw-r--r-- | src/emu/mconfig.h | 14 | ||||
-rw-r--r-- | src/emu/sound.c | 2 | ||||
-rw-r--r-- | src/emu/video/generic.c | 8 |
10 files changed, 91 insertions, 91 deletions
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; } |