summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-04-17 05:26:05 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-04-17 05:26:05 +0000
commitb35c15fef5b1412f383b52aae91991e3003416e5 (patch)
treeb2bae875db00457a235f35562cf278d69b608358 /src/emu
parent2028ecc2f7d98c91b0794664bd14fea900d72c3f (diff)
Cleanups and version bump to 0.124u3.mame0124u3
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/cdp1802/cdp1802.h2
-rw-r--r--src/emu/machine/idectrl.c12
-rw-r--r--src/emu/memory.c54
3 files changed, 34 insertions, 34 deletions
diff --git a/src/emu/cpu/cdp1802/cdp1802.h b/src/emu/cpu/cdp1802/cdp1802.h
index f525538a616..cd436f1ddbe 100644
--- a/src/emu/cpu/cdp1802/cdp1802.h
+++ b/src/emu/cpu/cdp1802/cdp1802.h
@@ -104,7 +104,7 @@ struct _cdp1802_interface
/* if specified, this gets called for every DMA read */
cdp1802_dma_read_func dma_r;
-
+
/* if specified, this gets called for every DMA write */
cdp1802_dma_write_func dma_w;
};
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 21f26eb278f..f3c8c1f4e3f 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -101,7 +101,7 @@ typedef struct _ide_state ide_state;
struct _ide_state
{
const device_config *device;
-
+
UINT8 adapter_control;
UINT8 status;
UINT8 error;
@@ -198,7 +198,7 @@ INLINE ide_state *get_safe_token(const device_config *device)
INLINE void signal_interrupt(ide_state *ide)
{
const ide_config *config = ide->device->inline_config;
-
+
LOG(("IDE interrupt assert\n"));
/* signal an interrupt */
@@ -1289,7 +1289,7 @@ static UINT32 ide_controller_read(const device_config *device, offs_t offset, in
static void ide_controller_write(const device_config *device, offs_t offset, int size, UINT32 data)
{
ide_state *ide = get_safe_token(device);
-
+
/* logit */
if (offset != IDE_ADDR_DATA)
LOG(("%08X:IDE write to %03X = %08X, size=%d\n", activecpu_get_previouspc(), offset, data, size));
@@ -1439,7 +1439,7 @@ static void ide_controller_write(const device_config *device, offs_t offset, int
static UINT32 ide_bus_master_read(const device_config *device, offs_t offset, int size)
{
ide_state *ide = get_safe_token(device);
-
+
LOG(("%08X:ide_bus_master_read(%d, %d)\n", activecpu_get_previouspc(), offset, size));
/* command register */
@@ -1678,7 +1678,7 @@ static DEVICE_START( ide_controller )
assert(device->inline_config != NULL);
assert(device->machine != NULL);
assert(device->machine->config != NULL);
-
+
/* store a pointer back to the device */
ide->device = device;
@@ -1768,7 +1768,7 @@ static DEVICE_STOP( ide_controller )
{
ide_state *ide = get_safe_token(device);
- /* close the hard disk */
+ /* close the hard disk */
if (ide->disk != NULL)
hard_disk_close(ide->disk);
}
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 623a7566903..09cf5c78493 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -1282,7 +1282,7 @@ int memory_get_log_unmap(int spacenum)
/*-------------------------------------------------
memory_install_handlerX - install
- dynamic machine read and write handlers for
+ dynamic machine read and write handlers for
X-bit case
-------------------------------------------------*/
@@ -1345,8 +1345,8 @@ UINT64 *_memory_install_handler64(running_machine *machine, int cpunum, int spac
/*-------------------------------------------------
- memory_install_device_handlerX -
- install dynamic device read and write handlers
+ memory_install_device_handlerX -
+ install dynamic device read and write handlers
for X-bit case
-------------------------------------------------*/
@@ -1852,13 +1852,13 @@ static void table_compute_subhandler(handler_data *table, UINT8 entry, read_or_w
int maxunits = spacebits / handlerbits;
handler_data *hdata = &table[entry];
int unitnum;
-
- assert_always(!HANDLER_IS_STATIC(entry), "table_compute_subhandler called with static handlers and mismatched data bus widths");
+
+ assert_always(!HANDLER_IS_STATIC(entry), "table_compute_subhandler called with static handlers and mismatched data bus widths");
/* copy raw data to the subhandler data */
hdata->subobject = hdata->object;
hdata->subhandler = hdata->handler;
-
+
/* fill in a stub as the real handler */
hdata->object = hdata;
hdata->handler = get_stub_handler(readorwrite, spacebits, handlerbits);
@@ -1952,8 +1952,8 @@ static void table_populate_range(table_data *tabledata, offs_t bytestart, offs_t
/*-------------------------------------------------
- table_populate_range_mirrored - assign a
- memory handler to a range of addresses
+ table_populate_range_mirrored - assign a
+ memory handler to a range of addresses
including mirrors
-------------------------------------------------*/
@@ -3027,7 +3027,7 @@ static READ16_HANDLER( stub_read8_from_16 )
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
UINT16 result = 0;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3051,7 +3051,7 @@ static READ32_HANDLER( stub_read8_from_32 )
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
UINT32 result = 0;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3075,7 +3075,7 @@ static READ64_HANDLER( stub_read8_from_64 )
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
UINT64 result = 0;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3099,7 +3099,7 @@ static READ32_HANDLER( stub_read16_from_32 )
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
UINT32 result = 0;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3123,7 +3123,7 @@ static READ64_HANDLER( stub_read16_from_64 )
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
UINT64 result = 0;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3147,7 +3147,7 @@ static READ64_HANDLER( stub_read32_from_64 )
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
UINT64 result = 0;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3175,7 +3175,7 @@ static WRITE16_HANDLER( stub_write8_from_16 )
const handler_data *handler = (const handler_data *)machine;
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3197,7 +3197,7 @@ static WRITE32_HANDLER( stub_write8_from_32 )
const handler_data *handler = (const handler_data *)machine;
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3219,7 +3219,7 @@ static WRITE64_HANDLER( stub_write8_from_64 )
const handler_data *handler = (const handler_data *)machine;
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3241,7 +3241,7 @@ static WRITE32_HANDLER( stub_write16_from_32 )
const handler_data *handler = (const handler_data *)machine;
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3263,7 +3263,7 @@ static WRITE64_HANDLER( stub_write16_from_64 )
const handler_data *handler = (const handler_data *)machine;
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3285,7 +3285,7 @@ static WRITE64_HANDLER( stub_write32_from_64 )
const handler_data *handler = (const handler_data *)machine;
const UINT8 *subshift = handler->subshift;
int subunits = handler->subunits;
-
+
offset *= subunits;
while (subunits-- != 0)
{
@@ -3310,7 +3310,7 @@ static WRITE64_HANDLER( stub_write32_from_64 )
static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits, int handlerdbits)
{
memory_handler result = { 0 };
-
+
/* read stubs */
if (readorwrite == ROW_READ)
{
@@ -3320,7 +3320,7 @@ static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits
if (handlerdbits == 8)
result.read.mhandler16 = stub_read8_from_16;
}
-
+
/* 32-bit read stubs */
else if (spacedbits == 32)
{
@@ -3329,7 +3329,7 @@ static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits
else if (handlerdbits == 16)
result.read.mhandler32 = stub_read16_from_32;
}
-
+
/* 64-bit read stubs */
else if (spacedbits == 64)
{
@@ -3341,7 +3341,7 @@ static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits
result.read.mhandler64 = stub_read32_from_64;
}
}
-
+
/* write stubs */
else if (readorwrite == ROW_WRITE)
{
@@ -3351,7 +3351,7 @@ static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits
if (handlerdbits == 8)
result.write.mhandler16 = stub_write8_from_16;
}
-
+
/* 32-bit write stubs */
else if (spacedbits == 32)
{
@@ -3360,7 +3360,7 @@ static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits
else if (handlerdbits == 16)
result.write.mhandler32 = stub_write16_from_32;
}
-
+
/* 64-bit write stubs */
else if (spacedbits == 64)
{
@@ -3372,7 +3372,7 @@ static memory_handler get_stub_handler(read_or_write readorwrite, int spacedbits
result.write.mhandler64 = stub_write32_from_64;
}
}
-
+
assert(result.read.generic != NULL);
return result;
}