diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/arm7/arm7core.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/i8255a.c | 20 | ||||
| -rw-r--r-- | src/emu/machine/i8255a.h | 44 | ||||
| -rw-r--r-- | src/emu/machine/idectrl.c | 20 | ||||
| -rw-r--r-- | src/emu/machine/ldcore.c | 4 | ||||
| -rw-r--r-- | src/emu/video.c | 18 |
6 files changed, 54 insertions, 54 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 */ |
