From 8036ff71ec5c2aa4b25a8d2ca30d47963ff2a3de Mon Sep 17 00:00:00 2001
From: Tau <tau@nowhere>
Date: Thu, 17 Jan 2019 14:07:59 -0500
Subject: [PATCH] board: Factor out Chunithm slider

---
 board/meson.build                   | 3 +++
 {chunihook => board}/slider-cmd.h   | 2 +-
 {chunihook => board}/slider-frame.c | 2 +-
 {chunihook => board}/slider-frame.h | 0
 chunihook/meson.build               | 3 ---
 chunihook/slider-hook.c             | 9 +++++----
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename {chunihook => board}/slider-cmd.h (95%)
 rename {chunihook => board}/slider-frame.c (99%)
 rename {chunihook => board}/slider-frame.h (100%)

diff --git a/board/meson.build b/board/meson.build
index b20dcdc..6ed2636 100644
--- a/board/meson.build
+++ b/board/meson.build
@@ -22,5 +22,8 @@ board_lib = static_library(
         'sg-nfc-cmd.h',
         'sg-frame.c',
         'sg-frame.h',
+        'slider-cmd.h',
+        'slider-frame.c',
+        'slider-frame.h',
     ],
 )
diff --git a/chunihook/slider-cmd.h b/board/slider-cmd.h
similarity index 95%
rename from chunihook/slider-cmd.h
rename to board/slider-cmd.h
index 5ba6afd..8a19ca7 100644
--- a/chunihook/slider-cmd.h
+++ b/board/slider-cmd.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "chunihook/slider-frame.h"
+#include "board/slider-frame.h"
 
 enum {
     SLIDER_CMD_AUTO_SCAN = 0x01,
diff --git a/chunihook/slider-frame.c b/board/slider-frame.c
similarity index 99%
rename from chunihook/slider-frame.c
rename to board/slider-frame.c
index af18e84..0e61b56 100644
--- a/chunihook/slider-frame.c
+++ b/board/slider-frame.c
@@ -5,7 +5,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "chunihook/slider-frame.h"
+#include "board/slider-frame.h"
 
 #include "hook/iobuf.h"
 
diff --git a/chunihook/slider-frame.h b/board/slider-frame.h
similarity index 100%
rename from chunihook/slider-frame.h
rename to board/slider-frame.h
diff --git a/chunihook/meson.build b/chunihook/meson.build
index a643f21..3c299a6 100644
--- a/chunihook/meson.build
+++ b/chunihook/meson.build
@@ -21,9 +21,6 @@ shared_library(
         'dllmain.c',
         'jvs.c',
         'jvs.h',
-        'slider-cmd.h',
-        'slider-frame.c',
-        'slider-frame.h',
         'slider-hook.c',
         'slider-hook.h',
     ],
diff --git a/chunihook/slider-hook.c b/chunihook/slider-hook.c
index 46ba1c6..77f82f2 100644
--- a/chunihook/slider-hook.c
+++ b/chunihook/slider-hook.c
@@ -6,11 +6,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#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"
@@ -18,6 +16,9 @@
 
 #include "hooklib/uart.h"
 
+#include "util/dprintf.h"
+#include "util/dump.h"
+
 static HRESULT slider_handle_irp(struct irp *irp);
 static HRESULT slider_handle_irp_locked(struct irp *irp);