summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-05-24 00:13:27 +0000
committerGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-05-24 00:13:27 +0000
commit95f06e11a8766e27e7c955e48ea9b84e533624fb (patch)
treeef17f8bc9d4ccd7397ac85c01c0851bb656cd87b
parent873978a025ef08f52e203ff2d1b2a4e47d6142b3 (diff)
Cleanups and version bumpmame0142u4
-rw-r--r--src/build/makelist.c4
-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
-rw-r--r--src/mame/drivers/arkanoid.c2
-rw-r--r--src/mame/drivers/bfm_sc1.c2
-rw-r--r--src/mame/drivers/cps1.c6
-rw-r--r--src/mame/drivers/cps3.c6
-rw-r--r--src/mame/drivers/galpanic.c4
-rw-r--r--src/mame/drivers/goldstar.c2
-rw-r--r--src/mame/drivers/gundealr.c38
-rw-r--r--src/mame/drivers/igspoker.c6
-rw-r--r--src/mame/drivers/mpu4.c2
-rw-r--r--src/mame/drivers/saturn.c42
-rw-r--r--src/mame/drivers/xexex.c2
-rw-r--r--src/mame/video/stvvdp1.c2
-rw-r--r--src/osd/windows/winmain.c104
-rw-r--r--src/osd/windows/winmain.h2
-rw-r--r--src/version.c2
29 files changed, 168 insertions, 168 deletions
diff --git a/src/build/makelist.c b/src/build/makelist.c
index 363d15fdf7a..ee960a074bd 100644
--- a/src/build/makelist.c
+++ b/src/build/makelist.c
@@ -122,7 +122,7 @@ int parse_file(const char *srcfile)
in_import = true;
continue;
}
-
+
// if we hit a C++ comment, scan to the end of line
if (c == '/' && *srcptr == '/')
{
@@ -132,7 +132,7 @@ int parse_file(const char *srcfile)
}
if (in_import) {
- in_import = false;
+ in_import = false;
char filename[256];
filename[0] = 0;
srcptr--;
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;
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 7f848bafb8d..066c3c7af81 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -878,7 +878,7 @@ static INPUT_PORTS_START( hexa )
INPUT_PORTS_END
static INPUT_PORTS_START( brixian )
- PORT_START("SYSTEM")
+ PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index e41af91e0c3..1b4e26b0840 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -485,7 +485,7 @@ static WRITE8_HANDLER( mux2latch_w )
{
output_set_lamp_value(BFM_strcnv[offset ], (state->m_mux2_datalo & pattern?1:0) );
output_set_lamp_value(BFM_strcnv[offset+8], (state->m_mux2_datahi & pattern?1:0) );
- pattern<<=1;
+ pattern<<=1;
offset++;
}
}
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 55b10543c78..5553d26d4dc 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -781,7 +781,7 @@ INPUT_PORTS_END
/* CPS1 games with 2 players and 6 buttons each */
static INPUT_PORTS_START( cps1_6b)
PORT_INCLUDE( cps1_3b)
-
+
PORT_MODIFY("IN1")
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Jab Punch") PORT_PLAYER(1)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Strong Punch") PORT_PLAYER(1)
@@ -789,7 +789,7 @@ static INPUT_PORTS_START( cps1_6b)
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P2 Jab Punch") PORT_PLAYER(2)
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Strong Punch") PORT_PLAYER(2)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 Fierce Punch") PORT_PLAYER(2)
-
+
PORT_START("IN2") /* Extra buttons */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("P1 Short Kick") PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("P1 Forward Kick") PORT_PLAYER(1)
@@ -1772,7 +1772,7 @@ static INPUT_PORTS_START( sf2 )
PORT_DIPNAME( 0x80, 0x80, "Game Mode") PORT_DIPLOCATION("SW(C):8")
PORT_DIPSETTING( 0x80, "Game" )
PORT_DIPSETTING( 0x00, DEF_STR( Test ) )
-
+
INPUT_PORTS_END
/* Needs further checking */
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 055be81ec42..693f00e6497 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -2281,7 +2281,7 @@ INPUT_PORTS_END
/* Red Earth game inputs */
static INPUT_PORTS_START ( cps3_re )
PORT_INCLUDE ( cps3 )
-
+
PORT_MODIFY("INPUTS")
PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("P1 Start / Change Orb")
PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("P2 Start / Change Orb")
@@ -2290,7 +2290,7 @@ INPUT_PORTS_END
/* Jojo game inputs */
static INPUT_PORTS_START( cps3_jojo)
PORT_INCLUDE( cps3 )
-
+
PORT_MODIFY("INPUTS")
PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Light") PORT_PLAYER(1)
PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Medium") PORT_PLAYER(1)
@@ -2299,7 +2299,7 @@ static INPUT_PORTS_START( cps3_jojo)
PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Medium") PORT_PLAYER(2)
PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 Strong") PORT_PLAYER(2)
PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(2)
-
+
PORT_MODIFY("EXTRA")
PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(1)
PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_PLAYER(1)
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index a2f4a21a802..14d7892b9d2 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -248,7 +248,7 @@ static READ16_HANDLER( comad_timer_r )
static READ8_DEVICE_HANDLER( comad_okim6295_r )
{
UINT16 retvalue;
-// okim6295_device *oki = downcast<okim6295_device *>(device);
+// okim6295_device *oki = downcast<okim6295_device *>(device);
// retvalue = oki->read_status(); // doesn't work, causes lockups when girls change..
retvalue = device->machine().rand();
@@ -942,7 +942,7 @@ static MACHINE_CONFIG_DERIVED( supmodel, comad )
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_CLOCK(12000000) /* ? */
MCFG_CPU_PROGRAM_MAP(supmodel_map)
-// MCFG_TIMER_ADD_SCANLINE("scantimer", galpanic_scanline, "screen", 0, 1)
+// MCFG_TIMER_ADD_SCANLINE("scantimer", galpanic_scanline, "screen", 0, 1)
/* video hardware */
MCFG_SCREEN_MODIFY("screen")
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 11e07683c5c..b0937c47260 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -8036,7 +8036,7 @@ ROM_END
******************************************************************************
About encryption...
-
+
Seems that programmers left a hole at offset 3890-3a90, enough to see some
values and progressions as hints. Some of these strings (IE: 00 20 00 20),
are valid to XOR some text offsets, as 3ac7-3acf, 3ae5-3aea, 3c00-3c0f, and
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index ce21050549e..ef0aaa426dc 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -454,12 +454,12 @@ static TIMER_DEVICE_CALLBACK( yamyam_mcu_sim )
case 0x03:
state->m_rambase[0x001] = 0x03;
/*
- read dip switches
- 3a 00 c0 ld a,($c000)
- 47 ld b,a
- 3a 01 c0 ld a,($c001)
- c9 ret
- */
+ read dip switches
+ 3a 00 c0 ld a,($c000)
+ 47 ld b,a
+ 3a 01 c0 ld a,($c001)
+ c9 ret
+ */
for(i=0;i<8;i++)
state->m_rambase[0x010+i] = snipped_cmd03[i];
@@ -470,23 +470,23 @@ static TIMER_DEVICE_CALLBACK( yamyam_mcu_sim )
case 0x05:
state->m_rambase[0x001] = 0x05;
/*
- add a to hl
- c5 push bc
- 01 00 00 ld bc,#0000
- 4f ld c,a
- 09 add hl,bc
- c1 pop bc
- c9 ret
- */
+ add a to hl
+ c5 push bc
+ 01 00 00 ld bc,#0000
+ 4f ld c,a
+ 09 add hl,bc
+ c1 pop bc
+ c9 ret
+ */
for(i=0;i<8;i++)
state->m_rambase[0x020+i] = snipped_cmd05_2[i];
/*
- lookup data in table
- cd 20 e0 call #e020
- 7e ld a,(hl)
- c9 ret
- */
+ lookup data in table
+ cd 20 e0 call #e020
+ 7e ld a,(hl)
+ c9 ret
+ */
for(i=0;i<5;i++)
state->m_rambase[0x010+i] = snipped_cmd05_1[i];
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index 3fb5dd355c3..ac083fa99c8 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -235,12 +235,12 @@ static WRITE8_HANDLER( igs_lamps_w )
---- ---x Start lamp.
cpokerx set has different layout:
-
+
- Lbits -
7654 3210
=========
---- ---x Start lamp.
-
+
---- ---x Hold1 lamp.
---- --x- Hold2 lamp.
---- -x-- Hold3 lamp.
@@ -2035,7 +2035,7 @@ ROM_END
/*
Champion Poker (IGS) V100.
-
+
1x ZILOG Z0840006PSC-Z80CPU (main)
1x oscillator 12.000MHz (main)
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index df56a1591d0..3f4efa1ec9d 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -2784,7 +2784,7 @@ static ADDRESS_MAP_START( mpu4_crystal_map, AS_PROGRAM, 8 )
AM_RANGE(0x0850, 0x0850) AM_WRITE(bankswitch_w) // write bank (rom page select)
AM_RANGE(0x0858, 0x0858) AM_WRITE(bankswitch_w) // write bank (rom page select)
AM_RANGE(0x0878, 0x0878) AM_WRITE(bankset_w) // write bank (rom page select)
-// AM_RANGE(0x08e0, 0x08e7) AM_READWRITE(68681_duart_r,68681_duart_w) //Runs hoppers
+// AM_RANGE(0x08e0, 0x08e7) AM_READWRITE(68681_duart_r,68681_duart_w) //Runs hoppers
AM_RANGE(0x0900, 0x0907) AM_DEVREADWRITE_MODERN("ptm_ic2", ptm6840_device, read, write)/* PTM6840 IC2 */
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE_MODERN("pia_ic3", pia6821_device, read, write) /* PIA6821 IC3 */
AM_RANGE(0x0b00, 0x0b03) AM_DEVREADWRITE_MODERN("pia_ic4", pia6821_device, read, write) /* PIA6821 IC4 */
diff --git a/src/mame/drivers/saturn.c b/src/mame/drivers/saturn.c
index 14667bc72d6..331eec131f4 100644
--- a/src/mame/drivers/saturn.c
+++ b/src/mame/drivers/saturn.c
@@ -489,7 +489,7 @@ static void smpc_intback(running_machine &machine, UINT8 sys_type,system_time sy
{
state->m_smpc_ram[0x23] = dec_2_bcd(systime.local_time.year / 100);
state->m_smpc_ram[0x25] = dec_2_bcd(systime.local_time.year % 100);
- state->m_smpc_ram[0x27] = (systime.local_time.weekday << 4) | (systime.local_time.month + 1);
+ state->m_smpc_ram[0x27] = (systime.local_time.weekday << 4) | (systime.local_time.month + 1);
state->m_smpc_ram[0x29] = dec_2_bcd(systime.local_time.mday);
state->m_smpc_ram[0x2b] = dec_2_bcd(systime.local_time.hour);
state->m_smpc_ram[0x2d] = dec_2_bcd(systime.local_time.minute);
@@ -588,12 +588,12 @@ static WRITE8_HANDLER( stv_SMPC_w8 )
if(offset == 0x75)
{
/*
- -xx- ---- PDR1
- ---x ---- EEPROM write bit
- ---- x--- EEPROM CLOCK line
- ---- -x-- EEPROM CS line
- ---- --xx A-Bus bank bits
- */
+ -xx- ---- PDR1
+ ---x ---- EEPROM write bit
+ ---- x--- EEPROM CLOCK line
+ ---- -x-- EEPROM CS line
+ ---- --xx A-Bus bank bits
+ */
eeprom_device *eeprom = space->machine().device<eeprom_device>("eeprom");
eeprom->set_clock_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE);
eeprom->write_bit(data & 0x10);
@@ -608,7 +608,7 @@ static WRITE8_HANDLER( stv_SMPC_w8 )
if(offset == 0x77)
{
/*
- -xx- ---- PDR2
+ -xx- ---- PDR2
---x ---- Enable Sound System (ACTIVE LOW)
*/
//popmessage("PDR2 = %02x",state->m_smpc_ram[0x77]);
@@ -624,9 +624,9 @@ static WRITE8_HANDLER( stv_SMPC_w8 )
if(offset == 0x7d)
{
/*
- ---- --x- IOSEL2 direct (1) / control mode (0) port select
- ---- ---x IOSEL1 direct (1) / control mode (0) port select
- */
+ ---- --x- IOSEL2 direct (1) / control mode (0) port select
+ ---- ---x IOSEL1 direct (1) / control mode (0) port select
+ */
state->m_smpc.IOSEL1 = (state->m_smpc_ram[0x7d] & 1) >> 0;
state->m_smpc.IOSEL2 = (state->m_smpc_ram[0x7d] & 2) >> 1;
}
@@ -823,7 +823,7 @@ static WRITE8_HANDLER( saturn_SMPC_w8 )
state->m_smpc.EXLE1 = (state->m_smpc_ram[0x7f] & 1) >> 0;
state->m_smpc.EXLE2 = (state->m_smpc_ram[0x7f] & 2) >> 1;
//if(state->m_smpc.EXLE1 || state->m_smpc.EXLE2)
- // cputag_set_input_line_and_vector(space->machine(), "maincpu", 8, (stv_irq.pad) ? HOLD_LINE : CLEAR_LINE, 0x48);
+ // cputag_set_input_line_and_vector(space->machine(), "maincpu", 8, (stv_irq.pad) ? HOLD_LINE : CLEAR_LINE, 0x48);
}
if (offset == 0x1f)
@@ -1303,7 +1303,7 @@ static WRITE32_HANDLER( saturn_scu_w )
if(state->m_scu_regs[offset] & 1 && ((state->m_scu_regs[offset+1] & 7) == 7) && state->m_scu_regs[offset] & 0x100)
{
if(DIRECT_MODE(DMA_CH)) { scu_dma_direct(space,DMA_CH); }
- else { scu_dma_indirect(space,DMA_CH); }
+ else { scu_dma_indirect(space,DMA_CH); }
state->m_scu_regs[offset]&=~1;//disable starting bit.
}
@@ -2397,15 +2397,15 @@ static TIMER_CALLBACK(stv_rtc_increment)
state->m_smpc_ram[0x2f]++;
/* seconds from 9 -> 10*/
- if((state->m_smpc_ram[0x2f] & 0x0f) >= 0x0a) { state->m_smpc_ram[0x2f]+=0x10; state->m_smpc_ram[0x2f]&=0xf0; }
+ if((state->m_smpc_ram[0x2f] & 0x0f) >= 0x0a) { state->m_smpc_ram[0x2f]+=0x10; state->m_smpc_ram[0x2f]&=0xf0; }
/* seconds from 59 -> 0 */
- if((state->m_smpc_ram[0x2f] & 0xf0) >= 0x60) { state->m_smpc_ram[0x2d]++; state->m_smpc_ram[0x2f] = 0; }
+ if((state->m_smpc_ram[0x2f] & 0xf0) >= 0x60) { state->m_smpc_ram[0x2d]++; state->m_smpc_ram[0x2f] = 0; }
/* minutes from 9 -> 10 */
- if((state->m_smpc_ram[0x2d] & 0x0f) >= 0x0a) { state->m_smpc_ram[0x2d]+=0x10; state->m_smpc_ram[0x2d]&=0xf0; }
+ if((state->m_smpc_ram[0x2d] & 0x0f) >= 0x0a) { state->m_smpc_ram[0x2d]+=0x10; state->m_smpc_ram[0x2d]&=0xf0; }
/* minutes from 59 -> 0 */
- if((state->m_smpc_ram[0x2d] & 0xf0) >= 0x60) { state->m_smpc_ram[0x2b]++; state->m_smpc_ram[0x2d] = 0; }
+ if((state->m_smpc_ram[0x2d] & 0xf0) >= 0x60) { state->m_smpc_ram[0x2b]++; state->m_smpc_ram[0x2d] = 0; }
/* hours from 9 -> 10 */
- if((state->m_smpc_ram[0x2b] & 0x0f) >= 0x0a) { state->m_smpc_ram[0x2b]+=0x10; state->m_smpc_ram[0x2b]&=0xf0; }
+ if((state->m_smpc_ram[0x2b] & 0x0f) >= 0x0a) { state->m_smpc_ram[0x2b]+=0x10; state->m_smpc_ram[0x2b]&=0xf0; }
/* hours from 23 -> 0 */
if((state->m_smpc_ram[0x2b] & 0xff) >= 0x24) { state->m_smpc_ram[0x29]++; state->m_smpc_ram[0x27]+=0x10; state->m_smpc_ram[0x2b] = 0; }
/* week day name sunday -> monday */
@@ -2898,9 +2898,9 @@ static const struct stv_cart_region stv_cart_table[] =
static DEVICE_IMAGE_LOAD( stv_cart )
{
-// saturn_state *state = image.device().machine().driver_data<saturn_state>();
+// saturn_state *state = image.device().machine().driver_data<saturn_state>();
const struct stv_cart_region *stv_cart = &stv_cart_table[0], *this_cart;
- //const char *pcb_name;
+ //const char *pcb_name;
/* First, determine where this cart has to be loaded */
while (stv_cart->tag)
@@ -2940,7 +2940,7 @@ static DEVICE_IMAGE_LOAD( stv_cart )
}
//if ((pcb_name = image.get_feature("pcb_type")) == NULL)
- // return IMAGE_INIT_FAIL;
+ // return IMAGE_INIT_FAIL;
return IMAGE_INIT_PASS;
}
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 93f3b6a19dd..a795a6155c5 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -339,7 +339,7 @@ static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x0c8000, 0x0c800f) AM_DEVREADWRITE("k053250", k053250_r, k053250_w)
AM_RANGE(0x0ca000, 0x0ca01f) AM_DEVWRITE("k054338", k054338_word_w) // CLTC
AM_RANGE(0x0cc000, 0x0cc01f) AM_DEVWRITE("k053251", k053251_lsb_w) // priority encoder
-// AM_RANGE(0x0d0000, 0x0d001f) AM_DEVREADWRITE8("k053252", k053252_r,k053252_w,0x00ff) // CCU
+// AM_RANGE(0x0d0000, 0x0d001f) AM_DEVREADWRITE8("k053252", k053252_r,k053252_w,0x00ff) // CCU
AM_RANGE(0x0d4000, 0x0d4001) AM_WRITE(sound_irq_w)
AM_RANGE(0x0d600c, 0x0d600d) AM_WRITE(sound_cmd1_w)
AM_RANGE(0x0d600e, 0x0d600f) AM_WRITE(sound_cmd2_w)
diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c
index 5dc82c81559..1f929c6c697 100644
--- a/src/mame/video/stvvdp1.c
+++ b/src/mame/video/stvvdp1.c
@@ -154,7 +154,7 @@ struct shaded_point
#define STV_VDP1_EDSR ((state->m_vdp1_regs[0x010/4] >> 16)&0x0000ffff)
#define STV_VDP1_CEF (STV_VDP1_EDSR & 2)
#define STV_VDP1_BEF (STV_VDP1_EDSR & 1)
-#define CEF_1 state->m_vdp1_regs[0x010/4]|=0x00020000
+#define CEF_1 state->m_vdp1_regs[0x010/4]|=0x00020000
#define CEF_0 state->m_vdp1_regs[0x010/4]&=~0x00020000
/**/
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index bb856e96429..297c65002d4 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -327,57 +327,57 @@ const options_entry windows_options::s_option_entries[] =
{ WINOPTION_FILTER ";d3dfilter;flt", "1", OPTION_BOOLEAN, "enable bilinear filtering on screen output" },
// post-processing options
- { NULL, NULL, OPTION_HEADER, "DIRECT3D POST-PROCESSING OPTIONS" },
- { WINOPTION_HLSL_ENABLE";hlsl", "0", OPTION_BOOLEAN, "enable HLSL post-processing (PS3.0 required)" },
- { WINOPTION_HLSLPATH, "hlsl", OPTION_STRING, "path to hlsl files" },
- { WINOPTION_SHADOW_MASK_ALPHA";fs_shadwa(0.0-1.0)", "0.0", OPTION_FLOAT, "shadow mask alpha-blend value (1.0 is fully blended, 0.0 is no mask)" },
+ { NULL, NULL, OPTION_HEADER, "DIRECT3D POST-PROCESSING OPTIONS" },
+ { WINOPTION_HLSL_ENABLE";hlsl", "0", OPTION_BOOLEAN, "enable HLSL post-processing (PS3.0 required)" },
+ { WINOPTION_HLSLPATH, "hlsl", OPTION_STRING, "path to hlsl files" },
+ { WINOPTION_SHADOW_MASK_ALPHA";fs_shadwa(0.0-1.0)", "0.0", OPTION_FLOAT, "shadow mask alpha-blend value (1.0 is fully blended, 0.0 is no mask)" },
{ WINOPTION_SHADOW_MASK_TEXTURE";fs_shadwt(0.0-1.0)", "aperture.png", OPTION_STRING, "shadow mask texture name" },
- { WINOPTION_SHADOW_MASK_COUNT_X";fs_shadww", "640", OPTION_INTEGER, "shadow mask width, in phosphor dots" },
+ { WINOPTION_SHADOW_MASK_COUNT_X";fs_shadww", "640", OPTION_INTEGER, "shadow mask width, in phosphor dots" },
{ WINOPTION_SHADOW_MASK_COUNT_Y";fs_shadwh", "480", OPTION_INTEGER, "shadow mask height, in phosphor dots" },
{ WINOPTION_SHADOW_MASK_USIZE";fs_shadwu(0.0-1.0)", "0.1875", OPTION_FLOAT, "shadow mask texture size in U direction" },
{ WINOPTION_SHADOW_MASK_VSIZE";fs_shadwv(0.0-1.0)", "0.1875", OPTION_FLOAT, "shadow mask texture size in V direction" },
- { WINOPTION_OVERSAMPLE_X";fs_overx(0.1-9.0)", "1.0", OPTION_FLOAT, "oversample amount in screen-relative X direction, multiple" },
- { WINOPTION_OVERSAMPLE_Y";fs_overy(0.1-9.0)", "1.0", OPTION_FLOAT, "oversample amount in screen-relative Y direction, multiple" },
- { WINOPTION_CURVATURE";fs_curv(0.0-4.0)", "0.0", OPTION_FLOAT, "screen curvature amount" },
- { WINOPTION_SCREEN_SCALE_TOP";fs_scalex(0.0-2.0)", "1.0", OPTION_FLOAT, "screen scale, top" },
- { WINOPTION_SCREEN_SCALE_BOTTOM";fs_scaley(0.0-2.0)", "1.0", OPTION_FLOAT, "screen scale, bottom" },
+ { WINOPTION_OVERSAMPLE_X";fs_overx(0.1-9.0)", "1.0", OPTION_FLOAT, "oversample amount in screen-relative X direction, multiple" },
+ { WINOPTION_OVERSAMPLE_Y";fs_overy(0.1-9.0)", "1.0", OPTION_FLOAT, "oversample amount in screen-relative Y direction, multiple" },
+ { WINOPTION_CURVATURE";fs_curv(0.0-4.0)", "0.0", OPTION_FLOAT, "screen curvature amount" },
+ { WINOPTION_SCREEN_SCALE_TOP";fs_scalex(0.0-2.0)", "1.0", OPTION_FLOAT, "screen scale, top" },
+ { WINOPTION_SCREEN_SCALE_BOTTOM";fs_scaley(0.0-2.0)", "1.0", OPTION_FLOAT, "screen scale, bottom" },
/* Beam-related values below this line*/
- { WINOPTION_PINCUSHION";fs_pin(0.0-4.0)", "0.0", OPTION_FLOAT, "pincushion amount" },
- { WINOPTION_SCANLINE_AMOUNT";fs_scanam(0.0-4.0)", "0.0", OPTION_FLOAT, "overall alpha scaling value for scanlines" },
- { WINOPTION_SCANLINE_SCALE";fs_scansc(0.0-4.0)", "1.0", OPTION_FLOAT, "overall height scaling value for scanlines" },
- { WINOPTION_SCANLINE_BRIGHT_SCALE";fs_scanbs(0.0-1.0)", "1.0", OPTION_FLOAT, "overall brightness scaling value for scanlines (multiplicative)" },
- { WINOPTION_SCANLINE_BRIGHT_OFFSET";fs_scanbo(0.0-1.0)", "0.6", OPTION_FLOAT, "overall brightness offset value for scanlines (additive)" },
- { WINOPTION_SCANLINE_OFFSET";fs_scanjt(0.0-4.0)", "0.0", OPTION_FLOAT, "overall interlace jitter scaling value for scanlines" },
- { WINOPTION_DEFOCUS_X";fs_focusx(0.0-16.0)", "0.0", OPTION_FLOAT, "overall defocus scaling value in screen-relative X direction" },
- { WINOPTION_DEFOCUS_Y";fs_focusy(0.0-16.0)", "0.0", OPTION_FLOAT, "overall defocus scaling value in screen-relative Y direction" },
- { WINOPTION_RED_CONVERGE_X";fs_redcvx(-1.0-1.0)", "0.0", OPTION_FLOAT, "red convergence in screen-relative X direction" },
- { WINOPTION_RED_CONVERGE_Y";fs_redcvy(-1.0-1.0)", "0.0", OPTION_FLOAT, "red convergence in screen-relative Y direction" },
- { WINOPTION_GREEN_CONVERGE_X";fs_grncvx(-1.0-1.0)", "0.0", OPTION_FLOAT, "green convergence in screen-relative X direction" },
- { WINOPTION_GREEN_CONVERGE_Y";fs_grncvy(-1.0-1.0)", "0.0", OPTION_FLOAT, "green convergence in screen-relative Y direction" },
- { WINOPTION_BLUE_CONVERGE_X";fs_blucvx(-1.0-1.0)", "0.0", OPTION_FLOAT, "blue convergence in screen-relative X direction" },
- { WINOPTION_BLUE_CONVERGE_Y";fs_blucvy(-1.0-1.0)", "0.0", OPTION_FLOAT, "blue convergence in screen-relative Y direction" },
- { WINOPTION_RED_RADIAL_CONVERGE_X";fs_redrcvx(-16 - 16)", "0.0", OPTION_FLOAT, "red radial convergence in screen-relative X direction" },
- { WINOPTION_RED_RADIAL_CONVERGE_Y";fs_redrcvy(-16 - 16)", "0.0", OPTION_FLOAT, "red radial convergence in screen-relative Y direction" },
- { WINOPTION_GREEN_RADIAL_CONVERGE_X";fs_grnrcvx(-16 - 16)", "0.0", OPTION_FLOAT, "green radial convergence in screen-relative X direction" },
- { WINOPTION_GREEN_RADIAL_CONVERGE_Y";fs_grnrcvy(-16 - 16)", "0.0", OPTION_FLOAT, "green radial convergence in screen-relative Y direction" },
- { WINOPTION_BLUE_RADIAL_CONVERGE_X";fs_blurcvx(-16 - 16)", "0.0", OPTION_FLOAT, "blue radial convergence in screen-relative X direction" },
- { WINOPTION_BLUE_RADIAL_CONVERGE_Y";fs_blurcvy(-16 - 16)", "0.0", OPTION_FLOAT, "blue radial convergence in screen-relative Y direction" },
+ { WINOPTION_PINCUSHION";fs_pin(0.0-4.0)", "0.0", OPTION_FLOAT, "pincushion amount" },
+ { WINOPTION_SCANLINE_AMOUNT";fs_scanam(0.0-4.0)", "0.0", OPTION_FLOAT, "overall alpha scaling value for scanlines" },
+ { WINOPTION_SCANLINE_SCALE";fs_scansc(0.0-4.0)", "1.0", OPTION_FLOAT, "overall height scaling value for scanlines" },
+ { WINOPTION_SCANLINE_BRIGHT_SCALE";fs_scanbs(0.0-1.0)", "1.0", OPTION_FLOAT, "overall brightness scaling value for scanlines (multiplicative)" },
+ { WINOPTION_SCANLINE_BRIGHT_OFFSET";fs_scanbo(0.0-1.0)", "0.6", OPTION_FLOAT, "overall brightness offset value for scanlines (additive)" },
+ { WINOPTION_SCANLINE_OFFSET";fs_scanjt(0.0-4.0)", "0.0", OPTION_FLOAT, "overall interlace jitter scaling value for scanlines" },
+ { WINOPTION_DEFOCUS_X";fs_focusx(0.0-16.0)", "0.0", OPTION_FLOAT, "overall defocus scaling value in screen-relative X direction" },
+ { WINOPTION_DEFOCUS_Y";fs_focusy(0.0-16.0)", "0.0", OPTION_FLOAT, "overall defocus scaling value in screen-relative Y direction" },
+ { WINOPTION_RED_CONVERGE_X";fs_redcvx(-1.0-1.0)", "0.0", OPTION_FLOAT, "red convergence in screen-relative X direction" },
+ { WINOPTION_RED_CONVERGE_Y";fs_redcvy(-1.0-1.0)", "0.0", OPTION_FLOAT, "red convergence in screen-relative Y direction" },
+ { WINOPTION_GREEN_CONVERGE_X";fs_grncvx(-1.0-1.0)", "0.0", OPTION_FLOAT, "green convergence in screen-relative X direction" },
+ { WINOPTION_GREEN_CONVERGE_Y";fs_grncvy(-1.0-1.0)", "0.0", OPTION_FLOAT, "green convergence in screen-relative Y direction" },
+ { WINOPTION_BLUE_CONVERGE_X";fs_blucvx(-1.0-1.0)", "0.0", OPTION_FLOAT, "blue convergence in screen-relative X direction" },
+ { WINOPTION_BLUE_CONVERGE_Y";fs_blucvy(-1.0-1.0)", "0.0", OPTION_FLOAT, "blue convergence in screen-relative Y direction" },
+ { WINOPTION_RED_RADIAL_CONVERGE_X";fs_redrcvx(-16 - 16)", "0.0", OPTION_FLOAT, "red radial convergence in screen-relative X direction" },
+ { WINOPTION_RED_RADIAL_CONVERGE_Y";fs_redrcvy(-16 - 16)", "0.0", OPTION_FLOAT, "red radial convergence in screen-relative Y direction" },
+ { WINOPTION_GREEN_RADIAL_CONVERGE_X";fs_grnrcvx(-16 - 16)", "0.0", OPTION_FLOAT, "green radial convergence in screen-relative X direction" },
+ { WINOPTION_GREEN_RADIAL_CONVERGE_Y";fs_grnrcvy(-16 - 16)", "0.0", OPTION_FLOAT, "green radial convergence in screen-relative Y direction" },
+ { WINOPTION_BLUE_RADIAL_CONVERGE_X";fs_blurcvx(-16 - 16)", "0.0", OPTION_FLOAT, "blue radial convergence in screen-relative X direction" },
+ { WINOPTION_BLUE_RADIAL_CONVERGE_Y";fs_blurcvy(-16 - 16)", "0.0", OPTION_FLOAT, "blue radial convergence in screen-relative Y direction" },
/* RGB colorspace convolution below this line */
- { WINOPTION_RED_MATRIX_R";fs_matrr(-2.0-2.0)", "1.0", OPTION_FLOAT, "red output signal generated by red input signal" },
- { WINOPTION_RED_MATRIX_G";fs_matrg(-2.0-2.0)", "0.0", OPTION_FLOAT, "red output signal generated by green input signal" },
- { WINOPTION_RED_MATRIX_B";fs_matrb(-2.0-2.0)", "0.0", OPTION_FLOAT, "red output signal generated by blue input signal" },
- { WINOPTION_GREEN_MATRIX_R";fs_matgr(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by red input signal" },
- { WINOPTION_GREEN_MATRIX_G";fs_matgg(-2.0-2.0)", "1.0", OPTION_FLOAT, "green output signal generated by green input signal" },
- { WINOPTION_GREEN_MATRIX_B";fs_matgb(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by blue input signal" },
- { WINOPTION_BLUE_MATRIX_R";fs_matbr(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by red input signal" },
- { WINOPTION_BLUE_MATRIX_G";fs_matbg(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by green input signal" },
- { WINOPTION_BLUE_MATRIX_B";fs_matbb(-2.0-2.0)", "1.0", OPTION_FLOAT, "blue output signal generated by blue input signal" },
- { WINOPTION_GREEN_MATRIX_R";fs_matgr(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by red input signal" },
- { WINOPTION_GREEN_MATRIX_G";fs_matgg(-2.0-2.0)", "1.0", OPTION_FLOAT, "green output signal generated by green input signal" },
- { WINOPTION_GREEN_MATRIX_B";fs_matgb(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by blue input signal" },
- { WINOPTION_BLUE_MATRIX_R";fs_matbr(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by red input signal" },
- { WINOPTION_BLUE_MATRIX_G";fs_matbg(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by green input signal" },
- { WINOPTION_BLUE_MATRIX_B";fs_matbb(-2.0-2.0)", "1.0", OPTION_FLOAT, "blue output signal generated by blue input signal" },
+ { WINOPTION_RED_MATRIX_R";fs_matrr(-2.0-2.0)", "1.0", OPTION_FLOAT, "red output signal generated by red input signal" },
+ { WINOPTION_RED_MATRIX_G";fs_matrg(-2.0-2.0)", "0.0", OPTION_FLOAT, "red output signal generated by green input signal" },
+ { WINOPTION_RED_MATRIX_B";fs_matrb(-2.0-2.0)", "0.0", OPTION_FLOAT, "red output signal generated by blue input signal" },
+ { WINOPTION_GREEN_MATRIX_R";fs_matgr(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by red input signal" },
+ { WINOPTION_GREEN_MATRIX_G";fs_matgg(-2.0-2.0)", "1.0", OPTION_FLOAT, "green output signal generated by green input signal" },
+ { WINOPTION_GREEN_MATRIX_B";fs_matgb(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by blue input signal" },
+ { WINOPTION_BLUE_MATRIX_R";fs_matbr(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by red input signal" },
+ { WINOPTION_BLUE_MATRIX_G";fs_matbg(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by green input signal" },
+ { WINOPTION_BLUE_MATRIX_B";fs_matbb(-2.0-2.0)", "1.0", OPTION_FLOAT, "blue output signal generated by blue input signal" },
+ { WINOPTION_GREEN_MATRIX_R";fs_matgr(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by red input signal" },
+ { WINOPTION_GREEN_MATRIX_G";fs_matgg(-2.0-2.0)", "1.0", OPTION_FLOAT, "green output signal generated by green input signal" },
+ { WINOPTION_GREEN_MATRIX_B";fs_matgb(-2.0-2.0)", "0.0", OPTION_FLOAT, "green output signal generated by blue input signal" },
+ { WINOPTION_BLUE_MATRIX_R";fs_matbr(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by red input signal" },
+ { WINOPTION_BLUE_MATRIX_G";fs_matbg(-2.0-2.0)", "0.0", OPTION_FLOAT, "blue output signal generated by green input signal" },
+ { WINOPTION_BLUE_MATRIX_B";fs_matbb(-2.0-2.0)", "1.0", OPTION_FLOAT, "blue output signal generated by blue input signal" },
{ WINOPTION_SATURATION";fs_sat(0.0-4.0)", "1.0", OPTION_FLOAT, "saturation scaling value" },
{ WINOPTION_RED_OFFSET";fs_redoff(-1.0-1.0)", "0.0", OPTION_FLOAT, "red signal offset value (additive)" },
{ WINOPTION_GREEN_OFFSET";fs_grnoff(-1.0-1.0)", "0.0", OPTION_FLOAT, "green signal offset value (additive)" },
@@ -385,9 +385,9 @@ const options_entry windows_options::s_option_entries[] =
{ WINOPTION_RED_SCALE";fs_redmul(0.0-2.0)", "1.0", OPTION_FLOAT, "red signal scaling value (multiplicative)" },
{ WINOPTION_GREEN_SCALE";fs_grnmul(0.0-2.0)", "1.0", OPTION_FLOAT, "green signal scaling value (multiplicative)" },
{ WINOPTION_BLUE_SCALE";fs_blumul(0.0-2.0)", "1.0", OPTION_FLOAT, "blue signal scaling value (multiplicative)" },
- { WINOPTION_RED_POWER";fs_redpow(0.01-32.0)", "1.0", OPTION_FLOAT, "red signal power value (exponential)" },
- { WINOPTION_GREEN_POWER";fs_grnpow(0.01-32.0)", "1.0", OPTION_FLOAT, "green signal power value (exponential)" },
- { WINOPTION_BLUE_POWER";fs_blupow(0.01-32.0)", "1.0", OPTION_FLOAT, "blue signal power value (exponential)" },
+ { WINOPTION_RED_POWER";fs_redpow(0.01-32.0)", "1.0", OPTION_FLOAT, "red signal power value (exponential)" },
+ { WINOPTION_GREEN_POWER";fs_grnpow(0.01-32.0)", "1.0", OPTION_FLOAT, "green signal power value (exponential)" },
+ { WINOPTION_BLUE_POWER";fs_blupow(0.01-32.0)", "1.0", OPTION_FLOAT, "blue signal power value (exponential)" },
{ WINOPTION_RED_FLOOR";fs_redfl(0.0-1.0)", "0.0", OPTION_FLOAT, "red signal floor level" },
{ WINOPTION_GREEN_FLOOR";fs_grnfl(0.0-1.0)", "0.0", OPTION_FLOAT, "green signal floor level" },
{ WINOPTION_BLUE_FLOOR";fs_blufl(0.0-1.0)", "0.0", OPTION_FLOAT, "blue signal floor level" },
@@ -395,12 +395,12 @@ const options_entry windows_options::s_option_entries[] =
{ WINOPTION_GREEN_PHOSPHOR";fs_grnpho(0.0-1.0)", "0.0", OPTION_FLOAT, "green phosphorescence decay rate (0.0 is instant, 1.0 is forever)" },
{ WINOPTION_BLUE_PHOSPHOR";fs_grnpho(0.0-1.0)", "0.0", OPTION_FLOAT, "blue phosphorescence decay rate (0.0 is instant, 1.0 is forever)" },
/* NTSC simulation below this line */
- { WINOPTION_YIQ_ENABLE";yiq", "0", OPTION_BOOLEAN, "enable YIQ-space HLSL post-processing" },
+ { WINOPTION_YIQ_ENABLE";yiq", "0", OPTION_BOOLEAN, "enable YIQ-space HLSL post-processing" },
{ WINOPTION_YIQ_WVALUE";yiqw", "4.1187867", OPTION_FLOAT, "W value for YIQ signal processing" },
- { WINOPTION_YIQ_AVALUE";yiqa", "0.5", OPTION_FLOAT, "A value for YIQ signal processing" },
+ { WINOPTION_YIQ_AVALUE";yiqa", "0.5", OPTION_FLOAT, "A value for YIQ signal processing" },
{ WINOPTION_YIQ_BVALUE";yiqb", "0.5", OPTION_FLOAT, "B value for YIQ signal processing" },
- { WINOPTION_YIQ_FSCVALUE";yiqfsc", "1.5", OPTION_FLOAT, "Fsc value for YIQ signal processing" },
- { WINOPTION_YIQ_FSCSCALE";yiqfscs", "1.0", OPTION_FLOAT, "Incoming Fsc scaling value for YIQ signal processing" },
+ { WINOPTION_YIQ_FSCVALUE";yiqfsc", "1.5", OPTION_FLOAT, "Fsc value for YIQ signal processing" },
+ { WINOPTION_YIQ_FSCSCALE";yiqfscs", "1.0", OPTION_FLOAT, "Incoming Fsc scaling value for YIQ signal processing" },
{ WINOPTION_YIQ_PHASE_COUNT";yiqp", "2", OPTION_INTEGER, "Phase Count value for YIQ signal processing" },
// per-window options
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index 916f6a2b155..1e4287df5cf 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -96,7 +96,7 @@
#define WINOPTION_SCANLINE_AMOUNT "scanline_alpha"
#define WINOPTION_SCANLINE_SCALE "scanline_size"
#define WINOPTION_SCANLINE_BRIGHT_SCALE "scanline_bright_scale"
-#define WINOPTION_SCANLINE_BRIGHT_OFFSET "scanline_bright_offset"
+#define WINOPTION_SCANLINE_BRIGHT_OFFSET "scanline_bright_offset"
#define WINOPTION_SCANLINE_OFFSET "scanline_jitter"
#define WINOPTION_DEFOCUS_X "defocus_x"
#define WINOPTION_DEFOCUS_Y "defocus_y"
diff --git a/src/version.c b/src/version.c
index 732b55f4f9c..7d083e9bfe1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.142u3 ("__DATE__")";
+const char build_version[] = "0.142u4 ("__DATE__")";