From d3ae0834e663420d86799a8064bb298a2a6db123 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 15 Aug 2014 21:18:46 +0200
Subject: [PATCH] (GX) Move sicksaxis GX files to input/ and rename it

---
 griffin/griffin.c                            |  2 +-
 gx/sicksaxis.c => input/gx_input_sicksaxis.c | 11 ++++++-----
 gx/sicksaxis.h => input/gx_input_sicksaxis.h |  3 +--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename gx/sicksaxis.c => input/gx_input_sicksaxis.c (98%)
 rename gx/sicksaxis.h => input/gx_input_sicksaxis.h (99%)

diff --git a/griffin/griffin.c b/griffin/griffin.c
index 685e55b229..c29b130379 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -294,7 +294,7 @@ INPUT
 #include "../input/autoconf/builtin_psp.c"
 #elif defined(GEKKO)
 #ifdef HAVE_LIBSICKSAXIS
-#include "../gx/sicksaxis.c"
+#include "../input/gx_input_sicksaxis.c"
 #endif
 #include "../input/gx_input.c"
 #include "../input/autoconf/builtin_gx.c"
diff --git a/gx/sicksaxis.c b/input/gx_input_sicksaxis.c
similarity index 98%
rename from gx/sicksaxis.c
rename to input/gx_input_sicksaxis.c
index d57b9c07a3..0ae6198290 100644
--- a/gx/sicksaxis.c
+++ b/input/gx_input_sicksaxis.c
@@ -1,4 +1,4 @@
-#include "sicksaxis.h"
+#include "gx_input_sicksaxis.h"
 #include <gccore.h>
 #include <stdio.h>
 #include <string.h>
@@ -34,11 +34,12 @@ static int _ss_set_operational(struct ss_device *dev);
 static int _ss_build_attributes_payload(struct ss_device *dev);
 static int _ss_send_attributes_payload(struct ss_device *dev);
 
-int ss_init()
+int ss_init(void)
 {
-    if (!_ss_inited) {
-        _ss_heap_id = iosCreateHeap(SS_HEAP_SIZE);
-        _ss_inited = 1;
+    if (!_ss_inited)
+    {
+       _ss_heap_id = iosCreateHeap(SS_HEAP_SIZE);
+       _ss_inited = 1;
     }
     return 1;
 }
diff --git a/gx/sicksaxis.h b/input/gx_input_sicksaxis.h
similarity index 99%
rename from gx/sicksaxis.h
rename to input/gx_input_sicksaxis.h
index c514aed5c3..5dfe5222a2 100644
--- a/gx/sicksaxis.h
+++ b/input/gx_input_sicksaxis.h
@@ -3,7 +3,6 @@
 
 #include <gccore.h>
 
-
 #define SS_HEAP_SIZE    4096
 #define SS_MAX_DEV      8
 #define SS_VENDOR_ID    0x054C
@@ -122,7 +121,7 @@ struct ss_device {
 }__attribute__((aligned(32)));
 
 
-int ss_init();
+int ss_init(void);
 int ss_initialize(struct ss_device *dev);
 int ss_open(struct ss_device *dev);
 int ss_close(struct ss_device *dev);