2 files changed, 14 insertions, 7 deletions
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index ae78587..79d294e 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -6,7 +6,7 @@
 
 #include <zmk/endpoints.h>
 #include <zmk/hid.h>
-#include <zmk/usb_hid.h>
+#include <zmk/usb.h>
 #include <zmk/hog.h>
 
 #include <logging/log.h>
diff --git a/app/src/usb_hid.c b/app/src/usb.c
index 64addae..434b3d4 100644
--- a/app/src/usb_hid.c
+++ b/app/src/usb.c
@@ -18,6 +18,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 static enum usb_dc_status_code usb_status = USB_DC_UNKNOWN;
 
+#ifdef CONFIG_ZMK_USB
+
 static struct device *hid_dev;
 
 static K_SEM_DEFINE(hid_sem, 1, 1);
@@ -28,8 +30,6 @@ static const struct hid_ops ops = {
     .int_in_ready = in_ready_cb,
 };
 
-enum usb_dc_status_code zmk_usb_hid_get_status() { return usb_status; }
-
 int zmk_usb_hid_send_report(const u8_t *report, size_t len) {
     switch (usb_status) {
     case USB_DC_SUSPEND:
@@ -51,11 +51,16 @@ int zmk_usb_hid_send_report(const u8_t *report, size_t len) {
     }
 }
 
-void usb_hid_status_cb(enum usb_dc_status_code status, const u8_t *params) { usb_status = status; };
+#endif /* CONFIG_ZMK_USB */
+
+enum usb_dc_status_code zmk_usb_get_status() { return usb_status; }
 
-static int zmk_usb_hid_init(struct device *_arg) {
+void usb_status_cb(enum usb_dc_status_code status, const u8_t *params) { usb_status = status; };
+
+static int zmk_usb_init(struct device *_arg) {
     int usb_enable_ret;
 
+#ifdef CONFIG_ZMK_USB
     hid_dev = device_get_binding("HID_0");
     if (hid_dev == NULL) {
         LOG_ERR("Unable to locate HID device");
@@ -66,7 +71,9 @@ static int zmk_usb_hid_init(struct device *_arg) {
 
     usb_hid_init(hid_dev);
 
-    usb_enable_ret = usb_enable(usb_hid_status_cb);
+#endif /* CONFIG_ZMK_USB */
+
+    usb_enable_ret = usb_enable(usb_status_cb);
 
     if (usb_enable_ret != 0) {
         LOG_ERR("Unable to enable USB");
@@ -76,4 +83,4 @@ static int zmk_usb_hid_init(struct device *_arg) {
     return 0;
 }
 
-SYS_INIT(zmk_usb_hid_init, APPLICATION, CONFIG_ZMK_USB_INIT_PRIORITY);
+SYS_INIT(zmk_usb_init, APPLICATION, CONFIG_ZMK_USB_INIT_PRIORITY);