Compiles

diff --git a/Makefile b/Makefile
index 364f84636908e4b4f891240acf961271cabdcc96..2bce5ca6924d11b39cf2194ba1c55a63f911c628 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 ARMCC=arm-none-eabi-gcc
 OBJCOPY=arm-none-eabi-objcopy
 
-CPPFLAGS=-DSTM32F205xx -DUSE_HAL_DRIVER -Wall -Werror
+CPPFLAGS=-DSTM32F205xx -DUSE_HAL_DRIVER -Wall 
 CFLAGS=-mcpu=cortex-m3 -mthumb -mslow-flash-data \
        -std=gnu11 \
        -specs=nosys.specs \
@@ -37,8 +37,6 @@ build/stm32cubemx/stm32f2xx_hal_msp.o: STM32CubeMX/SCSI2SD-V6/Src/stm32f2xx_hal_
 build/stm32cubemx/stm32f2xx_it.o: STM32CubeMX/SCSI2SD-V6/Src/stm32f2xx_it.c
 build/stm32cubemx/usart.o: STM32CubeMX/SCSI2SD-V6/Src/usart.c
 build/stm32cubemx/usbd_conf.o: STM32CubeMX/SCSI2SD-V6/Src/usbd_conf.c
-build/stm32cubemx/usbh_conf.o: STM32CubeMX/SCSI2SD-V6/Src/usbh_conf.c
-build/stm32cubemx/usb_host.o: STM32CubeMX/SCSI2SD-V6/Src/usb_host.c
 build/stm32cubemx/stm32f2xx_hal.o: STM32CubeMX/SCSI2SD-V6/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal.c
 build/stm32cubemx/stm32f2xx_hal_cortex.o: STM32CubeMX/SCSI2SD-V6/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_cortex.c
 build/stm32cubemx/stm32f2xx_hal_dma.o: STM32CubeMX/SCSI2SD-V6/Drivers/STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_dma.c
@@ -59,18 +57,10 @@ build/stm32cubemx/stm32f2xx_ll_usb.o: STM32CubeMX/SCSI2SD-V6/Drivers/STM32F2xx_H
 build/stm32cubemx/usbd_core.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
 build/stm32cubemx/usbd_ctlreq.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
 build/stm32cubemx/usbd_ioreq.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
-build/stm32cubemx/usbh_core.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_core.c
-build/stm32cubemx/usbh_ctlreq.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ctlreq.c
-build/stm32cubemx/usbh_ioreq.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_ioreq.c
-build/stm32cubemx/usbh_pipes.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_pipes.c
-build/stm32cubemx/usbh_msc.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c
-build/stm32cubemx/usbh_msc_bot.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c
-build/stm32cubemx/usbh_msc_scsi.o: STM32CubeMX/SCSI2SD-V6/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c
 build/stm32cubemx/system_stm32f2xx.o: STM32CubeMX/SCSI2SD-V6/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
 build/stm32cubemx/startup_stm32f205xx.o: STM32CubeMX/SCSI2SD-V6/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f205xx.s
 
 STM32OBJS = \
-       build/stm32cubemx/bsp_driver_sd.o \
        build/stm32cubemx/fsmc.o \
        build/stm32cubemx/gpio.o \
        build/stm32cubemx/main.o \
@@ -80,8 +70,6 @@ STM32OBJS = \
        build/stm32cubemx/stm32f2xx_it.o \
        build/stm32cubemx/usart.o \
        build/stm32cubemx/usbd_conf.o \
-       build/stm32cubemx/usbh_conf.o \
-       build/stm32cubemx/usb_host.o \
        build/stm32cubemx/stm32f2xx_hal.o \
        build/stm32cubemx/stm32f2xx_hal_cortex.o \
        build/stm32cubemx/stm32f2xx_hal_dma.o \
@@ -102,13 +90,6 @@ STM32OBJS = \
        build/stm32cubemx/usbd_core.o \
        build/stm32cubemx/usbd_ctlreq.o \
        build/stm32cubemx/usbd_ioreq.o \
