summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/i86/instr286.c26
-rw-r--r--src/emu/cpu/i86/instr86.c6
-rw-r--r--src/emu/delegate.h6
-rw-r--r--src/emu/driver.h2
-rw-r--r--src/emu/inptport.c4
-rw-r--r--src/emu/inptport.h4
-rw-r--r--src/emu/machine/k053252.c38
-rw-r--r--src/emu/machine/k053252.h2
-rw-r--r--src/emu/mconfig.c4
-rw-r--r--src/emu/render.c6
-rw-r--r--src/emu/rendlay.c4
-rw-r--r--src/emu/uimenu.c6
-rw-r--r--src/emu/video/mc6845.c2
13 files changed, 55 insertions, 55 deletions
diff --git a/src/emu/cpu/i86/instr286.c b/src/emu/cpu/i86/instr286.c
index 3a8df831394..104356af418 100644
--- a/src/emu/cpu/i86/instr286.c
+++ b/src/emu/cpu/i86/instr286.c
@@ -107,7 +107,7 @@ static void i80286_trap2(i80286_state *cpustate,UINT32 error)
i80286_interrupt_descriptor(cpustate,number,1,-1);
}
} catch(UINT32 e) { i80286_trap2(cpustate, e); }
- if(cpustate->trap_level == 3)
+ if(cpustate->trap_level == 3)
// this is supposed to triggered by support hardware
// create a shutdown output line that causes a reset
// NMI can wake processor without reset
@@ -128,7 +128,7 @@ static int i80286_verify(i80286_state *cpustate, UINT16 selector, i80286_operati
{
if (!IDXTBL(selector)) return GENERAL_PROTECTION_FAULT;
if (!SEGDESC(rights)) return GENERAL_PROTECTION_FAULT;
-
+
switch(operation) {
case I80286_READ:
if (CODE(rights) && !READ(rights)) return GENERAL_PROTECTION_FAULT;
@@ -228,7 +228,7 @@ static void i80286_switch_task(i80286_state *cpustate, UINT16 ntask, int type)
cpustate->flags = CompressFlags();
if (type == CALL) WriteWord(BASE(ndesc)+TSS_BACK*2, cpustate->tr.sel);
if (type == IRET) cpustate->flags &= ~0x4000;
-
+
otss[TSS_IP] = cpustate->pc-cpustate->base[CS];
otss[TSS_FLAG] = cpustate->flags;
otss[TSS_AX] = cpustate->regs.w[AX];
@@ -282,7 +282,7 @@ static void i80286_switch_task(i80286_state *cpustate, UINT16 ntask, int type)
if (type == CALL) cpustate->flags |= 0x4000;
cpustate->msw |= 8;
-
+
cpustate->ldtr.sel=ntss[TSS_LDT]; // docs say nothing about whether a null ldt can be in a tss
cpustate->ldtr.limit=LIMIT(desc);
cpustate->ldtr.base=BASE(desc);
@@ -298,7 +298,7 @@ static void i80286_switch_task(i80286_state *cpustate, UINT16 ntask, int type)
if(error_code == GENERAL_PROTECTION_FAULT) e = TRAP(INVALID_TSS,(e >> 16)); // #NP fault is correct
throw e;
}
-
+
i80286_data_descriptor_full(cpustate, ES, ntss[TSS_ES], RPL(ntss[TSS_CS]), TRAP(INVALID_TSS,IDXTBL(ntss[TSS_ES])));
i80286_data_descriptor_full(cpustate, DS, ntss[TSS_DS], RPL(ntss[TSS_CS]), TRAP(INVALID_TSS,IDXTBL(ntss[TSS_DS])));
}
@@ -324,7 +324,7 @@ static void i80286_code_descriptor(i80286_state *cpustate, UINT16 selector, UINT
if (!CODE(r)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(selector));
if (CONF(r)) { if(DPL(r)>CPL) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(selector)); }
else if ((RPL(selector)>CPL) || (DPL(r)!=CPL)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(selector));
-
+
if (!PRES(r)) throw TRAP(SEG_NOT_PRESENT,IDXTBL(selector)); // this order is important
if (offset > LIMIT(desc)) throw TRAP(GENERAL_PROTECTION_FAULT, 0);
SET_ACC(desc);
@@ -411,7 +411,7 @@ static void i80286_interrupt_descriptor(i80286_state *cpustate,UINT16 number, in
if(!PM) return PREFIX86(_interrupt)(cpustate, number);
- if ((number<<3)>=cpustate->idtr.limit)
+ if ((number<<3)>=cpustate->idtr.limit)
throw TRAP(GENERAL_PROTECTION_FAULT,(number*8+2+(hwint&&1)));
desc[0] = ReadWord(cpustate->idtr.base+(number<<3));
@@ -421,7 +421,7 @@ static void i80286_interrupt_descriptor(i80286_state *cpustate,UINT16 number, in
if (!hwint && (DPL(r)<CPL)) throw TRAP(GENERAL_PROTECTION_FAULT,(number*8+2+(hwint&&1)));
if (!PRES(r)) throw TRAP(SEG_NOT_PRESENT,(number*8+2+(hwint&&1)));
gatesel = GATESEL(desc);
-
+
switch (GATE(r)) {
case TASKGATE:
gatesel = GATESEL(gatedesc);
@@ -452,7 +452,7 @@ static void i80286_interrupt_descriptor(i80286_state *cpustate,UINT16 number, in
cpustate->regs.w[SP] = tss_sp;
PUSH(oldss);
PUSH(oldsp);
- }
+ }
SET_ACC(gatedesc);
WriteWord(addr+4, gatedesc[2]);
PREFIX(_pushf(cpustate));
@@ -635,7 +635,7 @@ static void PREFIX286(_0fpre)(i8086_state *cpustate)
if (PM&&(CPL!=0)) throw TRAP(GENERAL_PROTECTION_FAULT,0);
cpustate->msw = (cpustate->msw&1)|ReadWord(0x806);
cpustate->tr.sel = ReadWord(0x816);
- tmp = ReadWord(0x818);
+ tmp = ReadWord(0x818);
ExpandFlags(tmp);
cpustate->flags = tmp;
cpustate->flags = CompressFlags();
@@ -715,7 +715,7 @@ static void i80286_load_flags(i8086_state *cpustate, UINT16 flags, int cpl)
ExpandFlags(flags);
cpustate->flags = flags;
cpustate->flags = CompressFlags();
-
+
if (cpustate->TF) PREFIX(_trap)(cpustate);
/* if the IF is set, and an interrupt is pending, signal an interrupt */
if (cpustate->IF && cpustate->irq_state)
@@ -756,12 +756,12 @@ static UINT16 i80286_far_return(i8086_state *cpustate, int iret, int bytes)
desc[1] = ReadWord(addr+2);
desc[2] = ReadWord(addr+4);
r = RIGHTS(desc);
-
+
if (NT && iret) {
i80286_switch_task(cpustate, ReadWord(cpustate->tr.base+TSS_BACK*2), IRET);
return cpustate->flags;
}
-
+
if (!CODE(r) || !SEGDESC(r)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(sel));
if (CONF(r)) { if(DPL(r)>RPL(sel)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(sel)); }
else if (DPL(r)!=RPL(sel)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(sel));
diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c
index 44fc09a9df4..3ae3f72c747 100644
--- a/src/emu/cpu/i86/instr86.c
+++ b/src/emu/cpu/i86/instr86.c
@@ -382,7 +382,7 @@ static void PREFIX86(_rotate_shift_Word)(i8086_state *cpustate, unsigned ModRM,
cpustate->AuxVal = 1;
PutbackRMWord(ModRM,dst);
break;
- case 0x38: /* SAR ew,count */
+ case 0x38: /* SAR ew,count */
for(int i=0;i<count-1;i++) dst = ((INT16)dst) >> 1;
cpustate->CarryVal = dst & 0x01;
dst = ((INT16)((WORD)dst)) >> 1;
@@ -1856,7 +1856,7 @@ static void PREFIX86(_mov_wsreg)(i8086_state *cpustate) /* Opcode 0x8c */
cpustate->pc = cpustate->prevpc;
return PREFIX86(_invalid)(cpustate);
}
-
+
PutRMWord(ModRM,cpustate->sregs[(ModRM & 0x38) >> 3]);
}
@@ -2800,7 +2800,7 @@ static void PREFIX(_sti)(i8086_state *cpustate) /* Opcode 0xfb */
if (cpustate->irq_state)
#ifdef I80286
i80286_interrupt_descriptor(cpustate, (*cpustate->irq_callback)(cpustate->device, 0), 2, -1);
-#else
+#else
PREFIX86(_interrupt)(cpustate, (UINT32)-1);
#endif
}
diff --git a/src/emu/delegate.h b/src/emu/delegate.h
index cd04df63df7..9826ad522e5 100644
--- a/src/emu/delegate.h
+++ b/src/emu/delegate.h
@@ -421,7 +421,7 @@ protected:
static delegate_generic_class *late_bind_helper(delegate_late_bind &object)
{
return reinterpret_cast<delegate_generic_class *>(dynamic_cast<_FunctionClass *>(&object));
- }
+ }
// internal state
const char * m_name; // name string
@@ -593,13 +593,13 @@ protected:
if (m_object != NULL && m_rawfunction.m_function != 0)
m_function = reinterpret_cast<generic_static_func>(m_rawfunction.convert_to_generic(m_object));
}
-
+
// late binding helper
template<class _FunctionClass>
static delegate_generic_class *late_bind_helper(delegate_late_bind &object)
{
return reinterpret_cast<delegate_generic_class *>(dynamic_cast<_FunctionClass *>(&object));
- }
+ }
// internal state
const char * m_name; // name string
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 3e66e7fee39..2fc09425888 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -100,7 +100,7 @@ struct game_driver
const char * year; /* year the game was released */
const char * manufacturer; /* manufacturer of the game */
machine_config_constructor machine_config; /* machine driver tokens */
- ioport_constructor ipt; /* pointer to array of input port tokens */
+ ioport_constructor ipt; /* pointer to array of input port tokens */
void (*driver_init)(running_machine &machine); /* DRIVER_INIT callback */
const rom_entry * rom; /* pointer to list of ROMs for the game */
const char * compatible_with;
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index b0f1ba723b0..e7d15be6ab1 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -974,7 +974,7 @@ void input_port_list_init(device_t &device, ioport_list &portlist, astring &erro
/* detokenize into the list */
(*constructor)(device, portlist, errorbuf);
- // collapse fields and sort the list
+ // collapse fields and sort the list
for (input_port_config *port = portlist.first(); port != NULL; port = port->next())
port->collapse_fields(errorbuf);
}
@@ -3004,7 +3004,7 @@ void input_port_config::collapse_fields(astring &errorbuf)
void field_config_insert(input_field_config &newfield, input_port_value &disallowedbits, astring &errorbuf)
{
input_port_value lowbit;
-
+
/* verify against the disallowed bits, but only if we are condition-free */
if (newfield.condition.condition == PORTCOND_ALWAYS)
{
diff --git a/src/emu/inptport.h b/src/emu/inptport.h
index c024cc05715..521b8c2a230 100644
--- a/src/emu/inptport.h
+++ b/src/emu/inptport.h
@@ -706,9 +706,9 @@ public:
simple_list<input_field_config> &fieldlist() { return m_fieldlist; }
const char *tag() const { return m_tag; }
int modcount() const { return m_modcount; }
-
+
void bump_modcount() { m_modcount++; }
-
+
void collapse_fields(astring &errorbuf);
/* these fields are only valid if the port is live */
diff --git a/src/emu/machine/k053252.c b/src/emu/machine/k053252.c
index 351694ebd08..76437b56eba 100644
--- a/src/emu/machine/k053252.c
+++ b/src/emu/machine/k053252.c
@@ -2,7 +2,7 @@
Konami 053252 chip emulation, codenamed "CCU"
- device emulation by Angelo Salese, based off notes by Olivier Galibert
+ device emulation by Angelo Salese, based off notes by Olivier Galibert
============================================================================================================================
@@ -25,24 +25,24 @@ xexex: 01 FF 00 21 00 37 01 00 00 20 0C 0E 54 00 00 00 384x256 ~ 384x256 (*)
(*) hblank duration 512 (0x200), hdisp 384 (0x180), vblank duration 288 (0x120), vdisp 256 (0x100)
- Definitions from GX, look similar, all values big-endian, write-only:
-
- 0-1: bits 9-0: HC - Total hblank duration (-1) Hres ~ (HC+1) - HFP - HBP - 8*(HSW+1)
- 2-3: bits 8-0: HFP - HBlank front porch
- 4-5: bits 8-0: HBP - HBlank back porch
- 6 : bits 7-0: INT1EN
- 7 : bits 7-0: INT2EN
- 8-9: bits 8-0: VC - Total vblank duration
- a : bits 7-0: VFP - VBlank front porch Vres ~ VC - VFP - VBP - (VSW+1)
- b : bits 7-0: VBP - VBlank back porch
- c : bits 7-4: VSW - V-Sync Width
- c : bits 3-0: HSW - H-Sync Width
- d : bits 7-0: INT-TIME
- e : bits 7-0: INT1ACK
- f : bits 7-0: INT2ACK
-
- Read-only:
- e-f: bits 8-0: VCT
+ Definitions from GX, look similar, all values big-endian, write-only:
+
+ 0-1: bits 9-0: HC - Total hblank duration (-1) Hres ~ (HC+1) - HFP - HBP - 8*(HSW+1)
+ 2-3: bits 8-0: HFP - HBlank front porch
+ 4-5: bits 8-0: HBP - HBlank back porch
+ 6 : bits 7-0: INT1EN
+ 7 : bits 7-0: INT2EN
+ 8-9: bits 8-0: VC - Total vblank duration
+ a : bits 7-0: VFP - VBlank front porch Vres ~ VC - VFP - VBP - (VSW+1)
+ b : bits 7-0: VBP - VBlank back porch
+ c : bits 7-4: VSW - V-Sync Width
+ c : bits 3-0: HSW - H-Sync Width
+ d : bits 7-0: INT-TIME
+ e : bits 7-0: INT1ACK
+ f : bits 7-0: INT2ACK
+
+ Read-only:
+ e-f: bits 8-0: VCT
TODO:
- xexex sets up 0x20 as the VC? default value?
diff --git a/src/emu/machine/k053252.h b/src/emu/machine/k053252.h
index 705e6c6c0b4..c6e3ffb1e1f 100644
--- a/src/emu/machine/k053252.h
+++ b/src/emu/machine/k053252.h
@@ -19,7 +19,7 @@ struct _k053252_interface
devcb_write_line int2_en;
devcb_write_line int1_ack;
devcb_write_line int2_ack;
-// devcb_write8 int_time;
+// devcb_write8 int_time;
int offsx;
int offsy;
};
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index b2f434d31f5..5313ddbee3f 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -75,8 +75,8 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
const slot_interface *intf = slot->get_slot_interfaces();
if (intf != NULL)
{
- const char *selval = options.value(owner.tag());
- if (options.seqid(owner.tag())==0) {
+ const char *selval = options.value(owner.tag());
+ if (options.seqid(owner.tag())==0) {
selval = slot->get_default_card();
}
if (selval) {
diff --git a/src/emu/render.c b/src/emu/render.c
index f9ab847a006..25e74acf61b 100644
--- a/src/emu/render.c
+++ b/src/emu/render.c
@@ -1070,7 +1070,7 @@ render_target::render_target(render_manager &manager, const char *layoutfile, UI
m_base_layerconfig.set_overlays_enabled(manager.machine().options().use_overlays());
m_base_layerconfig.set_bezels_enabled(manager.machine().options().use_bezels());
m_base_layerconfig.set_cpanels_enabled(manager.machine().options().use_cpanels());
- m_base_layerconfig.set_marquees_enabled(manager.machine().options().use_marquees());
+ m_base_layerconfig.set_marquees_enabled(manager.machine().options().use_marquees());
m_base_layerconfig.set_zoom_to_screen(manager.machine().options().artwork_crop());
// determine the base orientation based on options
@@ -2102,11 +2102,11 @@ void render_target::config_load(xml_data_node &targetnode)
tmpint = xml_get_attribute_int(&targetnode, "bezels", -1);
if (tmpint == 0 || tmpint == 1)
set_bezels_enabled(tmpint);
-
+
tmpint = xml_get_attribute_int(&targetnode, "cpanels", -1);
if (tmpint == 0 || tmpint == 1)
set_cpanels_enabled(tmpint);
-
+
tmpint = xml_get_attribute_int(&targetnode, "marquees", -1);
if (tmpint == 0 || tmpint == 1)
set_marquees_enabled(tmpint);
diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c
index c1fdb8dd02f..6b736e1f655 100644
--- a/src/emu/rendlay.c
+++ b/src/emu/rendlay.c
@@ -1701,11 +1701,11 @@ layout_view::layout_view(running_machine &machine, xml_data_node &viewnode, simp
// load bezel items
for (xml_data_node *itemnode = xml_get_sibling(viewnode.child, "bezel"); itemnode != NULL; itemnode = xml_get_sibling(itemnode->next, "bezel"))
m_bezel_list.append(*auto_alloc(machine, item(machine, *itemnode, elemlist)));
-
+
// load cpanel items
for (xml_data_node *itemnode = xml_get_sibling(viewnode.child, "cpanel"); itemnode != NULL; itemnode = xml_get_sibling(itemnode->next, "cpanel"))
m_cpanel_list.append(*auto_alloc(machine, item(machine, *itemnode, elemlist)));
-
+
// load marquee items
for (xml_data_node *itemnode = xml_get_sibling(viewnode.child, "marquee"); itemnode != NULL; itemnode = xml_get_sibling(itemnode->next, "marquee"))
m_marquee_list.append(*auto_alloc(machine, item(machine, *itemnode, elemlist)));
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index b51f013d84d..18034e6e13d 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -3222,7 +3222,7 @@ static void menu_video_options(running_machine &machine, ui_menu *menu, void *pa
changed = TRUE;
}
break;
-
+
case VIDEO_ITEM_MARQUEES:
if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT)
{
@@ -3304,11 +3304,11 @@ static void menu_video_options_populate(running_machine &machine, ui_menu *menu,
/* bezel item */
enabled = target->bezels_enabled();
ui_menu_item_append(menu, "Bezels", enabled ? "Enabled" : "Disabled", enabled ? MENU_FLAG_LEFT_ARROW : MENU_FLAG_RIGHT_ARROW, (void *)VIDEO_ITEM_BEZELS);
-
+
/* cpanel item */
enabled = target->cpanels_enabled();
ui_menu_item_append(menu, "CPanels", enabled ? "Enabled" : "Disabled", enabled ? MENU_FLAG_LEFT_ARROW : MENU_FLAG_RIGHT_ARROW, (void *)VIDEO_ITEM_CPANELS);
-
+
/* marquee item */
enabled = target->marquees_enabled();
ui_menu_item_append(menu, "Marquees", enabled ? "Enabled" : "Disabled", enabled ? MENU_FLAG_LEFT_ARROW : MENU_FLAG_RIGHT_ARROW, (void *)VIDEO_ITEM_MARQUEES);
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index e685e58b93c..474ff305c43 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -779,7 +779,7 @@ void mc6845_device::device_start()
m_adjust_active = 0;
m_horiz_sync_pos = 1;
m_vert_sync_pos = 1;
- m_de = 0;
+ m_de = 0;
m_sync_width = 1;
m_vert_char_total = 0;
m_vert_disp = 0;