From f710b61edbd866075332581772eb7cf37d503f50 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 3 Aug 2015 23:28:34 +0200
Subject: [PATCH] Don't make input_apply_turbo a separate function again

---
 libretro_version_1.c | 53 ++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/libretro_version_1.c b/libretro_version_1.c
index 7d66f34a24..df1a8632c3 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -115,37 +115,6 @@ static void video_frame(const void *data, unsigned width,
    *frame_count = *frame_count + 1;
 }
 
-/**
- * input_apply_turbo:
- * @port                 : user number
- * @id                   : identifier of the key
- * @res                  : boolean return value. FIXME/TODO: to be refactored.
- *
- * Apply turbo button if activated.
- *
- * If turbo button is held, all buttons pressed except
- * for D-pad will go into a turbo mode. Until the button is
- * released again, the input state will be modulated by a 
- * periodic pulse defined by the configured duty cycle. 
- *
- * Returns: 1 (true) if turbo button is enabled for this
- * key ID, otherwise the value of @res will be returned.
- *
- **/
-static bool input_apply_turbo(global_t *global, settings_t *settings,
-      unsigned port, unsigned id, bool res)
-{
-   if (res && global->turbo.frame_enable[port])
-      global->turbo.enable[port] |= (1 << id);
-   else if (!res)
-      global->turbo.enable[port] &= ~(1 << id);
-
-   if (global->turbo.enable[port] & (1 << id))
-      return res && ((global->turbo.count % settings->input.turbo_period)
-            < settings->input.turbo_duty_cycle);
-   return res;
-}
-
 /**
  * input_state:
  * @port                 : user number.
@@ -204,7 +173,27 @@ static int16_t input_state(unsigned port, unsigned device,
    /* Don't allow turbo for D-pad. */
    if (device == RETRO_DEVICE_JOYPAD && (id < RETRO_DEVICE_ID_JOYPAD_UP ||
             id > RETRO_DEVICE_ID_JOYPAD_RIGHT))
-      res = input_apply_turbo(global, settings, port, id, res);
+   {
+      /*
+       * Apply turbo button if activated.
+       *
+       * If turbo button is held, all buttons pressed except
+       * for D-pad will go into a turbo mode. Until the button is
+       * released again, the input state will be modulated by a 
+       * periodic pulse defined by the configured duty cycle. 
+       */
+      if (res && global->turbo.frame_enable[port])
+         global->turbo.enable[port] |= (1 << id);
+      else if (!res)
+         global->turbo.enable[port] &= ~(1 << id);
+
+      if (global->turbo.enable[port] & (1 << id))
+      {
+         /* if turbo button is enabled for this key ID */
+         res = res && ((global->turbo.count % settings->input.turbo_period)
+               < settings->input.turbo_duty_cycle);
+      }
+   }
 
    if (global->bsv.movie && !global->bsv.movie_playback)
       bsv_movie_set_input(global->bsv.movie, res);