kc3-lang/SDL

diff --git a/Makefile.vita.gles2.dolce b/Makefile.vita.gles2.dolce
index 7573cf4..7ad460c 100644
--- a/Makefile.vita.gles2.dolce
+++ b/Makefile.vita.gles2.dolce
@@ -23,7 +23,7 @@ SOURCES = \
 	src/render/software/*.c \
 	src/render/vitagles2/*.c \
 	src/sensor/*.c \
-	src/sensor/dummy/*.c \
+	src/sensor/vita/*.c \
 	src/stdlib/*.c \
 	src/thread/*.c \
 	src/thread/generic/SDL_systls.c \
diff --git a/Makefile.vita.gxm.dolce b/Makefile.vita.gxm.dolce
index ca84ccd..bc560fd 100644
--- a/Makefile.vita.gxm.dolce
+++ b/Makefile.vita.gxm.dolce
@@ -23,7 +23,7 @@ SOURCES = \
 	src/render/software/*.c \
 	src/render/vitagxm/*.c \
 	src/sensor/*.c \
-	src/sensor/dummy/*.c \
+	src/sensor/vita/*.c \
 	src/stdlib/*.c \
 	src/thread/*.c \
 	src/thread/generic/SDL_systls.c \
diff --git a/include/SDL_config_vita.h b/include/SDL_config_vita.h
index dad5098..e34767d 100644
--- a/include/SDL_config_vita.h
+++ b/include/SDL_config_vita.h
@@ -137,6 +137,7 @@
 #define SDL_POWER_VITA 1
 #define SDL_VIDEO_DRIVER_VITA  1
 #define SDL_FILESYSTEM_VITA   1
+#define SDL_SENSOR_VITA 1
 
 #if defined(_VITA_GLES2_)
  #define SDL_VIDEO_RENDER_VITA_GLES2 1
@@ -156,8 +157,4 @@
 // that' not true, but oh well
 #define SDL_LOADSO_DISABLED    1
 
-/* TODO: VITA does have gyroscope. */
-#define SDL_SENSOR_DISABLED 1
-#define SDL_SENSOR_DUMMY  1
-
 #endif /* _SDL_config_vita_h */
diff --git a/src/sensor/SDL_sensor.c b/src/sensor/SDL_sensor.c
index 8523a9e..9b4f30d 100644
--- a/src/sensor/SDL_sensor.c
+++ b/src/sensor/SDL_sensor.c
@@ -44,6 +44,9 @@ static SDL_SensorDriver *SDL_sensor_drivers[] = {
 #if defined(SDL_SENSOR_DUMMY) || defined(SDL_SENSOR_DISABLED)
     &SDL_DUMMY_SensorDriver
 #endif
+#if defined(SDL_SENSOR_VITA)
+    &SDL_VITA_SensorDriver
+#endif
 };
 static SDL_Sensor *SDL_sensors = NULL;
 static SDL_bool SDL_updating_sensor = SDL_FALSE;
diff --git a/src/sensor/SDL_syssensor.h b/src/sensor/SDL_syssensor.h
index 29fe5dd..7baf9b3 100644
--- a/src/sensor/SDL_syssensor.h
+++ b/src/sensor/SDL_syssensor.h
@@ -100,6 +100,7 @@ extern SDL_SensorDriver SDL_ANDROID_SensorDriver;
 extern SDL_SensorDriver SDL_COREMOTION_SensorDriver;
 extern SDL_SensorDriver SDL_WINDOWS_SensorDriver;
 extern SDL_SensorDriver SDL_DUMMY_SensorDriver;
+extern SDL_SensorDriver SDL_VITA_SensorDriver;
 
 #endif /* SDL_syssensor_h_ */
 
