From 9f43f9f397caf20595712fe204cd05d507969e6d Mon Sep 17 00:00:00 2001
From: Tau <tau@nowhere>
Date: Tue, 13 Nov 2018 19:36:34 -0500
Subject: [PATCH] Hoist slider from board into chunihook

Diva slider uses the quasi-JVS framing used by all other SEGA
boards, the Chunithm slider is a special case.
---
 board/meson.build                     | 3 ---
 chunihook/dllmain.c                   | 2 +-
 chunihook/meson.build                 | 7 +++++--
 {board => chunihook}/slider-cmd.h     | 2 +-
 {board => chunihook}/slider-frame.c   | 2 +-
 {board => chunihook}/slider-frame.h   | 0
 chunihook/{slider.c => slider-hook.c} | 5 +++--
 chunihook/{slider.h => slider-hook.h} | 0
 8 files changed, 11 insertions(+), 10 deletions(-)
 rename {board => chunihook}/slider-cmd.h (95%)
 rename {board => chunihook}/slider-frame.c (99%)
 rename {board => chunihook}/slider-frame.h (100%)
 rename chunihook/{slider.c => slider-hook.c} (98%)
 rename chunihook/{slider.h => slider-hook.h} (100%)

diff --git a/board/meson.build b/board/meson.build
index 003b4f1..6bde450 100644
--- a/board/meson.build
+++ b/board/meson.build
@@ -9,8 +9,5 @@ board_lib = static_library(
     sources : [
         'io3.c',
         'io3.h',
-        'slider-cmd.h',
-        'slider-frame.c',
-        'slider-frame.h',
     ],
 )
diff --git a/chunihook/dllmain.c b/chunihook/dllmain.c
index ad38482..b75ce35 100644
--- a/chunihook/dllmain.c
+++ b/chunihook/dllmain.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 
 #include "chunihook/jvs.h"
-#include "chunihook/slider.h"
+#include "chunihook/slider-hook.h"
 
 #include "hook/process.h"
 
diff --git a/chunihook/meson.build b/chunihook/meson.build
index 8c0772d..27f9190 100644
--- a/chunihook/meson.build
+++ b/chunihook/meson.build
@@ -19,7 +19,10 @@ shared_library(
         'dllmain.c',
         'jvs.c',
         'jvs.h',
-        'slider.c',
-        'slider.h',
+        'slider-cmd.h',
+        'slider-frame.c',
+        'slider-frame.h',
+        'slider-hook.c',
+        'slider-hook.h',
     ],
 )
diff --git a/board/slider-cmd.h b/chunihook/slider-cmd.h
similarity index 95%
rename from board/slider-cmd.h
rename to chunihook/slider-cmd.h
index 8a19ca7..5ba6afd 100644
--- a/board/slider-cmd.h
+++ b/chunihook/slider-cmd.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "board/slider-frame.h"
+#include "chunihook/slider-frame.h"
 
 enum {
     SLIDER_CMD_AUTO_SCAN = 0x01,
diff --git a/board/slider-frame.c b/chunihook/slider-frame.c
similarity index 99%
rename from board/slider-frame.c
rename to chunihook/slider-frame.c
index c1409e8..1cb1091 100644
--- a/board/slider-frame.c
+++ b/chunihook/slider-frame.c
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "board/slider-frame.h"
+#include "chunihook/slider-frame.h"
 
 #include "hook/iobuf.h"
 
diff --git a/board/slider-frame.h b/chunihook/slider-frame.h
similarity index 100%
rename from board/slider-frame.h
rename to chunihook/slider-frame.h
diff --git a/chunihook/slider.c b/chunihook/slider-hook.c
similarity index 98%
rename from chunihook/slider.c
rename to chunihook/slider-hook.c
index 55fbf8a..46ba1c6 100644
--- a/chunihook/slider.c
+++ b/chunihook/slider-hook.c
@@ -9,8 +9,9 @@
 #include "util/dprintf.h"
 #include "util/dump.h"
 
-#include "board/slider-cmd.h"
-#include "board/slider-frame.h"
+#include "chunihook/slider-cmd.h"
+#include "chunihook/slider-frame.h"
+#include "chunihook/slider-hook.h"
 
 #include "hook/iobuf.h"
 #include "hook/iohook.h"
diff --git a/chunihook/slider.h b/chunihook/slider-hook.h
similarity index 100%
rename from chunihook/slider.h
rename to chunihook/slider-hook.h