diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/m68000/m68kcpu.h | 44 | ||||
| -rw-r--r-- | src/emu/cpu/m68000/m68kfpu.c | 12 | ||||
| -rw-r--r-- | src/emu/cpu/powerpc/ppccom.c | 2 | ||||
| -rw-r--r-- | src/emu/imagedev/floppy.c | 22 | ||||
| -rw-r--r-- | src/emu/imagedev/floppy.h | 22 | ||||
| -rw-r--r-- | src/emu/softlist.c | 16 | ||||
| -rw-r--r-- | src/emu/sound/awacs.c | 4 | ||||
| -rw-r--r-- | src/emu/video/mc6845.c | 2 |
8 files changed, 62 insertions, 62 deletions
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index 3190a6409cf..9311cfa2f52 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -80,7 +80,7 @@ typedef struct _m68ki_cpu_core m68ki_cpu_core; #define CPU_TYPE_010 (0x00000004) #define CPU_TYPE_EC020 (0x00000008) #define CPU_TYPE_020 (0x00000010) -#define CPU_TYPE_EC030 (0x00000020) +#define CPU_TYPE_EC030 (0x00000020) #define CPU_TYPE_030 (0x00000040) #define CPU_TYPE_EC040 (0x00000080) #define CPU_TYPE_LC040 (0x00000100) @@ -669,7 +669,7 @@ struct _m68ki_cpu_core UINT32 virq_state; UINT32 nmi_pending; - void (**jump_table)(m68ki_cpu_core *m68k); + void (**jump_table)(m68ki_cpu_core *m68k); const UINT8* cyc_instruction; const UINT8* cyc_exception; @@ -904,31 +904,31 @@ INLINE void m68ki_ic_clear(m68ki_cpu_core *m68k) INLINE UINT32 m68ki_ic_readimm16(m68ki_cpu_core *m68k, UINT32 address) { -/* if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type) && (m68k->cacr & M68K_CACR_EI)) - { - UINT32 ic_offset = (address >> 1) % M68K_IC_SIZE; - if (m68k->ic_address[ic_offset] == address) - { - return m68k->ic_data[ic_offset]; - } - else - { - UINT32 data = m68k->memory.readimm16(address); - if (!m68k->mmu_tmp_buserror_occurred) - { - m68k->ic_data[ic_offset] = data; - m68k->ic_address[ic_offset] = address; - } - return data; - } - } - else*/ +/* if(CPU_TYPE_IS_EC020_PLUS(m68k->cpu_type) && (m68k->cacr & M68K_CACR_EI)) + { + UINT32 ic_offset = (address >> 1) % M68K_IC_SIZE; + if (m68k->ic_address[ic_offset] == address) + { + return m68k->ic_data[ic_offset]; + } + else + { + UINT32 data = m68k->memory.readimm16(address); + if (!m68k->mmu_tmp_buserror_occurred) + { + m68k->ic_data[ic_offset] = data; + m68k->ic_address[ic_offset] = address; + } + return data; + } + } + else*/ { return m68k->memory.readimm16(address); } // this can't happen, but Apple GCC insists -// return 0; +// return 0; } /* Handles all immediate reads, does address error check, function code setting, diff --git a/src/emu/cpu/m68000/m68kfpu.c b/src/emu/cpu/m68000/m68kfpu.c index 9c226f9eb1f..7e17bbfb1a5 100644 --- a/src/emu/cpu/m68000/m68kfpu.c +++ b/src/emu/cpu/m68000/m68kfpu.c @@ -1495,22 +1495,22 @@ static void fmove_fpcr(m68ki_cpu_core *m68k, UINT16 w2) { address = EA_AY_DI_32(m68k); } - else if (mode == 6) + else if (mode == 6) { address = EA_AY_IX_32(m68k); } if (dir) // From system control reg to <ea> { - if (regsel & 4) { m68ki_write_32(m68k, address, REG_FPCR); address += 4; } - if (regsel & 2) { m68ki_write_32(m68k, address, REG_FPSR); address += 4; } - if (regsel & 1) { m68ki_write_32(m68k, address, REG_FPIAR); address += 4; } + if (regsel & 4) { m68ki_write_32(m68k, address, REG_FPCR); address += 4; } + if (regsel & 2) { m68ki_write_32(m68k, address, REG_FPSR); address += 4; } + if (regsel & 1) { m68ki_write_32(m68k, address, REG_FPIAR); address += 4; } } else // From <ea> to system control reg { if (regsel & 4) { REG_FPCR = m68ki_read_32(m68k, address); address += 4; } - if (regsel & 2) { REG_FPSR = m68ki_read_32(m68k, address); address += 4; } - if (regsel & 1) { REG_FPIAR = m68ki_read_32(m68k, address); address += 4; } + if (regsel & 2) { REG_FPSR = m68ki_read_32(m68k, address); address += 4; } + if (regsel & 1) { REG_FPIAR = m68ki_read_32(m68k, address); address += 4; } } } else diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c index d5c72cd751d..a8d659e93ed 100644 --- a/src/emu/cpu/powerpc/ppccom.c +++ b/src/emu/cpu/powerpc/ppccom.c @@ -510,7 +510,7 @@ static UINT32 ppccom_translate_address_internal(powerpc_state *ppc, int intentio UINT32 lower = ppc->spr[SPROEA_IBAT0U + 2*batnum + 1]; int privbit = ((intention & TRANSLATE_USER_MASK) == 0) ? 3 : 2; -// printf("bat %d upper = %08x privbit %d\n", batnum, upper, privbit); +// printf("bat %d upper = %08x privbit %d\n", batnum, upper, privbit); // is this pair valid? if (lower & 0x40) diff --git a/src/emu/imagedev/floppy.c b/src/emu/imagedev/floppy.c index 78a5c090a9c..0041603dff3 100644 --- a/src/emu/imagedev/floppy.c +++ b/src/emu/imagedev/floppy.c @@ -46,7 +46,7 @@ void floppy_image_device::device_config_complete() // or initialize to defaults if none provided else - { + { memset(&m_formats, 0, sizeof(m_formats)); memset(&m_interface, 0, sizeof(m_interface)); memset(&m_device_displayinfo, 0, sizeof(m_device_displayinfo)); @@ -62,7 +62,7 @@ void floppy_image_device::device_config_complete() while (m_formats[cnt].name) { // allocate a new format - format = global_alloc_clear(image_device_format); + format = global_alloc_clear(image_device_format); format->m_index = cnt; format->m_name = m_formats[cnt].name; format->m_description = m_formats[cnt].description; @@ -75,7 +75,7 @@ void floppy_image_device::device_config_complete() formatptr = &format->m_next; cnt++; } - + // set brief and instance name update_names(); } @@ -94,18 +94,18 @@ void floppy_image_device::device_start() { // resolve callbacks m_out_idx_func.resolve(m_out_idx_cb, *this); - + m_idx = 0; - + /* motor off */ m_mon = 1; /* set write protect on */ m_wpt = 0; m_rpm = 300.0f; - + m_cyl = 0; - m_ss = 1; + m_ss = 1; m_stp = 1; m_dskchg = 0; m_index_timer = machine().scheduler().timer_alloc(FUNC(floppy_drive_index_callback), (void *)this); @@ -131,7 +131,7 @@ bool floppy_image_device::call_load() void floppy_image_device::call_unload() { m_dskchg = 0; - + if (m_image) global_free(m_image); if (m_unload_func) @@ -203,14 +203,14 @@ void floppy_image_device::stp_w(int state) if ( m_dir ) { if ( m_cyl ) m_cyl--; } else { - if ( m_cyl < 83 ) m_cyl++; + if ( m_cyl < 83 ) m_cyl++; } /* Update disk detection if applicable */ if (exists()) { if (m_dskchg==0) m_dskchg = 1; - } + } } } -}
\ No newline at end of file +} diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h index 5ac4f0de9a7..24abf9c6d10 100644 --- a/src/emu/imagedev/floppy.h +++ b/src/emu/imagedev/floppy.h @@ -16,7 +16,7 @@ struct floppy_interface { - devcb_write_line m_out_idx_cb; /* index */ + devcb_write_line m_out_idx_cb; /* index */ const struct floppy_format_def *m_formats; const char * m_interface; @@ -54,19 +54,19 @@ public: virtual const option_guide *create_option_guide() const { return NULL; } UINT8* get_buffer() { return m_image->get_buffer(m_cyl,m_ss ^ 1); } - + void mon_w(int state); void index_func(); int ready_r(); double get_pos(); - + int wpt_r() { return m_wpt; } int dskchg_r() { return m_dskchg; } int trk00_r() { return (m_cyl==0) ? 0 : 1; } - - void stp_w(int state); + + void stp_w(int state); void dir_w(int state) { m_dir = state; } - void ss_w(int state) { m_ss = state; } + void ss_w(int state) { m_ss = state; } protected: // device-level overrides @@ -74,12 +74,12 @@ protected: virtual void device_start(); image_device_format m_format; - floppy_image *m_image; + floppy_image *m_image; char m_extension_list[256]; - + /* index pulse timer */ emu_timer *m_index_timer; - + /* state of input lines */ int m_dir; /* direction */ int m_stp; /* step */ @@ -93,10 +93,10 @@ protected: int m_wpt; /* write protect */ int m_rdy; /* ready */ int m_dskchg; /* disk changed */ - + /* rotation per minute => gives index pulse frequency */ float m_rpm; - + int m_cyl; devcb_resolved_write_line m_out_idx_func; }; diff --git a/src/emu/softlist.c b/src/emu/softlist.c index 547cb8d3fa1..fae5b2c8844 100644 --- a/src/emu/softlist.c +++ b/src/emu/softlist.c @@ -1385,10 +1385,10 @@ static void find_software_item(const device_list &devlist, emu_options &options, /* Split full software name into software list name and short software name */ software_name_split(path, &swlist_name, &swname, &swpart ); -// swname_bckp = swname; +// swname_bckp = swname; const char *interface = image->image_interface(); - + if ( swlist_name ) { /* Try to open the software list xml file explicitly named by the user */ @@ -1499,7 +1499,7 @@ static void find_software_item(const device_list &devlist, emu_options &options, } } *sw_list_name = global_strdup(swlist_name); - + global_free( swlist_name ); global_free( swname ); global_free( swpart ); @@ -1524,16 +1524,16 @@ bool load_software_part(emu_options &options, device_image_interface *image, con software_info *software_info_ptr = NULL; software_part *software_part_ptr = NULL; const char *swlist_name = NULL; - + bool result = false; *sw_info = NULL; *sw_part = NULL; find_software_item(image->device().machine().devicelist(), options, image, path, &software_list_ptr, &software_info_ptr, &software_part_ptr, &swlist_name); - + // if no match has been found, we suggest similar shortnames if (software_info_ptr == NULL) - { + { software_display_matches(image->device().machine().devicelist(),image->device().machine().options(), image->image_interface(), path); } @@ -1639,7 +1639,7 @@ const char *software_part_get_feature(software_part *part, const char *feature_n software_info *software_info_ptr = NULL; software_part *software_part_ptr = NULL; const char *swlist_name = NULL; - + if (strlen(path)>0) { retVal = default_card_slot; find_software_item(devlist, options, image, path, &software_list_ptr, &software_info_ptr, &software_part_ptr, &swlist_name); @@ -1652,7 +1652,7 @@ const char *software_part_get_feature(software_part *part, const char *feature_n software_list_close(software_list_ptr); global_free(swlist_name); } - return retVal; + return retVal; } /*************************************************************************** diff --git a/src/emu/sound/awacs.c b/src/emu/sound/awacs.c index 8c2ead95206..fda9f1ae8b6 100644 --- a/src/emu/sound/awacs.c +++ b/src/emu/sound/awacs.c @@ -5,7 +5,7 @@ AWACS/Singer style 16-bit audio I/O for '040 and PowerPC Macs Emulation by R. Belmont - + ***************************************************************************/ #include "emu.h" @@ -145,7 +145,7 @@ WRITE8_MEMBER( awacs_device::write ) { static const int rates[4] = { 22100, 29400, 44100, 22100 }; m_stream->set_sample_rate(rates[(data>>1)&3]); -// printf("rate %d, enable: %d\n", rates[(data>>1)&3], data & 1); +// printf("rate %d, enable: %d\n", rates[(data>>1)&3], data & 1); m_playback_enable = (data & 1) ? true : false; if (m_playback_enable && !(m_regs[0x10]&1)) diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c index d584310e580..de2448afe66 100644 --- a/src/emu/video/mc6845.c +++ b/src/emu/video/mc6845.c @@ -987,7 +987,7 @@ void ams40041_device::device_start() m_vert_disp = 100; m_vert_sync_pos = 112; m_mode_control = 2; - + m_supports_disp_start_addr_r = false; m_supports_vert_sync_width = false; m_supports_status_reg_d5 = false; |
