diff options
| author | Damien George | 2014-03-22 12:32:54 +0000 |
|---|---|---|
| committer | Damien George | 2014-03-22 12:32:54 +0000 |
| commit | fb25c2d95f2c2e9e5fdf372caa16398eafe3910d (patch) | |
| tree | 62f5ad5d68ad63f2b189ba91c424ae3a49ece08f /stmhal/Makefile | |
| parent | b32db4e1ad381edaaf91320cb2830e4a1b151863 (diff) | |
stmhal: USB CDC and MSC device work together.
Diffstat (limited to 'stmhal/Makefile')
| -rw-r--r-- | stmhal/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile index 86791607a..6bb60ec89 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 -I$(USBDEV_DIR)/class/msc/inc +INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/cdc_msc/inc #INC += -I$(USBHOST_DIR) INC += -I$(FATFS_DIR)/src #INC += -I$(CC3K_DIR) @@ -56,9 +56,8 @@ SRC_C = \ stm32f4xx_it.c \ stm32f4xx_hal_msp.c \ usbd_conf.c \ - usbd_desc_vcp.c \ + usbd_desc_cdc_msc.c \ usbd_cdc_interface.c \ - usbd_desc_msc.c \ usbd_msc_storage.c \ pendsv.c \ systick.c \ @@ -124,13 +123,14 @@ SRC_USBDEV = $(addprefix $(USBDEV_DIR)/,\ core/src/usbd_core.c \ 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 \ + class/cdc_msc/src/usbd_cdc_msc.c \ + class/cdc_msc/src/usbd_msc_bot.c \ + class/cdc_msc/src/usbd_msc_scsi.c \ + class/cdc_msc/src/usbd_msc_data.c \ ) +# class/cdc/src/usbd_cdc.c \ + class/msc/src/usbd_msc.c \ # usbd_core.c \ usbd_ioreq.c \ usbd_req.c \ |