diff options
| author | 2011-06-19 19:29:25 +0000 | |
|---|---|---|
| committer | 2011-06-19 19:29:25 +0000 | |
| commit | e6050ace10f2c2271c110d667e1b67a6b4367e25 (patch) | |
| tree | f856b597851f07e2f9f7e95b4d49710c392d09e2 /src/emu | |
| parent | a8c80b5a5f5df38c8080bb369c4a7c0e9f2b4b57 (diff) | |
Cleanups and version bumpmame0142u6
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/clifront.c | 16 | ||||
| -rw-r--r-- | src/emu/cpu/i386/i386.c | 6 | ||||
| -rw-r--r-- | src/emu/cpu/i86/instr86.c | 4 | ||||
| -rw-r--r-- | src/emu/debug/debugcmd.c | 14 | ||||
| -rw-r--r-- | src/emu/devimage.c | 4 | ||||
| -rw-r--r-- | src/emu/devlegcy.h | 4 | ||||
| -rw-r--r-- | src/emu/diimage.c | 2 | ||||
| -rw-r--r-- | src/emu/diimage.h | 16 | ||||
| -rw-r--r-- | src/emu/imagedev/cassette.c | 4 | ||||
| -rw-r--r-- | src/emu/imagedev/cassette.h | 14 | ||||
| -rw-r--r-- | src/emu/imagedev/chd_cd.c | 4 | ||||
| -rw-r--r-- | src/emu/imagedev/chd_cd.h | 12 | ||||
| -rw-r--r-- | src/emu/imagedev/flopdrv.c | 2 | ||||
| -rw-r--r-- | src/emu/imagedev/harddriv.c | 4 | ||||
| -rw-r--r-- | src/emu/imagedev/harddriv.h | 12 | ||||
| -rw-r--r-- | src/emu/imagedev/printer.c | 2 | ||||
| -rw-r--r-- | src/emu/imagedev/printer.h | 12 | ||||
| -rw-r--r-- | src/emu/info.c | 8 | ||||
| -rw-r--r-- | src/emu/memory.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/scsp.c | 2 | ||||
| -rw-r--r-- | src/emu/uiimage.c | 4 |
21 files changed, 74 insertions, 74 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c index 0975fc8c487..0b90cb4cf97 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -199,21 +199,21 @@ int cli_frontend::execute(int argc, char **argv) if (list) { software_info *swinfo = software_list_find(list, m_options.software_name(), NULL); - if (swinfo!=NULL) { + if (swinfo!=NULL) { for (software_part *swpart = software_find_part(swinfo, NULL, NULL); swpart != NULL; swpart = software_part_next(swpart)) { const char *mount = software_part_get_feature(swpart, "automount"); - if (mount==NULL || strcmp(mount,"no")!=0) { - // loop trough all parts - // search for a device with the right interface + if (mount==NULL || strcmp(mount,"no")!=0) { + // loop trough all parts + // search for a device with the right interface const device_image_interface *image = NULL; for (bool gotone = config.devicelist().first(image); gotone; gotone = image->next(image)) { - const char *interface = image->image_interface(); + const char *interface = image->image_interface(); if (interface != NULL) - { + { if (!strcmp(interface, swpart->interface_)) - { + { const char *option = m_options.value(image->brief_instance_name()); // mount only if not already mounted if (strlen(option)==0) { @@ -221,7 +221,7 @@ int cli_frontend::execute(int argc, char **argv) astring error; val.printf("%s:%s",m_options.software_name(),swpart->name); m_options.set_value(image->brief_instance_name(), val.cstr(), OPTION_PRIORITY_CMDLINE, error); - assert(!error); + assert(!error); } break; } diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c index 2039edb44e5..b07d84bdcbb 100644 --- a/src/emu/cpu/i386/i386.c +++ b/src/emu/cpu/i386/i386.c @@ -519,7 +519,7 @@ static void i386_trap(i386_state *cpustate,int irq, int irq_gate, int trap_level i386_load_protected_mode_segment(cpustate,&desc); CPL = cpustate->CPL; // current privilege level DPL = (desc.flags >> 5) & 0x03; // descriptor privilege level -// RPL = segment & 0x03; // requested privilege level +// RPL = segment & 0x03; // requested privilege level if((segment & ~0x07) == 0) { @@ -816,7 +816,7 @@ static void i286_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested } /* For nested tasks, we write the outgoing task's selector to the back-link field of the new TSS, - and set the NT flag in the EFLAGS register */ + and set the NT flag in the EFLAGS register */ if(nested != 0) { WRITE16(cpustate,tss+0,old_task); @@ -929,7 +929,7 @@ static void i386_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested } /* For nested tasks, we write the outgoing task's selector to the back-link field of the new TSS, - and set the NT flag in the EFLAGS register */ + and set the NT flag in the EFLAGS register */ if(nested != 0) { WRITE32(cpustate,tss+0,old_task); diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c index 9c94ff6ca78..595b0ec6f3f 100644 --- a/src/emu/cpu/i86/instr86.c +++ b/src/emu/cpu/i86/instr86.c @@ -72,7 +72,7 @@ static void PREFIX86(_trap)(i8086_state *cpustate) #ifndef I80186 static void PREFIX86(_rotate_shift_Byte)(i8086_state *cpustate, unsigned ModRM, unsigned count, unsigned src) { -// unsigned src = (unsigned)GetRMByte(ModRM); +// unsigned src = (unsigned)GetRMByte(ModRM); unsigned dst=src; if (count==0) @@ -208,7 +208,7 @@ static void PREFIX86(_rotate_shift_Byte)(i8086_state *cpustate, unsigned ModRM, static void PREFIX86(_rotate_shift_Word)(i8086_state *cpustate, unsigned ModRM, unsigned count, unsigned src) { -// unsigned src = GetRMWord(ModRM); +// unsigned src = GetRMWord(ModRM); unsigned dst=src; if (count==0) diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index e5d4a6f27b1..5f5606f1968 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -2677,12 +2677,12 @@ static void execute_hardreset(running_machine &machine, int ref, int params, con /*------------------------------------------------- execute_images - lists all image devices with - mounted files + mounted files -------------------------------------------------*/ static void execute_images(running_machine &machine, int ref, int params, const char **param) { - device_image_interface *img = NULL; + device_image_interface *img = NULL; for (bool gotone = machine.devicelist().first(img); gotone; gotone = img->next(img)) { debug_console_printf(machine, "%s: %s\n",img->brief_instance_name(),img->exists() ? img->filename() : "[empty slot]"); @@ -2698,7 +2698,7 @@ static void execute_images(running_machine &machine, int ref, int params, const static void execute_mount(running_machine &machine, int ref, int params, const char **param) { - device_image_interface *img = NULL; + device_image_interface *img = NULL; bool done = false; for (bool gotone = machine.devicelist().first(img); gotone; gotone = img->next(img)) { @@ -2707,8 +2707,8 @@ static void execute_mount(running_machine &machine, int ref, int params, const c debug_console_printf(machine, "Unable to mount file %s on %s\n",param[1],param[0]); } else { debug_console_printf(machine, "File %s mounted on %s\n",param[1],param[0]); - } - done = true; + } + done = true; break; } } @@ -2722,14 +2722,14 @@ static void execute_mount(running_machine &machine, int ref, int params, const c static void execute_unmount(running_machine &machine, int ref, int params, const char **param) { - device_image_interface *img = NULL; + device_image_interface *img = NULL; bool done = false; for (bool gotone = machine.devicelist().first(img); gotone; gotone = img->next(img)) { if (strcmp(img->brief_instance_name(),param[0])==0) { img->unload(); debug_console_printf(machine, "Unmounted file from : %s\n",param[0]); - done = true; + done = true; break; } } diff --git a/src/emu/devimage.c b/src/emu/devimage.c index 361b25207b6..7ab5318b8b6 100644 --- a/src/emu/devimage.c +++ b/src/emu/devimage.c @@ -105,10 +105,10 @@ void legacy_image_device_base::device_config_complete() } update_names(); - + // Override in case of hardcoded values if (strlen(get_legacy_string(DEVINFO_STR_IMAGE_INSTANCE_NAME))>0) { - m_instance_name = get_legacy_string(DEVINFO_STR_IMAGE_INSTANCE_NAME); + m_instance_name = get_legacy_string(DEVINFO_STR_IMAGE_INSTANCE_NAME); } if (strlen(get_legacy_string(DEVINFO_STR_IMAGE_BRIEF_INSTANCE_NAME))>0) { m_brief_instance_name = get_legacy_string(DEVINFO_STR_IMAGE_BRIEF_INSTANCE_NAME); diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h index bb58b0cf92f..52d685cd780 100644 --- a/src/emu/devlegcy.h +++ b/src/emu/devlegcy.h @@ -523,8 +523,8 @@ public: virtual void call_get_devices(); virtual void *get_device_specific_call(); - virtual iodevice_t image_type() const { return static_cast<iodevice_t>(get_legacy_int(DEVINFO_INT_IMAGE_TYPE)); } - + virtual iodevice_t image_type() const { return static_cast<iodevice_t>(get_legacy_int(DEVINFO_INT_IMAGE_TYPE)); } + virtual bool is_readable() const { return get_legacy_int(DEVINFO_INT_IMAGE_READABLE)!=0; } virtual bool is_writeable() const { return get_legacy_int(DEVINFO_INT_IMAGE_WRITEABLE)!=0; } virtual bool is_creatable() const { return get_legacy_int(DEVINFO_INT_IMAGE_CREATABLE)!=0; } diff --git a/src/emu/diimage.c b/src/emu/diimage.c index 773d215cd81..ab785964cf0 100644 --- a/src/emu/diimage.c +++ b/src/emu/diimage.c @@ -1032,4 +1032,4 @@ void device_image_interface::update_names() m_instance_name = device_typename(image_type()); m_brief_instance_name = device_brieftypename(image_type()); } -}
\ No newline at end of file +} diff --git a/src/emu/diimage.h b/src/emu/diimage.h index 2a4af0d69fd..f87622638e0 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -182,12 +182,12 @@ public: virtual const char *image_interface() const { return NULL; } virtual const char *file_extensions() const = 0; virtual const option_guide *create_option_guide() const = 0; - + const image_device_format *device_get_indexed_creatable_format(int index); const image_device_format *device_get_named_creatable_format(const char *format_name); const option_guide *device_get_creation_option_guide() { return create_option_guide(); } const image_device_format *device_get_creatable_formats() { return formatlist(); } - + const char *error(); void seterror(image_error_t err, const char *message); void message(const char *format, ...); @@ -233,11 +233,11 @@ public: void battery_load(void *buffer, int length, int fill); void battery_save(const void *buffer, int length); - + const char *image_type_name() const { return device_typename(image_type()); } - + const char *instance_name() const { return m_instance_name; } const char *brief_instance_name() const { return m_brief_instance_name; } bool uses_file_extension(const char *file_extension) const; @@ -247,7 +247,7 @@ public: bool finish_load(); void unload(); bool create(const char *path, const image_device_format *create_format, option_resolution *create_args); - bool load_software(char *swlist, char *swname, rom_entry *entry); + bool load_software(char *swlist, char *swname, rom_entry *entry); protected: bool load_internal(const char *path, bool is_create, int create_format, option_resolution *create_args); void determine_open_plan(int is_create, UINT32 *open_plan); @@ -311,12 +311,12 @@ protected: option_resolution *m_create_args; hash_collection m_hash; - + astring m_brief_instance_name; astring m_instance_name; - + /* creation info */ - image_device_format *m_formatlist; + image_device_format *m_formatlist; bool m_is_loading; }; diff --git a/src/emu/imagedev/cassette.c b/src/emu/imagedev/cassette.c index 62be33ce9b4..39bb0057957 100644 --- a/src/emu/imagedev/cassette.c +++ b/src/emu/imagedev/cassette.c @@ -73,11 +73,11 @@ void cassette_image_device::device_config_complete() memset(&m_interface, 0, sizeof(m_interface)); memset(&m_device_displayinfo, 0, sizeof(m_device_displayinfo)); } - + m_extension_list[0] = '\0'; for (int i = 0; m_formats[i]; i++ ) image_specify_extension( m_extension_list, 256, m_formats[i]->extensions ); - + // set brief and instance name update_names(); } diff --git a/src/emu/imagedev/cassette.h b/src/emu/imagedev/cassette.h index 922c7c9bcbb..d1956f97935 100644 --- a/src/emu/imagedev/cassette.h +++ b/src/emu/imagedev/cassette.h @@ -69,8 +69,8 @@ public: virtual void call_display_info() { if (m_device_displayinfo) m_device_displayinfo(*this); } virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - virtual iodevice_t image_type() const { return IO_CASSETTE; } - + virtual iodevice_t image_type() const { return IO_CASSETTE; } + virtual bool is_readable() const { return 1; } virtual bool is_writeable() const { return 1; } virtual bool is_creatable() const { return 1; } @@ -79,7 +79,7 @@ public: virtual const char *image_interface() const { return m_interface; } virtual const char *file_extensions() const { return m_extension_list; } virtual const option_guide *create_option_guide() const { return NULL; } - + // specific implementation cassette_state get_state() { return m_state; } void set_state(cassette_state state) { change_state(m_state, (cassette_state)(~0)); } @@ -92,20 +92,20 @@ public: double get_position(); double get_length(); void seek(double time, int origin); - + protected: bool is_motor_on(); void update(); - + // device-level overrides virtual void device_config_complete(); virtual void device_start(); -private: +private: cassette_image *m_cassette; cassette_state m_state; double m_position; double m_position_time; - INT32 m_value; + INT32 m_value; char m_extension_list[256]; }; diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c index 28971f5d2a0..8687882605e 100644 --- a/src/emu/imagedev/chd_cd.c +++ b/src/emu/imagedev/chd_cd.c @@ -100,9 +100,9 @@ void cdrom_image_device::device_config_complete() format->m_extensions = "chd"; format->m_optspec = cd_option_spec; format->m_next = NULL; - + m_formatlist = format; - + // set brief and instance name update_names(); } diff --git a/src/emu/imagedev/chd_cd.h b/src/emu/imagedev/chd_cd.h index 82ab73ed48f..8095b1dd3ad 100644 --- a/src/emu/imagedev/chd_cd.h +++ b/src/emu/imagedev/chd_cd.h @@ -18,7 +18,7 @@ struct cdrom_interface { - const char * m_interface; + const char * m_interface; device_image_display_info_func m_device_displayinfo; }; @@ -39,8 +39,8 @@ public: virtual void call_display_info() { if (m_device_displayinfo) m_device_displayinfo(*this); } virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - virtual iodevice_t image_type() const { return IO_CDROM; } - + virtual iodevice_t image_type() const { return IO_CDROM; } + virtual bool is_readable() const { return 1; } virtual bool is_writeable() const { return 0; } virtual bool is_creatable() const { return 0; } @@ -49,14 +49,14 @@ public: virtual const char *image_interface() const { return m_interface; } virtual const char *file_extensions() const { return "chd"; } virtual const option_guide *create_option_guide() const; - + // specific implementation - cdrom_file *get_cdrom_file() { return m_cdrom_handle; } + cdrom_file *get_cdrom_file() { return m_cdrom_handle; } protected: // device-level overrides virtual void device_config_complete(); virtual void device_start(); - + cdrom_file *m_cdrom_handle; image_device_format m_format; }; diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c index 19282aab650..a81af75c030 100644 --- a/src/emu/imagedev/flopdrv.c +++ b/src/emu/imagedev/flopdrv.c @@ -634,7 +634,7 @@ static int internal_floppy_device_load(device_image_interface *image, int create } /* disk changed */ flopimg->dskchg = CLEAR_LINE; - + return IMAGE_INIT_PASS; error: diff --git a/src/emu/imagedev/harddriv.c b/src/emu/imagedev/harddriv.c index 53039069fb2..19ec4128a5e 100644 --- a/src/emu/imagedev/harddriv.c +++ b/src/emu/imagedev/harddriv.c @@ -116,9 +116,9 @@ void harddisk_image_device::device_config_complete() format->m_extensions = "chd,hd"; format->m_optspec = hd_option_spec; format->m_next = NULL; - + m_formatlist = format; - + // set brief and instance name update_names(); } diff --git a/src/emu/imagedev/harddriv.h b/src/emu/imagedev/harddriv.h index 75bd49dc1b8..10420c23bdf 100644 --- a/src/emu/imagedev/harddriv.h +++ b/src/emu/imagedev/harddriv.h @@ -40,8 +40,8 @@ public: virtual bool call_create(int create_format, option_resolution *create_args); virtual void call_unload(); - virtual iodevice_t image_type() const { return IO_HARDDISK; } - + virtual iodevice_t image_type() const { return IO_HARDDISK; } + virtual bool is_readable() const { return 1; } virtual bool is_writeable() const { return 1; } virtual bool is_creatable() const { return 0; } @@ -49,7 +49,7 @@ public: virtual bool is_reset_on_load() const { return 0; } virtual const char *file_extensions() const { return "chd,hd"; } virtual const option_guide *create_option_guide() const; - + // specific implementation hard_disk_file *get_hard_disk_file() { return m_hard_disk_handle; } chd_file *get_chd_file(); @@ -58,13 +58,13 @@ protected: // device-level overrides virtual void device_config_complete(); virtual void device_start(); - + int internal_load_hd(const char *metadata); - + chd_file *m_chd; hard_disk_file *m_hard_disk_handle; - image_device_format m_format; + image_device_format m_format; }; // device type definition diff --git a/src/emu/imagedev/printer.c b/src/emu/imagedev/printer.c index 9137583931d..0164ca60282 100644 --- a/src/emu/imagedev/printer.c +++ b/src/emu/imagedev/printer.c @@ -50,7 +50,7 @@ void printer_image_device::device_config_complete() { memset(&m_online, 0, sizeof(m_online)); } - + // set brief and instance name update_names(); } diff --git a/src/emu/imagedev/printer.h b/src/emu/imagedev/printer.h index 4348cf487b4..5e059e87b8d 100644 --- a/src/emu/imagedev/printer.h +++ b/src/emu/imagedev/printer.h @@ -38,8 +38,8 @@ public: virtual bool call_load(); virtual void call_unload(); - virtual iodevice_t image_type() const { return IO_PRINTER; } - + virtual iodevice_t image_type() const { return IO_PRINTER; } + virtual bool is_readable() const { return 0; } virtual bool is_writeable() const { return 1; } virtual bool is_creatable() const { return 1; } @@ -48,18 +48,18 @@ public: virtual const char *image_interface() const { return NULL; } virtual const char *file_extensions() const { return "prn"; } virtual const option_guide *create_option_guide() const { return NULL; } - + // specific implementation - + /* checks to see if a printer is ready */ int is_ready(); /* outputs data to a printer */ - void output(UINT8 data); + void output(UINT8 data); protected: // device-level overrides virtual void device_config_complete(); virtual void device_start(); - + devcb_resolved_write_line m_online_func; }; diff --git a/src/emu/info.c b/src/emu/info.c index 460cb5b03b9..db8d6db9977 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -1098,10 +1098,10 @@ void info_xml_creator::output_slots() fprintf(m_output, "\t\t<slot name=\"%s\">\n", xml_normalize_string(slot->device().tag())); /* - if (slot->slot_interface()[0]) - fprintf(m_output, " interface=\"%s\"", xml_normalize_string(slot->slot_interface())); - */ - + if (slot->slot_interface()[0]) + fprintf(m_output, " interface=\"%s\"", xml_normalize_string(slot->slot_interface())); + */ + const slot_interface* intf = slot->get_slot_interfaces(); for (int i = 0; intf[i].name != NULL; i++) { diff --git a/src/emu/memory.c b/src/emu/memory.c index 18bf6c0a50c..8a6e1014b68 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -3338,7 +3338,7 @@ void address_table::setup_range_solid(offs_t addrstart, offs_t addrend, offs_t a // entry and requests to populate the address map with // it. Handle non-overlapping subunits. //------------------------------------------------- - + namespace { struct subrange { offs_t start, end; diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index f3f15455fb6..8ae615a6ea2 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -236,7 +236,7 @@ static void dma_scsp(address_space *space, scsp_state *scsp); /*state DMA trans #define scsp_ddir scsp->scsp_dmactrl & 0x2000 #define scsp_dexe scsp->scsp_dmactrl & 0x1000 /* TODO */ -//#define dma_transfer_end ((scsp_regs[0x24/2] & 0x10)>>4)|(((scsp_regs[0x26/2] & 0x10)>>4)<<1)|(((scsp_regs[0x28/2] & 0x10)>>4)<<2) +//#define dma_transfer_end ((scsp_regs[0x24/2] & 0x10)>>4)|(((scsp_regs[0x26/2] & 0x10)>>4)<<1)|(((scsp_regs[0x28/2] & 0x10)>>4)<<2) static const float SDLT[8]={-1000000.0f,-36.0f,-30.0f,-24.0f,-18.0f,-12.0f,-6.0f,0.0f}; diff --git a/src/emu/uiimage.c b/src/emu/uiimage.c index 8861c6188e6..65fdf5196b5 100644 --- a/src/emu/uiimage.c +++ b/src/emu/uiimage.c @@ -1394,9 +1394,9 @@ void ui_mess_menu_tape_control(running_machine &machine, ui_menu *menu, void *pa /* rebuild the menu - we have to do this so that the counter updates */ ui_menu_reset(menu, UI_MENU_RESET_REMEMBER_POSITION); menu_tape_control_populate(machine, menu, (tape_control_menu_state*)state); - + cassette_image_device* cassette = dynamic_cast<cassette_image_device*>(&menustate->device->device()); - + /* process the menu */ event = ui_menu_process(machine, menu, UI_MENU_PROCESS_LR_REPEAT); if (event != NULL) |
