Skip to content

Commit b2e7d6c

Browse files
committed
Wrap HAL sources
1 parent 0f01641 commit b2e7d6c

File tree

9 files changed

+63
-10
lines changed

9 files changed

+63
-10
lines changed

Marlin/src/HAL/STM32/usb_hostlib/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
*
2929
******************************************************************************
3030
*/
31+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
32+
33+
#include "../../../../../../../inc/MarlinConfig.h"
34+
35+
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
3136

3237
/* BSPDependencies
3338
- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
@@ -856,3 +861,6 @@ USBH_StatusTypeDef USBH_MSC_Write(USBH_HandleTypeDef *phost,
856861
*/
857862

858863
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
864+
865+
#endif // USB_HOST_MSC_FLASH_SUPPORT
866+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
******************************************************************************
1818
*/
1919

20+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
21+
22+
#include "../../../../../../../inc/MarlinConfig.h"
23+
24+
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
25+
2026
/* BSPDependencies
2127
- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
2228
- "stm32xxxxx_{eval}{discovery}_io.c"
@@ -696,5 +702,5 @@ static BOT_CSWStatusTypeDef USBH_MSC_DecodeCSW(USBH_HandleTypeDef *phost)
696702

697703
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
698704

699-
700-
705+
#endif // USB_HOST_MSC_FLASH_SUPPORT
706+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
******************************************************************************
1818
*/
1919

20+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
21+
22+
#include "../../../../../../../inc/MarlinConfig.h"
23+
24+
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
25+
2026
/* BSPDependencies
2127
- "stm32xxxxx_{eval}{discovery}{nucleo_144}.c"
2228
- "stm32xxxxx_{eval}{discovery}_io.c"
@@ -462,5 +468,5 @@ USBH_StatusTypeDef USBH_MSC_SCSI_Read(USBH_HandleTypeDef *phost,
462468

463469
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
464470

465-
466-
471+
#endif // USB_HOST_MSC_FLASH_SUPPORT
472+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/STM32_USB_Host_Library/Core/Src/usbh_core.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
******************************************************************************
1919
*/
2020

21+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
22+
23+
#include "../../../../../../inc/MarlinConfig.h"
24+
25+
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
26+
2127
/* Includes ------------------------------------------------------------------*/
2228
#include "../Inc/usbh_core.h"
2329

@@ -1368,3 +1374,6 @@ USBH_StatusTypeDef USBH_LL_NotifyURBChange(USBH_HandleTypeDef *phost)
13681374
*/
13691375

13701376
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
1377+
1378+
#endif // USB_HOST_MSC_FLASH_SUPPORT
1379+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
******************************************************************************
1818
*/
1919

20+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
21+
22+
#include "../../../../../../inc/MarlinConfig.h"
23+
24+
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
25+
2026
/* Includes ------------------------------------------------------------------*/
2127
#include "../Inc/usbh_ctlreq.h"
2228

@@ -998,6 +1004,5 @@ static USBH_StatusTypeDef USBH_HandleControl(USBH_HandleTypeDef *phost)
9981004

9991005
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
10001006

1001-
1002-
1003-
1007+
#endif // USB_HOST_MSC_FLASH_SUPPORT
1008+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/STM32_USB_Host_Library/Core/Src/usbh_ioreq.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
******************************************************************************
1818
*/
1919

20+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
21+
22+
#include "../../../../../../inc/MarlinConfig.h"
23+
24+
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
25+
2026
/* Includes ------------------------------------------------------------------*/
2127
#include "../Inc/usbh_ioreq.h"
2228

@@ -346,5 +352,5 @@ USBH_StatusTypeDef USBH_IsocSendData(USBH_HandleTypeDef *phost,
346352

347353
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
348354

349-
350-
355+
#endif // USB_HOST_MSC_FLASH_SUPPORT
356+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/STM32_USB_Host_Library/Core/Src/usbh_pipes.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
******************************************************************************
1818
*/
1919

20+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
21+
22+
#include "../../../../../../inc/MarlinConfig.h"
23+
24+
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
25+
2026
/* Includes ------------------------------------------------------------------*/
2127
#include "../Inc/usbh_pipes.h"
2228

@@ -185,4 +191,5 @@ static uint16_t USBH_GetFreePipe(USBH_HandleTypeDef *phost)
185191

186192
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
187193

188-
194+
#endif // USB_HOST_MSC_FLASH_SUPPORT
195+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/usbh_conf.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
******************************************************************************
1818
*/
1919

20+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
21+
2022
/* Includes ------------------------------------------------------------------*/
2123

2224
#include "../../../inc/MarlinConfig.h"
@@ -477,3 +479,4 @@ void USBH_Delay(uint32_t Delay)
477479
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
478480

479481
#endif // USB_HOST_MSC_FLASH_SUPPORT
482+
#endif // STM32

Marlin/src/HAL/STM32/usb_hostlib/usbh_usr.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
******************************************************************************
1818
*/
1919

20+
#if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
21+
2022
#include "../../../inc/MarlinConfig.h"
2123

2224
#if ENABLED(USB_HOST_MSC_FLASH_SUPPORT)
@@ -173,3 +175,4 @@ uint8_t USBH_write(uint8_t lun, const uint8_t *buff, uint32_t sector, uint32_t c
173175
}
174176

175177
#endif // USB_HOST_MSC_FLASH_SUPPORT
178+
#endif // STM32

0 commit comments

Comments
 (0)