[ADAPTER] Initial JVS support

main/CMakeLists.txt

@@ -5,6 +5,7 @@ idf_component_register(SRCS "main.c"
                             "adapter/hid_generic.c"
                             "adapter/npiso.c"
                             "adapter/segaio.c"
+                            "adapter/jvs.c"
                             "adapter/n64.c"
                             "adapter/dc.c"
                             "adapter/gc.c"

main/adapter/adapter.c

@@ -12,6 +12,7 @@
 #include "adapter.h"
 #include "npiso.h"
 #include "segaio.h"
+#include "jvs.h"
 #include "n64.h"
 #include "dc.h"
 #include "gc.h"
@@ -66,7 +67,7 @@ static from_generic_t from_generic_func[WIRED_MAX] = {
     NULL, /* PSX */
     segaio_from_generic, /* SATURN */
     NULL, /* PCFX */
-    NULL, /* JVS */
+    jvs_from_generic, /* JVS */
     n64_from_generic, /* N64 */
     dc_from_generic, /* DC */
     NULL, /* PS2 */
@@ -127,7 +128,7 @@ static meta_init_t meta_init_func[WIRED_MAX] = {
     NULL, /* PSX */
     segaio_meta_init, /* SATURN */
     NULL, /* PCFX */
-    NULL, /* JVS */
+    jvs_meta_init, /* JVS */
     n64_meta_init, /* N64 */
     dc_meta_init, /* DC */
     NULL, /* PS2 */
@@ -151,7 +152,7 @@ static buffer_init_t buffer_init_func[WIRED_MAX] = {
     NULL, /* PSX */
     segaio_init_buffer, /* SATURN */
     NULL, /* PCFX */
-    NULL, /* JVS */
+    jvs_init_buffer, /* JVS */
     n64_init_buffer, /* N64 */
     dc_init_buffer, /* DC */
     NULL, /* PS2 */

main/adapter/adapter.h

@@ -247,6 +247,7 @@ enum {
 enum {
     WIRED_NEW_DATA,
     WIRED_SAVE_MEM,
+    WIRED_WAITING_FOR_RELEASE,
 };
 
 /* Dev mode */

main/adapter/jvs.c

@@ -0,0 +1,143 @@
+#include <string.h>
+#include "../zephyr/types.h"
+#include "../zephyr/atomic.h"
+#include "../util.h"
+#include "jvs.h"
+
+#define JVS_AXES_MAX 2
+
+enum {
+    JVS_2 = 0,
+    JVS_1,
+    JVS_LD_RIGHT,
+    JVS_LD_LEFT,
+    JVS_LD_DOWN,
+    JVS_LD_UP,
+    JVS_SERVICE,
+    JVS_START,
+    JVS_10,
+    JVS_9,
+    JVS_8,
+    JVS_7,
+    JVS_6,
+    JVS_5,
+    JVS_4,
+    JVS_3,
+};
+
+const uint8_t jvs_axes_idx[JVS_AXES_MAX] =
+{
+/*  AXIS_LX, AXIS_LY  */
+    0,       1,
+};
+
+const struct ctrl_meta jvs_axes_meta[JVS_AXES_MAX] =
+{
+    {.size_min = -32768, .size_max = 32767, .neutral = 0x8000, .abs_max = 0x8000},
+    {.size_min = -32768, .size_max = 32767, .neutral = 0x8000, .abs_max = 0x8000},
+};
+
+struct jvs_map {
+    uint16_t coins;
+    uint16_t buttons;
+    uint16_t axes[2];
+    uint8_t test;
+} __packed;
+
+const uint32_t jvs_mask[4] = {0xBBFF0F0F, 0x00000000, 0x00000000, 0x00000000};
+const uint32_t jvs_desc[4] = {0x0000000F, 0x00000000, 0x00000000, 0x00000000};
+
+const uint32_t jvs_btns_mask[32] = {
+    0, 0, 0, 0,
+    0, 0, 0, 0,
+    BIT(JVS_LD_LEFT), BIT(JVS_LD_RIGHT), BIT(JVS_LD_DOWN), BIT(JVS_LD_UP),
+    0, 0, 0, 0,
+    BIT(JVS_3), BIT(JVS_2), BIT(JVS_1), BIT(JVS_4),
+    BIT(JVS_START), 0, BIT(JVS_SERVICE), 0,
+    BIT(JVS_5), BIT(JVS_7), 0, BIT(JVS_9),
+    BIT(JVS_6), BIT(JVS_8), 0, BIT(JVS_10),
+};
+
+void jvs_init_buffer(int32_t dev_mode, struct wired_data *wired_data) {
+    struct jvs_map *map = (struct jvs_map *)wired_data->output;
+
+    map->coins = 0x0000;
+    map->buttons = 0x0000;
+    for (uint32_t i = 0; i < JVS_AXES_MAX; i++) {
+        map->axes[jvs_axes_idx[i]] = jvs_axes_meta[i].neutral;
+    }
+}
+
+void jvs_meta_init(int32_t dev_mode, struct generic_ctrl *ctrl_data) {
+    memset((void *)ctrl_data, 0, sizeof(*ctrl_data)*4);
+
+    for (uint32_t i = 0; i < WIRED_MAX_DEV; i++) {
+        for (uint32_t j = 0; j < JVS_AXES_MAX; j++) {
+            ctrl_data[i].mask = jvs_mask;
+            ctrl_data[i].desc = jvs_desc;
+            ctrl_data[i].axes[j].meta = &jvs_axes_meta[j];
+        }
+    }
+}
+
+void jvs_from_generic(int32_t dev_mode, struct generic_ctrl *ctrl_data, struct wired_data *wired_data) {
+    struct jvs_map map_tmp;
+    uint32_t map_mask = 0xFFFF;
+
+    memcpy((void *)&map_tmp, wired_data->output, sizeof(map_tmp));
+
+    for (uint32_t i = 0; i < ARRAY_SIZE(generic_btns_mask); i++) {
+        if (ctrl_data->map_mask[0] & generic_btns_mask[i]) {
+            if (ctrl_data->btns[0].value & generic_btns_mask[i]) {
+                map_tmp.buttons |= jvs_btns_mask[i];
+                map_mask &= ~jvs_btns_mask[i];
+            }
+            else if (map_mask & jvs_btns_mask[i]) {
+                map_tmp.buttons &= ~jvs_btns_mask[i];
+            }
+        }
+    }
+
+    if (ctrl_data->map_mask[0] & generic_btns_mask[PAD_MS]) {
+        if (ctrl_data->btns[0].value & generic_btns_mask[PAD_MS]) {
+            if (!atomic_test_bit(&wired_data->flags, WIRED_WAITING_FOR_RELEASE)) {
+                atomic_set_bit(&wired_data->flags, WIRED_WAITING_FOR_RELEASE);
+            }
+        }
+        else {
+            if (atomic_test_bit(&wired_data->flags, WIRED_WAITING_FOR_RELEASE)) {
+                uint16_t val_cpu = sys_be16_to_cpu(map_tmp.coins);
+                atomic_clear_bit(&wired_data->flags, WIRED_WAITING_FOR_RELEASE);
+                if (val_cpu < 16383) {
+                    val_cpu++;
+                    map_tmp.coins = sys_cpu_to_be16(val_cpu);
+                }
+            }
+        }
+    }
+
+    if (ctrl_data->map_mask[0] & generic_btns_mask[PAD_MQ]) {
+        if (ctrl_data->btns[0].value & generic_btns_mask[PAD_MQ]) {
+            map_tmp.test |= 0x80;
+        }
+        else {
+            map_tmp.test &= ~0x80;
+        }
+    }
+
+    for (uint32_t i = 0; i < JVS_AXES_MAX; i++) {
+        if (ctrl_data->map_mask[0] & (axis_to_btn_mask(i) & jvs_desc[0])) {
+            if (ctrl_data->axes[i].value > ctrl_data->axes[i].meta->size_max) {
+                *(uint16_t *)&map_tmp.axes[jvs_axes_idx[i]] = sys_cpu_to_be16(32767);
+            }
+            else if (ctrl_data->axes[i].value < ctrl_data->axes[i].meta->size_min) {
+                *(uint16_t *)&map_tmp.axes[jvs_axes_idx[i]] = sys_cpu_to_be16(-32768);
+            }
+            else {
+                *(uint16_t *)&map_tmp.axes[jvs_axes_idx[i]] = sys_cpu_to_be16((uint16_t)(ctrl_data->axes[i].value + ctrl_data->axes[i].meta->neutral));
+            }
+        }
+    }
+
+    memcpy(wired_data->output, (void *)&map_tmp, sizeof(map_tmp));
+}

main/adapter/jvs.h

@@ -0,0 +1,9 @@
+#ifndef _JVS_H_
+#define _JVS_H_
+#include "adapter.h"
+
+void jvs_meta_init(int32_t dev_mode, struct generic_ctrl *ctrl_data);
+void jvs_init_buffer(int32_t dev_mode, struct wired_data *wired_data);
+void jvs_from_generic(int32_t dev_mode, struct generic_ctrl *ctrl_data, struct wired_data *wired_data);
+
+#endif /* _JVS_H_ */

main/main.c

@@ -54,7 +54,7 @@ static const wired_init_t wired_init[WIRED_MAX] = {
     NULL, /* PSX */
     sega_io_init, /* SATURN */
     NULL, /* PCFX */
-    NULL, /* JVS */
+    jvs_init, /* JVS */
     nsi_init, /* N64 */
     maple_init, /* DC */
     NULL, /* PS2 */