Cleanups

Author: inactive123

src/emu/machine.c

@@ -1,4 +1,4 @@
-// license:BSD-3-Clause
+u/ license:BSD-3-Clause
 // copyright-holders:Aaron Giles
 /***************************************************************************
 
@@ -370,24 +370,7 @@ int running_machine::run(bool firstrun)
    // run the CPUs until a reset or exit
    m_hard_reset_pending = false;
    while ((!m_hard_reset_pending && !m_exit_pending) || m_saveload_schedule != SLS_NONE)
-   {
-
-#ifdef __LIBRETRO__
-			//break out to LIBRETRO LOOP
-			return 0;
-#endif
-      // execute CPUs if not paused
-      if (!m_paused)
-         m_scheduler.timeslice();
-
-      // otherwise, just pump video updates through
-      else
-         m_video->frame_update();
-
-      // handle save/load
-      if (m_saveload_schedule != SLS_NONE)
-         handle_saveload();
-   }
+      return 0;
 
    // and out via the exit phase
    m_current_phase = MACHINE_PHASE_EXIT;
@@ -410,8 +393,6 @@ int running_machine::run(bool firstrun)
    return error;
 }
 
-#ifdef __LIBRETRO__
-
 extern void retro_finish();
 extern int RLOOP;
 extern int ENDEXEC;
@@ -435,10 +416,8 @@ void running_machine::retro_machineexit(){
 
 void running_machine::retro_loop(){
 
-	while (RLOOP==1) {
-
-		//manager().web()->serve();
-
+	while (RLOOP==1)
+   {
 		// execute CPUs if not paused
 		if (!m_paused)
 			m_scheduler.timeslice();
@@ -475,8 +454,6 @@ void running_machine::retro_loop(){
 
 }
 
-#endif
-
 //-------------------------------------------------
 //  schedule_exit - schedule a clean exit
 //-------------------------------------------------

src/emu/machine.h

@@ -197,10 +197,8 @@ class running_machine
 	// configuration helpers
 	device_t &add_dynamic_device(device_t &owner, device_type type, const char *tag, UINT32 clock);
 
-#ifdef __LIBRETRO__
-void retro_machineexit();
-void retro_loop();
-#endif
+   void retro_machineexit();
+   void retro_loop();
 	// immediate operations
 	int run(bool firstrun);
 	void pause();

src/emu/video.c

@@ -29,7 +29,6 @@
 //  GLOBAL VARIABLES
 //**************************************************************************
 
-void retro_switch_to_main_thread();
 extern render_target *our_target;
 extern int mame_reset;
 extern int retro_pause;
@@ -200,8 +199,6 @@ void video_manager::frame_update(bool debug)
 		if (machine().first_screen() != NULL && (machine().paused() || debug || debugger_within_instruction_hook(machine())))
 			machine().first_screen()->reset_partial_updates();
 	}
-
-   retro_switch_to_main_thread();
 }
 
 

src/osd/retro/libretro.c

@@ -636,11 +636,6 @@ void retro_cheat_reset(void) {}
 void retro_cheat_set(unsigned unused, bool unused1, const char* unused2) {}
 void retro_set_controller_port_device(unsigned in_port, unsigned device) {}
 
-void retro_switch_to_main_thread(void)
-{
-
-}
-
 void *retro_get_fb_ptr(void)
 {
    return videoBuffer;

src/osd/retro/libretro_shared.h

@@ -77,8 +77,6 @@ static const char core[] = "mame2014";
 extern retro_log_printf_t log_cb;
 extern retro_input_state_t input_state_cb;
 
-void retro_switch_to_main_thread(void);
-
 void retro_frame_draw_enable(bool enable);
 
 void *retro_get_fb_ptr(void);

src/osd/retro/retromain.c

@@ -2195,10 +2195,6 @@ void retro_osd_interface::init(running_machine &machine)
 
 	if (log_cb)
 		log_cb(RETRO_LOG_INFO, "OSD initialization complete\n");
-
-//   retro_switch_to_main_thread();
-
-
 }
 
 void retro_osd_interface::update(bool skip_redraw, UINT32 flags)