summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-07-16 07:37:54 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-07-16 07:37:54 +0000
commit6519412d599ecfa7e6ae9814abe3cefde8a82cb2 (patch)
tree733e3f738cc467e6359219e920eec6db982fe7e7
parent96b4503e041f7c809988c93f21477c2bbc16305f (diff)
Cleanups and version bump.mame0132u5
-rw-r--r--src/emu/cpu/arm7/arm7core.h2
-rw-r--r--src/emu/machine/i8255a.c20
-rw-r--r--src/emu/machine/i8255a.h44
-rw-r--r--src/emu/machine/idectrl.c20
-rw-r--r--src/emu/machine/ldcore.c4
-rw-r--r--src/emu/video.c18
-rw-r--r--src/lib/util/bitmap.c2
-rw-r--r--src/mame/drivers/cmmb.c22
-rw-r--r--src/mame/drivers/darkhors.c8
-rw-r--r--src/mame/drivers/deco_ld.c10
-rw-r--r--src/mame/drivers/kaneko16.c52
-rw-r--r--src/mame/drivers/ksys573.c2
-rw-r--r--src/mame/drivers/quakeat.c4
-rw-r--r--src/mame/drivers/seta.c4
-rw-r--r--src/mame/drivers/taitogn.c12
-rw-r--r--src/mame/drivers/tecmo.c16
-rw-r--r--src/mame/drivers/viper.c2
-rw-r--r--src/mame/machine/kaneko16.c2
-rw-r--r--src/mame/mamedriv.c2
-rw-r--r--src/tools/split.c84
-rw-r--r--src/version.c2
21 files changed, 166 insertions, 166 deletions
diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h
index 9d81daa9000..779a668d9b0 100644
--- a/src/emu/cpu/arm7/arm7core.h
+++ b/src/emu/cpu/arm7/arm7core.h
@@ -168,7 +168,7 @@ enum
typedef struct
{
ARM7CORE_REGS // these must be included in your cpu specific register implementation
- ARM7COPRO_REGS
+ ARM7COPRO_REGS
UINT8 archRev; // ARM architecture revision (3, 4, and 5 are valid)
UINT8 archFlags; // architecture flags
diff --git a/src/emu/machine/i8255a.c b/src/emu/machine/i8255a.c
index 0184d467e71..b0df18b25f4 100644
--- a/src/emu/machine/i8255a.c
+++ b/src/emu/machine/i8255a.c
@@ -159,7 +159,7 @@ static void output_pc(i8255a_t *i8255a)
case MODE_1:
data |= i8255a->intr[PORT_A] ? 0x08 : 0x00;
-
+
if (port_mode(i8255a, PORT_A) == MODE_OUTPUT)
{
data |= i8255a->obf[PORT_A] ? 0x80 : 0x00;
@@ -261,7 +261,7 @@ static void set_obf(i8255a_t *i8255a, int port, int state)
if (LOG) logerror("8255A Port %c OBF: %u\n", 'A' + port, state);
i8255a->obf[port] = state;
-
+
check_interrupt(i8255a, port);
}
@@ -270,7 +270,7 @@ static void set_inte(i8255a_t *i8255a, int port, int state)
if (LOG) logerror("8255A Port %c INTE: %u\n", 'A' + port, state);
i8255a->inte[port] = state;
-
+
check_interrupt(i8255a, port);
}
@@ -279,7 +279,7 @@ static void set_inte1(i8255a_t *i8255a, int state)
if (LOG) logerror("8255A Port A INTE1: %u\n", state);
i8255a->inte1 = state;
-
+
check_interrupt(i8255a, PORT_A);
}
@@ -288,7 +288,7 @@ static void set_inte2(i8255a_t *i8255a, int state)
if (LOG) logerror("8255A Port A INTE2: %u\n", state);
i8255a->inte2 = state;
-
+
check_interrupt(i8255a, PORT_A);
}
@@ -382,7 +382,7 @@ static UINT8 read_pc(i8255a_t *i8255a)
case MODE_1:
data |= i8255a->intr[PORT_A] ? 0x08 : 0x00;
-
+
if (port_mode(i8255a, PORT_A) == MODE_OUTPUT)
{
data |= i8255a->obf[PORT_A] ? 0x80 : 0x00;
@@ -441,7 +441,7 @@ static UINT8 read_pc(i8255a_t *i8255a)
/* read data from port */
data |= devcb_call_read8(&i8255a->in_port_func[PORT_C], 0) & mask;
}
-
+
return data;
}
@@ -643,9 +643,9 @@ static void set_pc_bit(const device_config *device, int bit, int state)
case 0: set_intr(i8255a, PORT_B, state); break;
case 1:
if (port_mode(i8255a, PORT_B) == MODE_OUTPUT)
- set_obf(i8255a, PORT_B, state);
+ set_obf(i8255a, PORT_B, state);
else
- set_ibf(i8255a, PORT_B, state);
+ set_ibf(i8255a, PORT_B, state);
break;
case 2: set_inte(i8255a, PORT_B, state); break;
}
@@ -700,7 +700,7 @@ WRITE8_DEVICE_HANDLER( i8255a_w )
int state = BIT(data, 0);
if (LOG) logerror("8255A '%s' %s Bit %u\n", device->tag, state ? "Set" : "Reset", bit);
-
+
set_pc_bit(device, bit, state);
}
break;
diff --git a/src/emu/machine/i8255a.h b/src/emu/machine/i8255a.h
index dfe49887015..ad30db00163 100644
--- a/src/emu/machine/i8255a.h
+++ b/src/emu/machine/i8255a.h
@@ -6,27 +6,27 @@
Visit http://mamedev.org for licensing and usage restrictions.
**********************************************************************
- _____ _____
- PA3 1 |* \_/ | 40 PA4
- PA2 2 | | 39 PA5
- PA1 3 | | 38 PA6
- PA0 4 | | 37 PA7
- _RD 5 | | 36 WR
- _CS 6 | | 35 RESET
- GND 7 | | 34 D0
- A1 8 | | 33 D1
- A0 9 | | 32 D2
- PC7 10 | 8255A | 31 D3
- PC6 11 | | 30 D4
- PC5 12 | | 29 D5
- PC4 13 | | 28 D6
- PC0 14 | | 27 D7
- PC1 15 | | 26 Vcc
- PC2 16 | | 25 PB7
- PC3 17 | | 24 PB6
- PB0 18 | | 23 PB5
- PB1 19 | | 22 PB4
- PB2 20 |_____________| 21 PB3
+ _____ _____
+ PA3 1 |* \_/ | 40 PA4
+ PA2 2 | | 39 PA5
+ PA1 3 | | 38 PA6
+ PA0 4 | | 37 PA7
+ _RD 5 | | 36 WR
+ _CS 6 | | 35 RESET
+ GND 7 | | 34 D0
+ A1 8 | | 33 D1
+ A0 9 | | 32 D2
+ PC7 10 | 8255A | 31 D3
+ PC6 11 | | 30 D4
+ PC5 12 | | 29 D5
+ PC4 13 | | 28 D6
+ PC0 14 | | 27 D7
+ PC1 15 | | 26 Vcc
+ PC2 16 | | 25 PB7
+ PC3 17 | | 24 PB6
+ PB0 18 | | 23 PB5
+ PB1 19 | | 22 PB4
+ PB2 20 |_____________| 21 PB3
**********************************************************************/
@@ -58,7 +58,7 @@ struct _i8255a_interface
devcb_read8 in_pa_func;
devcb_read8 in_pb_func;
devcb_read8 in_pc_func;
-
+
devcb_write8 out_pa_func;
devcb_write8 out_pb_func;
devcb_write8 out_pc_func;
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 9166d21d089..d480a83fd80 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -153,7 +153,7 @@ struct _ide_state
hard_disk_file *disk;
emu_timer * last_status_timer;
emu_timer * reset_timer;
-
+
UINT8 master_password_enable;
UINT8 user_password_enable;
const UINT8 * master_password;
@@ -279,7 +279,7 @@ UINT8 *ide_get_features(const device_config *device)
void ide_set_gnet_readlock(const device_config *device, const UINT8 onoff)
{
ide_state *ide = get_safe_token(device);
- ide->gnetreadlock = onoff;
+ ide->gnetreadlock = onoff;
}
void ide_set_master_password(const device_config *device, const UINT8 *password)
@@ -724,7 +724,7 @@ static void read_sector_done(ide_state *ide)
/* GNET readlock check */
if (ide->gnetreadlock) {
ide->status &= ~IDE_STATUS_ERROR;
- ide->status &= ~IDE_STATUS_BUSY;
+ ide->status &= ~IDE_STATUS_BUSY;
return;
}
/* now do the read */
@@ -1000,9 +1000,9 @@ static TIMER_CALLBACK( write_sector_done_callback )
*************************************/
static void handle_command(ide_state *ide, UINT8 command)
-{
+{
UINT8 key[5];
-
+
/* implicitly clear interrupts here */
clear_interrupt(ide);
@@ -1209,17 +1209,17 @@ static void handle_command(ide_state *ide, UINT8 command)
case IDE_COMMAND_TAITO_GNET_UNLOCK_3:
LOGPRINT(("IDE GNET Unlock 3\n"));
-
- /* key check */
- chd_get_metadata (ide->handle, HARD_DISK_KEY_METADATA_TAG, 0, key, 5, 0, 0, 0);
+
+ /* key check */
+ chd_get_metadata (ide->handle, HARD_DISK_KEY_METADATA_TAG, 0, key, 5, 0, 0, 0);
if ((ide->precomp_offset == key[0]) && (ide->sector_count == key[1]) && (ide->cur_sector == key[2]) && (ide->cur_cylinder == (((UINT16)key[4]<<8)|key[3])))
{
ide->gnetreadlock= 0;
}
-
+
/* update flags */
ide->status |= IDE_STATUS_DRIVE_READY;
- ide->status &= ~IDE_STATUS_ERROR;
+ ide->status &= ~IDE_STATUS_ERROR;
signal_interrupt(ide);
break;
diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c
index bdc21c384b5..315d1595c79 100644
--- a/src/emu/machine/ldcore.c
+++ b/src/emu/machine/ldcore.c
@@ -479,7 +479,7 @@ UINT32 laserdisc_get_field_code(const device_config *device, UINT32 code, UINT8
laserdisc_state *ld = get_safe_token(device);
ldcore_data *ldcore = ld->core;
int field = ldcore->fieldnum;
-
+
/* return nothing if the video is off (external devices can't sense) */
if (zero_if_squelched && ldcore->videosquelch)
return 0;
@@ -821,7 +821,7 @@ static void read_track_data(laserdisc_state *ld)
/* cheat and look up the metadata we are about to retrieve */
if (ldcore->vbidata != NULL)
vbi_metadata_unpack(&vbidata, NULL, &ldcore->vbidata[readhunk * VBI_PACKED_BYTES]);
-
+
/* if we're in the lead-in area, force the VBI data to be standard lead-in */
if (tracknum - 1 < VIRTUAL_LEAD_IN_TRACKS)
{
diff --git a/src/emu/video.c b/src/emu/video.c
index e691fd0ac71..a2eaf6f8faf 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -368,7 +368,7 @@ void video_init(running_machine *machine)
/* extract snap resolution if present */
if (sscanf(options_get_string(mame_options(), OPTION_SNAPSIZE), "%dx%d", &global.snap_width, &global.snap_height) != 2)
global.snap_width = global.snap_height = 0;
-
+
/* start recording movie if specified */
filename = options_get_string(mame_options(), OPTION_MNGWRITE);
if (filename[0] != 0)
@@ -2622,7 +2622,7 @@ void video_avi_add_sound(running_machine *machine, const INT16 *sound, int numsa
static void video_update_burnin(running_machine *machine)
{
const device_config *screen;
-
+
/* iterate over screens and update the burnin for the ones that care */
for (screen = video_screen_first(machine->config); screen != NULL; screen = video_screen_next(screen))
{
@@ -2641,11 +2641,11 @@ static void video_update_burnin(running_machine *machine)
int srcx, srcy;
int x, y;
- /* iterate over rows in the destination */
+ /* iterate over rows in the destination */
for (y = 0, srcy = ystart; y < dstheight; y++, srcy += ystep)
{
UINT64 *dst = BITMAP_ADDR64(state->burnin, y, 0);
-
+
/* handle the 16-bit palettized case */
if (srcbitmap->format == BITMAP_FORMAT_INDEXED16)
{
@@ -2657,7 +2657,7 @@ static void video_update_burnin(running_machine *machine)
dst[x] += RGB_GREEN(pixel) + RGB_RED(pixel) + RGB_BLUE(pixel);
}
}
-
+
/* handle the 15-bit RGB case */
else if (srcbitmap->format == BITMAP_FORMAT_RGB15)
{
@@ -2703,18 +2703,18 @@ static void video_finalize_burnin(const device_config *screen)
file_error filerr;
mame_file *file;
int x, y;
-
+
/* compute the scaled visible region */
scaledvis.min_x = state->visarea.min_x * state->burnin->width / state->width;
scaledvis.max_x = state->visarea.max_x * state->burnin->width / state->width;
scaledvis.min_y = state->visarea.min_y * state->burnin->height / state->height;
scaledvis.max_y = state->visarea.max_y * state->burnin->height / state->height;
-
+
/* wrap a bitmap around the subregion we care about */
finalmap = bitmap_alloc(scaledvis.max_x + 1 - scaledvis.min_x,
scaledvis.max_y + 1 - scaledvis.min_y,
BITMAP_FORMAT_ARGB32);
-
+
/* find the maximum value */
for (y = 0; y < finalmap->height; y++)
{
@@ -2737,7 +2737,7 @@ static void video_finalize_burnin(const device_config *screen)
dst[x] = MAKE_ARGB(0xff, brightness, brightness, brightness);
}
}
-
+
/* write the final PNG */
/* compute the name and create the file */
diff --git a/src/lib/util/bitmap.c b/src/lib/util/bitmap.c
index 32bddd397e8..cb947734aac 100644
--- a/src/lib/util/bitmap.c
+++ b/src/lib/util/bitmap.c
@@ -300,7 +300,7 @@ int bitmap_format_to_bpp(bitmap_format format)
case BITMAP_FORMAT_RGB32:
case BITMAP_FORMAT_ARGB32:
return 32;
-
+
case BITMAP_FORMAT_INDEXED64:
return 64;
diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c
index c8f881cb15f..22288d5a49c 100644
--- a/src/mame/drivers/cmmb.c
+++ b/src/mame/drivers/cmmb.c
@@ -102,13 +102,13 @@ static READ8_HANDLER( cmmb_input_r )
static UINT8 irq_mask;
/*
- {
- UINT8 *ROM = memory_region(space->machine, "maincpu");
- UINT32 bankaddress;
+ {
+ UINT8 *ROM = memory_region(space->machine, "maincpu");
+ UINT32 bankaddress;
- bankaddress = 0x10000 + (0x10000 * (data & 0x03));
- memory_set_bankptr(space->machine, 1, &ROM[bankaddress]);
- }
+ bankaddress = 0x10000 + (0x10000 * (data & 0x03));
+ memory_set_bankptr(space->machine, 1, &ROM[bankaddress]);
+ }
*/
static WRITE8_HANDLER( cmmb_output_w )
@@ -141,7 +141,7 @@ static READ8_HANDLER( kludge_r )
/* overlap empty addresses */
static ADDRESS_MAP_START( cmmb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM /* zero page address */
-// AM_RANGE(0x13c0, 0x13ff) AM_RAM //spriteram
+// AM_RANGE(0x13c0, 0x13ff) AM_RAM //spriteram
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE(&videoram)
AM_RANGE(0x2480, 0x249f) AM_RAM_WRITE(cmmb_paletteram_w) AM_BASE(&paletteram)
AM_RANGE(0x4000, 0x400f) AM_READWRITE(cmmb_input_r,cmmb_output_w) //i/o
@@ -263,7 +263,7 @@ GFXDECODE_END
static INTERRUPT_GEN( cmmb_irq )
{
//if(input_code_pressed_once(KEYCODE_Z))
- // cpu_set_input_line(device, 0, HOLD_LINE);
+ // cpu_set_input_line(device, 0, HOLD_LINE);
}
static MACHINE_RESET( cmmb )
@@ -293,9 +293,9 @@ static MACHINE_DRIVER_START( cmmb )
MDRV_MACHINE_RESET(cmmb)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
/***************************************************************************
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 40c592c81c0..2b947aa0ab8 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -782,7 +782,7 @@ ROM_START( darkhors )
ROM_LOAD( "eeprom", 0x00000, 0x80000, CRC(45314fdb) SHA1(c4bd5508e5b51a6e0356c049f1ccf2b5d94caee9) )
ROM_END
-/*
+/*
Jockey Club II Original sets
@@ -791,9 +791,9 @@ Jockey Club II Original sets
-- the program can be upgraded by placing a ROM in the socket next to the main program ROM.
*/
-
-
-
+
+
+
/*
Jockey Club II by SETA 1996
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index 9353f030964..2b360fa1dd2 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -79,8 +79,8 @@ static ADDRESS_MAP_START( cobra_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1001, 0x1001) AM_READ(test_r)//_PORT("IN2")
AM_RANGE(0x1002, 0x1002) AM_READ(test_r)//_PORT("IN3")
AM_RANGE(0x1003, 0x1003) AM_READ(test_r)//AM_READ_PORT("IN0")
-// AM_RANGE(0x1004, 0x1004) AM_READ(test_r)//_PORT("IN4")
-// AM_RANGE(0x1005, 0x1005) AM_READ(test_r)//_PORT("IN5")
+// AM_RANGE(0x1004, 0x1004) AM_READ(test_r)//_PORT("IN4")
+// AM_RANGE(0x1005, 0x1005) AM_READ(test_r)//_PORT("IN5")
AM_RANGE(0x1004, 0x1004) AM_WRITE(rblaster_vram_bank_w) //might be 1001
AM_RANGE(0x1006, 0x1006) AM_NOP //ld status / command
AM_RANGE(0x1007, 0x1007) AM_READWRITE(laserdisc_r,laserdisc_w) // ld data
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( rblaster_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
-// AM_RANGE(0x1000, 0x1007) AM_NOP
+// AM_RANGE(0x1000, 0x1007) AM_NOP
AM_RANGE(0x1001, 0x1001) AM_WRITENOP //???
AM_RANGE(0x1003, 0x1003) AM_READ_PORT("IN0")
AM_RANGE(0x1003, 0x1003) AM_WRITE(rblaster_vram_bank_w) //might be 1001
@@ -383,12 +383,12 @@ static MACHINE_DRIVER_START( rblaster )
/* basic machine hardware */
MDRV_CPU_ADD("maincpu",M6502,8000000/2)
MDRV_CPU_PROGRAM_MAP(rblaster_map)
-// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
+// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold)
MDRV_CPU_VBLANK_INT("screen",nmi_line_pulse)
MDRV_CPU_ADD("audiocpu",M6502,8000000/2)
MDRV_CPU_PROGRAM_MAP(rblaster_sound_map)
-// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold) //test
+// MDRV_CPU_VBLANK_INT("screen",irq0_line_hold) //test
MDRV_CPU_PERIODIC_INT(sound_interrupt, 640)
MDRV_LASERDISC_ADD("laserdisc", PIONEER_LDV1000, "screen", "ldsound") //Sony LDP-1000A, is it truly compatible with the Pioneer?
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 40017f3e57e..cbbe48d5459 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -232,8 +232,8 @@ static MACHINE_RESET( shogwarr )
kaneko16_sprite_xoffs = 0xa00;
kaneko16_sprite_yoffs = 0x200;
-
-
+
+
kaneko16_priority.sprite[0] = 2; // below all
kaneko16_priority.sprite[1] = 3; // above tile[0], below the others
kaneko16_priority.sprite[2] = 5; // above all
@@ -1994,14 +1994,14 @@ static INTERRUPT_GEN( shogwarr_interrupt )
// the code for this interupt is provided by the MCU..
case 0: cpu_set_input_line(device, 4, HOLD_LINE); break;
/*case 0:
- {
- // hack, clear this ram address to get into test mode (interrupt would clear it)
- if (kaneko16_mainram[0x2dfe/2]==0xff00)
- {
- kaneko16_mainram[0x2dfe/2]=0x0000;
- }
-
- }*/
+ {
+ // hack, clear this ram address to get into test mode (interrupt would clear it)
+ if (kaneko16_mainram[0x2dfe/2]==0xff00)
+ {
+ kaneko16_mainram[0x2dfe/2]=0x0000;
+ }
+
+ }*/
}
}
@@ -3814,7 +3814,7 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram,
UINT8 inlinet = rom[inline_table_base + (i%inline_table_size)];
//printf("%02x, ",inlinet);
dat -= inlinet;
-
+
if (tabnum==0x40) // fjbuster / shogun warriors japanese character select (what enables this extra?)
{
// note the original, table is an odd number of words, so we can't just check if i is odd / even because the additional overlay
@@ -3823,14 +3823,14 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram,
{
// thie gets mapped over half the inline table?!.. (inline length is 0x22, this changes odd bytes)
// what specifies the additional overlay here?
- UINT8 extra[0x11] = { 0x14,0xf0,0xf8,0xd2,0xbe,0xfc,0xac,0x86,0x64,0x08,0x0c,0x74,0xd6,0x6a,0x24,0x12,0x1a };
+ UINT8 extra[0x11] = { 0x14,0xf0,0xf8,0xd2,0xbe,0xfc,0xac,0x86,0x64,0x08,0x0c,0x74,0xd6,0x6a,0x24,0x12,0x1a };
dat -= extra[(i%inline_table_size)>>1];
-
+
}
}
-
+
dstram[(dstoffset+i)^1] = dat;
}
}
@@ -3847,14 +3847,14 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram,
for (i=0;i<length;i++)
{
-
-
+
+
UINT8 dat = rom[offset+i];
-
-
+
+
if (tabnum==0x80) // shogwarr table 80 (irq code)
{
-
+
unsigned char extracted80[686+2] = {
0x00, 0x00,
0xE7, 0x48, 0xFE, 0xFF, 0x39, 0x4A, 0x10, 0x00, 0xFE, 0x2D, 0x00, 0x67,
@@ -3916,7 +3916,7 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram,
0xFE, 0xFF, 0xC0, 0x33, 0x2D, 0x00, 0x00, 0x00, 0xDF, 0x4C, 0xFF, 0x7F,
0x73, 0x4E
};
-
+
if ((i&1)==0)
{
dat -= table[i&0x3f];
@@ -3932,16 +3932,16 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram,
-
- // dat = BITSWAP8(dat,4,3,2,1,0,7,6,5);
- // dat -= table[i&0x3f];
+
+ // dat = BITSWAP8(dat,4,3,2,1,0,7,6,5);
+ // dat -= table[i&0x3f];
}
}
else if (tabnum==0x41) // shogwarr table 41 -- note fjbuster uses table 40, which looks like (almost) the same data but with better encryption...
{
- // simple shifts...
+ // simple shifts...
dat -= table[i&0x3f];
-
+
if ((i&1)==1) dat = BITSWAP8(dat,0,7,6,5,4,3,2,1);
else dat = BITSWAP8(dat,6,5,4,3,2,1,0,7);
}
@@ -3950,7 +3950,7 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram,
dat -= table[i&0x3f];
}
-
+
dstram[(dstoffset+i)^1] = dat;
}
}
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 53c38aeccf3..e1d7cc568ec 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -35,7 +35,7 @@
The games can be swapped by exchanging the CDROM disc and the security cart, whereby the main-board
FlashROMs are re-programmed after a small wait. On subsequent power-ups, there is a check to test if the
contents of the FlashROMs matches the CDROM, then the game boots up immediately.
-
+
PCMCIA card slot is used by Dance Dance Revolution (2ndMIX link ver. and later),
GUITARFREAKS (2ndMIX link ver. and later), drummania (7thMIX and later), and Gun Mania.
DDR and GF: 32M flash card is used to store edit data (players can edit data by PlayStation
diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c
index 5f81e7b8823..2bd8fa0d0c5 100644
--- a/src/mame/drivers/quakeat.c
+++ b/src/mame/drivers/quakeat.c
@@ -45,8 +45,8 @@ shock-mounted 3.1GB Ultra DMA-33 hard drive
PCI-based 2D/VGA
built-in 10/100 Ethernet
Obsidian2 90-4440 AGP Voodoo2-based realtime 3D graphics accelerator
-Quantum3D's GCI (Game Control Interface) - a unique, low-cost subsystem
- designed to interface coin-op and industrial input/output control devices to a PC
+Quantum3D's GCI (Game Control Interface) - a unique, low-cost subsystem
+ designed to interface coin-op and industrial input/output control devices to a PC
*/
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 15c84d0e12b..9d2fcfc81ac 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -3941,8 +3941,8 @@ static INPUT_PORTS_START( jjsquawk )
PORT_DIPSETTING( 0x1000, "4" )
PORT_DIPSETTING( 0x0000, "5" )
PORT_DIPNAME( 0xc000, 0xc000, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:7,8")
- PORT_DIPSETTING( 0x8000, "20K, Every 100K" ) // TYPO on manual "20000 200000"
- PORT_DIPSETTING( 0xc000, "50K, Every 200K" ) // manufacturer setting // TYPO on manual "50000 100000"
+ PORT_DIPSETTING( 0x8000, "20K, Every 100K" ) // TYPO on manual "20000 200000"
+ PORT_DIPSETTING( 0xc000, "50K, Every 200K" ) // manufacturer setting // TYPO on manual "50000 100000"
PORT_DIPSETTING( 0x4000, "70K, 200K Only" )
PORT_DIPSETTING( 0x0000, "100K Only" )
INPUT_PORTS_END
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index 868aeee3232..98539cc13b2 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -555,11 +555,11 @@ static WRITE32_HANDLER(control3_w)
{
COMBINE_DATA(&control3);
- /* Not card reset */
+ /* Not card reset */
#if 0
// card reset, maybe
if(control3 & 2) {
- devtag_reset(space->machine, "card");
+ devtag_reset(space->machine, "card");
locked = 0x1ff;
}
#endif
@@ -1039,11 +1039,11 @@ static INPUT_PORTS_START( coh3002t_mp )
INPUT_PORTS_END
-//
+//
#define ROM_LOAD16_WORD_BIOS(bios,name,offset,length,hash) \
- ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_BIOS(bios+1)) /* Note '+1' */
-
+ ROMX_LOAD(name, offset, length, hash, ROM_GROUPWORD | ROM_BIOS(bios+1)) /* Note '+1' */
+
#define TAITOGNET_BIOS \
ROM_REGION32_LE( 0x080000, "mainbios", 0 ) \
ROM_LOAD( "coh-3002t.353", 0x000000, 0x080000, CRC(03967fa7) SHA1(0e17fec2286e4e25deb23d40e41ce0986f373d49) ) \
@@ -1199,7 +1199,7 @@ ROM_END
ROM_START(otenamhf)
TAITOGNET_BIOS
ROM_DEFAULT_BIOS( "v2" )
-
+
DISK_REGION( "card" )
DISK_IMAGE( "otenamhf", 0, SHA1(5b15c33bf401e5546d78e905f538513d6ffcf562))
ROM_END
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 4041c865784..6063bd41ac2 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -768,7 +768,7 @@ static MACHINE_DRIVER_START( backfirt )
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
/* no MSM on this PCB */
-
+
MACHINE_DRIVER_END
/***************************************************************************
@@ -988,8 +988,8 @@ sound ic ym3812 + 3014
Osc 8Mhz and 24Mhz
*Note:The sound cpu was protected inside a epoxy block fit on a 40 pin socket in reverse of cpu board (solder side).By dissolving resin the small sub pcb contains Z80A (identified by pins),76c28 (6116),a 74ls00 and 74ls138.
-
-ROMs B4,B5 main program
+
+ROMs B4,B5 main program
B2 sound program
B3 character gfx
B6 to B9 object gfx
@@ -1006,7 +1006,7 @@ RAMs:
6116 scroll
6116 foreground
6116 background
-4164 x20 object/sprites
+4164 x20 object/sprites
*/
@@ -1086,18 +1086,18 @@ static DRIVER_INIT( gemini ) { tecmo_video_type = 2; }
static DRIVER_INIT( backfirt )
{
tecmo_video_type = 2;
-
+
/* no MSM */
memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0, SMH_NOP);
memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xd000, 0xd000, 0, 0, SMH_NOP);
memory_install_write8_handler(cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, SMH_NOP);
-
+
}
-
-
+
+
GAME( 1986, rygar, 0, rygar, rygar, rygar, ROT0, "Tecmo", "Rygar (US set 1)", 0 )
GAME( 1986, rygar2, rygar, rygar, rygar, rygar, ROT0, "Tecmo", "Rygar (US set 2)", 0 )
GAME( 1986, rygar3, rygar, rygar, rygar, rygar, ROT0, "Tecmo", "Rygar (US set 3 Old Version)", 0 )
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index 96b12d5e721..1f11d5a0e2f 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -872,7 +872,7 @@ ROM_START(thrild2) //*
ROM_REGION(0x2000, "m48t58", ROMREGION_ERASE00) /* M48T58 Timekeeper NVRAM */
ROM_LOAD("a41ebb_nvram.u39", 0x00000, 0x2000, CRC(22f59ac0) SHA1(e14ea2ba95b72edf0a3331ab82c192760bfdbce3))
-// a41eba_nvram == a41ebb_nvram
+// a41eba_nvram == a41ebb_nvram
DISK_REGION( "ide" )
DISK_IMAGE( "a41b02", 0, SHA1(0426f4bb9001cf457f44e2c22e3d7575b8049aa3) )
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index de56999e79a..047354b4be7 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -361,7 +361,7 @@ static void calc3_mcu_run(running_machine *machine)
// execute the command:
kaneko16_mcu_ram[param1 / 2] = ~input_port_read(machine, "DSW1"); // DSW
- kaneko16_mcu_ram[param2 / 2] = 0x0000;// 0xffff; // ? -1 / anything else (changes coinage..)
+ kaneko16_mcu_ram[param2 / 2] = 0x0000;// 0xffff; // ? -1 / anything else (changes coinage..)
// param 4?
kaneko16_mcu_ram[param5 / 2] = calc3_mcu_crc; // MCU Rom Checksum!
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index 268f86e6c9e..0fdb15e3c47 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -9131,7 +9131,7 @@ Other Sun games
/* Dyna */
DRIVER( cb2001 ) /* (c) 2001 Dyna Electronics */
DRIVER( scherrym ) /* (c) 2001? Dyna Electronics */
-
+
DRIVER( ncb3 ) /* (c) 199? Dyna Electronics */
DRIVER( cb3a ) /* (c) 199? Dyna Electronics */
DRIVER( cb3 ) /* (c) 199? Dyna Electronics */
diff --git a/src/tools/split.c b/src/tools/split.c
index 826e89aced0..0477a81b9ab 100644
--- a/src/tools/split.c
+++ b/src/tools/split.c
@@ -44,14 +44,14 @@ static void compute_hash_as_string(astring *buffer, void *data, UINT32 length)
sha1_update(&sha1, length, data);
sha1_final(&sha1);
sha1_digest(&sha1, sizeof(sha1digest), sha1digest);
-
+
// expand the digest to a string
for (ch = 0; ch < SHA1_DIGEST_SIZE; ch++)
{
expanded[ch * 2 + 0] = "0123456789ABCDEF"[sha1digest[ch] >> 4];
expanded[ch * 2 + 1] = "0123456789ABCDEF"[sha1digest[ch] & 15];
}
-
+
// copy it to the buffer
astring_cpych(buffer, expanded, sizeof(expanded));
}
@@ -72,7 +72,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
UINT32 totalparts;
file_error filerr;
int error = 1;
-
+
// convert split size to MB
if (splitsize > 500)
{
@@ -80,7 +80,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
goto cleanup;
}
splitsize *= 1024 * 1024;
-
+
// open the file for read
filerr = core_fopen(filename, OPEN_FLAG_READ, &infile);
if (filerr != FILERR_NONE)
@@ -88,7 +88,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
fprintf(stderr, "Fatal error: unable to open file '%s'\n", filename);
goto cleanup;
}
-
+
// get the total length
totallength = core_fsize(infile);
if (totallength < splitsize)
@@ -102,7 +102,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
goto cleanup;
}
totalparts = totallength / splitsize;
-
+
// allocate a buffer for reading
splitbuffer = malloc(splitsize);
if (splitbuffer == NULL)
@@ -110,7 +110,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
fprintf(stderr, "Fatal error: unable to allocate memory for the split\n");
goto cleanup;
}
-
+
// find the base name of the file
astring_cpyc(basefilename, basename);
index = astring_rchr(basefilename, 0, PATH_SEPARATOR[0]);
@@ -120,7 +120,7 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
// compute the split filename
astring_cpyc(splitfilename, basename);
astring_catc(splitfilename, ".split");
-
+
// create the split file
filerr = core_fopen(astring_c(splitfilename), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_NO_BOM, &splitfile);
if (filerr != FILERR_NONE)
@@ -128,35 +128,35 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
fprintf(stderr, "Fatal error: unable to create split file '%s'\n", astring_c(splitfilename));
goto cleanup;
}
-
+
// write the basics out
core_fprintf(splitfile, "splitfile=%s\n", astring_c(basefilename));
core_fprintf(splitfile, "splitsize=%d\n", splitsize);
-
+
printf("Split file is '%s'\n", astring_c(splitfilename));
printf("Splitting file %s into chunks of %dMB...\n", astring_c(basefilename), splitsize / (1024 * 1024));
-
+
// now iterate until done
for (partnum = 0; partnum < 1000; partnum++)
{
UINT32 actual, length;
-
+
printf("Reading part %d...", partnum);
-
+
// read as much as we can from the file
length = core_fread(infile, splitbuffer, splitsize);
if (length == 0)
break;
-
+
// hash what we have
compute_hash_as_string(computedhash, splitbuffer, length);
-
+
// write that info to the split file
core_fprintf(splitfile, "hash=%s file=%s.%03d\n", astring_c(computedhash), astring_c(basefilename), partnum);
-
+
// compute the full filename for this guy
astring_printf(outfilename, "%s.%03d", basename, partnum);
-
+
// create it
filerr = core_fopen(astring_c(outfilename), OPEN_FLAG_WRITE | OPEN_FLAG_CREATE, &outfile);
if (filerr != FILERR_NONE)
@@ -165,9 +165,9 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
fprintf(stderr, "Fatal error: unable to create output file '%s'\n", astring_c(outfilename));
goto cleanup;
}
-
+
printf(" writing %s.%03d...", astring_c(basefilename), partnum);
-
+
// write the data
actual = core_fwrite(outfile, splitbuffer, length);
if (actual != length)
@@ -178,18 +178,18 @@ static int split_file(const char *filename, const char *basename, UINT32 splitsi
}
core_fclose(outfile);
outfile = NULL;
-
+
printf(" done\n");
-
+
// stop if this is the end
if (length < splitsize)
break;
}
printf("File split successfully\n");
-
+
// if we get here, clear the errors
error = 0;
-
+
cleanup:
if (splitfile != NULL)
{
@@ -232,7 +232,7 @@ static int join_file(const char *filename, const char *outname, int write_output
char buffer[256];
int error = 1;
int index;
-
+
// open the file for read
filerr = core_fopen(filename, OPEN_FLAG_READ, &splitfile);
if (filerr != FILERR_NONE)
@@ -240,7 +240,7 @@ static int join_file(const char *filename, const char *outname, int write_output
fprintf(stderr, "Fatal error: unable to open file '%s'\n", filename);
goto cleanup;
}
-
+
// read the first line and verify this is a split file
if (!core_fgets(buffer, sizeof(buffer), splitfile) || strncmp(buffer, "splitfile=", 10) != 0)
{
@@ -248,7 +248,7 @@ static int join_file(const char *filename, const char *outname, int write_output
goto cleanup;
}
astring_trimspace(astring_cpyc(outfilename, buffer + 10));
-
+
// compute the base path
astring_cpyc(basepath, filename);
index = astring_rchr(basepath, 0, PATH_SEPARATOR[0]);
@@ -256,20 +256,20 @@ static int join_file(const char *filename, const char *outname, int write_output
astring_del(basepath, index + 1, -1);
else
astring_reset(basepath);
-
+
// override the output filename if specified, otherwise prepend the path
if (outname != NULL)
astring_cpyc(outfilename, outname);
else
astring_ins(outfilename, 0, basepath);
-
+
// read the split size
if (!core_fgets(buffer, sizeof(buffer), splitfile) || sscanf(buffer, "splitsize=%d", &splitsize) != 1)
{
fprintf(stderr, "Fatal error: corrupt or incomplete split file at line:\n%s\n", buffer);
goto cleanup;
}
-
+
// attempt to open the new file
if (write_output)
{
@@ -291,14 +291,14 @@ static int join_file(const char *filename, const char *outname, int write_output
goto cleanup;
}
}
-
+
printf("%s file '%s'...\n", write_output ? "Joining" : "Verifying", astring_c(outfilename));
-
+
// now iterate through each file
while (core_fgets(buffer, sizeof(buffer), splitfile))
{
UINT32 length, actual;
-
+
// make sure the hash and filename are in the right place
if (strncmp(buffer, "hash=", 5) != 0 || strncmp(buffer + 5 + SHA1_DIGEST_SIZE * 2, " file=", 6) != 0)
{
@@ -309,7 +309,7 @@ static int join_file(const char *filename, const char *outname, int write_output
astring_trimspace(astring_cpyc(infilename, buffer + 5 + SHA1_DIGEST_SIZE * 2 + 6));
printf(" Reading file '%s'...", astring_c(infilename));
-
+
// read the file's contents
astring_ins(infilename, 0, basepath);
filerr = core_fload(astring_c(infilename), &splitbuffer, &length);
@@ -319,10 +319,10 @@ static int join_file(const char *filename, const char *outname, int write_output
fprintf(stderr, "Fatal error: unable to load file '%s'\n", astring_c(infilename));
goto cleanup;
}
-
+
// hash the contents
compute_hash_as_string(computedhash, splitbuffer, length);
-
+
// compare
if (astring_cmp(computedhash, expectedhash) != 0)
{
@@ -330,12 +330,12 @@ static int join_file(const char *filename, const char *outname, int write_output
fprintf(stderr, "Fatal error: file '%s' has incorrect hash\n Expected: %s\n Computed: %s\n", astring_c(infilename), astring_c(expectedhash), astring_c(computedhash));
goto cleanup;
}
-
+
// append to the file
if (write_output)
{
printf(" writing...");
-
+
actual = core_fwrite(outfile, splitbuffer, length);
if (actual != length)
{
@@ -348,7 +348,7 @@ static int join_file(const char *filename, const char *outname, int write_output
}
else
printf(" verified\n");
-
+
// release allocated memory
free(splitbuffer);
splitbuffer = NULL;
@@ -357,10 +357,10 @@ static int join_file(const char *filename, const char *outname, int write_output
printf("File re-created successfully\n");
else
printf("File verified successfully\n");
-
+
// if we get here, clear the errors
error = 0;
-
+
cleanup:
if (splitfile != NULL)
core_fclose(splitfile);
@@ -390,7 +390,7 @@ cleanup:
int main(int argc, char *argv[])
{
int result;
-
+
/* skip if no command */
if (argc < 2)
goto usage;
@@ -410,7 +410,7 @@ int main(int argc, char *argv[])
goto usage;
result = join_file(argv[2], (argc >= 4) ? argv[3] : NULL, TRUE);
}
-
+
/* verify command */
else if (stricmp(argv[1], "-verify") == 0)
{
diff --git a/src/version.c b/src/version.c
index 9ac07ec1f40..195b6bdbdbc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.132u4 ("__DATE__")";
+const char build_version[] = "0.132u5 ("__DATE__")";