From 2569671adf9a583110589eba64c4555e1e692301 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Sun, 28 Apr 2024 16:12:18 +0200
Subject: [PATCH] Renamed the usb.h file to avoid conflicts with Ubuntu Linux
systems.
---
f1/usb/include/{usb.h => stm32_usb.h} | 0
f1/usb/src/usb.c | 2 +-
f3/usb/include/{usb.h => stm32_usb.h} | 0
f3/usb/src/usb.c | 2 +-
f4/usb/include/{usb.h => stm32_usb.h} | 0
f4/usb/include/{usb_hs.h => stm32_usb_hs.h} | 0
f4/usb/src/usb.c | 2 +-
f4/usb/src/usb_hs.c | 2 +-
8 files changed, 4 insertions(+), 4 deletions(-)
rename f1/usb/include/{usb.h => stm32_usb.h} (100%)
rename f3/usb/include/{usb.h => stm32_usb.h} (100%)
rename f4/usb/include/{usb.h => stm32_usb.h} (100%)
rename f4/usb/include/{usb_hs.h => stm32_usb_hs.h} (100%)
diff --git a/f1/usb/include/usb.h b/f1/usb/include/stm32_usb.h
similarity index 100%
rename from f1/usb/include/usb.h
rename to f1/usb/include/stm32_usb.h
diff --git a/f1/usb/src/usb.c b/f1/usb/src/usb.c
index 1652d23..c241794 100644
--- a/f1/usb/src/usb.c
+++ b/f1/usb/src/usb.c
@@ -1,4 +1,4 @@
-#include "usb.h"
+#include "stm32_usb.h"
#include "usbd_cdc.h"
#define RX_DATA_SIZE 64
diff --git a/f3/usb/include/usb.h b/f3/usb/include/stm32_usb.h
similarity index 100%
rename from f3/usb/include/usb.h
rename to f3/usb/include/stm32_usb.h
diff --git a/f3/usb/src/usb.c b/f3/usb/src/usb.c
index d265cb5..7294399 100644
--- a/f3/usb/src/usb.c
+++ b/f3/usb/src/usb.c
@@ -1,4 +1,4 @@
-#include "usb.h"
+#include "stm32_usb.h"
#include "usbd_cdc.h"
#define RX_DATA_SIZE 64
diff --git a/f4/usb/include/usb.h b/f4/usb/include/stm32_usb.h
similarity index 100%
rename from f4/usb/include/usb.h
rename to f4/usb/include/stm32_usb.h
diff --git a/f4/usb/include/usb_hs.h b/f4/usb/include/stm32_usb_hs.h
similarity index 100%
rename from f4/usb/include/usb_hs.h
rename to f4/usb/include/stm32_usb_hs.h
diff --git a/f4/usb/src/usb.c b/f4/usb/src/usb.c
index 1821df2..084b43d 100644
--- a/f4/usb/src/usb.c
+++ b/f4/usb/src/usb.c
@@ -1,4 +1,4 @@
-#include "usb.h"
+#include "stm32_usb.h"
#include "usbd_cdc.h"
#define RX_DATA_SIZE 1024
diff --git a/f4/usb/src/usb_hs.c b/f4/usb/src/usb_hs.c
index 0eed559..e8bd6a0 100644
--- a/f4/usb/src/usb_hs.c
+++ b/f4/usb/src/usb_hs.c
@@ -1,4 +1,4 @@
-#include "usb.h"
+#include "stm32_usb_hs.h"
#include "usbd_cdc.h"
#define RX_DATA_SIZE 1024
--
GitLab