From b8e4aa54e22c9d21b047f8363179210e83a28d60 Mon Sep 17 00:00:00 2001
From: Benedek Kupper <kupper.benedek@gmail.com>
Date: Sat, 9 Nov 2024 22:32:53 +0100
Subject: [PATCH] import c2usb not as submodule, but as zephyr module

---
 .gitmodules           | 3 ---
 device/CMakeLists.txt | 4 ----
 device/Kconfig        | 2 --
 device/c2usb          | 1 -
 lib/c2usb             | 1 -
 west.yml              | 8 +++++++-
 6 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 120000 device/c2usb
 delete mode 160000 lib/c2usb

diff --git a/.gitmodules b/.gitmodules
index 3e5c6e8ec..2f6263328 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule "lib/SDK_2.8.0_MKL17Z32xxx4"]
 	path = lib/SDK_2.8.0_MKL17Z32xxx4
 	url = https://github.com/UltimateHackingKeyboard/SDK_2.8.0_MKL17Z32xxx4.git
-[submodule "lib/c2usb"]
-	path = lib/c2usb
-	url = https://github.com/IntergatedCircuits/c2usb.git
diff --git a/device/CMakeLists.txt b/device/CMakeLists.txt
index ba0f22414..6921c7d66 100644
--- a/device/CMakeLists.txt
+++ b/device/CMakeLists.txt
@@ -41,10 +41,6 @@ if(NOT BOARD STREQUAL "uhk-60-right")
     # C headers compiled with C++ give pointer conversion errors, turn them to warnings
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 
-    set(C2USB_PATH "c2usb")
-
-    add_subdirectory(${C2USB_PATH})
-
     # Link app to c2usb
     target_link_libraries(app PRIVATE
         c2usb
diff --git a/device/Kconfig b/device/Kconfig
index 7f75c93cd..f3a709495 100644
--- a/device/Kconfig
+++ b/device/Kconfig
@@ -73,5 +73,3 @@ configdefault BT_DEVICE_APPEARANCE
 # to these application-specific defaults instead of the unconditional default in the Zephyr Kconfig tree.
 # https://github.com/nrfconnect/sdk-nrf/blob/4b9841a28e97e9d61b93f8981375d644b9d04ea0/samples/bluetooth/mesh/light/Kconfig#L11C1-L13C30
 source "Kconfig.zephyr"
-
-rsource "c2usb/c2usb/port/zephyr/Kconfig"
diff --git a/device/c2usb b/device/c2usb
deleted file mode 120000
index 060933c71..000000000
--- a/device/c2usb
+++ /dev/null
@@ -1 +0,0 @@
-../lib/c2usb
\ No newline at end of file
diff --git a/lib/c2usb b/lib/c2usb
deleted file mode 160000
index db88eb051..000000000
--- a/lib/c2usb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit db88eb051cb0792f0296ce58357180029f3da5e2
diff --git a/west.yml b/west.yml
index 85b68d067..90613a99c 100644
--- a/west.yml
+++ b/west.yml
@@ -7,6 +7,8 @@ manifest:
       url-base: https://github.com/nrfconnect
     - name: zephyr
       url-base: https://github.com/zephyrproject-rtos
+    - name: IntergatedCircuits
+      url-base: https://github.com/IntergatedCircuits
 
   projects:
     - name: sdk-nrf
@@ -30,5 +32,9 @@ manifest:
 
     - name: hal_nxp
       remote: zephyr
-      path: nrfconnect/zephyr-hal-nxp
+      clone-depth: 1
+
+    - name: c2usb
+      remote: IntergatedCircuits
+      revision: 19551fec19680cfe759bb3a8dced914233e4ddd1
       clone-depth: 1