diff options
| author | 2011-12-04 18:50:00 +0000 | |
|---|---|---|
| committer | 2011-12-04 18:50:00 +0000 | |
| commit | ba2d56dc725216e02517cd0bafa1f42c1da838ac (patch) | |
| tree | a0eee6725797685ed603c4cb09af2b4bada4fa18 /src/emu | |
| parent | 2592b58d583dea3d8a8c0e933ad15ccbba0c70c0 (diff) | |
Clean-ups and version bumpmame0144u2
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/diexec.c | 12 | ||||
| -rw-r--r-- | src/emu/diexec.h | 4 | ||||
| -rw-r--r-- | src/emu/schedule.c | 2 | ||||
| -rw-r--r-- | src/emu/schedule.h | 4 | ||||
| -rw-r--r-- | src/emu/softlist.c | 34 | ||||
| -rw-r--r-- | src/emu/video/ramdac.c | 8 | ||||
| -rw-r--r-- | src/emu/video/ramdac.h | 2 |
7 files changed, 33 insertions, 33 deletions
diff --git a/src/emu/diexec.c b/src/emu/diexec.c index 483a330f701..ec905110803 100644 --- a/src/emu/diexec.c +++ b/src/emu/diexec.c @@ -73,7 +73,7 @@ const int TRIGGER_SUSPENDTIME = -4000; device_execute_interface::device_execute_interface(const machine_config &mconfig, device_t &device) : device_interface(device), -// m_cothread(cothread_entry_delegate(FUNC(device_execute_interface::run_thread_wrapper), this)), +// m_cothread(cothread_entry_delegate(FUNC(device_execute_interface::run_thread_wrapper), this)), m_disabled(false), m_vblank_interrupt(NULL), m_vblank_interrupts_per_frame(0), @@ -380,12 +380,12 @@ UINT64 device_execute_interface::total_cycles() const /* void device_execute_interface::run_thread_wrapper() { - // loop infinitely - device_scheduler &scheduler = device().machine().scheduler(); - while (1) + // loop infinitely + device_scheduler &scheduler = device().machine().scheduler(); + while (1) { - // call the classic run function, then swap back to the scheduler's thread - execute_run(); + // call the classic run function, then swap back to the scheduler's thread + execute_run(); scheduler.make_active(); } } diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 488f70cc1a1..5bc1a29f770 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -205,7 +205,7 @@ public: // required operation overrides //#if USE_COTHREADS -// void run() { m_cothread.make_active(); } +// void run() { m_cothread.make_active(); } //#else void run() { execute_run(); } //#endif @@ -272,7 +272,7 @@ protected: }; // internal state -// cothread m_cothread; // thread used for execution +// cothread m_cothread; // thread used for execution // configuration bool m_disabled; // disabled from executing? diff --git a/src/emu/schedule.c b/src/emu/schedule.c index 1a3dfa2e445..614ed8bdacb 100644 --- a/src/emu/schedule.c +++ b/src/emu/schedule.c @@ -341,7 +341,7 @@ device_scheduler::device_scheduler(running_machine &machine) : m_executing_device(NULL), m_execute_list(NULL), m_basetime(attotime::zero), -// m_cothread(co_active()), +// m_cothread(co_active()), m_timer_list(NULL), m_timer_allocator(machine.respool()), m_callback_timer(NULL), diff --git a/src/emu/schedule.h b/src/emu/schedule.h index cad78513066..6ef60ce0f9c 100644 --- a/src/emu/schedule.h +++ b/src/emu/schedule.h @@ -165,7 +165,7 @@ public: void abort_timeslice(); void trigger(int trigid, attotime after = attotime::zero); void boost_interleave(attotime timeslice_time, attotime boost_duration); -// void make_active() { m_cothread.make_active(); } +// void make_active() { m_cothread.make_active(); } // timers, specified by callback/name emu_timer *timer_alloc(timer_expired_delegate callback, void *ptr = NULL); @@ -210,7 +210,7 @@ private: device_execute_interface * m_executing_device; // pointer to currently executing device device_execute_interface * m_execute_list; // list of devices to be executed attotime m_basetime; // global basetime; everything moves forward from here -// cothread m_cothread; // core scheduler thread +// cothread m_cothread; // core scheduler thread // list of active timers emu_timer * m_timer_list; // head of the active list diff --git a/src/emu/softlist.c b/src/emu/softlist.c index bd987347059..bd7a593b9f6 100644 --- a/src/emu/softlist.c +++ b/src/emu/softlist.c @@ -385,7 +385,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut else if ( !strcmp( attributes[0], "supported" ) ) { supported = attributes[1]; - } + } else unknown_attribute(swlist, attributes[0]); } @@ -538,9 +538,9 @@ static void start_handler(void *data, const char *tagname, const char **attribut else if ( !strcmp( attributes[0], "interface" ) ) str_interface = attributes[1]; - - else - unknown_attribute(swlist, attributes[0]); + + else + unknown_attribute(swlist, attributes[0]); } if ( str_name && str_interface ) @@ -593,9 +593,9 @@ static void start_handler(void *data, const char *tagname, const char **attribut else if ( !strcmp( attributes[0], "size") ) str_size = attributes[1]; - - else - unknown_attribute(swlist, attributes[0]); + + else + unknown_attribute(swlist, attributes[0]); } if ( str_name && str_size ) { @@ -629,7 +629,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut if ( !strcmp( attributes[0], "name" ) ) str_name = attributes[1]; else - unknown_attribute(swlist, attributes[0]); + unknown_attribute(swlist, attributes[0]); } if ( str_name ) { @@ -665,9 +665,9 @@ static void start_handler(void *data, const char *tagname, const char **attribut else if ( !strcmp( attributes[0], "value" ) ) str_feature_value = attributes[1]; - + else - unknown_attribute(swlist, attributes[0]); + unknown_attribute(swlist, attributes[0]); } /* Prepare for adding feature to feature list */ @@ -733,9 +733,9 @@ static void start_handler(void *data, const char *tagname, const char **attribut else if ( !strcmp( attributes[0], "status" ) ) str_status = attributes[1]; else if ( !strcmp( attributes[0], "loadflag" ) ) - str_loadflag = attributes[1]; + str_loadflag = attributes[1]; else - unknown_attribute(swlist, attributes[0]); + unknown_attribute(swlist, attributes[0]); } if ( swlist->softinfo ) { @@ -822,7 +822,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut parse_error(&swlist->state, "%s: Incomplete rom definition (line %lu)\n", swlist->file->filename(),XML_GetCurrentLineNumber(swlist->state.parser)); } - } + } } else if (!strcmp(tagname, "disk")) @@ -843,7 +843,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut else if ( !strcmp( attributes[0], "writeable" ) ) str_writeable = attributes[1]; else - unknown_attribute(swlist, attributes[0]); + unknown_attribute(swlist, attributes[0]); } if ( swlist->softinfo ) { @@ -870,7 +870,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut } else if (!strcmp(tagname, "dipvalue")) { - } + } else unknown_tag(swlist, tagname); break; @@ -1811,7 +1811,7 @@ void validate_softlists(emu_options &options) { lists[list_count++] = swlist->list_name[i]; software_list_parse( list, &validate_error_proc, NULL ); - + for (software_info *swinfo = software_list_find(list, "*", NULL); swinfo != NULL; swinfo = software_list_find(list, "*", swinfo)) { const char *s; @@ -1948,7 +1948,7 @@ void validate_softlists(emu_options &options) } } software_list_close(list); - } + } } } } diff --git a/src/emu/video/ramdac.c b/src/emu/video/ramdac.c index c9ef304f180..e773bf0d75f 100644 --- a/src/emu/video/ramdac.c +++ b/src/emu/video/ramdac.c @@ -1,11 +1,11 @@ /*************************************************************************** - Generic Palette RAMDAC device + Generic Palette RAMDAC device - Written by Angelo Salese + Written by Angelo Salese - TODO: - - masking register + TODO: + - masking register ***************************************************************************/ diff --git a/src/emu/video/ramdac.h b/src/emu/video/ramdac.h index 782daa0a0a9..0e53de36b4a 100644 --- a/src/emu/video/ramdac.h +++ b/src/emu/video/ramdac.h @@ -1,6 +1,6 @@ /*************************************************************************** - Generic Palette RAMDAC device + Generic Palette RAMDAC device ***************************************************************************/ |
