From f78d9b1a721bbe56b9049f33a8ec610f811011e5 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Thu, 20 Mar 2014 23:33:30 +0000
Subject: stmhal: Add accelerometer driver; fix bug with LFN.

---
 stmhal/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'stmhal/Makefile')

diff --git a/stmhal/Makefile b/stmhal/Makefile
index 9f3e365a1..a1a5a1db6 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -84,9 +84,9 @@ SRC_C = \
 	sdcard.c \
 	diskio.c \
 	lcd.c \
+	accel.c \
 
 #	servo.c \
-#	accel.c \
 #	timer.c \
 #	audio.c \
 #	i2c.c \
@@ -104,6 +104,7 @@ SRC_HAL = $(addprefix $(HAL_DIR)/src/,\
 	stm32f4xx_hal_flash.c \
 	stm32f4xx_hal_flash_ex.c \
 	stm32f4xx_hal_gpio.c \
+	stm32f4xx_hal_i2c.c \
 	stm32f4xx_hal_pcd.c \
 	stm32f4xx_hal_rcc.c \
 	stm32f4xx_hal_rcc_ex.c \
-- 
cgit v1.2.3


From 8913c04831c94d2bcb82b0447ab7ccf6b2e346a6 Mon Sep 17 00:00:00 2001
From: Damien George
Date: Fri, 21 Mar 2014 23:32:01 +0000
Subject: stmhal: Add support for USB MSC device.

This gives a functioning, independent MSC device.
---
 stmhal/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'stmhal/Makefile')

diff --git a/stmhal/Makefile b/stmhal/Makefile
index a1a5a1db6..86791607a 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -21,7 +21,7 @@ INC += -I$(PY_SRC)
 INC += -I$(CMSIS_DIR)/inc
 INC += -I$(CMSIS_DIR)/devinc
 INC += -I$(HAL_DIR)/inc
-INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/cdc/inc
+INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/cdc/inc -I$(USBDEV_DIR)/class/msc/inc
 #INC += -I$(USBHOST_DIR)
 INC += -I$(FATFS_DIR)/src
 #INC += -I$(CC3K_DIR)
@@ -56,8 +56,10 @@ SRC_C = \
 	stm32f4xx_it.c \
 	stm32f4xx_hal_msp.c \
 	usbd_conf.c \
-	usbd_desc.c \
+	usbd_desc_vcp.c \
 	usbd_cdc_interface.c \
+	usbd_desc_msc.c \
+	usbd_msc_storage.c \
 	pendsv.c \
 	systick.c  \
 	led.c \
@@ -123,6 +125,10 @@ SRC_USBDEV = $(addprefix $(USBDEV_DIR)/,\
 	core/src/usbd_ctlreq.c \
 	core/src/usbd_ioreq.c \
 	class/cdc/src/usbd_cdc.c \
+	class/msc/src/usbd_msc.c \
+	class/msc/src/usbd_msc_bot.c \
+	class/msc/src/usbd_msc_scsi.c \
+	class/msc/src/usbd_msc_data.c \
 	)
 
 #	usbd_core.c \
-- 
cgit v1.2.3