Relocate usb_detach to utils (qmk#5121)

* Relocate usb_detach to utils * Relocate usb_detach to utils - fix up files after move
axelson · Feb 18, 2019 · 1a6a2a7 · 1a6a2a7
1 parent 545f95c
commit 1a6a2a7
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 105 deletions.
diff --git a/keyboards/jj40/tools/usb_detach.c b/keyboards/jj40/tools/usb_detach.c
diff --git a/keyboards/jj4x4/tools/README.md b/keyboards/jj4x4/tools/README.md
diff --git a/keyboards/jj4x4/tools/usb_detach.c b/keyboards/jj4x4/tools/usb_detach.c
diff --git a/keyboards/ymd96/tools/README.md b/keyboards/ymd96/tools/README.md
diff --git a/util/usb_detach/Makefile b/util/usb_detach/Makefile
@@ -0,0 +1,18 @@
+# the compiler: gcc for C program, define as g++ for C++
+CC = gcc
+
+# compiler flags:
+#  -g    adds debugging information to the executable file
+#  -Wall turns on most, but not all, compiler warnings
+CFLAGS  = -g -Wall
+
+# the build target executable:
+TARGET = usb_detach
+
+all: $(TARGET)
+
+$(TARGET): $(TARGET).c
+	$(CC) $(CFLAGS) -o $(TARGET) $(TARGET).c
+
+clean:
+	$(RM) $(TARGET)
diff --git a/keyboards/jj40/tools/README.md → util/usb_detach/readme.md b/keyboards/jj40/tools/README.md → util/usb_detach/readme.md
@@ -1,16 +1,14 @@
-# JJ40 Tools
-
-## usb_detach.c
+# usb_detach
 
 When trying to flash on Linux, you may encounter a "Resource Unavailable" error. This means that Linux's HID driver has taken exclusive control of the keyboard, and the program script can't flash it.
 This program can force Linux to give up a device, so that the programming script can reset it.
 
-### To compile:
-```
-gcc usb_detach.c -o usb_detach
+## To compile:
+```bash
+make clean && make
 ```
 
-### To run:
+## To run:
 1. Use `lsusb` to discover the Bus and Device numbers for your keyboard.
 2. Run the program: `sudo ./usb_detach /dev/bus/usb/<BUS>/<DEVICE>`.
 3. Build and program the firmware as normal.
diff --git a/keyboards/ymd96/tools/usb_detach.c → util/usb_detach/usb_detach.c b/keyboards/ymd96/tools/usb_detach.c → util/usb_detach/usb_detach.c
@@ -1,5 +1,6 @@
 /* Found at https://www.linuxquestions.org/questions/linux-hardware-18/how-to-unclaim-usb-device-558138/#post3406986 */
 #include <stdio.h>
+#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>