moved all usb implementation files to seperate folder

itzandroidtab · itzandroidtab · commit 542f9c5d31cd · 2024-08-11T13:30:55.000+02:00
diff --git a/klib/usb/device/bulk.hpp b/klib/usb/device/bulk.hpp
@@ -4,8 +4,8 @@
 #include <algorithm>
 
 #include <klib/string.hpp>
-#include <klib/usb/device.hpp>
-#include <klib/usb/descriptor.hpp>
+#include <klib/usb/usb/device.hpp>
+#include <klib/usb/usb/descriptor.hpp>
 
 namespace klib::usb::device {
     template <uint8_t InEndpoint = 0x2, uint8_t OutEndpoint = 0x05>
diff --git a/klib/usb/device/device_template.hpp b/klib/usb/device/device_template.hpp
@@ -3,7 +3,7 @@
 
 #include <algorithm>
 
-#include <klib/usb/device.hpp>
+#include <klib/usb/usb/device.hpp>
 
 namespace klib::usb::device {
     class device_template {
diff --git a/klib/usb/device/dfu.hpp b/klib/usb/device/dfu.hpp
@@ -4,10 +4,10 @@
 #include <algorithm>
 #include <cstdint>
 
-#include <klib/usb/usb.hpp>
-#include <klib/usb/dfu/descriptor.hpp>
-#include <klib/usb/device.hpp>
-#include <klib/usb/dfu/request.hpp>
+#include <klib/usb/usb/usb.hpp>
+#include <klib/usb/usb/device.hpp>
+#include <klib/usb/usb/dfu/descriptor.hpp>
+#include <klib/usb/usb/dfu/request.hpp>
 
 namespace klib::usb::device {
     template <typename Memory, uint32_t TransferSize = 64>
diff --git a/klib/usb/device/keyboard.hpp b/klib/usb/device/keyboard.hpp
@@ -4,9 +4,9 @@
 #include <algorithm>
 
 #include <klib/string.hpp>
-#include <klib/usb/device.hpp>
-#include <klib/usb/descriptor.hpp>
-#include <klib/usb/hid/descriptor.hpp>
+#include <klib/usb/usb/device.hpp>
+#include <klib/usb/usb/descriptor.hpp>
+#include <klib/usb/usb/hid/descriptor.hpp>
 
 namespace klib::usb::device {
     template <uint32_t Endpoint = 6>
diff --git a/klib/usb/device/mass_storage.hpp b/klib/usb/device/mass_storage.hpp
@@ -1,11 +1,10 @@
 #ifndef KLIB_USB_MASS_STORAGE_HPP
 #define KLIB_USB_MASS_STORAGE_HPP
 
-#include <klib/usb/device.hpp>
-#include <klib/usb/capability.hpp>
-
-#include <klib/usb/msc/msc.hpp>
-#include <klib/usb/msc/bulk_only_transfer.hpp>
+#include <klib/usb/usb/device.hpp>
+#include <klib/usb/usb/capability.hpp>
+#include <klib/usb/usb/msc/msc.hpp>
+#include <klib/usb/usb/msc/bulk_only_transfer.hpp>
 
 namespace klib::usb::device {
     template <typename Memory, uint8_t InEndpoint = 0x02, uint8_t OutEndpoint = 0x05>
diff --git a/klib/usb/device/mouse.hpp b/klib/usb/device/mouse.hpp
@@ -4,9 +4,9 @@
 #include <algorithm>
 
 #include <klib/string.hpp>
-#include <klib/usb/device.hpp>
-#include <klib/usb/descriptor.hpp>
-#include <klib/usb/hid/descriptor.hpp>
+#include <klib/usb/usb/device.hpp>
+#include <klib/usb/usb/descriptor.hpp>
+#include <klib/usb/usb/hid/descriptor.hpp>
 
 namespace klib::usb::device {
     template <uint32_t Endpoint = 6>
diff --git a/klib/usb/device/serial.hpp b/klib/usb/device/serial.hpp
@@ -6,9 +6,9 @@
 
 #include <klib/ringbuffer.hpp>
 #include <klib/string.hpp>
-#include <klib/usb/device.hpp>
-#include <klib/usb/descriptor.hpp>
-#include <klib/usb/cdc/descriptor.hpp>
+#include <klib/usb/usb/device.hpp>
+#include <klib/usb/usb/descriptor.hpp>
+#include <klib/usb/usb/cdc/descriptor.hpp>
 
 namespace klib::usb::device {
     template <uint8_t CmdEndpoint = 1, uint8_t OutEndpoint = 2, uint8_t InEndpoint = 3, uint32_t RxSize = 128>
diff --git a/klib/usb/usb/capability.hpp b/klib/usb/usb/capability.hpp
diff --git a/klib/usb/usb/cdc/descriptor.hpp b/klib/usb/usb/cdc/descriptor.hpp
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include <klib/usb/descriptor.hpp>
+#include <klib/usb/usb/descriptor.hpp>
 
 // Push the current pack to the stack and set the pack to 1
 // as all these structs have specific sizes
diff --git a/klib/usb/usb/descriptor.hpp b/klib/usb/usb/descriptor.hpp
diff --git a/klib/usb/usb/device.hpp b/klib/usb/usb/device.hpp
@@ -1,8 +1,8 @@
 #ifndef KLIB_USB_DEVICE_HPP
 #define KLIB_USB_DEVICE_HPP
 
-#include <klib/usb/usb.hpp>
-#include <klib/usb/descriptor.hpp>
+#include "usb.hpp"
+#include "descriptor.hpp"
 
 namespace klib::usb::device {
     /**
diff --git a/klib/usb/usb/dfu/descriptor.hpp b/klib/usb/usb/dfu/descriptor.hpp
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include <klib/usb/descriptor.hpp>
+#include <klib/usb/usb/descriptor.hpp>
 
 // Push the current pack to the stack and set the pack to 1
 // as all these structs have specific sizes
diff --git a/klib/usb/usb/dfu/request.hpp b/klib/usb/usb/dfu/request.hpp
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include <klib/usb/descriptor.hpp>
+#include <klib/usb/usb/descriptor.hpp>
 
 // Push the current pack to the stack and set the pack to 1
 // as all these structs have specific sizes
diff --git a/klib/usb/usb/hid/descriptor.hpp b/klib/usb/usb/hid/descriptor.hpp
diff --git a/klib/usb/usb/msc/bot.hpp b/klib/usb/usb/msc/bot.hpp
diff --git a/klib/usb/usb/msc/bulk_only_transfer.hpp b/klib/usb/usb/msc/bulk_only_transfer.hpp
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <algorithm>
 
-#include <klib/usb/usb.hpp>
+#include <klib/usb/usb/usb.hpp>
 #include <klib/string.hpp>
 
 #include "bot.hpp"
diff --git a/klib/usb/usb/msc/msc.hpp b/klib/usb/usb/msc/msc.hpp
diff --git a/klib/usb/usb/setup.hpp b/klib/usb/usb/setup.hpp
diff --git a/klib/usb/usb/usb.hpp b/klib/usb/usb/usb.hpp
diff --git a/targets/chip/max32625/io/usb.hpp b/targets/chip/max32625/io/usb.hpp
@@ -4,7 +4,7 @@
 #include <max32625.hpp>
 
 #include <klib/irq_helper.hpp>
-#include <klib/usb/usb.hpp>
+#include <klib/usb/usb/usb.hpp>
 #include <klib/math.hpp>
 
 #include "clocks.hpp"
diff --git a/targets/core/atmel/atsam4s/usb.hpp b/targets/core/atmel/atsam4s/usb.hpp
@@ -4,7 +4,7 @@
 #include <span>
 
 #include <klib/klib.hpp>
-#include <klib/usb/usb.hpp>
+#include <klib/usb/usb/usb.hpp>
 #include <klib/math.hpp>
 
 #include <io/power.hpp>
diff --git a/targets/core/nxp/lpc17xx/usb.hpp b/targets/core/nxp/lpc17xx/usb.hpp
@@ -4,7 +4,7 @@
 #include <span>
 
 #include <klib/klib.hpp>
-#include <klib/usb/usb.hpp>
+#include <klib/usb/usb/usb.hpp>
 #include <klib/math.hpp>
 
 #include <io/power.hpp>
