summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-10-21 06:01:17 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-10-21 06:01:17 +0000
commit3ae00656d4bd5240de5e8529071007e7c20986e6 (patch)
treeb942960074ba1e253dec5c99b811785303f934f9
parent082621bd254754fe0ba1bc25dbc36520647cd2db (diff)
Cleanups and version bump.mame0140
-rw-r--r--src/emu/cpu/cosmac/cosmac.c36
-rw-r--r--src/emu/cpu/cosmac/cosmac.h18
-rw-r--r--src/emu/drivers/emudummy.c4
-rw-r--r--src/emu/emucore.h2
-rw-r--r--src/emu/render.c8
-rw-r--r--src/emu/render.h4
-rw-r--r--src/emu/rendlay.c32
-rw-r--r--src/emu/rendlay.h30
-rw-r--r--src/emu/sound/asc.c32
-rw-r--r--src/emu/sound/cdp1869.c28
-rw-r--r--src/emu/sound/cdp1869.h6
-rw-r--r--src/emu/video.c6
-rw-r--r--src/mame/audio/dkong.c2
-rw-r--r--src/mame/drivers/magtouch.c98
-rw-r--r--src/mame/drivers/megadriv.c82
-rw-r--r--src/mame/drivers/nmk16.c2
-rw-r--r--src/mame/video/cidelsa.c2
-rw-r--r--src/osd/windows/winmain.c8
-rw-r--r--src/version.c2
19 files changed, 201 insertions, 201 deletions
diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/emu/cpu/cosmac/cosmac.c
index 089458467ad..afd5b535119 100644
--- a/src/emu/cpu/cosmac/cosmac.c
+++ b/src/emu/cpu/cosmac/cosmac.c
@@ -14,11 +14,11 @@
/*
- TODO:
+ TODO:
- - debugger cursor is not on R(P)
- - divide clock by 8
- - min cycles -> 2 and 3
+ - debugger cursor is not on R(P)
+ - divide clock by 8
+ - min cycles -> 2 and 3
*/
@@ -47,7 +47,7 @@ const cosmac_state_code COSMAC_STATE_CODE[] =
COSMAC_STATE_CODE_S1_EXECUTE, // COSMAC_STATE_1_RESET
COSMAC_STATE_CODE_S1_EXECUTE, // COSMAC_STATE_1_INIT
COSMAC_STATE_CODE_S1_EXECUTE, // COSMAC_STATE_1_EXECUTE
- COSMAC_STATE_CODE_S2_DMA, // COSMAC_STATE_2_DMA_IN
+ COSMAC_STATE_CODE_S2_DMA, // COSMAC_STATE_2_DMA_IN
COSMAC_STATE_CODE_S2_DMA, // COSMAC_STATE_2_DMA_OUT
COSMAC_STATE_CODE_S3_INTERRUPT // COSMAC_STATE_3_INT
};
@@ -109,9 +109,9 @@ const cosmac_device::ophandler cosmac_device::s_opcodetable[256] =
&cosmac_device::dec, &cosmac_device::dec, &cosmac_device::dec, &cosmac_device::dec,
&cosmac_device::br, &cosmac_device::bq, &cosmac_device::bz, &cosmac_device::bdf,
- &cosmac_device::b, &cosmac_device::b, &cosmac_device::b, &cosmac_device::b,
+ &cosmac_device::b, &cosmac_device::b, &cosmac_device::b, &cosmac_device::b,
&cosmac_device::nbr, &cosmac_device::bnq, &cosmac_device::bnz, &cosmac_device::bnf,
- &cosmac_device::bn, &cosmac_device::bn, &cosmac_device::bn, &cosmac_device::bn,
+ &cosmac_device::bn, &cosmac_device::bn, &cosmac_device::bn, &cosmac_device::bn,
&cosmac_device::lda, &cosmac_device::lda, &cosmac_device::lda, &cosmac_device::lda,
&cosmac_device::lda, &cosmac_device::lda, &cosmac_device::lda, &cosmac_device::lda,
@@ -169,7 +169,7 @@ const cosmac_device::ophandler cosmac_device::s_opcodetable[256] =
&cosmac_device::sex, &cosmac_device::sex, &cosmac_device::sex, &cosmac_device::sex,
&cosmac_device::ldx, &cosmac_device::_or, &cosmac_device::_and, &cosmac_device::_xor,
- &cosmac_device::add, &cosmac_device::sd, &cosmac_device::shr, &cosmac_device::sm,
+ &cosmac_device::add, &cosmac_device::sd, &cosmac_device::shr, &cosmac_device::sm,
&cosmac_device::ldi, &cosmac_device::ori, &cosmac_device::ani, &cosmac_device::xri,
&cosmac_device::adi, &cosmac_device::sdi, &cosmac_device::shl, &cosmac_device::smi
};
@@ -360,16 +360,16 @@ void cosmac_device::device_start()
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", R[P]).noshow();
state_add(STATE_GENFLAGS, "GENFLAGS", m_flagsio).mask(0x7).callimport().callexport().noshow().formatstr("%3s");
-
+
state_add(COSMAC_P, "P", m_p).mask(0xf);
state_add(COSMAC_X, "X", m_x).mask(0xf);
state_add(COSMAC_D, "D", m_d);
state_add(COSMAC_B, "B", m_b);
state_add(COSMAC_T, "T", m_t);
-
+
state_add(COSMAC_I, "I", m_i).mask(0xf);
state_add(COSMAC_N, "N", m_n).mask(0xf);
-
+
astring tempstr;
for (int regnum = 0; regnum < 16; regnum++)
state_add(COSMAC_R0 + regnum, tempstr.format("R%x", regnum), m_r[regnum]);
@@ -427,7 +427,7 @@ void cosmac_device::device_start()
void cosmac_device::device_reset()
{
}
-
+
//-------------------------------------------------
// state_import - import state into the device,
@@ -518,7 +518,7 @@ inline UINT8 cosmac_device::read_byte(offs_t address)
//-------------------------------------------------
-// read_io_byte - read an I/O byte at the given
+// read_io_byte - read an I/O byte at the given
// address
//-------------------------------------------------
@@ -539,7 +539,7 @@ inline void cosmac_device::write_byte(offs_t address, UINT8 data)
//-------------------------------------------------
-// write_io_byte - write an I/O byte at the given
+// write_io_byte - write an I/O byte at the given
// address
//-------------------------------------------------
@@ -565,7 +565,7 @@ offs_t cosmac_device::get_memory_address()
}
//-------------------------------------------------
-// execute_set_input -
+// execute_set_input -
//-------------------------------------------------
void cosmac_device::execute_set_input(int inputnum, int state)
@@ -595,7 +595,7 @@ void cosmac_device::execute_set_input(int inputnum, int state)
//-------------------------------------------------
-// execute_run -
+// execute_run -
//-------------------------------------------------
void cosmac_device::execute_run()
@@ -676,7 +676,7 @@ void cosmac_device::execute_run()
inline void cosmac_device::run()
{
output_state_code();
-
+
switch (m_state)
{
case COSMAC_STATE_0_FETCH:
@@ -1129,7 +1129,7 @@ void cosmac_device::lsnf() { long_skip(!DF); }
void cosmac_device::lsq() { long_skip(Q); }
void cosmac_device::lsnq() { long_skip(!Q); }
void cosmac_device::lsie() { long_skip(IE); }
-
+
// control instructions opcode handlers
void cosmac_device::idl() { /* idle */ }
void cosmac_device::nop() { m_icount -= CLOCKS_EXECUTE; }
diff --git a/src/emu/cpu/cosmac/cosmac.h b/src/emu/cpu/cosmac/cosmac.h
index e2e8888be3e..042e18910a9 100644
--- a/src/emu/cpu/cosmac/cosmac.h
+++ b/src/emu/cpu/cosmac/cosmac.h
@@ -29,14 +29,14 @@
Vss 20 |_____________| 21 _EF4
- Type Internal ROM Internal RAM Timer Pin 16 (*)
+ Type Internal ROM Internal RAM Timer Pin 16 (*)
------------------------------------------------------------------
- CDP1802 none none no Vcc
- CDP1803 ? ? ? ?
- CDP1804 2 KB 64 bytes yes ?
- CDP1805 none 64 bytes yes _ME
- CDP1806 none none yes Vdd
-
+ CDP1802 none none no Vcc
+ CDP1803 ? ? ? ?
+ CDP1804 2 KB 64 bytes yes ?
+ CDP1805 none 64 bytes yes _ME
+ CDP1806 none none yes Vdd
+
**********************************************************************/
#pragma once
@@ -319,7 +319,7 @@ protected:
void lsq();
void lsnq();
void lsie();
-
+
// control instructions opcode handlers
void idl();
void nop();
@@ -346,7 +346,7 @@ protected:
cosmac_out_sc_func m_out_sc_func;
devcb_resolved_write_line m_out_tpa_func;
devcb_resolved_write_line m_out_tpb_func;
-
+
// control modes
enum _cosmac_mode
{
diff --git a/src/emu/drivers/emudummy.c b/src/emu/drivers/emudummy.c
index 9f2f4923b94..a52e106e71e 100644
--- a/src/emu/drivers/emudummy.c
+++ b/src/emu/drivers/emudummy.c
@@ -3,8 +3,8 @@
emudummy.c
Dummy driver file that references CPU devices which are in turn
- referenced by devices in libemu.a.
-
+ referenced by devices in libemu.a.
+
The reason we need this is due to link ordering issues with gcc
if the actual drivers being linked don't reference these CPU
devices. Since we link libcpu first, if libemu needs stuff from
diff --git a/src/emu/emucore.h b/src/emu/emucore.h
index 71881cf8ac9..0fba8172b22 100644
--- a/src/emu/emucore.h
+++ b/src/emu/emucore.h
@@ -374,7 +374,7 @@ public:
m_count(0) { }
virtual ~simple_list() { reset(); }
-
+
resource_pool &pool() const { return m_pool; }
T *first() const { return m_head; }
diff --git a/src/emu/render.c b/src/emu/render.c
index 48bc9fcdfe4..106fa80cd6a 100644
--- a/src/emu/render.c
+++ b/src/emu/render.c
@@ -1232,7 +1232,7 @@ void render_target::compute_minimum_size(INT32 &minwidth, INT32 &minheight)
{
float maxxscale = 1.0f, maxyscale = 1.0f;
int screens_considered = 0;
-
+
// early exit in case we are called between device teardown and render teardown
if (m_manager.machine().m_devicelist.count() == 0)
{
@@ -1584,12 +1584,12 @@ bool render_target::load_layout_file(const char *dirname, const char *filename)
file_error filerr = mame_fopen(SEARCHPATH_ARTWORK, fname, OPEN_FLAG_READ, &layoutfile);
if (filerr != FILERR_NONE)
return false;
-
+
// read the file
rootnode = xml_file_read(mame_core_file(layoutfile), NULL);
mame_fclose(layoutfile);
}
-
+
// if we didn't get a properly-formatted XML file, record a warning and exit
if (rootnode == NULL)
{
@@ -1599,7 +1599,7 @@ bool render_target::load_layout_file(const char *dirname, const char *filename)
mame_printf_warning("Improperly formatted XML string, ignorning");
return false;
}
-
+
// parse and catch any errors
bool result = true;
try
diff --git a/src/emu/render.h b/src/emu/render.h
index b615da4309d..0fd44be7214 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -239,7 +239,7 @@ class render_screen_list
{
friend class simple_list<item>;
friend class render_screen_list;
-
+
public:
// construction/destruction
item(screen_device &screen)
@@ -262,7 +262,7 @@ public:
// operations
void add(screen_device &screen) { m_list.append(*pool_alloc(m_list.pool(), item(screen))); }
void reset() { m_list.reset(); }
-
+
// query
bool contains(screen_device &screen) const
{
diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c
index 1886f44ab20..963426f2286 100644
--- a/src/emu/rendlay.c
+++ b/src/emu/rendlay.c
@@ -441,7 +441,7 @@ layout_element::layout_element(running_machine &machine, xml_data_node &elemnode
if (name == NULL)
throw emu_fatalerror("All layout elements must have a name!\n");
m_name = name;
-
+
// get the default state
m_defstate = xml_get_attribute_int_with_subst(machine, elemnode, "defstate", -1);
@@ -474,7 +474,7 @@ layout_element::layout_element(running_machine &machine, xml_data_node &elemnode
if (newcomp.m_type == component::CTYPE_DOTMATRIX)
m_maxstate = 255;
}
-
+
// determine the scale/offset for normalization
float xoffs = bounds.x0;
float yoffs = bounds.y0;
@@ -526,8 +526,8 @@ render_texture *layout_element::state_texture(int state)
//-------------------------------------------------
-// element_scale - scale an element by rendering
-// all the components at the appropriate
+// element_scale - scale an element by rendering
+// all the components at the appropriate
// resolution
//-------------------------------------------------
@@ -718,7 +718,7 @@ void layout_element::component::draw(running_machine &machine, bitmap_t &dest, c
case CTYPE_DOTMATRIX:
draw_dotmatrix(dest, bounds, state);
break;
-
+
default:
throw emu_fatalerror("Unknown component type requested draw()");
}
@@ -726,7 +726,7 @@ void layout_element::component::draw(running_machine &machine, bitmap_t &dest, c
//-------------------------------------------------
-// draw_rect - draw a rectangle in the specified
+// draw_rect - draw a rectangle in the specified
// color
//-------------------------------------------------
@@ -762,7 +762,7 @@ void layout_element::component::draw_rect(bitmap_t &dest, const rectangle &bound
//-------------------------------------------------
-// draw_disk - draw an ellipse in the specified
+// draw_disk - draw an ellipse in the specified
// color
//-------------------------------------------------
@@ -888,7 +888,7 @@ void layout_element::component::draw_text(running_machine &machine, bitmap_t &de
//-------------------------------------------------
-// load_bitmap - load a PNG file with artwork for
+// load_bitmap - load a PNG file with artwork for
// a component
//-------------------------------------------------
@@ -1083,7 +1083,7 @@ void layout_element::component::draw_led14seg(bitmap_t &dest, const rectangle &b
//-------------------------------------------------
-// draw_led14segsc - draw a 14-segment LCD with
+// draw_led14segsc - draw a 14-segment LCD with
// semicolon (2 extra segments)
//-------------------------------------------------
@@ -1309,7 +1309,7 @@ void layout_element::component::draw_led16seg(bitmap_t &dest, const rectangle &b
//-------------------------------------------------
-// draw_led16segsc - draw a 16-segment LCD with
+// draw_led16segsc - draw a 16-segment LCD with
// semicolon (2 extra segments)
//-------------------------------------------------
@@ -1432,7 +1432,7 @@ void layout_element::component::draw_led16segsc(bitmap_t &dest, const rectangle
//-------------------------------------------------
-// draw_dotmatrix - draw a row of 8 dots for a
+// draw_dotmatrix - draw a row of 8 dots for a
// dotmatrix
//-------------------------------------------------
@@ -1553,7 +1553,7 @@ void layout_element::component::draw_segment_diagonal_1(bitmap_t &dest, int minx
//-------------------------------------------------
// draw_segment_diagonal_2 - draw a diagonal
-// LED segment that looks like this:
+// LED segment that looks like this:
//-------------------------------------------------
void layout_element::component::draw_segment_diagonal_2(bitmap_t &dest, int minx, int maxx, int miny, int maxy, int width, rgb_t color)
@@ -1722,7 +1722,7 @@ layout_view::item *layout_view::first_item(item_layer layer) const
//-------------------------------------------------
-// recompute - recompute the bounds and aspect
+// recompute - recompute the bounds and aspect
// ratio of a view and all of its contained items
//-------------------------------------------------
@@ -1895,13 +1895,13 @@ layout_view::item::~item()
int layout_view::item::state() const
{
int state = 0;
-
+
assert(m_element != NULL);
-
+
// if configured to an output, fetch the output value
if (m_output_name[0] != 0)
state = output_get_value(m_output_name);
-
+
// if configured to an input, fetch the input value
else if (m_input_tag[0] != 0)
{
diff --git a/src/emu/rendlay.h b/src/emu/rendlay.h
index 2b25d11d5be..361e6f93cd1 100644
--- a/src/emu/rendlay.h
+++ b/src/emu/rendlay.h
@@ -71,13 +71,13 @@ DECLARE_ENUM_OPERATORS(item_layer);
class layout_element
{
friend class simple_list<layout_element>;
-
+
public:
// construction/destruction
layout_element(running_machine &machine, xml_data_node &elemnode, const char *dirname);
virtual ~layout_element();
- // getters
+ // getters
layout_element *next() const { return m_next; }
const char *name() const { return m_name; }
running_machine &machine() const { return m_machine; }
@@ -91,7 +91,7 @@ private:
{
friend class layout_element;
friend class simple_list<component>;
-
+
public:
// construction/destruction
component(running_machine &machine, xml_data_node &compnode, const char *dirname);
@@ -100,7 +100,7 @@ private:
// getters
component *next() const { return m_next; }
const render_bounds &bounds() const { return m_bounds; }
-
+
// operations
void draw(running_machine &machine, bitmap_t &dest, const rectangle &bounds, int state);
@@ -121,7 +121,7 @@ private:
CTYPE_DOTMATRIX,
CTYPE_MAX
};
-
+
// helpers
void draw_rect(bitmap_t &dest, const rectangle &bounds);
void draw_disk(bitmap_t &dest, const rectangle &bounds);
@@ -163,7 +163,7 @@ private:
public:
texture();
~texture();
-
+
layout_element * m_element; // pointer back to the element
render_texture * m_texture; // texture for this state
int m_state; // associated state number
@@ -212,7 +212,7 @@ public:
render_container *screen_container(running_machine &machine) const { return (m_screen != NULL) ? &m_screen->container() : NULL; }
bool has_input() const { return bool(m_input_tag); }
const char *input_tag_and_mask(UINT32 &mask) const { mask = m_input_mask; return m_input_tag; }
-
+
// fetch state based on configured source
int state() const;
@@ -229,7 +229,7 @@ public:
render_bounds m_rawbounds; // raw (original) bounds of the item
render_color m_color; // color of the item
};
-
+
// construction/destruction
layout_view(running_machine &machine, xml_data_node &viewnode, simple_list<layout_element> &elemlist);
virtual ~layout_view();
@@ -241,7 +241,7 @@ public:
const render_screen_list &screens() const { return m_screens; }
bool layer_enabled(item_layer layer) const { return m_layenabled[layer]; }
- //
+ //
bool has_art() const { return (m_backdrop_list.count() + m_overlay_list.count() + m_bezel_list.count() != 0); }
float effective_aspect(render_layer_config config) const { return (config.zoom_to_screen() && m_screens.count() != 0) ? m_scraspect : m_aspect; }
@@ -254,15 +254,15 @@ private:
astring m_name; // name of the layout
float m_aspect; // X/Y of the layout
float m_scraspect; // X/Y of the screen areas
- render_screen_list m_screens; // list of active screens
+ render_screen_list m_screens; // list of active screens
render_bounds m_bounds; // computed bounds of the view
render_bounds m_scrbounds; // computed bounds of the screens within the view
render_bounds m_expbounds; // explicit bounds of the view
bool m_layenabled[ITEM_LAYER_MAX]; // is this layer enabled?
- simple_list<item> m_backdrop_list; // list of backdrop items
- simple_list<item> m_screen_list; // list of screen items
- simple_list<item> m_overlay_list; // list of overlay items
- simple_list<item> m_bezel_list; // list of bezel items
+ simple_list<item> m_backdrop_list; // list of backdrop items
+ simple_list<item> m_screen_list; // list of screen items
+ simple_list<item> m_overlay_list; // list of overlay items
+ simple_list<item> m_bezel_list; // list of bezel items
};
@@ -272,7 +272,7 @@ private:
class layout_file
{
friend class simple_list<layout_file>;
-
+
public:
// construction/destruction
layout_file(running_machine &machine, xml_data_node &rootnode, const char *dirname);
diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c
index 4be28c40bef..0f8cc96de70 100644
--- a/src/emu/sound/asc.c
+++ b/src/emu/sound/asc.c
@@ -4,7 +4,7 @@
Apple Sound Chip (ASC) 344S0063
Enhanced Apple Sound Chip (EASC) 343S1063
-
+
Emulation by R. Belmont
Registers:
@@ -190,7 +190,7 @@ void asc_device::stream_generate(stream_sample_t **inputs, stream_sample_t **out
m_fifo_a_rdptr &= 0x3ff;
m_fifo_cap_a--;
}
-
+
if (m_fifo_cap_b)
{
m_fifo_b_rdptr++;
@@ -249,7 +249,7 @@ void asc_device::stream_generate(stream_sample_t **inputs, stream_sample_t **out
INT8 smpl;
mixL = mixR = 0;
-
+
// update channel pointers
for (ch = 0; ch < 4; ch++)
{
@@ -284,7 +284,7 @@ UINT8 asc_device::read(UINT16 offset)
{
UINT8 rv;
-// printf("ASC: read at %x\n", offset);
+// printf("ASC: read at %x\n", offset);
// not sure what actually happens when the CPU reads the FIFO...
if (offset < 0x400)
@@ -416,7 +416,7 @@ UINT8 asc_device::read(UINT16 offset)
void asc_device::write(UINT16 offset, UINT8 data)
{
-// printf("ASC: write %02x to %x\n", data, offset);
+// printf("ASC: write %02x to %x\n", data, offset);
if (offset < 0x400)
{
@@ -450,7 +450,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
}
m_fifo_b_wrptr &= 0x3ff;
- }
+ }
else
{
m_fifo_b[offset-0x400] = data;
@@ -458,7 +458,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
}
else
{
-// printf("ASC: %02x to %x (was %x)\n", data, offset, m_regs[offset-0x800]);
+// printf("ASC: %02x to %x (was %x)\n", data, offset, m_regs[offset-0x800]);
stream_update(m_stream);
switch (offset)
@@ -484,10 +484,10 @@ void asc_device::write(UINT16 offset, UINT8 data)
break;
case R_WTCONTROL:
-// printf("One-shot wavetable %02x\n", data);
+// printf("One-shot wavetable %02x\n", data);
break;
- case 0x811:
+ case 0x811:
m_phase[0] &= 0x00ffff;
m_phase[0] |= data<<16;
break;
@@ -502,7 +502,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
m_phase[0] |= data;
break;
- case 0x815:
+ case 0x815:
m_incr[0] &= 0x00ffff;
m_incr[0] |= data<<16;
break;
@@ -517,7 +517,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
m_incr[0] |= data;
break;
- case 0x819:
+ case 0x819:
m_phase[1] &= 0x00ffff;
m_phase[1] |= data<<16;
break;
@@ -532,7 +532,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
m_phase[1] |= data;
break;
- case 0x81d:
+ case 0x81d:
m_incr[1] &= 0x00ffff;
m_incr[1] |= data<<16;
break;
@@ -547,7 +547,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
m_incr[1] |= data;
break;
- case 0x821:
+ case 0x821:
m_phase[2] &= 0x00ffff;
m_phase[2] |= data<<16;
break;
@@ -562,7 +562,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
m_phase[2] |= data;
break;
- case 0x825:
+ case 0x825:
m_incr[2] &= 0x00ffff;
m_incr[2] |= data<<16;
break;
@@ -577,7 +577,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
m_incr[2] |= data;
break;
- case 0x829:
+ case 0x829:
m_phase[3] &= 0x00ffff;
m_phase[3] |= data<<16;
break;
@@ -592,7 +592,7 @@ void asc_device::write(UINT16 offset, UINT8 data)
m_phase[3] |= data;
break;
- case 0x82d:
+ case 0x82d:
m_incr[3] &= 0x00ffff;
m_incr[3] |= data<<16;
break;
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index 8f3d067fb2c..c9a716e1fff 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -1,6 +1,6 @@
/**********************************************************************
- RCA CDP1869/1870/1876 Video Interface System (VIS) emulation
+ RCA CDP1869/1870/1876 Video Interface System (VIS) emulation
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -23,7 +23,7 @@
//**************************************************************************
-// MACROS / CONSTANTS
+// MACROS / CONSTANTS
//**************************************************************************
#define LOG 0
@@ -157,7 +157,7 @@ inline bool cdp1869_device::is_ntsc()
//-------------------------------------------------
-// read_page_ram_byte - read a page RAM byte at
+// read_page_ram_byte - read a page RAM byte at
// the given address
//-------------------------------------------------
@@ -168,7 +168,7 @@ inline UINT8 cdp1869_device::read_page_ram_byte(offs_t pma)
//-------------------------------------------------
-// write_page_ram_byte - write a page RAM byte at
+// write_page_ram_byte - write a page RAM byte at
// the given address
//-------------------------------------------------
@@ -179,7 +179,7 @@ inline void cdp1869_device::write_page_ram_byte(offs_t pma, UINT8 data)
//-------------------------------------------------
-// read_char_ram_byte - read a char RAM byte at
+// read_char_ram_byte - read a char RAM byte at
// the given address
//-------------------------------------------------
@@ -197,7 +197,7 @@ inline UINT8 cdp1869_device::read_char_ram_byte(offs_t pma, offs_t cma, UINT8 pm
//-------------------------------------------------
-// write_char_ram_byte - write a char RAM byte at
+// write_char_ram_byte - write a char RAM byte at
// the given address
//-------------------------------------------------
@@ -228,7 +228,7 @@ inline int cdp1869_device::read_pcb(offs_t pma, offs_t cma, UINT8 pmd)
//-------------------------------------------------
-// update_prd_changed_timer -
+// update_prd_changed_timer -
//-------------------------------------------------
inline void cdp1869_device::update_prd_changed_timer()
@@ -294,7 +294,7 @@ inline rgb_t cdp1869_device::get_rgb(int i, int c, int l)
//-------------------------------------------------
-// get_lines - get number of character lines
+// get_lines - get number of character lines
//-------------------------------------------------
inline int cdp1869_device::get_lines()
@@ -315,7 +315,7 @@ inline int cdp1869_device::get_lines()
//-------------------------------------------------
-// get_pmemsize - get page memory size
+// get_pmemsize - get page memory size
//-------------------------------------------------
inline UINT16 cdp1869_device::get_pmemsize(int cols, int rows)
@@ -330,7 +330,7 @@ inline UINT16 cdp1869_device::get_pmemsize(int cols, int rows)
//-------------------------------------------------
-// get_pma - get page memory address
+// get_pma - get page memory address
//-------------------------------------------------
inline UINT16 cdp1869_device::get_pma()
@@ -347,7 +347,7 @@ inline UINT16 cdp1869_device::get_pma()
//-------------------------------------------------
-// get_pen - get pen for color bits
+// get_pen - get pen for color bits
//-------------------------------------------------
inline int cdp1869_device::get_pen(int ccb0, int ccb1, int pcb)
@@ -581,7 +581,7 @@ void cdp1869_device::stream_generate(stream_sample_t **inputs, stream_sample_t *
//-------------------------------------------------
-// draw_line - draw character line
+// draw_line - draw character line
//-------------------------------------------------
void cdp1869_device::draw_line(bitmap_t *bitmap, const rectangle *rect, int x, int y, UINT8 data, int color)
@@ -625,7 +625,7 @@ void cdp1869_device::draw_line(bitmap_t *bitmap, const rectangle *rect, int x, i
//-------------------------------------------------
-// draw_char - draw character
+// draw_char - draw character
//-------------------------------------------------
void cdp1869_device::draw_char(bitmap_t *bitmap, const rectangle *rect, int x, int y, UINT16 pma)
@@ -1011,7 +1011,7 @@ void cdp1869_device::update_screen(bitmap_t *bitmap, const rectangle *cliprect)
int y = sy * height;
draw_char(bitmap, &screen_rect, x, y, addr);
-
+
addr++;
if (addr == pmemsize) addr = 0;
diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h
index 6adb08a130c..d6bcadd6ad4 100644
--- a/src/emu/sound/cdp1869.h
+++ b/src/emu/sound/cdp1869.h
@@ -1,6 +1,6 @@
/**********************************************************************
- RCA CDP1869/1870/1876 Video Interface System (VIS) emulation
+ RCA CDP1869/1870/1876 Video Interface System (VIS) emulation
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -84,7 +84,7 @@
//**************************************************************************
-// MACROS / CONSTANTS
+// MACROS / CONSTANTS
//**************************************************************************
#define CDP1869_DOT_CLK_PAL (float)XTAL_5_626MHz
@@ -170,7 +170,7 @@
//**************************************************************************
-// TYPE DEFINITIONS
+// TYPE DEFINITIONS
//**************************************************************************
typedef UINT8 (*cdp1869_char_ram_read_func)(running_device *device, UINT16 pma, UINT8 cma, UINT8 pmd);
diff --git a/src/emu/video.c b/src/emu/video.c
index 1aa8cb2e774..dce8c1239ec 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -1611,7 +1611,7 @@ int video_get_view_for_target(running_machine *machine, render_target *target, c
for (screen = screen_first(*machine); screen != NULL; screen = screen_next(screen))
if (index-- == 0)
break;
-
+
/* find the first view with this screen and this screen only */
for (viewindex = 0; ; viewindex++)
{
@@ -2098,11 +2098,11 @@ void screen_device::reset_origin(int beamy, int beamx)
attotime curtime = timer_get_time(machine);
m_vblank_end_time = attotime_sub_attoseconds(curtime, beamy * m_scantime + beamx * m_pixeltime);
m_vblank_start_time = attotime_sub_attoseconds(m_vblank_end_time, m_vblank_period);
-
+
// if we are resetting relative to (0,0) == VBLANK end, call the
// scanline 0 timer by hand now; otherwise, adjust it for the future
if (beamy == 0 && beamx == 0)
- scanline0_callback();
+ scanline0_callback();
else
timer_adjust_oneshot(m_scanline0_timer, time_until_pos(0), 0);
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index cf85113ebb6..c6f63886b27 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -901,7 +901,7 @@ DISCRETE_TASK_START(1)
DISCRETE_BIT_DECODE(NODE_104, NODE_100, 11, 1) /*LS157 3B */
/* LS157 Switches */
-// DISCRETE_SWITCH(NODE_105, 1, DS_SOUND7_INV, GND, NODE_113) /* Switch 1 from LS624 */
+// DISCRETE_SWITCH(NODE_105, 1, DS_SOUND7_INV, GND, NODE_113) /* Switch 1 from LS624 */
DISCRETE_SWITCH(NODE_106, 1, DS_SOUND7_INV, NODE_101, NODE_102) /* Switch 2 */
DISCRETE_SWITCH(NODE_107, 1, DS_SOUND7_INV, NODE_103, NODE_104) /* Switch 3 */
diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c
index 0cceb2e77b2..45988741b64 100644
--- a/src/mame/drivers/magtouch.c
+++ b/src/mame/drivers/magtouch.c
@@ -4,45 +4,45 @@ Magical Touch by Micro MFG
Preliminary driver by Mariusz Wojcieszek
Big daughter card
-silkscreend 2296
- COMPONENT SIDE
- EPROM/IO GAME BOARD
- JNS-0001 REV-C
-
-sticker on back
- Warranty Void If Removed
- Date: 07-30-1996
- SER# MTC-COM-170065
-
-.u20 27c801 stickered MTOUCH
- ROM-0
- U20
- 041296
- MICRO
- MFG.
- COPYRIGHT (C)
-
-.u21 27c801 stickered MTOUCH
- ROM-1
- U21
- 041296
- MICRO
- MFG.
- COPYRIGHT (C)
-
-.u22 27c801 stickered MTOUCH
- ROM-2
- U22
- 041296
- MICRO
- MFG.
- COPYRIGHT (C)
-
-.u7 ds1225y-150 read as 2764
-
-.u8 tibpal16l8-15 blue dot on it checksum was 0
-
-.u4 gal20v8b
+silkscreend 2296
+ COMPONENT SIDE
+ EPROM/IO GAME BOARD
+ JNS-0001 REV-C
+
+sticker on back
+ Warranty Void If Removed
+ Date: 07-30-1996
+ SER# MTC-COM-170065
+
+.u20 27c801 stickered MTOUCH
+ ROM-0
+ U20
+ 041296
+ MICRO
+ MFG.
+ COPYRIGHT (C)
+
+.u21 27c801 stickered MTOUCH
+ ROM-1
+ U21
+ 041296
+ MICRO
+ MFG.
+ COPYRIGHT (C)
+
+.u22 27c801 stickered MTOUCH
+ ROM-2
+ U22
+ 041296
+ MICRO
+ MFG.
+ COPYRIGHT (C)
+
+.u7 ds1225y-150 read as 2764
+
+.u8 tibpal16l8-15 blue dot on it checksum was 0
+
+.u4 gal20v8b
1.8432 MHz crystal
18.00 Mhz Crystal
@@ -51,9 +51,9 @@ es488f d465 wf62225
motherboard
-.u13 27c512 stickered Warranty Void If Removed
- Date: 07-30-1996
- SER# MTC-MBD-170065
+.u13 27c512 stickered Warranty Void If Removed
+ Date: 07-30-1996
+ SER# MTC-MBD-170065
am386dx-40 ng80386dx-40
ali m1429 a1 9504 ts6 ab3519
@@ -61,13 +61,13 @@ ali m1431 a2 9503 ts6ab0511b
jetkey v5.0 fastest keyboard bios
video card
-.u6 - unknown chip type stickered Warranty Void If Removed
- Date: 07-30-1996
- SER# MTC-VGA-170065
- silkscreend Trident Ver. D4.01E
- (c)'95 Trident Microsystems
- (C)'90 Phoenix Technologies
- *605C61W6ANJDH009 * = a triangle character
+.u6 - unknown chip type stickered Warranty Void If Removed
+ Date: 07-30-1996
+ SER# MTC-VGA-170065
+ silkscreend Trident Ver. D4.01E
+ (c)'95 Trident Microsystems
+ (C)'90 Phoenix Technologies
+ *605C61W6ANJDH009 * = a triangle character
*/
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 1999132df4c..ebb0e5f253a 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -2681,7 +2681,7 @@ static READ16_HANDLER( _32x_dreq_common_r )
current_fifo_read_pos++;
- // printf("reading FIFO!\n");
+ // printf("reading FIFO!\n");
if (current_fifo_readblock == fifo_block_a && !fifo_block_a_full)
printf("Fifo block a isn't filled!\n");
@@ -2741,7 +2741,7 @@ static WRITE16_HANDLER( _32x_dreq_common_w )
dreq_src_addr[offset&1] = ((offset&1) == 0) ? (data & 0xff) : (data & 0xfffe);
//if((dreq_src_addr[0]<<16)|dreq_src_addr[1])
- // printf("DREQ set SRC = %08x\n",(dreq_src_addr[0]<<16)|dreq_src_addr[1]);
+ // printf("DREQ set SRC = %08x\n",(dreq_src_addr[0]<<16)|dreq_src_addr[1]);
break;
@@ -2756,7 +2756,7 @@ static WRITE16_HANDLER( _32x_dreq_common_w )
dreq_dst_addr[offset&1] = ((offset&1) == 0) ? (data & 0xff) : (data & 0xffff);
//if((dreq_dst_addr[0]<<16)|dreq_dst_addr[1])
- // printf("DREQ set DST = %08x\n",(dreq_dst_addr[0]<<16)|dreq_dst_addr[1]);
+ // printf("DREQ set DST = %08x\n",(dreq_dst_addr[0]<<16)|dreq_dst_addr[1]);
break;
@@ -2769,8 +2769,8 @@ static WRITE16_HANDLER( _32x_dreq_common_w )
dreq_size = data & 0xfffc;
- // if(dreq_size)
- // printf("DREQ set SIZE = %04x\n",dreq_size);
+ // if(dreq_size)
+ // printf("DREQ set SIZE = %04x\n",dreq_size);
break;
@@ -3208,7 +3208,7 @@ static READ16_HANDLER( _32x_common_vdp_regs_r )
-// printf("_32x_68k_a15180_r (a15180) %04x\n",mem_mask);
+// printf("_32x_68k_a15180_r (a15180) %04x\n",mem_mask);
// read needs authorization too I think, undefined behavior otherwise
switch (offset)
@@ -3382,7 +3382,7 @@ static WRITE16_HANDLER( _32x_common_vdp_regs_w )
case 0x0a/2:
// bit 0 is the framebuffer select, change is delayed until vblank;
- // _32x_a1518a_reg = (_32x_a1518a_reg & 0xfffe);
+ // _32x_a1518a_reg = (_32x_a1518a_reg & 0xfffe);
if (ACCESSING_BITS_0_7)
{
_32x_fb_swap = data & 1;
@@ -4070,7 +4070,7 @@ static WRITE16_HANDLER( scd_a12002_memory_mode_w )
static READ16_HANDLER( segacd_sub_memory_mode_r )
{
return (segacd_ram_writeprotect_bits << 8) |
- /*(segacd_4meg_prgbank << 6) | */
+ /*(segacd_4meg_prgbank << 6) | */
(segacd_memory_priority_mode << 3) |
(segacd_ram_mode << 2) |
((segacd_dmna) << 1) |
@@ -4097,9 +4097,9 @@ static WRITE16_HANDLER( segacd_sub_memory_mode_w )
{
if (segacd_dmna)
{
- // printf("sub ret\n");
- // segacd_ret = 1;
- // segacd_dmna = 0;
+ // printf("sub ret\n");
+ // segacd_ret = 1;
+ // segacd_dmna = 0;
timer_adjust_oneshot(segacd_dmna_ret_timer, ATTOTIME_IN_USEC(100), 0);
}
}
@@ -4494,7 +4494,7 @@ static WRITE16_HANDLER( segacd_main_dataram_part1_w )
static READ16_HANDLER( scd_hint_vector_r )
{
-// printf("read HINT offset %d\n", offset);
+// printf("read HINT offset %d\n", offset);
switch (offset&1)
{
@@ -4545,13 +4545,13 @@ static TIMER_CALLBACK( segacd_gfx_conversion_timer_callback )
/*
static const gfx_layout sega_8x8_layout =
{
- 8,8,
- SEGACD_NUM_TILES16,
- 4,
- { 0,1,2,3 },
- { 8,12,0,4,24,28,16,20 },
- { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
- 8*32
+ 8,8,
+ SEGACD_NUM_TILES16,
+ 4,
+ { 0,1,2,3 },
+ { 8,12,0,4,24,28,16,20 },
+ { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
+ 8*32
};
*/
@@ -4606,8 +4606,8 @@ static const gfx_layout sega_8x8_layout =
#define _32x32_SEQUENCE_2 \
{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, \
- 8*32, 9*32, 10*32, 11*32, 12*32, 13*32, 14*32, 15*32, \
- 16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32, \
+ 8*32, 9*32, 10*32, 11*32, 12*32, 13*32, 14*32, 15*32, \
+ 16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32, \
24*32,25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32}, \
#define _32x32_SEQUENCE_2_FLIP \
@@ -5063,9 +5063,9 @@ void segacd_init_main_cpu( running_machine* machine )
/* as a temporary measure we use the MAME tilemaps, this is hideously inefficient as we have to mark the active one as
dirty before each operation due to the RAM based tiles. For the larger tilemaps this means we have to re-render a 4096x4096
- bitmap to the tilemap cache on each blit operation just to copy the few needed tiles out of it, needless to say, this is SLOW.
- Eventually the tilemaps will be replaced with a get_pixel function which will perform all the needed lookups on a per-pixel
- basis instead of re-rendering the whole thing */
+ bitmap to the tilemap cache on each blit operation just to copy the few needed tiles out of it, needless to say, this is SLOW.
+ Eventually the tilemaps will be replaced with a get_pixel function which will perform all the needed lookups on a per-pixel
+ basis instead of re-rendering the whole thing */
segacd_stampmap[0] = tilemap_create(machine, get_stampmap_16x16_1x1_tile_info, tilemap_scan_rows, 16, 16, 16, 16);
segacd_stampmap[1] = tilemap_create(machine, get_stampmap_32x32_1x1_tile_info, tilemap_scan_rows, 32, 32, 8, 8);
segacd_stampmap[2] = tilemap_create(machine, get_stampmap_16x16_16x16_tile_info, tilemap_scan_rows, 16, 16, 256, 256); // 128kb!
@@ -5534,17 +5534,17 @@ static WRITE16_HANDLER( segacd_stampsize_w )
INLINE UINT8 read_pixel_from_stampmap( running_machine* machine, bitmap_t* srcbitmap, int x, int y)
{
/*
- if (!srcbitmap)
- {
- return mame_rand(machine);
- }
+ if (!srcbitmap)
+ {
+ return mame_rand(machine);
+ }
- if (x >= srcbitmap->width) return 0;
- if (y >= srcbitmap->height) return 0;
+ if (x >= srcbitmap->width) return 0;
+ if (y >= srcbitmap->height) return 0;
- UINT16* cacheptr = BITMAP_ADDR16( srcbitmap, y, x);
+ UINT16* cacheptr = BITMAP_ADDR16( srcbitmap, y, x);
- return cacheptr[0] & 0xf;
+ return cacheptr[0] & 0xf;
*/
switch (segacd_get_active_stampmap_tilemap()&3)
@@ -5820,9 +5820,9 @@ static ADDRESS_MAP_START( segacd_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff8004 ,0xff8005) AM_READWRITE(segacd_cdc_mode_address_r, segacd_cdc_mode_address_w)
AM_RANGE(0xff8006 ,0xff8007) AM_READWRITE(segacd_cdc_data_r, segacd_cdc_data_w)
-// AM_RANGE(0xff8008, 0xff8009) // CDC Host Data
-// AM_RANGE(0xff800a, 0xff800b) // CDC DMA Address
-// AM_RANGE(0xff800c, 0xff800d) // Stopwatch timer
+// AM_RANGE(0xff8008, 0xff8009) // CDC Host Data
+// AM_RANGE(0xff800a, 0xff800b) // CDC DMA Address
+// AM_RANGE(0xff800c, 0xff800d) // Stopwatch timer
AM_RANGE(0xff800e ,0xff800f) AM_READWRITE(segacd_comms_flags_r, segacd_comms_flags_subcpu_w)
AM_RANGE(0xff8010 ,0xff801f) AM_READWRITE(segacd_comms_sub_part1_r, segacd_comms_sub_part1_w)
AM_RANGE(0xff8020 ,0xff802f) AM_READWRITE(segacd_comms_sub_part2_r, segacd_comms_sub_part2_w)
@@ -5832,9 +5832,9 @@ static ADDRESS_MAP_START( segacd_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff8036, 0xff8037) AM_READWRITE(segacd_cdd_ctrl_r,segacd_cdd_ctrl_w)
AM_RANGE(0xff8038, 0xff8041) AM_READ8(segacd_cdd_rx_r,0xffff)
AM_RANGE(0xff8042, 0xff804b) AM_WRITE8(segacd_cdd_tx_w,0xffff)
-// AM_RANGE(0xff804c, 0xff804d) // Font Color
-// AM_RANGE(0xff804e, 0xff804f) // Font bit
-// AM_RANGE(0xff8050, 0xff8057) // Font data (read only)
+// AM_RANGE(0xff804c, 0xff804d) // Font Color
+// AM_RANGE(0xff804e, 0xff804f) // Font bit
+// AM_RANGE(0xff8050, 0xff8057) // Font data (read only)
AM_RANGE(0xff8058, 0xff8059) AM_READWRITE(segacd_stampsize_r, segacd_stampsize_w) // Stamp size
AM_RANGE(0xff805a, 0xff805b) AM_READWRITE(segacd_stampmap_base_address_r, segacd_stampmap_base_address_w) // Stamp map base address
AM_RANGE(0xff805c, 0xff805d) AM_READWRITE(segacd_imagebuffer_vcell_size_r, segacd_imagebuffer_vcell_size_w)// Image buffer V cell size
@@ -5843,10 +5843,10 @@ static ADDRESS_MAP_START( segacd_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff8062, 0xff8063) AM_READWRITE(segacd_imagebuffer_hdot_size_r, segacd_imagebuffer_hdot_size_w) // Image buffer H dot size
AM_RANGE(0xff8064, 0xff8065) AM_READWRITE(segacd_imagebuffer_vdot_size_r, segacd_imagebuffer_vdot_size_w ) // Image buffer V dot size
AM_RANGE(0xff8066, 0xff8067) AM_WRITE(segacd_trace_vector_base_address_w)// Trace vector base address
-// AM_RANGE(0xff8068, 0xff8069) // Subcode address
+// AM_RANGE(0xff8068, 0xff8069) // Subcode address
-// AM_RANGE(0xff8100, 0xff817f) // Subcode buffer area
-// AM_RANGE(0xff8180, 0xff81ff) // mirror of subcode buffer area
+// AM_RANGE(0xff8100, 0xff817f) // Subcode buffer area
+// AM_RANGE(0xff8180, 0xff81ff) // mirror of subcode buffer area
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 30dd0798077..c4835d91c76 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -3525,7 +3525,7 @@ static TIMER_DEVICE_CALLBACK( nmk16_scanline )
cputag_set_input_line(timer.machine, "maincpu", 4, HOLD_LINE);
/* This is either vblank-in or sprite dma irq complete, Vandyke definitely relies that irq fires at scanline ~0 instead of 112 (as per previous
- cpu_getiloops() implementation), mostly noticeable with sword collisions and related attract mode behaviour. */
+ cpu_getiloops() implementation), mostly noticeable with sword collisions and related attract mode behaviour. */
if(scanline == 0)
cputag_set_input_line(timer.machine, "maincpu", 2, HOLD_LINE);
}
diff --git a/src/mame/video/cidelsa.c b/src/mame/video/cidelsa.c
index 240915ce42b..1a45141803c 100644
--- a/src/mame/video/cidelsa.c
+++ b/src/mame/video/cidelsa.c
@@ -19,7 +19,7 @@ WRITE8_MEMBER( cidelsa_state::cdp1869_w )
case 4:
m_vis->out4_w(space, ma, data);
break;
-
+
case 5:
m_vis->out5_w(space, ma, data);
break;
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 012026c5d4f..cb9ff0ec332 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -391,7 +391,7 @@ int main(int argc, char *argv[])
{
// initialize common controls
InitCommonControls();
-
+
// set a handler to catch ctrl-c
SetConsoleCtrlHandler(control_handler, TRUE);
@@ -450,14 +450,14 @@ static BOOL WINAPI control_handler(DWORD type)
fprintf(stderr, ", exiting\n");
TerminateProcess(GetCurrentProcess(), MAMERR_FATALERROR);
}
-
+
// all other situations attempt to do a clean exit
else
{
fprintf(stderr, ", exit requested\n");
g_current_machine->schedule_exit();
}
-
+
// in all cases we handled it
return TRUE;
}
@@ -498,7 +498,7 @@ static void output_oslog(running_machine &machine, const char *buffer)
void osd_init(running_machine *machine)
{
const char *stemp;
-
+
// determine if we are benchmarking, and adjust options appropriately
int bench = options_get_int(machine->options(), WINOPTION_BENCH);
if (bench > 0)
diff --git a/src/version.c b/src/version.c
index 666f37cd3a1..1a47597be37 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.139u4 ("__DATE__")";
+const char build_version[] = "0.140 ("__DATE__")";