-       build/stm32cubemx/usbh_core.o \
-       build/stm32cubemx/usbh_ctlreq.o \
-       build/stm32cubemx/usbh_ioreq.o \
-       build/stm32cubemx/usbh_pipes.o \
-       build/stm32cubemx/usbh_msc.o \
-       build/stm32cubemx/usbh_msc_bot.o \
-       build/stm32cubemx/usbh_msc_scsi.o \
        build/stm32cubemx/system_stm32f2xx.o \
        build/stm32cubemx/startup_stm32f205xx.o \
 

diff --git a/src/firmware/cubemx.patch b/src/firmware/cubemx.patch
index e7c12d1495da1229e597590c2603358ac20051d4..943b1af52c8b40dc2879ed668c80ae8f7a52e2d8 100644 (file)
--- a/src/firmware/cubemx.patch
+++ b/src/firmware/cubemx.patch
@@ -208,23 +208,6 @@ index ef23c94..c899300 100755
  #define HAL_GPIO_MODULE_ENABLED
  #define HAL_DMA_MODULE_ENABLED
  #define HAL_RCC_MODULE_ENABLED
-diff --git b/STM32CubeMX/SCSI2SD-V6/Inc/stm32f2xx_it.h a/STM32CubeMX/SCSI2SD-V6/Inc/stm32f2xx_it.h
-index a2efe1f..4c7075a 100755
---- b/STM32CubeMX/SCSI2SD-V6/Inc/stm32f2xx_it.h
-+++ a/STM32CubeMX/SCSI2SD-V6/Inc/stm32f2xx_it.h
-@@ -46,11 +46,13 @@
- /* Exported functions ------------------------------------------------------- */
- 
- void SysTick_Handler(void);
-+void EXTI3_IRQHandler(void);
- void EXTI4_IRQHandler(void);
- void SDIO_IRQHandler(void);
- void DMA2_Stream3_IRQHandler(void);
- void OTG_FS_IRQHandler(void);
- void DMA2_Stream6_IRQHandler(void);
- 
- #ifdef __cplusplus
- }
 diff --git b/STM32CubeMX/SCSI2SD-V6/Src/fsmc.c a/STM32CubeMX/SCSI2SD-V6/Src/fsmc.c
 index c257924..5261aa9 100755
 --- b/STM32CubeMX/SCSI2SD-V6/Src/fsmc.c
@@ -460,7 +443,7 @@ diff --git b/STM32CubeMX/SCSI2SD-V6/Src/main.c a/STM32CubeMX/SCSI2SD-V6/Src/main
 index 48e1f9a..a80e078 100755
 --- b/STM32CubeMX/SCSI2SD-V6/Src/main.c
 +++ a/STM32CubeMX/SCSI2SD-V6/Src/main.c
-@@ -32,12 +32,11 @@
+@@ -32,12 +32,10 @@
    */
  /* Includes ------------------------------------------------------------------*/
  #include "stm32f2xx_hal.h"
@@ -472,8 +455,8 @@ index 48e1f9a..a80e078 100755
  #include "usb_device.h"
  #include "gpio.h"
  #include "fsmc.h"
- 
-@@ -87,14 +87,11 @@ int main(void)
+
+@@ -87,14 +87,10 @@ int main(void)
  
    /* Initialize all configured peripherals */
    MX_GPIO_Init();

diff --git a/src/firmware/usb_device/usbd_msc_storage_sd.c b/src/firmware/usb_device/usbd_msc_storage_sd.c
index 263eb2b7b0e1008a09fe9912094629f8aa47c25d..8fb6aa89e9ef917c2bb4974826ed9da449930ac5 100755 (executable)
--- a/src/firmware/usb_device/usbd_msc_storage_sd.c
+++ b/src/firmware/usb_device/usbd_msc_storage_sd.c
@@ -18,7 +18,7 @@
 
 #include "usbd_msc_storage_sd.h"
 #include "stm32f2xx.h"
-#include "bsp_driver_sd.h"
+#include "../bsp_driver_sd.h"
 #include "../bsp.h"
 #include "../disk.h"
 #include "../led.h"