diff --git a/src/sensor/vita/SDL_vitasensor.c b/src/sensor/vita/SDL_vitasensor.c
new file mode 100644
index 0000000..286ab12
--- /dev/null
+++ b/src/sensor/vita/SDL_vitasensor.c
@@ -0,0 +1,189 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_config.h"
+
+#if defined(SDL_SENSOR_VITA)
+
+#include "SDL_error.h"
+#include "SDL_sensor.h"
+#include "SDL_vitasensor.h"
+#include "../SDL_syssensor.h"
+#include <psp2/motion.h>
+#include <psp2/error.h>
+
+typedef struct
+{
+    SDL_SensorType type;
+    SDL_SensorID instance_id;
+} SDL_VitaSensor;
+
+static SDL_VitaSensor *SDL_sensors;
+static int SDL_sensors_count;
+
+static int
+SDL_VITA_SensorInit(void)
+{
+    sceMotionReset();
+    sceMotionStartSampling();
+//    sceMotionMagnetometerOn();
+    sceMotionSetAngleThreshold(40);
+    sceMotionSetGyroBiasCorrection(SCE_TRUE);
+
+    SDL_sensors_count = 2;
+
+    SDL_sensors = (SDL_VitaSensor *)SDL_calloc(SDL_sensors_count, sizeof(*SDL_sensors));
+    if (!SDL_sensors) {
+        return SDL_OutOfMemory();
+    }
+
+    SDL_sensors[0].type = SDL_SENSOR_ACCEL;
+    SDL_sensors[0].instance_id = SDL_GetNextSensorInstanceID();
+    SDL_sensors[1].type = SDL_SENSOR_GYRO;
+    SDL_sensors[1].instance_id = SDL_GetNextSensorInstanceID();
+
+    return 0;
+}
+
+static int
+SDL_VITA_SensorGetCount(void)
+{
+    return SDL_sensors_count;
+}
+
+static void
+SDL_VITA_SensorDetect(void)
+{
+}
+
+static const char *
+SDL_VITA_SensorGetDeviceName(int device_index)
+{
+    if (device_index < SDL_sensors_count) {
+        switch (SDL_sensors[device_index].type) {
+            case SDL_SENSOR_ACCEL:
+                return "Accelerometer";
+            case SDL_SENSOR_GYRO:
+                return "Gyro";
+            default:
+                return "Unknown";
+        }
+    }
+
+    return NULL;
+}
+
+static SDL_SensorType
+SDL_VITA_SensorGetDeviceType(int device_index)
+{
+    if (device_index < SDL_sensors_count) {
+        return SDL_sensors[device_index].type;
+    }
+
+    return SDL_SENSOR_INVALID;
+}
+
+static int
+SDL_VITA_SensorGetDeviceNonPortableType(int device_index)
+{
+    if (device_index < SDL_sensors_count) {
+        return SDL_sensors[device_index].type;
+    }
+    return -1;
+}
+
+static SDL_SensorID
+SDL_VITA_SensorGetDeviceInstanceID(int device_index)
+{
+    if (device_index < SDL_sensors_count) {
+        return SDL_sensors[device_index].instance_id;
+    }
+    return -1;
+}
+
+static int
+SDL_VITA_SensorOpen(SDL_Sensor *sensor, int device_index)
+{
+    return 0;
+}
+
+static void
+SDL_VITA_SensorUpdate(SDL_Sensor *sensor)
+{
+    SceMotionState motionState;
+    int err = SCE_OK;
+    err = sceMotionGetState(&motionState);
+    if (err != SCE_OK) return;
+
+    switch (sensor->type)
+    {
+        case SDL_SENSOR_ACCEL:
+        {
+            float data[3];
+            data[0] = motionState.acceleration.x * SDL_STANDARD_GRAVITY;
+            data[1] = motionState.acceleration.y * SDL_STANDARD_GRAVITY;
+            data[2] = motionState.acceleration.z * SDL_STANDARD_GRAVITY;
+            SDL_PrivateSensorUpdate(sensor, data, SDL_arraysize(data));
+        }
+        break;
+        case SDL_SENSOR_GYRO:
+        {
+            float data[3];
+            data[0] = motionState.angularVelocity.x;
+            data[1] = motionState.angularVelocity.y;
+            data[2] = motionState.angularVelocity.z;
+            SDL_PrivateSensorUpdate(sensor, data, SDL_arraysize(data));
+        }
+        break;
+        default:
+        break;
+    }
+}
+
+static void
+SDL_VITA_SensorClose(SDL_Sensor *sensor)
+{
+}
+
+static void
+SDL_VITA_SensorQuit(void)
+{
+    sceMotionStopSampling();
+}
+
+SDL_SensorDriver SDL_VITA_SensorDriver =
+{
+    SDL_VITA_SensorInit,
+    SDL_VITA_SensorGetCount,
+    SDL_VITA_SensorDetect,
+    SDL_VITA_SensorGetDeviceName,
+    SDL_VITA_SensorGetDeviceType,
+    SDL_VITA_SensorGetDeviceNonPortableType,
+    SDL_VITA_SensorGetDeviceInstanceID,
+    SDL_VITA_SensorOpen,
+    SDL_VITA_SensorUpdate,
+    SDL_VITA_SensorClose,
+    SDL_VITA_SensorQuit,
+};
+
+#endif /* SDL_SENSOR_VITA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/vita/SDL_vitasensor.h b/src/sensor/vita/SDL_vitasensor.h
new file mode 100644
index 0000000..ee66f2f
--- /dev/null
+++ b/src/sensor/vita/SDL_vitasensor.h
@@ -0,0 +1,23 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+/* vi: set ts=4 sw=4 expandtab: */