From 019a71eb14238d5387117abb64d39ea5d4b90eaa Mon Sep 17 00:00:00 2001 From: Oskar Weigl Date: Tue, 23 Oct 2018 23:31:41 -0700 Subject: [PATCH] bake patch: release sem_usb_tx in usb_cdc.c --- ...001-release-sem_usb_tx-in-usbd_cdc.c.patch | 35 ------------------- .../Class/CDC/Src/usbd_cdc.c | 5 +-- 2 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 Firmware/Board/v3/0001-release-sem_usb_tx-in-usbd_cdc.c.patch diff --git a/Firmware/Board/v3/0001-release-sem_usb_tx-in-usbd_cdc.c.patch b/Firmware/Board/v3/0001-release-sem_usb_tx-in-usbd_cdc.c.patch deleted file mode 100644 index b69370f5..00000000 --- a/Firmware/Board/v3/0001-release-sem_usb_tx-in-usbd_cdc.c.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 965f7f2c80e30d7a66dcac7abaa9bdc371d9ea51 Mon Sep 17 00:00:00 2001 -From: Samuel Sadok -Date: Mon, 26 Feb 2018 14:53:52 -0800 -Subject: [PATCH] release sem_usb_tx in usbd_cdc.c - ---- - .../Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Firmware/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c b/Firmware/Board/v3.3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c -index b2ca5f1..6ae33e8 100644 ---- a/Firmware/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c -+++ b/Firmware/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c -@@ -62,7 +62,8 @@ - #include "usbd_cdc.h" - #include "usbd_desc.h" - #include "usbd_ctlreq.h" -- -+#include -+#include - - /** @addtogroup STM32_USB_DEVICE_LIBRARY - * @{ -@@ -669,7 +670,7 @@ static uint8_t USBD_CDC_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum) - { - - hcdc->TxState = 0; -- -+ osSemaphoreRelease(sem_usb_tx); - return USBD_OK; - } - else --- -2.16.1 - diff --git a/Firmware/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c b/Firmware/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c index b2ca5f16..24465641 100644 --- a/Firmware/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c +++ b/Firmware/Board/v3/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c @@ -62,7 +62,8 @@ #include "usbd_cdc.h" #include "usbd_desc.h" #include "usbd_ctlreq.h" - +#include +#include /** @addtogroup STM32_USB_DEVICE_LIBRARY * @{ @@ -669,7 +670,7 @@ static uint8_t USBD_CDC_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum) { hcdc->TxState = 0; - + osSemaphoreRelease(sem_usb_tx); return USBD_OK; } else