From d92a2e0c4e5060315ebce8bb26997227940f1662 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sat, 6 Dec 2008 17:54:42 +0000 Subject: Cleanups/version bump/added missing drivers. --- src/emu/cpu/arm7/arm7core.c | 4 +- src/emu/cpu/arm7/arm7dasm.c | 2 +- src/emu/cpu/ccpu/ccpu.c | 2 +- src/emu/cpu/e132xs/e132xs.c | 2 +- src/emu/cpu/g65816/g65816.c | 4 +- src/emu/cpu/i8085/i8085.c | 2 +- src/emu/cpu/m37710/m37710.c | 2 +- src/emu/cpu/spc700/spc700.c | 8 +- src/emu/cpu/t11/t11.c | 4 +- src/emu/cpuexec.c | 8 +- src/emu/cpuintrf.c | 2 +- src/emu/debug/debugcmd.c | 24 ++-- src/emu/debug/debugcpu.c | 2 +- src/emu/debug/debugvw.c | 260 ++++++++++++++++++++++---------------------- src/emu/debug/debugvw.h | 6 +- src/emu/devintrf.c | 2 +- src/emu/fileio.c | 2 +- src/emu/machine/6526cia.c | 4 +- src/emu/machine/6850acia.c | 10 +- src/emu/machine/6850acia.h | 4 +- src/emu/machine/idectrl.c | 2 +- src/emu/machine/z80dma.c | 2 +- src/emu/memory.c | 2 +- src/emu/memory.h | 6 +- src/emu/sound/okim6295.c | 2 +- src/emu/state.c | 4 +- src/emu/timer.c | 6 +- src/emu/uimenu.c | 10 +- src/lib/util/corefile.c | 48 ++++---- src/lib/util/pool.c | 10 +- src/mame/drivers/brasil.c | 22 ++-- src/mame/drivers/btime.c | 8 +- src/mame/drivers/coolridr.c | 14 +-- src/mame/drivers/deshoros.c | 8 +- src/mame/drivers/fantland.c | 8 +- src/mame/drivers/funworld.c | 20 ++-- src/mame/drivers/gal3.c | 74 ++++++------- src/mame/drivers/goldnpkr.c | 52 ++++----- src/mame/drivers/goldstar.c | 8 +- src/mame/drivers/ilpag.c | 16 +-- src/mame/drivers/mil4000.c | 18 +-- src/mame/drivers/plygonet.c | 6 +- src/mame/drivers/rallyx.c | 6 +- src/mame/drivers/wc90b.c | 8 +- src/mame/mamedriv.c | 3 + src/mame/video/sengokmj.c | 2 +- src/mame/video/stvvdp2.c | 2 +- src/osd/windows/debugwin.c | 10 +- src/version.c | 2 +- 49 files changed, 368 insertions(+), 365 deletions(-) diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c index 9ea4d7f6a67..bc55872b583 100644 --- a/src/emu/cpu/arm7/arm7core.c +++ b/src/emu/cpu/arm7/arm7core.c @@ -1051,7 +1051,7 @@ static void HandleHalfWordDT(arm_state *cpustate, UINT32 insn) if ((insn & 0x60) == 0x40) // LDRD { SET_REGISTER(cpustate, rd, READ32(rnv)); - SET_REGISTER(cpustate, rd+1, READ32(rnv+4)); + SET_REGISTER(cpustate, rd+1, READ32(rnv+4)); R15 += 4; } else if ((insn & 0x60) == 0x60) // STRD @@ -1059,7 +1059,7 @@ static void HandleHalfWordDT(arm_state *cpustate, UINT32 insn) WRITE32(rnv, GET_REGISTER(cpustate, rd)); WRITE32(rnv+4, GET_REGISTER(cpustate, rd+1)); R15 += 4; - } + } else { // WRITE16(rnv, rd == eR15 ? R15 + 8 : GET_REGISTER(cpustate, rd)); diff --git a/src/emu/cpu/arm7/arm7dasm.c b/src/emu/cpu/arm7/arm7dasm.c index 4f40a9a6b78..dbecb52e2fb 100644 --- a/src/emu/cpu/arm7/arm7dasm.c +++ b/src/emu/cpu/arm7/arm7dasm.c @@ -241,7 +241,7 @@ UINT32 arm7_disasm( char *pBuf, UINT32 pc, UINT32 opcode ) { pBuf += sprintf(pBuf, "LDRD%s", pConditionCode); } - else if (((opcode & 0x60) == 0x60) && !(opcode & 0x100000)) // bit 20 = 0, bits 5&6 = 11 is ARMv5 STRD + else if (((opcode & 0x60) == 0x60) && !(opcode & 0x100000)) // bit 20 = 0, bits 5&6 = 11 is ARMv5 STRD { pBuf += sprintf(pBuf, "STRD%s", pConditionCode); } diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c index 137d3769180..f8782344d89 100644 --- a/src/emu/cpu/ccpu/ccpu.c +++ b/src/emu/cpu/ccpu/ccpu.c @@ -39,7 +39,7 @@ struct _ccpu_state UINT8 waiting; UINT8 watchdog; - + int icount; const device_config *device; diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c index 3e42428e80a..d1090bc74f4 100644 --- a/src/emu/cpu/e132xs/e132xs.c +++ b/src/emu/cpu/e132xs/e132xs.c @@ -1528,7 +1528,7 @@ static void set_irq_line(hyperstone_state *cpustate, int irqline, int state) static void hyperstone_init(const device_config *device, int index, int clock, cpu_irq_callback irqcallback, int scale_mask) { hyperstone_state *cpustate = device->token; - + state_save_register_device_item_array(device, 0, cpustate->global_regs); state_save_register_device_item_array(device, 0, cpustate->local_regs); state_save_register_device_item(device, 0, cpustate->ppc); diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c index 98e5ee74536..e7326b09de7 100644 --- a/src/emu/cpu/g65816/g65816.c +++ b/src/emu/cpu/g65816/g65816.c @@ -21,8 +21,8 @@ author (Karl Stenerud) at karl@higashiyama-unet.ocn.ne.jp. Changes: 1.00 (2008-11-27): - R. Belmont - - Reworked for modern MAME + R. Belmont + - Reworked for modern MAME 0.94 (2007-06-14): Zsolt Vasvari diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index 42595c3724b..78866843da0 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -1239,7 +1239,7 @@ static void Interrupt(void) I.IREQ &= ~I.ISRV; // remove serviced IRQ flag RIM_IEN = (I.ISRV==IM_TRAP) ? I.IM & IM_IEN : 0; // latch general interrupt enable bit on TRAP or NMI //ZT - //I.IM &= ~IM_IEN; /* remove general interrupt enable bit */ + //I.IM &= ~IM_IEN; /* remove general interrupt enable bit */ if( I.ISRV == IM_INTR ) { diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c index 393a799bb1d..bc0e175e6c7 100644 --- a/src/emu/cpu/m37710/m37710.c +++ b/src/emu/cpu/m37710/m37710.c @@ -957,7 +957,7 @@ static CPU_INIT( m37710 ) cpustate->source = 0; cpustate->destination = 0; - + for (i = 0; i < 8; i++) cpustate->timers[i] = timer_alloc(device->machine, m37710_timer_cb, cpustate); diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c index e9704a701f6..74c7948a53c 100644 --- a/src/emu/cpu/spc700/spc700.c +++ b/src/emu/cpu/spc700/spc700.c @@ -1160,7 +1160,7 @@ INLINE void SET_FLAG_I(spc700i_cpu *cpustate, uint value) CLK(BCLK); \ PUSH_16(cpustate, REG_PC); \ JUMP(cpustate, read_16_NORM(0xffc0 + ((15-NUM)<<1))) - + /* Test and Clear Bits */ #define OP_TCLR1(BCLK, MODE) \ CLK(BCLK); \ @@ -1604,14 +1604,14 @@ CPU_GET_INFO( spc700 ) { spc700i_cpu *cpustate = (device != NULL) ? device->token : NULL; uint p = 0; - + if (device != NULL) - { + { p = ((cpustate->flag_n & 0x80) | ((cpustate->flag_v & 0x80) >> 1) | cpustate->flag_p>>3 | cpustate->flag_b | - (cpustate->flag_h & HFLAG_SET) | + (cpustate->flag_h & HFLAG_SET) | cpustate->flag_i | ((!cpustate->flag_z) << 1) | ((cpustate->flag_c >> 8)&1)); diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c index c7219d1a1db..23823b2e506 100644 --- a/src/emu/cpu/t11/t11.c +++ b/src/emu/cpu/t11/t11.c @@ -368,7 +368,7 @@ static CPU_EXECUTE( t11 ) do { UINT16 op; - + cpustate->ppc = cpustate->reg[7]; /* copy PC to previous PC */ debugger_instruction_hook(device, cpustate->PCD); @@ -424,7 +424,7 @@ static CPU_SET_INFO( t11 ) CPU_GET_INFO( t11 ) { t11_state *cpustate = (device != NULL) ? device->token : NULL; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c index 75138c1fbce..279d084a7a8 100644 --- a/src/emu/cpuexec.c +++ b/src/emu/cpuexec.c @@ -521,7 +521,7 @@ void cpu_resume(const device_config *device, int reason) /*------------------------------------------------- - cpu_is_executing - return TRUE if the given + cpu_is_executing - return TRUE if the given CPU is within its execute function -------------------------------------------------*/ @@ -611,7 +611,7 @@ void cpu_set_clockscale(const device_config *device, double clockscale) /*------------------------------------------------- - cpu_clocks_to_attotime - converts a number of + cpu_clocks_to_attotime - converts a number of clock ticks to an attotime -------------------------------------------------*/ @@ -626,7 +626,7 @@ attotime cpu_clocks_to_attotime(const device_config *device, UINT32 clocks) /*------------------------------------------------- - cpu_attotime_to_clocks - converts a duration + cpu_attotime_to_clocks - converts a duration as attotime to CPU clock ticks -------------------------------------------------*/ @@ -832,7 +832,7 @@ void cpuexec_trigger(running_machine *machine, int trigger) for (cpunum = 0; cpunum < ARRAY_LENGTH(machine->cpu) && machine->cpu[cpunum] != NULL; cpunum++) { cpu_class_data *classdata = machine->cpu[cpunum]->classtoken; - + /* if we're executing, for an immediate abort */ if (classdata->executing) cpu_abort_timeslice(machine->cpu[cpunum]); diff --git a/src/emu/cpuintrf.c b/src/emu/cpuintrf.c index e89a20954b1..f36390c9d2c 100644 --- a/src/emu/cpuintrf.c +++ b/src/emu/cpuintrf.c @@ -1297,7 +1297,7 @@ void cpu_reset(const device_config *device) offs_t cpu_get_physical_pc_byte(const device_config *device) { - const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM); + const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM); offs_t pc; cpu_push_context(device); diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index 42272d494c0..3f69ef5a850 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -366,11 +366,11 @@ static void global_set(void *globalref, void *ref, UINT64 value) int debug_command_parameter_number(running_machine *machine, const char *param, UINT64 *result) { EXPRERR err; - + /* NULL parameter does nothing and returns no error */ if (param == NULL) return TRUE; - + /* evaluate the expression; success if no error */ err = expression_evaluate(param, debug_cpu_get_visible_symtable(machine), &debug_expression_callbacks, machine, result); if (err == EXPRERR_NONE) @@ -393,7 +393,7 @@ int debug_command_parameter_cpu(running_machine *machine, const char *param, con { UINT64 cpunum; EXPRERR err; - + /* if no parameter, use the visible CPU */ if (param == NULL) { @@ -431,7 +431,7 @@ int debug_command_parameter_cpu(running_machine *machine, const char *param, con /*------------------------------------------------- - debug_command_parameter_cpu_space - validates + debug_command_parameter_cpu_space - validates a parameter as a cpu and retrieves the given address space -------------------------------------------------*/ @@ -439,7 +439,7 @@ int debug_command_parameter_cpu(running_machine *machine, const char *param, con int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, const address_space **result) { const device_config *cpu; - + /* first do the standard CPU thing */ if (!debug_command_parameter_cpu(machine, param, &cpu)) return FALSE; @@ -463,19 +463,19 @@ int debug_command_parameter_cpu_space(running_machine *machine, const char *para static int debug_command_parameter_expression(running_machine *machine, const char *param, parsed_expression **result) { EXPRERR err; - + /* NULL parameter does nothing and returns no error */ if (param == NULL) { *result = NULL; return TRUE; } - + /* parse the expression; success if no error */ err = expression_parse(param, debug_cpu_get_visible_symtable(machine), &debug_expression_callbacks, machine, result); if (err == EXPRERR_NONE) return TRUE; - + /* output an error */ debug_console_printf(machine, "Error in expression: %s\n", param); debug_console_printf(machine, " %*s^", EXPRERR_ERROR_OFFSET(err), ""); @@ -492,16 +492,16 @@ static int debug_command_parameter_expression(running_machine *machine, const ch static int debug_command_parameter_command(running_machine *machine, const char *param) { CMDERR err; - + /* NULL parameter does nothing and returns no error */ if (param == NULL) return TRUE; - + /* validate the comment; success if no error */ err = debug_console_validate_command(machine, param); if (err == CMDERR_NONE) return TRUE; - + /* output an error */ debug_console_printf(machine, "Error in command: %s\n", param); debug_console_printf(machine, " %*s^", CMDERR_ERROR_OFFSET(err), ""); @@ -1034,7 +1034,7 @@ static void execute_comment_del(running_machine *machine, int ref, int params, c /* param 1 can either be a command or the address for the comment */ if (!debug_command_parameter_number(machine, param[0], &address)) return; - + /* CPU parameter is implicit */ if (!debug_command_parameter_cpu(machine, NULL, &cpu)) return; diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index f46efe694c8..de4415f9a5e 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -1887,7 +1887,7 @@ static void perform_trace(cpu_debug_data *info) if (count <= 1) { const address_space *space = cpu_get_address_space(info->device, ADDRESS_SPACE_PROGRAM); - + /* if we just finished looping, indicate as much */ if (info->trace.loops != 0) fprintf(info->trace.file, "\n (loops for %d instructions)\n\n", info->trace.loops); diff --git a/src/emu/debug/debugvw.c b/src/emu/debug/debugvw.c index 4bf141c962a..9f5135c7dd9 100644 --- a/src/emu/debug/debugvw.c +++ b/src/emu/debug/debugvw.c @@ -347,7 +347,7 @@ void debug_view_init(running_machine *machine) /* register for some manual cleanup */ add_exit_callback(machine, debug_view_exit); - + /* build a list of disassembly and memory subviews */ global->registers_subviews = registers_view_enumerate_subviews(machine); global->disasm_subviews = disasm_view_enumerate_subviews(machine); @@ -383,7 +383,7 @@ debug_view *debug_view_alloc(running_machine *machine, int type, debug_view_osd_ { debugvw_private *global = machine->debugvw_data; debug_view *view; - + assert(type >= 0 && type < ARRAY_LENGTH(callback_table)); /* allocate memory for the view */ @@ -614,7 +614,7 @@ debug_view_xy debug_view_get_total_size(debug_view *view) /*------------------------------------------------- - debug_view_get_visible_size - return the + debug_view_get_visible_size - return the visible size in rows and columns -------------------------------------------------*/ @@ -627,8 +627,8 @@ debug_view_xy debug_view_get_visible_size(debug_view *view) /*------------------------------------------------- - debug_view_get_visible_position - return the - top left position of the visible area in rows + debug_view_get_visible_position - return the + top left position of the visible area in rows and columns -------------------------------------------------*/ @@ -641,7 +641,7 @@ debug_view_xy debug_view_get_visible_position(debug_view *view) /*------------------------------------------------- - debug_view_set_visible_size - set the visible + debug_view_set_visible_size - set the visible size in rows and columns -------------------------------------------------*/ @@ -660,8 +660,8 @@ void debug_view_set_visible_size(debug_view *view, debug_view_xy size) /*------------------------------------------------- - debug_view_set_visible_position - set the - top left position of the visible area in rows + debug_view_set_visible_position - set the + top left position of the visible area in rows and columns -------------------------------------------------*/ @@ -767,7 +767,7 @@ void debug_view_set_cursor_visible(debug_view *view, int visible) ***************************************************************************/ /*------------------------------------------------- - debug_view_expression_alloc - allocate data + debug_view_expression_alloc - allocate data for an expression -------------------------------------------------*/ @@ -778,7 +778,7 @@ static void debug_view_expression_alloc(debug_view_expression *expression) /*------------------------------------------------- - debug_view_expression_free - free data + debug_view_expression_free - free data allocated for an expression -------------------------------------------------*/ @@ -792,7 +792,7 @@ static void debug_view_expression_free(debug_view_expression *expression) /*------------------------------------------------- - debug_view_expression_set - set a new + debug_view_expression_set - set a new expression string -------------------------------------------------*/ @@ -804,7 +804,7 @@ static void debug_view_expression_set(debug_view_expression *expression, const c /*------------------------------------------------- - debug_view_expression_changed_value - update an + debug_view_expression_changed_value - update an expression and return TRUE if its value has changed -------------------------------------------------*/ @@ -813,7 +813,7 @@ static int debug_view_expression_changed_value(debug_view *view, debug_view_expr { int changed = expression->dirty; EXPRERR exprerr; - + /* if dirty, re-evaluate */ if (expression->dirty) { @@ -831,7 +831,7 @@ static int debug_view_expression_changed_value(debug_view *view, debug_view_expr expression->parsed = expr; } } - + /* if we have a parsed expression, evalute it */ if (expression->parsed != NULL) { @@ -841,7 +841,7 @@ static int debug_view_expression_changed_value(debug_view *view, debug_view_expr exprerr = expression_execute(expression->parsed, &expression->result); changed |= (expression->result != oldresult); } - + /* expression no longer dirty by definition */ expression->dirty = FALSE; return changed; @@ -854,7 +854,7 @@ static int debug_view_expression_changed_value(debug_view *view, debug_view_expr ***************************************************************************/ /*------------------------------------------------- - console_view_alloc - allocate memory for the + console_view_alloc - allocate memory for the console view -------------------------------------------------*/ @@ -865,7 +865,7 @@ static int console_view_alloc(debug_view *view) /*------------------------------------------------- - log_view_alloc - allocate memory for the log + log_view_alloc - allocate memory for the log view -------------------------------------------------*/ @@ -876,7 +876,7 @@ static int log_view_alloc(debug_view *view) /*------------------------------------------------- - textbuf_view_alloc - allocate memory for a + textbuf_view_alloc - allocate memory for a text buffer-based view -------------------------------------------------*/ @@ -985,7 +985,7 @@ static void textbuf_view_update(debug_view *view) /*------------------------------------------------- - textbuf_view_notify - handle notification of + textbuf_view_notify - handle notification of updates to visible area -------------------------------------------------*/ @@ -997,7 +997,7 @@ static void textbuf_view_notify(debug_view *view, view_notification type) { /* if the bottom line is visible, just track the bottom */ textdata->at_bottom = (view->total.y >= view->topleft.y && view->total.y <= view->topleft.y + view->visible.y); - + /* otherwise, track the seqence number of the top line */ if (!textdata->at_bottom) textdata->topseq = text_buffer_line_index_to_seqnum(textdata->textbuf, view->topleft.y); @@ -1023,29 +1023,29 @@ static const registers_subview_item *registers_view_enumerate_subviews(running_m int curindex = 0; int cpunum; - /* iterate over CPUs with program address spaces */ + /* iterate over CPUs with program address spaces */ for (cpunum = 0; cpunum < ARRAY_LENGTH(machine->cpu); cpunum++) if (machine->cpu[cpunum] != NULL) { const device_config *device = machine->cpu[cpunum]; registers_subview_item *subview; - + /* determine the string and allocate a subview large enough */ astring_printf(tempstring, "CPU '%s' (%s)", device->tag, cpu_get_name(device)); subview = auto_malloc(sizeof(*subview) + astring_len(tempstring)); memset(subview, 0, sizeof(*subview)); - + /* populate the subview */ subview->next = NULL; subview->index = curindex++; subview->device = device; strcpy(subview->name, astring_c(tempstring)); - + /* add to the list */ *tailptr = subview; tailptr = &subview->next; } - + /* free the temporary string */ astring_free(tempstring); return head; @@ -1070,7 +1070,7 @@ static int registers_view_alloc(debug_view *view) if (regdata == NULL) return FALSE; memset(regdata, 0, sizeof(*regdata)); - + /* default to the first subview */ regdata->device = view->machine->debugvw_data->registers_subviews->device; @@ -1165,7 +1165,7 @@ static void registers_view_recompute(debug_view *view) debug_view_registers *regdata = view->extra_data; int regnum, maxtaglen, maxvallen; const int *list; - + /* if no CPU, reset to the first one */ if (regdata->device == NULL) regdata->device = view->machine->cpu[0]; @@ -1388,7 +1388,7 @@ static void registers_view_update(debug_view *view) /*------------------------------------------------- - registers_view_get_subview_list - return a + registers_view_get_subview_list - return a linked list of subviews -------------------------------------------------*/ @@ -1409,11 +1409,11 @@ int registers_view_get_subview(debug_view *view) debug_view_registers *regdata = view->extra_data; const registers_subview_item *subview; int index = 0; - + assert(view->type == DVT_REGISTERS); debug_view_begin_update(view); debug_view_end_update(view); - + for (subview = view->machine->debugvw_data->registers_subviews; subview != NULL; subview = subview->next) { if (subview->device == regdata->device) @@ -1425,7 +1425,7 @@ int registers_view_get_subview(debug_view *view) /*------------------------------------------------- - registers_view_set_subview - select a new + registers_view_set_subview - select a new subview by index -------------------------------------------------*/ @@ -1433,7 +1433,7 @@ void registers_view_set_subview(debug_view *view, int index) { const registers_subview_item *subview = registers_view_get_subview_by_index(view->machine->debugvw_data->registers_subviews, index); debug_view_registers *regdata = view->extra_data; - + assert(view->type == DVT_REGISTERS); assert(subview != NULL); if (subview == NULL) @@ -1468,7 +1468,7 @@ static const disasm_subview_item *disasm_view_enumerate_subviews(running_machine int curindex = 0; int cpunum; - /* iterate over CPUs with program address spaces */ + /* iterate over CPUs with program address spaces */ for (cpunum = 0; cpunum < ARRAY_LENGTH(machine->cpu); cpunum++) if (machine->cpu[cpunum] != NULL) { @@ -1476,24 +1476,24 @@ static const disasm_subview_item *disasm_view_enumerate_subviews(running_machine if (space != NULL) { disasm_subview_item *subview; - + /* determine the string and allocate a subview large enough */ astring_printf(tempstring, "CPU '%s' (%s)", space->cpu->tag, cpu_get_name(space->cpu)); subview = auto_malloc(sizeof(*subview) + astring_len(tempstring)); memset(subview, 0, sizeof(*subview)); - + /* populate the subview */ subview->next = NULL; subview->index = curindex++; subview->space = space; strcpy(subview->name, astring_c(tempstring)); - + /* add to the list */ *tailptr = subview; tailptr = &subview->next; } } - + /* free the temporary string */ astring_free(tempstring); return head; @@ -1520,7 +1520,7 @@ static int disasm_view_alloc(debug_view *view) if (dasmdata == NULL) return FALSE; memset(dasmdata, 0, sizeof(*dasmdata)); - + /* default to the first subview */ dasmdata->space = view->machine->debugvw_data->disasm_subviews->space; @@ -1571,7 +1571,7 @@ static void disasm_view_free(debug_view *view) /*------------------------------------------------- - disasm_view_notify - handle notification of + disasm_view_notify - handle notification of updates to cursor changes -------------------------------------------------*/ @@ -1642,7 +1642,7 @@ static void disasm_view_char(debug_view *view, int chval) view->cursor.y = view->total.y - 1; break; } - + /* send a cursor changed notification */ if (view->cursor.y != origcursor.y) { @@ -1655,8 +1655,8 @@ static void disasm_view_char(debug_view *view, int chval) /*------------------------------------------------- - disasm_view_find_pc_backwards - back up the - specified numberof instructions from the given + disasm_view_find_pc_backwards - back up the + specified numberof instructions from the given PC -------------------------------------------------*/ @@ -1701,7 +1701,7 @@ static offs_t disasm_view_find_pc_backwards(const address_space *space, offs_t t { offs_t scanpcbyte = memory_address_to_byte(space, scanpc); offs_t physpcbyte = scanpcbyte; - + /* get the disassembly, but only if mapped */ instlen = 1; if (memory_address_physical(space, TRANSLATE_FETCH, &physpcbyte)) @@ -1734,7 +1734,7 @@ static offs_t disasm_view_find_pc_backwards(const address_space *space, offs_t t /*------------------------------------------------- - disasm_view_generate_bytes - generate the + disasm_view_generate_bytes - generate the opcode byte values -------------------------------------------------*/ @@ -1933,7 +1933,7 @@ static void disasm_view_update(debug_view *view) offs_t pc, pcbyte; EXPRERR exprerr; UINT32 row; - + /* no space, do nothing */ if (space == NULL) return; @@ -1958,7 +1958,7 @@ static void disasm_view_update(debug_view *view) expression_free(dasmdata->expression.parsed); dasmdata->expression.parsed = expr; } - + /* always recompute if the expression is dirty */ view->recompute = TRUE; } @@ -2122,7 +2122,7 @@ recompute: /*------------------------------------------------- - disasm_view_get_subview_list - return a linked + disasm_view_get_subview_list - return a linked list of subviews -------------------------------------------------*/ @@ -2143,11 +2143,11 @@ int disasm_view_get_subview(debug_view *view) debug_view_disasm *dasmdata = view->extra_data; const disasm_subview_item *subview; int index = 0; - + assert(view->type == DVT_DISASSEMBLY); debug_view_begin_update(view); debug_view_end_update(view); - + for (subview = view->machine->debugvw_data->disasm_subviews; subview != NULL; subview = subview->next) { if (subview->space == dasmdata->space) @@ -2159,7 +2159,7 @@ int disasm_view_get_subview(debug_view *view) /*------------------------------------------------- - disasm_view_get_expression - return the + disasm_view_get_expression - return the expression string describing the home address -------------------------------------------------*/ @@ -2174,7 +2174,7 @@ const char *disasm_view_get_expression(debug_view *view) /*------------------------------------------------- - disasm_view_get_right_column - return the + disasm_view_get_right_column - return the contents of the right column -------------------------------------------------*/ @@ -2189,8 +2189,8 @@ disasm_right_column disasm_view_get_right_column(debug_view *view) /*------------------------------------------------- - disasm_view_get_backward_steps - return the - number of instructions displayed before the + disasm_view_get_backward_steps - return the + number of instructions displayed before the home address -------------------------------------------------*/ @@ -2205,8 +2205,8 @@ UINT32 disasm_view_get_backward_steps(debug_view *view) /*------------------------------------------------- - disasm_view_get_disasm_width - return the - width in characters of the main disassembly + disasm_view_get_disasm_width - return the + width in characters of the main disassembly section -------------------------------------------------*/ @@ -2221,8 +2221,8 @@ UINT32 disasm_view_get_disasm_width(debug_view *view) /*------------------------------------------------- - disasm_view_get_selected_address - return the - PC of the currently selected address in the + disasm_view_get_selected_address - return the + PC of the currently selected address in the view -------------------------------------------------*/ @@ -2245,7 +2245,7 @@ void disasm_view_set_subview(debug_view *view, int index) { const disasm_subview_item *subview = disasm_view_get_subview_by_index(view->machine->debugvw_data->disasm_subviews, index); debug_view_disasm *dasmdata = view->extra_data; - + assert(view->type == DVT_DISASSEMBLY); assert(subview != NULL); if (subview == NULL) @@ -2266,7 +2266,7 @@ void disasm_view_set_subview(debug_view *view, int index) /*------------------------------------------------- - disasm_view_set_expression - set the + disasm_view_set_expression - set the expression string describing the home address -------------------------------------------------*/ @@ -2285,14 +2285,14 @@ void disasm_view_set_expression(debug_view *view, const char *expression) /*------------------------------------------------- - disasm_view_set_right_column - set the + disasm_view_set_right_column - set the contents of the right column -------------------------------------------------*/ void disasm_view_set_right_column(debug_view *view, disasm_right_column contents) { debug_view_disasm *dasmdata = view->extra_data; - + assert(view->type == DVT_DISASSEMBLY); assert(contents == DASM_RIGHTCOL_RAW || contents == DASM_RIGHTCOL_ENCRYPTED || contents == DASM_RIGHTCOL_COMMENTS); @@ -2307,8 +2307,8 @@ void disasm_view_set_right_column(debug_view *view, disasm_right_column contents /*------------------------------------------------- - disasm_view_set_backward_steps - set the - number of instructions displayed before the + disasm_view_set_backward_steps - set the + number of instructions displayed before the home address -------------------------------------------------*/ @@ -2329,8 +2329,8 @@ void disasm_view_set_backward_steps(debug_view *view, UINT32 steps) /*------------------------------------------------- - disasm_view_set_disasm_width - set the - width in characters of the main disassembly + disasm_view_set_disasm_width - set the + width in characters of the main disassembly section -------------------------------------------------*/ @@ -2351,8 +2351,8 @@ void disasm_view_set_disasm_width(debug_view *view, UINT32 width) /*------------------------------------------------- - disasm_view_set_selected_address - set the - PC of the currently selected address in the + disasm_view_set_selected_address - set the + PC of the currently selected address in the view -------------------------------------------------*/ @@ -2403,12 +2403,12 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine if (space != NULL) { memory_subview_item *subview; - + /* determine the string and allocate a subview large enough */ astring_printf(tempstring, "CPU '%s' (%s) %s memory", space->cpu->tag, cpu_get_name(space->cpu), space->name); subview = auto_malloc(sizeof(*subview) + astring_len(tempstring)); memset(subview, 0, sizeof(*subview)); - + /* populate the subview */ subview->next = NULL; subview->index = curindex++; @@ -2416,7 +2416,7 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine subview->endianness = space->endianness; subview->prefsize = space->dbits / 8; strcpy(subview->name, astring_c(tempstring)); - + /* add to the list */ *tailptr = subview; tailptr = &subview->next; @@ -2430,12 +2430,12 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine UINT8 little_endian = ((flags & ROMREGION_ENDIANMASK) == ROMREGION_LE); UINT8 width = 1 << ((flags & ROMREGION_WIDTHMASK) >> 8); memory_subview_item *subview; - + /* determine the string and allocate a subview large enough */ astring_printf(tempstring, "Region '%s'", rgntag); subview = auto_malloc(sizeof(*subview) + astring_len(tempstring)); memset(subview, 0, sizeof(*subview)); - + /* populate the subview */ subview->next = NULL; subview->index = curindex++; @@ -2449,7 +2449,7 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine subview->endianness = little_endian ? ENDIANNESS_LITTLE : ENDIANNESS_BIG; subview->prefsize = MIN(width, 8); strcpy(subview->name, astring_c(tempstring)); - + /* add to the list */ *tailptr = subview; tailptr = &subview->next; @@ -2476,7 +2476,7 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine astring_printf(tempstring, "%s", strrchr(name, '/') + 1); subview = auto_malloc(sizeof(*subview) + astring_len(tempstring)); memset(subview, 0, sizeof(*subview)); - + /* populate the subview */ subview->next = NULL; subview->index = curindex++; @@ -2490,13 +2490,13 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine #endif subview->prefsize = MIN(valsize, 8); strcpy(subview->name, astring_c(tempstring)); - + /* add to the list */ *tailptr = subview; tailptr = &subview->next; } } - + /* free the temporary string */ astring_free(tempstring); return head; @@ -2511,7 +2511,7 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine static int memory_view_alloc(debug_view *view) { debug_view_memory *memdata; - + /* fail if no available subviews */ if (view->machine->debugvw_data->memory_subviews == NULL) return FALSE; @@ -2530,7 +2530,7 @@ static int memory_view_alloc(debug_view *view) /* we support cursors */ view->supports_cursor = TRUE; - + /* default to the first subview */ memdata->desc = view->machine->debugvw_data->memory_subviews; @@ -2564,7 +2564,7 @@ static void memory_view_free(debug_view *view) /*------------------------------------------------- - memory_view_notify - handle notification of + memory_view_notify - handle notification of updates to cursor changes -------------------------------------------------*/ @@ -2574,7 +2574,7 @@ static void memory_view_notify(debug_view *view, view_notification type) { offs_t address; UINT8 shift; - + /* normalize the cursor */ memory_view_get_cursor_pos(view, &address, &shift); memory_view_set_cursor_pos(view, address, shift); @@ -2593,7 +2593,7 @@ static void memory_view_update(debug_view *view) const address_space *space = memdata->desc->space; const memory_view_pos *posdata; UINT32 row; - + /* if we need to recompute, do it now */ if (memory_view_needs_recompute(view)) memory_view_recompute(view); @@ -2614,7 +2614,7 @@ static void memory_view_update(debug_view *view) UINT32 effrow = view->topleft.y + row; debug_view_char *dest; int ch, chunknum; - + /* reset the line of data; section 1 is normal, others are ancillary, cursor is selected */ dest = destmin; for (ch = 0; ch < view->visible.x; ch++, dest++) @@ -2636,14 +2636,14 @@ static void memory_view_update(debug_view *view) offs_t addrbyte = memdata->byte_offset + effrow * memdata->bytes_per_row; offs_t address = (space != NULL) ? memory_byte_to_address(space, addrbyte) : addrbyte; char addrtext[20]; - + /* generate the address */ sprintf(addrtext, memdata->addrformat, address); dest = destrow + memdata->section[0].pos + 1; for (ch = 0; addrtext[ch] != 0 && ch < memdata->section[0].width - 1; ch++, dest++) if (dest >= destmin && dest < destmax) dest->byte = addrtext[ch]; - + /* generate the data */ for (chunknum = 0; chunknum < memdata->chunks_per_row; chunknum++) { @@ -2659,7 +2659,7 @@ static void memory_view_update(debug_view *view) dest->byte = "0123456789ABCDEF"[(chunkdata >> shift) & 0x0f]; } } - + /* generate the ASCII data */ if (memdata->section[2].width > 0) { @@ -2753,7 +2753,7 @@ static void memory_view_char(debug_view *view, int chval) if (address >= memdata->byte_offset + memdata->bytes_per_chunk) address -= memdata->bytes_per_chunk; break; - + case DCH_CTRLRIGHT: if (address <= memdata->maxaddr - memdata->bytes_per_chunk) address += memdata->bytes_per_chunk; @@ -2768,11 +2768,11 @@ static void memory_view_char(debug_view *view, int chval) data |= (UINT64)(hexchar - hexvals) << shift; memory_view_write(memdata, memdata->bytes_per_chunk, address, data); /* fall through... */ - + case DCH_RIGHT: if (shift == 0 && address != memdata->maxaddr) { - shift = memdata->bytes_per_chunk * 8 - 4; + shift = memdata->bytes_per_chunk * 8 - 4; address += memdata->bytes_per_chunk; } else @@ -2782,7 +2782,7 @@ static void memory_view_char(debug_view *view, int chval) case DCH_LEFT: if (shift == memdata->bytes_per_chunk * 8 - 4 && address != memdata->byte_offset) { - shift = 0; + shift = 0; address -= memdata->bytes_per_chunk; } else @@ -2810,7 +2810,7 @@ static void memory_view_recompute(debug_view *view) offs_t cursoraddr; UINT8 cursorshift; int addrchars; - + /* get the current cursor position */ memory_view_get_cursor_pos(view, &cursoraddr, &cursorshift); @@ -2825,7 +2825,7 @@ static void memory_view_recompute(debug_view *view) memdata->maxaddr = memdata->desc->length - 1; addrchars = sprintf(memdata->addrformat, "%X", memdata->maxaddr); } - + /* generate an 8-byte aligned format for the address */ if (!memdata->reverse_view) sprintf(memdata->addrformat, "%*s%%0%dX", 8 - addrchars, "", addrchars); @@ -2843,11 +2843,11 @@ static void memory_view_recompute(debug_view *view) } memdata->chunks_per_row = MAX(1, memdata->chunks_per_row); } - + /* recompute the byte offset based on the most recent expression result */ memdata->bytes_per_row = memdata->bytes_per_chunk * memdata->chunks_per_row; memdata->byte_offset = memdata->expression.result % memdata->bytes_per_row; - + /* compute the section widths */ memdata->section[0].width = 1 + 8 + 1; memdata->section[1].width = 1 + 3 * memdata->bytes_per_row + 1; @@ -2868,7 +2868,7 @@ static void memory_view_recompute(debug_view *view) memdata->section[0].pos = memdata->section[1].pos + memdata->section[1].width; view->total.x = memdata->section[0].pos + memdata->section[0].width; } - + /* derive total sizes from that */ view->total.y = (memdata->maxaddr - memdata->byte_offset + memdata->bytes_per_row - 1) / memdata->bytes_per_row; @@ -2879,7 +2879,7 @@ static void memory_view_recompute(debug_view *view) /*------------------------------------------------- memory_view_needs_recompute - determine if - anything has changed that requires a + anything has changed that requires a recomputation -------------------------------------------------*/ @@ -2888,7 +2888,7 @@ static int memory_view_needs_recompute(debug_view *view) debug_view_memory *memdata = view->extra_data; const address_space *space = memdata->desc->space; int recompute = view->recompute; - + /* handle expression changes */ if (debug_view_expression_changed_value(view, &memdata->expression, (space != NULL) ? space->cpu : NULL)) { @@ -2925,15 +2925,15 @@ static void memory_view_get_cursor_pos(debug_view *view, offs_t *address, UINT8 xposition = 0; else if (xposition >= posdata->spacing * memdata->chunks_per_row) xposition = posdata->spacing * memdata->chunks_per_row - 1; - + /* compute chunk number and offset within that chunk */ chunknum = xposition / posdata->spacing; chunkoffs = xposition % posdata->spacing; - + /* reverse the chunknum if we're reversed */ if (memdata->reverse_view) chunknum = memdata->chunks_per_row - 1 - chunknum; - + /* compute the address and shift */ *address += chunknum * memdata->bytes_per_chunk; *shift = posdata->shift[chunkoffs] & 0x7f; @@ -2960,16 +2960,16 @@ static void memory_view_set_cursor_pos(debug_view *view, offs_t address, UINT8 s /* compute the Y coordinate and chunk index */ view->cursor.y = address / memdata->bytes_per_row; chunknum = (address % memdata->bytes_per_row) / memdata->bytes_per_chunk; - + /* reverse the chunknum if we're reversed */ if (memdata->reverse_view) chunknum = memdata->chunks_per_row - 1 - chunknum; - + /* scan within the chunk to find the shift */ for (view->cursor.x = 0; view->cursor.x < posdata->spacing; view->cursor.x++) if (posdata->shift[view->cursor.x] == shift) break; - + /* add in the chunk offset and shift to the right of divider1 */ view->cursor.x += memdata->section[1].pos + 1 + posdata->spacing * chunknum; @@ -3007,7 +3007,7 @@ static UINT64 memory_view_read(debug_view_memory *memdata, UINT8 size, offs_t of cpu_pop_context(); return result; } - + /* if larger than a byte, reduce by half and recurse */ if (size > 1) { @@ -3017,7 +3017,7 @@ static UINT64 memory_view_read(debug_view_memory *memdata, UINT8 size, offs_t of else return memory_view_read(memdata, size, offs + 1 * size) | ((UINT64)memory_view_read(memdata, size, offs + 0 * size) << (size * 8)); } - + /* all 0xff if out of bounds */ offs ^= memdata->desc->offsetxor; if (offs >= memdata->desc->length) @@ -3037,7 +3037,7 @@ static void memory_view_write(debug_view_memory *memdata, UINT8 size, offs_t off if (memdata->desc->space != NULL) { const address_space *space = memdata->desc->space; - + cpu_push_context(space->cpu); switch (size) { @@ -3085,7 +3085,7 @@ static void memory_view_write(debug_view_memory *memdata, UINT8 size, offs_t off /*------------------------------------------------- - memory_view_get_subview_list - return a linked + memory_view_get_subview_list - return a linked list of subviews -------------------------------------------------*/ @@ -3104,17 +3104,17 @@ const memory_subview_item *memory_view_get_subview_list(debug_view *view) int memory_view_get_subview(debug_view *view) { debug_view_memory *memdata = view->extra_data; - + assert(view->type == DVT_MEMORY); debug_view_begin_update(view); debug_view_end_update(view); - + return memdata->desc->index; } /*------------------------------------------------- - memory_view_get_expression - return the + memory_view_get_expression - return the expression string describing the home address -------------------------------------------------*/ @@ -3129,7 +3129,7 @@ const char *memory_view_get_expression(debug_view *view) /*------------------------------------------------- - memory_view_get_bytes_per_chunk - return the + memory_view_get_bytes_per_chunk - return the currently displayed bytes per chunk -------------------------------------------------*/ @@ -3144,7 +3144,7 @@ UINT8 memory_view_get_bytes_per_chunk(debug_view *view) /*------------------------------------------------- - memory_view_get_chunks_per_row - return the + memory_view_get_chunks_per_row - return the number of chunks displayed across a row -------------------------------------------------*/ @@ -3159,7 +3159,7 @@ UINT32 memory_view_get_chunks_per_row(debug_view *view) /*------------------------------------------------- - memory_view_get_reverse - return TRUE if the + memory_view_get_reverse - return TRUE if the memory view is displayed reverse -------------------------------------------------*/ @@ -3174,8 +3174,8 @@ UINT8 memory_view_get_reverse(debug_view *view) /*------------------------------------------------- - memory_view_get_ascii - return TRUE if the - memory view is displaying an ASCII + memory_view_get_ascii - return TRUE if the + memory view is displaying an ASCII representation -------------------------------------------------*/ @@ -3190,8 +3190,8 @@ UINT8 memory_view_get_ascii(debug_view *view) /*------------------------------------------------- - memory_view_get_physical - return TRUE if the - memory view is displaying physical addresses + memory_view_get_physical - return TRUE if the + memory view is displaying physical addresses versus logical addresses -------------------------------------------------*/ @@ -3214,7 +3214,7 @@ void memory_view_set_subview(debug_view *view, int index) { const memory_subview_item *subview = memory_view_get_subview_by_index(view->machine->debugvw_data->memory_subviews, index); debug_view_memory *memdata = view->extra_data; - + assert(view->type == DVT_MEMORY); assert(subview != NULL); if (subview == NULL) @@ -3237,7 +3237,7 @@ void memory_view_set_subview(debug_view *view, int index) /*------------------------------------------------- - memory_view_set_expression - set the + memory_view_set_expression - set the expression string describing the home address -------------------------------------------------*/ @@ -3256,7 +3256,7 @@ void memory_view_set_expression(debug_view *view, const char *expression) /*------------------------------------------------- - memory_view_set_bytes_per_chunk - specify the + memory_view_set_bytes_per_chunk - specify the number of bytes displayed per chunk -------------------------------------------------*/ @@ -3272,12 +3272,12 @@ void memory_view_set_bytes_per_chunk(debug_view *view, UINT8 chunkbytes) int endianness = memdata->desc->endianness; offs_t address; UINT8 shift; - + debug_view_begin_update(view); memory_view_get_cursor_pos(view, &address, &shift); address += (shift / 8) ^ ((endianness == ENDIANNESS_LITTLE) ? 0 : (memdata->bytes_per_chunk - 1)); shift %= 8; - + memdata->bytes_per_chunk = chunkbytes; memdata->chunks_per_row = memdata->bytes_per_row / chunkbytes; view->recompute = view->update_pending = TRUE; @@ -3291,7 +3291,7 @@ void memory_view_set_bytes_per_chunk(debug_view *view, UINT8 chunkbytes) /*------------------------------------------------- - memory_view_set_chunks_per_row - specify the + memory_view_set_chunks_per_row - specify the number of chunks displayed across a row -------------------------------------------------*/ @@ -3306,7 +3306,7 @@ void memory_view_set_chunks_per_row(debug_view *view, UINT32 rowchunks) { offs_t address; UINT8 shift; - + debug_view_begin_update(view); memory_view_get_cursor_pos(view, &address, &shift); memdata->chunks_per_row = rowchunks; @@ -3318,7 +3318,7 @@ void memory_view_set_chunks_per_row(debug_view *view, UINT32 rowchunks) /*------------------------------------------------- - memory_view_set_reverse - specify TRUE if the + memory_view_set_reverse - specify TRUE if the memory view is displayed reverse -------------------------------------------------*/ @@ -3332,7 +3332,7 @@ void memory_view_set_reverse(debug_view *view, UINT8 reverse) { offs_t address; UINT8 shift; - + debug_view_begin_update(view); memory_view_get_cursor_pos(view, &address, &shift); memdata->reverse_view = reverse; @@ -3344,8 +3344,8 @@ void memory_view_set_reverse(debug_view *view, UINT8 reverse) /*------------------------------------------------- - memory_view_set_ascii - specify TRUE if the - memory view should display an ASCII + memory_view_set_ascii - specify TRUE if the + memory view should display an ASCII representation -------------------------------------------------*/ @@ -3359,7 +3359,7 @@ void memory_view_set_ascii(debug_view *view, UINT8 ascii) { offs_t address; UINT8 shift; - + debug_view_begin_update(view); memory_view_get_cursor_pos(view, &address, &shift); memdata->ascii_view = ascii; @@ -3371,8 +3371,8 @@ void memory_view_set_ascii(debug_view *view, UINT8 ascii) /*------------------------------------------------- - memory_view_set_physical - specify TRUE if the - memory view should display physical addresses + memory_view_set_physical - specify TRUE if the + memory view should display physical addresses versus logical addresses -------------------------------------------------*/ diff --git a/src/emu/debug/debugvw.h b/src/emu/debug/debugvw.h index 56ee9cab8e2..bd809388ec8 100644 --- a/src/emu/debug/debugvw.h +++ b/src/emu/debug/debugvw.h @@ -364,7 +364,7 @@ INLINE const registers_subview_item *registers_view_get_subview_by_index(const r /*------------------------------------------------- registers_view_get_current_subview - return a - pointer to the current subview of a + pointer to the current subview of a registers view -------------------------------------------------*/ @@ -390,7 +390,7 @@ INLINE const disasm_subview_item *disasm_view_get_subview_by_index(const disasm_ /*------------------------------------------------- disasm_view_get_current_subview - return a - pointer to the current subview of a + pointer to the current subview of a disassembly view -------------------------------------------------*/ @@ -416,7 +416,7 @@ INLINE const memory_subview_item *memory_view_get_subview_by_index(const memory_ /*------------------------------------------------- memory_view_get_current_subview - return a - pointer to the current subview of a + pointer to the current subview of a memory view -------------------------------------------------*/ diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index ff069dc26f7..df55d972caa 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -901,7 +901,7 @@ const char *devtype_get_info_string(device_type type, UINT32 state) assert(type != NULL); assert(state >= DEVINFO_STR_FIRST && state <= DEVINFO_STR_LAST); - + /* retrieve the value */ info.s = get_temp_string_buffer(); (*type)(NULL, state, &info); diff --git a/src/emu/fileio.c b/src/emu/fileio.c index 6e6e5e748c8..efcf2152515 100644 --- a/src/emu/fileio.c +++ b/src/emu/fileio.c @@ -385,7 +385,7 @@ void mame_fclose(mame_file *file) /*------------------------------------------------- - mame_fcompress - enable/disable streaming file + mame_fcompress - enable/disable streaming file compression via zlib -------------------------------------------------*/ diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c index 2f507b03b5c..e63685938e7 100644 --- a/src/emu/machine/6526cia.c +++ b/src/emu/machine/6526cia.c @@ -296,7 +296,7 @@ static int is_timer_active(emu_timer *timer) /*------------------------------------------------- cia_timer_update - updates the count and - emu_timer for a given CIA timer + emu_timer for a given CIA timer -------------------------------------------------*/ static void cia_timer_update(cia_timer *timer, INT32 new_count) @@ -499,7 +499,7 @@ void cia_clock_tod(const device_config *device) if ((device->type == CIA6526R1) || (device->type == CIA6526R2)) { /* The 6526 split the value into hours, minutes, seconds and - * subseconds */ + * subseconds */ cia6526_increment(cia); } else if (device->type == CIA8520) diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c index 687ca9def0c..9ef0582cf3e 100644 --- a/src/emu/machine/6850acia.c +++ b/src/emu/machine/6850acia.c @@ -1,8 +1,8 @@ /********************************************************************* - 6850acia.c + 6850acia.c - 6850 ACIA code + 6850 ACIA code *********************************************************************/ @@ -765,7 +765,7 @@ static void rx_tick(const device_config *device) /*------------------------------------------------- TIMER_CALLBACK( receive_event ) - Called on - receive timer event + receive timer event -------------------------------------------------*/ static TIMER_CALLBACK( receive_event ) @@ -807,7 +807,7 @@ void acia_rx_clock_in(const device_config *device) /*------------------------------------------------- acia6850_set_rx_clock - Set clock frequencies - dynamically + dynamically -------------------------------------------------*/ void acia6850_set_rx_clock(const device_config *device, int clock) @@ -819,7 +819,7 @@ void acia6850_set_rx_clock(const device_config *device, int clock) /*------------------------------------------------- acia6850_set_tx_clock - Set clock frequencies - dynamically + dynamically -------------------------------------------------*/ void acia6850_set_tx_clock(const device_config *device, int clock) diff --git a/src/emu/machine/6850acia.h b/src/emu/machine/6850acia.h index 086be3fa66a..fe787d674e4 100644 --- a/src/emu/machine/6850acia.h +++ b/src/emu/machine/6850acia.h @@ -1,8 +1,8 @@ /********************************************************************* - 6850acia.h + 6850acia.h - 6850 ACIA code + 6850 ACIA code *********************************************************************/ diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c index 3ed83ce9ced..ff11c1f0274 100644 --- a/src/emu/machine/idectrl.c +++ b/src/emu/machine/idectrl.c @@ -1675,7 +1675,7 @@ static DEVICE_START( ide_controller ) assert(device->inline_config != NULL); assert(device->machine != NULL); assert(device->machine->config != NULL); - + /* store a pointer back to the device */ ide->device = device; diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index dc91bafe86e..be6d5aee3c2 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -12,7 +12,7 @@ - Only memory to memory is tested! TODO: - - refactor according to new memory system + - refactor according to new memory system - implement interrupt support (not used in dkong3 and mario) - implement missing features - implement more asserts diff --git a/src/emu/memory.c b/src/emu/memory.c index e3bbc7f23e4..cc85c7f42b2 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -1501,7 +1501,7 @@ static void memory_init_spaces(running_machine *machine) int endianness = cputype_get_endianness(cputype); int accessorindex = (dbits == 8) ? 0 : (dbits == 16) ? 1 : (dbits == 32) ? 2 : 3; int entrynum; - + /* if logbits is 0, revert to abits */ if (logbits == 0) logbits = abits; diff --git a/src/emu/memory.h b/src/emu/memory.h index e6ef8ef4923..a76f0e36138 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -1012,9 +1012,9 @@ INLINE offs_t memory_byte_to_address(const address_space *space, offs_t address) /*------------------------------------------------- - memory_byte_to_address_end - convert a byte - offset to an address in the specified address - space specifying the last address covered by + memory_byte_to_address_end - convert a byte + offset to an address in the specified address + space specifying the last address covered by the byte -------------------------------------------------*/ diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c index 17537781e34..35e6d59bd00 100644 --- a/src/emu/sound/okim6295.c +++ b/src/emu/sound/okim6295.c @@ -62,7 +62,7 @@ static int diff_lookup[49*16]; /* volume lookup table. The manual lists only 9 steps, ~3dB per step. Given the dB values, that seems to map to a 5-bit volume control. What happens for steps after the 9th is not - known, we arbitrarily assign a "1" to all those steps. */ + known, we arbitrarily assign a "1" to all those steps. */ static int volume_table[16] = { 0x20, // 0 dB diff --git a/src/emu/state.c b/src/emu/state.c index fb6030c338a..874c7a8d954 100644 --- a/src/emu/state.c +++ b/src/emu/state.c @@ -95,7 +95,7 @@ struct _state_private state_entry * entrylist; /* list of live entries */ state_callback * prefunclist; /* presave function list */ state_callback * postfunclist; /* postsave function list */ - + UINT8 * ioarray; /* array where we accumulate all the data */ UINT32 ioarraysize; /* size of the array */ mame_file * iofile; /* file currently in use */ @@ -149,7 +149,7 @@ void state_init(running_machine *machine) /*------------------------------------------------- - state_save_get_reg_count - return the number + state_save_get_reg_count - return the number of total registrations so far -------------------------------------------------*/ diff --git a/src/emu/timer.c b/src/emu/timer.c index be4bba78f9a..31632e7fd8e 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -160,13 +160,13 @@ INLINE emu_timer *timer_new(running_machine *machine) timer_logtimers(machine); fatalerror("Out of timers!"); } - + /* pull an entry from the free list */ timer = global->freelist; global->freelist = timer->next; if (global->freelist == NULL) global->freelist_tail = NULL; - + /* set up the machine */ timer->machine = machine; return timer; @@ -288,7 +288,7 @@ void timer_init(running_machine *machine) { timer_private *global; int i; - + /* allocate global data */ global = machine->timer_data = auto_malloc(sizeof(*global)); memset(global, 0, sizeof(*global)); diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c index 4672d392e05..e96286800c5 100644 --- a/src/emu/uimenu.c +++ b/src/emu/uimenu.c @@ -1347,18 +1347,18 @@ UINT32 ui_menu_ui_handler(running_machine *machine, UINT32 state) UINT32 ui_slider_ui_handler(running_machine *machine, UINT32 state) { UINT32 result; - + /* if this is the first call, push the sliders menu */ if (state) ui_menu_stack_push(ui_menu_alloc(machine, menu_sliders, (void *)1)); /* handle standard menus */ result = ui_menu_ui_handler(machine, state); - + /* if we are cancelled, pop the sliders menu */ if (result == UI_HANDLER_CANCEL) ui_menu_stack_pop(machine); - + return (menu_stack != NULL && menu_stack->handler == menu_sliders && menu_stack->parameter != NULL) ? 0 : UI_HANDLER_CANCEL; } @@ -2685,7 +2685,7 @@ static void menu_sliders(running_machine *machine, ui_menu *menu, void *paramete else *hidden = !*hidden; break; - + /* decrease value */ case IPT_UI_LEFT: if (input_code_pressed(KEYCODE_LALT) || input_code_pressed(KEYCODE_RALT)) @@ -2774,7 +2774,7 @@ static void menu_sliders_populate(running_machine *machine, ui_menu *menu, int m if (curval < curslider->maxval) flags |= MENU_FLAG_RIGHT_ARROW; ui_menu_item_append(menu, curslider->description, astring_c(tempstring), flags, (void *)curslider); - + if (menuless_mode) break; } diff --git a/src/lib/util/corefile.c b/src/lib/util/corefile.c index 157ee455991..061d59523f8 100644 --- a/src/lib/util/corefile.c +++ b/src/lib/util/corefile.c @@ -223,29 +223,29 @@ void core_fclose(core_file *file) /*------------------------------------------------- - core_fcompress - enable/disable streaming file + core_fcompress - enable/disable streaming file compression via zlib -------------------------------------------------*/ file_error core_fcompress(core_file *file, int compress) { file_error result = FILERR_NONE; - + /* can only do this for read-only and write-only cases */ if ((file->openflags & OPEN_FLAG_WRITE) != 0 && (file->openflags & OPEN_FLAG_READ) != 0) return FILERR_INVALID_ACCESS; - + /* if we have been compressing, flush and free the data */ if (file->zdata != NULL && !compress) { int zerr = Z_OK; - + /* flush any remaining data if we are writing */ while ((file->openflags & OPEN_FLAG_WRITE) != 0 && zerr != Z_STREAM_END) { UINT32 actualdata; file_error filerr; - + /* deflate some more */ zerr = deflate(&file->zdata->stream, Z_FINISH); if (zerr != Z_STREAM_END && zerr != Z_OK) @@ -265,29 +265,29 @@ file_error core_fcompress(core_file *file, int compress) file->zdata->stream.avail_out = sizeof(file->zdata->buffer); } } - + /* end the appropriate operation */ if ((file->openflags & OPEN_FLAG_WRITE) != 0) deflateEnd(&file->zdata->stream); else inflateEnd(&file->zdata->stream); - + /* free memory */ free(file->zdata); file->zdata = NULL; } - + /* if we are just starting to compress, allocate a new buffer */ if (file->zdata == NULL && compress) { int zerr; - + /* allocate memory */ file->zdata = malloc(sizeof(*file->zdata)); if (file->zdata == NULL) return FILERR_OUT_OF_MEMORY; memset(file->zdata, 0, sizeof(file->zdata)); - + /* initialize the stream and compressor */ if ((file->openflags & OPEN_FLAG_WRITE) != 0) { @@ -297,7 +297,7 @@ file_error core_fcompress(core_file *file, int compress) } else zerr = inflateInit(&file->zdata->stream); - + /* on error, return an error */ if (zerr != Z_OK) { @@ -305,7 +305,7 @@ file_error core_fcompress(core_file *file, int compress) file->zdata = NULL; return FILERR_OUT_OF_MEMORY; } - + /* flush buffers */ file->bufferbytes = 0; @@ -313,7 +313,7 @@ file_error core_fcompress(core_file *file, int compress) file->zdata->realoffset = file->offset; file->zdata->nextoffset = file->offset; } - + return result; } @@ -330,7 +330,7 @@ file_error core_fcompress(core_file *file, int compress) int core_fseek(core_file *file, INT64 offset, int whence) { int err = 0; - + /* error if compressing */ if (file->zdata != NULL) return 1; @@ -883,11 +883,11 @@ static file_error osd_or_zlib_read(core_file *file, void *buffer, UINT64 offset, /* if no compression, just pass through */ if (file->zdata == NULL) return osd_read(file->file, buffer, offset, length, actual); - + /* if the offset doesn't match the next offset, fail */ if (offset != file->zdata->nextoffset) return FILERR_INVALID_ACCESS; - + /* set up the destination */ file->zdata->stream.next_out = buffer; file->zdata->stream.avail_out = length; @@ -896,7 +896,7 @@ static file_error osd_or_zlib_read(core_file *file, void *buffer, UINT64 offset, file_error filerr; UINT32 actualdata; int zerr = Z_OK; - + /* if we didn't make progress, report an error or the end */ if (file->zdata->stream.avail_in != 0) zerr = inflate(&file->zdata->stream, Z_SYNC_FLUSH); @@ -906,7 +906,7 @@ static file_error osd_or_zlib_read(core_file *file, void *buffer, UINT64 offset, file->zdata->nextoffset += *actual; return (zerr == Z_STREAM_END) ? FILERR_NONE : FILERR_INVALID_DATA; } - + /* fetch more data if needed */ if (file->zdata->stream.avail_in == 0) { @@ -922,7 +922,7 @@ static file_error osd_or_zlib_read(core_file *file, void *buffer, UINT64 offset, /* we read everything */ *actual = length; file->zdata->nextoffset += *actual; - return FILERR_NONE; + return FILERR_NONE; } @@ -936,11 +936,11 @@ static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 /* if no compression, just pass through */ if (file->zdata == NULL) return osd_write(file->file, buffer, offset, length, actual); - + /* if the offset doesn't match the next offset, fail */ if (offset != file->zdata->nextoffset) return FILERR_INVALID_ACCESS; - + /* set up the source */ file->zdata->stream.next_in = (void *)buffer; file->zdata->stream.avail_in = length; @@ -949,7 +949,7 @@ static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 file_error filerr; UINT32 actualdata; int zerr; - + /* if we didn't make progress, report an error or the end */ zerr = deflate(&file->zdata->stream, Z_NO_FLUSH); if (zerr != Z_OK) @@ -958,7 +958,7 @@ static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 file->zdata->nextoffset += *actual; return FILERR_INVALID_DATA; } - + /* write more data if we are full up */ if (file->zdata->stream.avail_out == 0) { @@ -974,7 +974,7 @@ static file_error osd_or_zlib_write(core_file *file, const void *buffer, UINT64 /* we read everything */ *actual = length; file->zdata->nextoffset += *actual; - return FILERR_NONE; + return FILERR_NONE; } diff --git a/src/lib/util/pool.c b/src/lib/util/pool.c index f19ec401507..479c61cbd21 100644 --- a/src/lib/util/pool.c +++ b/src/lib/util/pool.c @@ -147,7 +147,7 @@ object_pool *pool_alloc(void (*fail)(const char *message)) /* set the failure handler */ pool->fail = fail; - + /* register the built-in types */ pool_type_register(pool, OBJTYPE_MEMORY, "Memory", memory_destruct); @@ -196,7 +196,7 @@ void pool_type_register(object_pool *pool, object_type type, const char *friendl void pool_clear(object_pool *pool) { object_entry *entry, *next; - + /* iterate over all entries in the global list and free them */ for (entry = pool->globallist; entry != NULL; entry = next) { @@ -211,7 +211,7 @@ void pool_clear(object_pool *pool) entry->globalnext = entry->globalprev = NULL; pool->freelist = entry; } - + /* zap the hashtable */ memset(pool->hashtable, 0, sizeof(pool->hashtable)); } @@ -320,7 +320,7 @@ void *pool_object_add_file_line(object_pool *pool, object_type _type, void *obje entry->globalprev = NULL; entry->globalnext = pool->globallist; pool->globallist = entry; - + /* hook up to the appropriate hash table */ entry->next = pool->hashtable[hashnum]; pool->hashtable[hashnum] = entry; @@ -428,7 +428,7 @@ int pool_iterate_next(object_pool_iterator *iter, void **objectptr, size_t *size iter->last = iter->pool->globallist; else iter->last = iter->last->globalnext; - + /* stop when we get one */ if (iter->last != NULL) { diff --git a/src/mame/drivers/brasil.c b/src/mame/drivers/brasil.c index 6d6d828edd4..b38b8387948 100644 --- a/src/mame/drivers/brasil.c +++ b/src/mame/drivers/brasil.c @@ -123,7 +123,7 @@ static WRITE16_HANDLER( blit_status_w ) memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); -// popmessage("%04x",data); +// popmessage("%04x",data); } /* New Magic Card */ @@ -147,7 +147,7 @@ static WRITE16_HANDLER( vidpokr2_blit_status_w ) memory_set_bankptr(space->machine, 1, &ROM[bankaddress]); -// popmessage("%04x",data); +// popmessage("%04x",data); } static WRITE16_HANDLER( paletteram_io_w ) @@ -203,26 +203,26 @@ static UINT16 t1,t3; static READ16_HANDLER( read1_r ) { -// return mame_rand(space->machine); +// return mame_rand(space->machine); return input_port_read(space->machine, "IN0"); } static READ16_HANDLER( read2_r ) { -// return mame_rand(space->machine); +// return mame_rand(space->machine); return input_port_read(space->machine, "IN1"); } static READ16_HANDLER( read3_r ) { -// return mame_rand(space->machine); +// return mame_rand(space->machine); return input_port_read(space->machine, "IN2"); } static WRITE16_HANDLER( write1_w ) { t1 = data; -// popmessage("%04x %04x",t1,t3); +// popmessage("%04x %04x",t1,t3); } static WRITE16_HANDLER( write2_w ) @@ -239,7 +239,7 @@ static WRITE16_HANDLER( write2_w ) static WRITE16_HANDLER( write3_w ) { t3 = data; -// popmessage("%04x %04x",t1,t3); +// popmessage("%04x %04x",t1,t3); } static ADDRESS_MAP_START( brasil_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -258,8 +258,8 @@ static ADDRESS_MAP_START( brasil_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x0008, 0x0009) AM_READ( read1_r ) AM_RANGE(0x000a, 0x000b) AM_READ( read2_r ) AM_RANGE(0x000e, 0x000f) AM_READ( read3_r ) -// AM_RANGE(0x000e, 0x000f) AM_WRITE -// AM_RANGE(0xffa2, 0xffa3) AM_WRITE +// AM_RANGE(0x000e, 0x000f) AM_WRITE +// AM_RANGE(0xffa2, 0xffa3) AM_WRITE ADDRESS_MAP_END static ADDRESS_MAP_START( vidpokr2_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -281,8 +281,8 @@ static ADDRESS_MAP_START( vidpokr2_io, ADDRESS_SPACE_IO, 16 ) AM_RANGE(0x000c, 0x000d) AM_READ( vidpokr2_vblank_r ) AM_RANGE(0x000e, 0x000f) AM_READ( read3_r ) AM_RANGE(0x0010, 0x0015) AM_WRITE( paletteram_io_w ) -// AM_RANGE(0x000e, 0x000f) AM_WRITE -// AM_RANGE(0xffa2, 0xffa3) AM_WRITE +// AM_RANGE(0x000e, 0x000f) AM_WRITE +// AM_RANGE(0xffa2, 0xffa3) AM_WRITE ADDRESS_MAP_END static INPUT_PORTS_START( brasil ) diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 6c153908f5c..09432f1e545 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -178,7 +178,7 @@ static WRITE8_HANDLER( tisland_w ) else if (offset == 0x4003) audio_command_w(space,0,data); else if (offset == 0x4004) bnj_scroll1_w(space,0,data); else if (offset == 0x4005) bnj_scroll2_w(space,0,data); -// else if (offset == 0x8000) btime_video_control_w(space,0,data); +// else if (offset == 0x8000) btime_video_control_w(space,0,data); else logerror("CPU '%s' PC %04x: warning - write %02x to unmapped memory address %04x\n",space->cpu->tag,cpu_get_pc(space->cpu),data,offset); @@ -1789,9 +1789,9 @@ static DRIVER_INIT( tisland ) UINT8 *rom = memory_region(machine, "main"); /* At location 0xa2b6 there's a strange RLA followed by a BPL that reads from an - unmapped area that causes the game to fail in several circumstances.On the Cassette - version the RLA (33) is in reality a BIT (24),so I'm guessing that there's something - wrong going on in the encryption scheme.*/ + unmapped area that causes the game to fail in several circumstances.On the Cassette + version the RLA (33) is in reality a BIT (24),so I'm guessing that there's something + wrong going on in the encryption scheme.*/ memset(&rom[0xa2b6],0x24,1); init_rom1(machine); diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index 1049572b261..15b47606f23 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -5,7 +5,7 @@ preliminary 22 Aug 2004 - Basic skeleton driver, loads some roms doesn't run the right code yet 2 Dec 2008 - Added an hack for the SH-2,fixed some irqs and some memory maps/ram sharing. - Got to the point that area 0x03e00000 on the SH-2 loads some DMA-style tables. + Got to the point that area 0x03e00000 on the SH-2 loads some DMA-style tables. Known Games on this Platform Cool Riders @@ -144,7 +144,7 @@ static ADDRESS_MAP_START( system_h1_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x03e10000, 0x03e11fff) AM_RAM AM_BASE(&framebuffer_data)/*Buffer data should go here*/ AM_RANGE(0x03f00000, 0x03f0ffff) AM_RAM AM_SHARE(3) /*Communication area RAM*/ -// AM_RANGE(0x04000000, 0x0400001f) AM_RAM /*???*/ +// AM_RANGE(0x04000000, 0x0400001f) AM_RAM /*???*/ AM_RANGE(0x04000000, 0x0400ffff) AM_RAM /*dunno what it is,might be palette RAM*/ AM_RANGE(0x06000000, 0x060fffff) AM_RAM AM_BASE(&sysh1_workram_h) AM_RANGE(0x20000000, 0x200fffff) AM_ROM AM_SHARE(1) @@ -217,10 +217,10 @@ GFXDECODE_END // IRQs 4 & 6 are valid on SH-2 static INTERRUPT_GEN( system_h1 ) { -// if (cpu_getiloops(device)) -// cpu_set_input_line(device, 4, HOLD_LINE); -// else -// cpu_set_input_line(device, 6, HOLD_LINE); +// if (cpu_getiloops(device)) +// cpu_set_input_line(device, 4, HOLD_LINE); +// else +// cpu_set_input_line(device, 6, HOLD_LINE); } //IRQs 10,12 and 14 are valid on SH-1 instead @@ -237,7 +237,7 @@ static INTERRUPT_GEN( system_h1_sub ) static MACHINE_RESET ( coolridr ) { -// cpu_set_input_line(machine->cpu[0], INPUT_LINE_HALT, ASSERT_LINE); +// cpu_set_input_line(machine->cpu[0], INPUT_LINE_HALT, ASSERT_LINE); cpu_set_input_line(machine->cpu[1], INPUT_LINE_HALT, ASSERT_LINE); } diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c index 37c06df1a03..5ae34770001 100644 --- a/src/mame/drivers/deshoros.c +++ b/src/mame/drivers/deshoros.c @@ -70,7 +70,7 @@ static READ8_HANDLER( io_r ) case 0x0a: return io_ram[offset]; //"buzzer" 0 read case 0x0b: return io_ram[offset]; //"buzzer" 1 read } -// printf("R -> [%02x]\n",offset); +// printf("R -> [%02x]\n",offset); return io_ram[offset]; } @@ -83,12 +83,12 @@ static WRITE8_HANDLER( io_w ) case 0x02: update_led_array(data); return; case 0x05: coin_lockout_w(0,io_ram[offset] & 1);return; case 0x06: /*Printer IRQ enable*/ return; -// case 0x0a: "buzzer" 0 write -// case 0x0b: "buzzer" 1 write +// case 0x0a: "buzzer" 0 write +// case 0x0b: "buzzer" 1 write case 0x0c: answer_bankswitch(space->machine,data&0x03); return; //data & 0x10 enabled too,dunno if it is worth to shift the data... } io_ram[offset] = data; -// printf("%02x -> [%02x]\n",data,offset); +// printf("%02x -> [%02x]\n",data,offset); } static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index dbdadaaaa59..2f6a21a2f27 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -367,10 +367,10 @@ static void borntofi_adpcm_int(const device_config *device, int voice) } } -static void borntofi_adpcm_int_0(const device_config *device) { borntofi_adpcm_int(device, 0); } -static void borntofi_adpcm_int_1(const device_config *device) { borntofi_adpcm_int(device, 1); } -static void borntofi_adpcm_int_2(const device_config *device) { borntofi_adpcm_int(device, 2); } -static void borntofi_adpcm_int_3(const device_config *device) { borntofi_adpcm_int(device, 3); } +static void borntofi_adpcm_int_0(const device_config *device) { borntofi_adpcm_int(device, 0); } +static void borntofi_adpcm_int_1(const device_config *device) { borntofi_adpcm_int(device, 1); } +static void borntofi_adpcm_int_2(const device_config *device) { borntofi_adpcm_int(device, 2); } +static void borntofi_adpcm_int_3(const device_config *device) { borntofi_adpcm_int(device, 3); } static ADDRESS_MAP_START( borntofi_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index 0d5ef4f9409..0e974e985b9 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -1108,7 +1108,7 @@ static ADDRESS_MAP_START( saloon_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_READ(input_port_2_r) AM_RANGE(0x1800, 0x1800) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w) AM_RANGE(0x1801, 0x1801) AM_WRITE(ay8910_write_port_0_w) -// AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads... maybe a DSW */ +// AM_RANGE(0x2000, 0x2000) AM_READNOP /* some unknown reads... maybe a DSW */ AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram) AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE(&colorram) AM_RANGE(0x8000, 0xffff) AM_ROM @@ -1118,12 +1118,12 @@ ADDRESS_MAP_END Unknown R/W ----------- - 0800 RW ;input? - 081a W ;unknown (W 0x20) - 081b W ;unknown (W 0x20 & 0x30) - 0810 W ;unknown - 0a01 RW ;input? - 1000 RW ;input? (W 0xff & 0xfd) + 0800 RW ;input? + 081a W ;unknown (W 0x20) + 081b W ;unknown (W 0x20 & 0x30) + 0810 W ;unknown + 0a01 RW ;input? + 1000 RW ;input? (W 0xff & 0xfd) */ @@ -2733,7 +2733,7 @@ static DRIVER_INIT( saloon ) int i, a; /***************************** - * Program ROM decryption * + * Program ROM decryption * *****************************/ /* data lines swap: 76543210 -> 76543012 */ @@ -2759,7 +2759,7 @@ static DRIVER_INIT( saloon ) /****************************** - * Graphics ROM decryption * + * Graphics ROM decryption * ******************************/ buffer = malloc_or_die(sizeg); @@ -2777,7 +2777,7 @@ static DRIVER_INIT( saloon ) /**************************** - * Color PROM decryption * + * Color PROM decryption * ****************************/ /* data lines swap: 76543210 -> 23546710 */ diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c index 2839ceaa09e..f568f9227f8 100644 --- a/src/mame/drivers/gal3.c +++ b/src/mame/drivers/gal3.c @@ -151,12 +151,12 @@ screened : 8623961202 CPU020 Etched : (8623963202) -label loc. Device Filename +label loc. Device Filename -------------------------------------------------------- -GLC1-MST-PRG0E 6B 27c4001 PRG0E -GLC1-MST-PRG1E 10B 27c4001 PRG1E -GLC1-MST-PRG2E 14B 27c4001 PRG2E -GLC1-MST-PRG3E 18B 27c4001 PRG3E +GLC1-MST-PRG0E 6B 27c4001 PRG0E +GLC1-MST-PRG1E 10B 27c4001 PRG1E +GLC1-MST-PRG2E 14B 27c4001 PRG2E +GLC1-MST-PRG3E 18B 27c4001 PRG3E ************************************************************************************************** SLAVE CPU PCB @@ -167,12 +167,12 @@ screened : 8623961202 CPU020 Etched : (8623963202) -label loc. Device Filename +label loc. Device Filename -------------------------------------------------------- -GLC-SLV-PRG0 6B 27c010A PRG0.bin -GLC-SLV-PRG1 10B 27c010A PRG1.bin -GLC-SLV-PRG2 14B 27c010A PRG2.bin -GLC-SLV-PRG3 18B 27c010A PRG3.bin +GLC-SLV-PRG0 6B 27c010A PRG0.bin +GLC-SLV-PRG1 10B 27c010A PRG1.bin +GLC-SLV-PRG2 14B 27c010A PRG2.bin +GLC-SLV-PRG3 18B 27c010A PRG3.bin ************************************************************************************************** DSP PCB @@ -184,11 +184,11 @@ screened : 8623961703 DSP Etched : (8623963703) TSK-A -label loc. Device Filename +label loc. Device Filename -------------------------------------------------------- -GLC1-DSP-PTOH 2F 27c040 PTOH.BIN -GLC1-DSP-PTOU 2K 27c040 PTOU.BIN -GLC1-DSP-PTOL 2N 27c040 PTOL.BIN +GLC1-DSP-PTOH 2F 27c040 PTOH.BIN +GLC1-DSP-PTOU 2K 27c040 PTOU.BIN +GLC1-DSP-PTOL 2N 27c040 PTOL.BIN ************************************************************************************************** OBJ PCB @@ -199,12 +199,12 @@ screened : 8623962002 Etched : (8623964002) -label loc. Device Filename +label loc. Device Filename -------------------------------------------------------- -GLC1-OBJ-OBJ0 9T 27c040 OBJ0.BIN -GLC1-OBJ-OBJ2 9W 27c4000 OBJ2.BIN -GLC1-OBJ-OBJ1 9Y 27c040 OBJ1.BIN -GLC1-OBJ-OBJ3 9Z 27c4000 OBJ0.BIN +GLC1-OBJ-OBJ0 9T 27c040 OBJ0.BIN +GLC1-OBJ-OBJ2 9W 27c4000 OBJ2.BIN +GLC1-OBJ-OBJ1 9Y 27c040 OBJ1.BIN +GLC1-OBJ-OBJ3 9Z 27c4000 OBJ0.BIN ************************************************************************************************** PSN PCB @@ -216,11 +216,11 @@ screened : V1079603 Etched : (V1079703) -label loc. Device Filename +label loc. Device Filename -------------------------------------------------------- -GLC-PSN-VOL IC100 27c010A VOL.bin -GLC-PSN-PRG0B IC22 27c010A PRG0B.bin -GLC-PSN-PRG0B IC23 27c010A PRG1B.bin +GLC-PSN-VOL IC100 27c010A VOL.bin +GLC-PSN-PRG0B IC22 27c010A PRG0B.bin +GLC-PSN-PRG0B IC23 27c010A PRG1B.bin PCB markings: @@ -231,10 +231,10 @@ Etched : (V107970701) TSK-A RS PCB ************************************************************************************************** -label loc. Device Filename +label loc. Device Filename -------------------------------------------------------- -GLC-RS-PRGLB 18B 27c010 PRGLB.BIN -GLC-RS-PRGUB 19B 27c010 PRGUB.BIN +GLC-RS-PRGLB 18B 27c010 PRGLB.BIN +GLC-RS-PRGUB 19B 27c010 PRGUB.BIN ************************************************************************************************** SOUND PCB @@ -246,18 +246,18 @@ screened : V107965101 Etched : (V107975101) -label loc. Device Filename +label loc. Device Filename -------------------------------------------------------- -GLC1-SND-VOI0 13A 27c040 VOI0.BIN -GLC1-SND-VOI2 13C 27c040 VOI2.BIN -GLC1-SND-VOI8 10G 27c040 VOI8.BIN -GLC1-SND-VOI9 11/12G 27c040 VOI9.BIN -GLC1-SND-VOI10 13G 27c040 VOI10.BIN -GLC1-SND-VOI11 14G 27c040 VOI11.BIN - -GLC1-SND-PRG0 1H 27c1000 PRG0.BIN -GLC1-SND-PRG1 2H 27c1000 PRG1.BIN -GLC1-SND-DATA1 4/5H 27c1000 DATA1.BIN +GLC1-SND-VOI0 13A 27c040 VOI0.BIN +GLC1-SND-VOI2 13C 27c040 VOI2.BIN +GLC1-SND-VOI8 10G 27c040 VOI8.BIN +GLC1-SND-VOI9 11/12G 27c040 VOI9.BIN +GLC1-SND-VOI10 13G 27c040 VOI10.BIN +GLC1-SND-VOI11 14G 27c040 VOI11.BIN + +GLC1-SND-PRG0 1H 27c1000 PRG0.BIN +GLC1-SND-PRG1 2H 27c1000 PRG1.BIN +GLC1-SND-DATA1 4/5H 27c1000 DATA1.BIN */ diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 8b53f426a8c..5039ff60de6 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -181,7 +181,7 @@ take your credits, the 3 witches start to roll their own numbers like a slot machine. There is an attempt for each winning hand. the bonus ends when you win a prize, or when all attempts are done. - + * Super Loco 93 @@ -221,7 +221,7 @@ The rest is similar to Witch Card, but with 3 big numbers instead of witches. Once you lose or take your credits, the big numbers start to run 'alla' slot game, giving 1 attempt by each time you won a double-up - hand. + hand. - Settings: @@ -632,7 +632,7 @@ static TILE_GET_INFO( get_bg_tile_info ) int attr = colorram[tile_index]; int code = ((attr & 1) << 8) | videoram[tile_index]; - int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ + int bank = (attr & 0x02) >> 1; /* bit 1 switch the gfx banks */ int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */ SET_TILE_INFO(bank, code, color, 0); @@ -669,7 +669,7 @@ static PALETTE_INIT( goldnpkr ) int bit0, bit1, bit2, r, g, b, inten, intenmin, intenmax; intenmin = 0xe0; -// intenmin = 0xc2; /* 2.5 Volts (75.757575% of the whole range) */ +// intenmin = 0xc2; /* 2.5 Volts (75.757575% of the whole range) */ intenmax = 0xff; /* 3.3 Volts (the whole range) */ /* intensity component */ @@ -766,7 +766,7 @@ static READ8_HANDLER( goldnpkr_mux_port_r ) static READ8_HANDLER( pottnpkr_mux_port_r ) { UINT8 pa_0_4 = 0xff, pa_7; /* Temporary place holder for bits 0 to 4 & 7 */ - + switch( mux_data & 0xf0 ) /* bits 4-7 */ { case 0x10: return input_port_read(space->machine, "IN0-0"); @@ -776,7 +776,7 @@ static READ8_HANDLER( pottnpkr_mux_port_r ) } pa_7 = (pia0_PA_data >> 7) & 1; /* To do: bit PA5 to pin CB1 */ -// popmessage ("mux_port_r: %x ",((pa_0_4 & 0x3f) | (pa_7 << 6) | (pa_7 << 7))) ; /* Equates PA6 to PA7 */ +// popmessage ("mux_port_r: %x ",((pa_0_4 & 0x3f) | (pa_7 << 6) | (pa_7 << 7))) ; /* Equates PA6 to PA7 */ return ( (pa_0_4 & 0x3f) | (pa_7 << 6) | (pa_7 << 7) ) ; } @@ -834,7 +834,7 @@ static WRITE8_HANDLER( lamps_a_w ) output_set_lamp_value(3, 1 - ((data >> 3) & 1)); /* Lamp 3 */ output_set_lamp_value(4, 1 - ((data >> 4) & 1)); /* Lamp 4 */ -// popmessage("written : %02X", data); +// popmessage("written : %02X", data); coin_counter_w(0, data & 0x40); /* counter1 */ coin_counter_w(1, data & 0x80); /* counter2 */ coin_counter_w(2, data & 0x20); /* counter3 */ @@ -901,7 +901,7 @@ static ADDRESS_MAP_START( witchcrd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(goldnpkr_videoram_w) AM_BASE(&videoram) AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(goldnpkr_colorram_w) AM_BASE(&colorram) AM_RANGE(0x2000, 0x2000) AM_READ_PORT("SW2") -// AM_RANGE(0x2108, 0x210b) AM_NOP /* unknown 40-pin device */ +// AM_RANGE(0x2108, 0x210b) AM_NOP /* unknown 40-pin device */ AM_RANGE(0x4000, 0x7fff) AM_ROM ADDRESS_MAP_END @@ -2157,9 +2157,9 @@ static const discrete_dac_r1_ladder dac_goldnpkr_ladder = CAP_U(1.7) /* filtering cap tied to ground */ -// 12, /* voltage Bias resistor is tied to */ -// RES_K(330), /* additional resistor tied to vBias */ -// 0, /* resistor tied to ground */ +// 12, /* voltage Bias resistor is tied to */ +// RES_K(330), /* additional resistor tied to vBias */ +// 0, /* resistor tied to ground */ }; static DISCRETE_SOUND_START( goldnpkr ) @@ -2714,9 +2714,9 @@ ROM_END /* checksum routine at $5f3e - protect $4000+ & $7ff9. - (see cmp at $5f6b) - balanced at $7ff8. + protect $4000+ & $7ff9. + (see cmp at $5f6b) + balanced at $7ff8. */ ROM_START( maverik ) ROM_REGION( 0x10000, "main", 0 ) /* maverik: Maverik (ind arg, fixed, changed logo) */ @@ -2773,9 +2773,9 @@ ROM_END /******************************* bsuerte sets **************************/ /* checksum routine at $5827 - protect $4000+ & $7ff9. - (see cmp at $584a) - balanced at $7ff8. + protect $4000+ & $7ff9. + (see cmp at $584a) + balanced at $7ff8. */ ROM_START( bsuerte ) ROM_REGION( 0x10000, "main", 0 ) /* bs_chica.256: good BS set... (checksum) */ @@ -3169,19 +3169,19 @@ static DRIVER_INIT( pottnpkr ) } /* - Golden Poker H/W sets: + Golden Poker H/W sets: newname oldname gameplay music settings testmode - =================================================================== + =================================================================== pmpoker pmpoker fast minimal hack matrix/grill goldnpkr goldnpkr fast y.doodle excellent matrix/grill goldnpkb goldnpkb normal minimal normal matrix/grill - Potten's Poker H/W sets: + Potten's Poker H/W sets: newname oldname gameplay music settings testmode - =================================================================== + =================================================================== pottnpkr goldnpkc fast y.doodle normal only grid potnpkra jokerpkr normal normal normal only skill potnpkrb pottnpkb slow y.doodle normal only grid @@ -3190,10 +3190,10 @@ static DRIVER_INIT( pottnpkr ) potnpkre -------- slow y.doodle normal matrix/grill - Witch Card H/W sets: + Witch Card H/W sets: newname oldname gameplay music settings testmode - =================================================================== + =================================================================== bsuerte -------- normal minimal only 1-10 matrix/grill bsuertea -------- normal minimal only 1-10 matrix/grill goodluck -------- fast y.doodle normal matrix/grill @@ -3209,10 +3209,10 @@ static DRIVER_INIT( royale ) { /* $60bb, NOPing the ORA #$F0 (after read the PIA1 port B */ -// UINT8 *ROM = memory_region(machine, "main"); +// UINT8 *ROM = memory_region(machine, "main"); -// ROM[0x60bb] = 0xea; -// ROM[0x60bc] = 0xea; +// ROM[0x60bb] = 0xea; +// ROM[0x60bc] = 0xea; pia_config(0, &pottnpkr_pia0_intf); pia_config(1, &pottnpkr_pia1_intf); diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index d487430c111..bdb9335ded3 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -500,9 +500,9 @@ ROM_END Cherry I Gold -Anno 1998 +Anno 1998 Produttore -N.revisione W4BON (rev.1) +N.revisione W4BON (rev.1) CPU @@ -536,9 +536,9 @@ Note Cherry Gold (Cherry 10) -Anno 1997 +Anno 1997 Produttore -N.revisione W4BON (rev.1) +N.revisione W4BON (rev.1) CPU diff --git a/src/mame/drivers/ilpag.c b/src/mame/drivers/ilpag.c index 617ae8095b0..1f2f84cb7b3 100644 --- a/src/mame/drivers/ilpag.c +++ b/src/mame/drivers/ilpag.c @@ -57,11 +57,11 @@ VIDEO_START(ilpag) VIDEO_UPDATE(ilpag) { int x,y; -// static int counter = 0; +// static int counter = 0; int count; UINT8 *blit_rom = memory_region(screen->machine, "blit_data"); -// printf("counter %04x\n", counter); +// printf("counter %04x\n", counter); blit_rom = blit_buffer; @@ -81,7 +81,7 @@ VIDEO_UPDATE(ilpag) count++; } } -// counter++; +// counter++; return 0; } @@ -140,7 +140,7 @@ static WRITE16_HANDLER( blit_copy_w ) blit_dst_ypos = ((blit_dst_ram_loword[0] & 0xff00)>>8)*2; // ff00 = ypos? -// blit_dst_xpos|= (blit_dst_ram_hiword[0] & 0xffff)<<16; +// blit_dst_xpos|= (blit_dst_ram_hiword[0] & 0xffff)<<16; y_size = 8;// blit_romaddr[0] & 0x00ff; x_size = 14;//blit_romaddr[0] & 0xff00 >> 8; @@ -204,8 +204,8 @@ static ADDRESS_MAP_START( ilpag_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x1fffff) AM_ROM AM_REGION("blit_data", 0) AM_RANGE(0x200000, 0x20ffff) AM_RAM -// AM_RANGE(0x800000, 0x800001) AM_READ(unk_latch_1_r) -// AM_RANGE(0x880000, 0x880001) AM_READ(unk_latch_2_r) +// AM_RANGE(0x800000, 0x800001) AM_READ(unk_latch_1_r) +// AM_RANGE(0x880000, 0x880001) AM_READ(unk_latch_2_r) AM_RANGE(0x225000, 0x225fff) AM_RAM // NVRAM? AM_RANGE(0x900000, 0x900005) AM_WRITE( paletteram_io_w ) @@ -218,9 +218,9 @@ static ADDRESS_MAP_START( ilpag_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x9e0000, 0x9e0001) AM_READ(blitter_status_r) AM_RANGE(0xc00180, 0xc00181) AM_READ_PORT("IN2") -// AM_RANGE(0xc00200, 0xc00201) AM_WRITE(unk_latch_1_w) +// AM_RANGE(0xc00200, 0xc00201) AM_WRITE(unk_latch_1_w) AM_RANGE(0xc00380, 0xc00381) AM_READ_PORT("IN3") -// AM_RANGE(0xc002d0, 0xc002d1) AM_WRITE(unk_latch_2_w) +// AM_RANGE(0xc002d0, 0xc002d1) AM_WRITE(unk_latch_2_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index 14c04e1aa04..6abb0bf4480 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -181,14 +181,14 @@ static WRITE16_HANDLER( sc3_vram_w ) /*end of video stuff*/ /* - --x- ---- ---- ---- Coin Counter - ---- ---- -x-- ---- Prize - ---- ---- --x- ---- Start - ---- ---- ---x ---- Hold 5 - ---- ---- ---- x--- Hold 4 - ---- ---- ---- -x-- Hold 3 - ---- ---- ---- --x- Hold 2 - ---- ---- ---- ---x Hold 1 + --x- ---- ---- ---- Coin Counter + ---- ---- -x-- ---- Prize + ---- ---- --x- ---- Start + ---- ---- ---x ---- Hold 5 + ---- ---- ---- x--- Hold 4 + ---- ---- ---- -x-- Hold 3 + ---- ---- ---- --x- Hold 2 + ---- ---- ---- ---x Hold 1 */ static WRITE16_HANDLER( output_w ) { @@ -197,7 +197,7 @@ static WRITE16_HANDLER( output_w ) for(i=0;i<3;i++) coin_counter_w(i,data & 0x2000); -// popmessage("%04x\n",data); +// popmessage("%04x\n",data); } static ADDRESS_MAP_START( mil4000_map, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 8088d86385c..13fd037fd48 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -43,7 +43,7 @@ 440000-47ffff = PSVR 480000-4bffff = IO 4c0000-4fffff = SYS - 500000-53ffff = DSP + 500000-53ffff = DSP 540000-57ffff = FIX 580000-5bffff = OP1 5c0000-5fffff = UNUSED @@ -72,8 +72,8 @@ 500000-503fff = HCOM - 16kB common RAM 504000-504fff = CONTROL - DSP/Host Control - D10? = COMBNK - Switch between 68k and DSP access to common RAM - D08? = RESN - Reset DSP + D10? = COMBNK - Switch between 68k and DSP access to common RAM + D08? = RESN - Reset DSP 506000-506fff = HEN - DSP/Host interface */ diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c index 3319e6de719..d9c655490cb 100644 --- a/src/mame/drivers/rallyx.c +++ b/src/mame/drivers/rallyx.c @@ -1219,9 +1219,9 @@ ROM_START( locoboot ) ROM_LOAD( "g.119", 0x3000, 0x1000, CRC(3feb762e) SHA1(94ee68549752fac3c67582d968d3f5e3f1380eef) ) /* no other roms were present in this set, - but it appears to work best with the cottong roms, - and the program roms appear to be a hack of that - */ + but it appears to work best with the cottong roms, + and the program roms appear to be a hack of that + */ ROM_REGION( 0x10000, "tpsound", 0 ) ROM_LOAD( "c7", 0x0000, 0x1000, CRC(3d83f6d3) SHA1(e10ed6b6ce7280697c1bc9dbe6c6e6018e1d8be4) ) diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index b38360ab7ce..7bc82ac4ef4 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -479,10 +479,10 @@ ROM_START( wc90b2 ) ROM_CONTINUE( 0x10000, 0x8000 ) /* banked at 8000-bfff */ ROM_REGION( 0x010000, "gfx1", ROMREGION_DISPOSE ) -// ROM_LOAD( "18.bin", 0x000000, 0x04000, CRC(0c054481) SHA1(eebab099a4db5fbf13522ecd67bfa741e16e40d4) ) /* maybe bad dump: double size */ -// ROM_LOAD( "19.bin", 0x004000, 0x04000, CRC(ebb3eb48) SHA1(9cb133e02004bc04a9d7016b8cf5f6865e3ccf26) ) /* maybe bad dump: double size */ -// ROM_LOAD( "20.bin", 0x008000, 0x04000, CRC(c0232af8) SHA1(5bbab00403a47feae153e179c04212021036b8a7) ) /* maybe bad dump: double size */ -// ROM_LOAD( "21.bin", 0x00c000, 0x04000, CRC(a36e17fb) SHA1(45e4df4b4a22658f6dad21853e87fae734698fbd) ) /* maybe bad dump: double size */ +// ROM_LOAD( "18.bin", 0x000000, 0x04000, CRC(0c054481) SHA1(eebab099a4db5fbf13522ecd67bfa741e16e40d4) ) /* maybe bad dump: double size */ +// ROM_LOAD( "19.bin", 0x004000, 0x04000, CRC(ebb3eb48) SHA1(9cb133e02004bc04a9d7016b8cf5f6865e3ccf26) ) /* maybe bad dump: double size */ +// ROM_LOAD( "20.bin", 0x008000, 0x04000, CRC(c0232af8) SHA1(5bbab00403a47feae153e179c04212021036b8a7) ) /* maybe bad dump: double size */ +// ROM_LOAD( "21.bin", 0x00c000, 0x04000, CRC(a36e17fb) SHA1(45e4df4b4a22658f6dad21853e87fae734698fbd) ) /* maybe bad dump: double size */ ROM_LOAD( "a06.bin", 0x000000, 0x04000, BAD_DUMP SHA1(b839b4eafe8bf6f9e841e19fee1bdb64a66f3448) ) /* roms from parent */ ROM_LOAD( "a08.bin", 0x004000, 0x04000, BAD_DUMP SHA1(468c8c24af1f6f244228b66df04cb0ea81c1875e) ) /* roms from parent */ ROM_LOAD( "a10.bin", 0x008000, 0x04000, BAD_DUMP SHA1(4b10ee3fc17bb63cda51b2a978d066b6a140a551) ) /* roms from parent */ diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index fb4e92346a8..59d8b12a77a 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -597,6 +597,7 @@ const game_driver * const drivers[] = DRIVER( locomotn ) /* GX359 (c) 1982 Konami + Centuri license */ DRIVER( gutangtn ) /* GX359 (c) 1982 Konami + Sega license */ DRIVER( cottong ) /* bootleg */ + DRIVER( locoboot ) /* bootleg */ DRIVER( commsega ) /* (c) 1983 Sega */ /* the following ones all have a custom I/O chip */ DRIVER( bosco ) /* (c) 1981 */ @@ -7389,6 +7390,8 @@ Other Sun games DRIVER( goldstar ) /* (c) 198? IGS */ DRIVER( goldstbl ) /* (c) 198? IGS */ DRIVER( moonlght ) /* bootleg */ + DRIVER( chry10 ) /* bootleg */ + DRIVER( chryigld ) /* bootleg */ DRIVER( cpoker ) /* (c) 1993? IGS */ DRIVER( cpokert ) /* (c) 1993? Tuning */ DRIVER( csk227it ) /* (c) 198? IGS */ diff --git a/src/mame/video/sengokmj.c b/src/mame/video/sengokmj.c index 74d453fe7a6..c961e98c77b 100644 --- a/src/mame/video/sengokmj.c +++ b/src/mame/video/sengokmj.c @@ -140,6 +140,6 @@ VIDEO_UPDATE( sengokmj ) if(!(sengokmj_layer_en & 8)) tilemap_draw(bitmap,cliprect,tx_tilemap,0,0); -// popmessage("%04x",sengokmj_layer_en); +// popmessage("%04x",sengokmj_layer_en); return 0; } diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 9ef15170bbc..c833e958c24 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -5443,7 +5443,7 @@ static TIMER_CALLBACK( dyn_res_change ) visarea.max_y = vert_res-1; vblank_period = get_vblank_duration(machine); -// popmessage("%d",vblank_period); +// popmessage("%d",vblank_period); // hblank_period = get_hblank_duration(machine->primary_screen); video_screen_configure(machine->primary_screen, horz_res*2, (vert_res+vblank_period), &visarea, video_screen_get_frame_period(machine->primary_screen).attoseconds ); } diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c index a09cb1740ed..519ae59fb6f 100644 --- a/src/osd/windows/debugwin.c +++ b/src/osd/windows/debugwin.c @@ -432,7 +432,7 @@ void debugwin_destroy_windows(void) // loop over windows and free them while (window_list != NULL) { - // clear the view list because they will be freed by the core + // clear the view list because they will be freed by the core memset(window_list->view, 0, sizeof(window_list->view)); DestroyWindow(window_list->wnd); } @@ -1005,7 +1005,7 @@ static void debugwin_view_update(debug_view *view, void *osdprivate) debug_view_xy totalsize, visiblesize, topleft; int show_vscroll, show_hscroll; SCROLLINFO scrollinfo; - + assert(info->view == view); // get the view window bounds @@ -2222,7 +2222,7 @@ static int disasm_handle_command(debugwin_info *info, WPARAM wparam, LPARAM lpar cpu_debug_data *cpuinfo = cpu_get_debug_data(space->cpu); debug_cpu_breakpoint *bp; INT32 bpindex = -1; - + /* first find an existing breakpoint at this address */ for (bp = cpuinfo->bplist; bp != NULL; bp = bp->next) if (address == bp->address) @@ -2230,7 +2230,7 @@ static int disasm_handle_command(debugwin_info *info, WPARAM wparam, LPARAM lpar bpindex = bp->index; break; } - + /* if it doesn't exist, add a new one */ if (bpindex == -1) sprintf(command, "bpset %X", address); @@ -2306,7 +2306,7 @@ static void disasm_update_caption(running_machine *machine, HWND wnd) debugwin_info *info = (debugwin_info *)(FPTR)GetWindowLongPtr(wnd, GWLP_USERDATA); const disasm_subview_item *subview = disasm_view_get_current_subview(info->view[0].view); char title[256]; - + sprintf(title, "Disassembly: %s", subview->name); win_set_window_text_utf8(wnd, title); } diff --git a/src/version.c b/src/version.c index a9c370cf76e..5d2015893fd 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.128u4 ("__DATE__")"; +const char build_version[] = "0.128u5 ("__DATE__")"; -- cgit v1.2.3