Merge branch 'master' of https://github.com/MegabytePhreak/ChibiOS-Contrib
This commit is contained in:
Diego Ismirlian
commit
dd1799beda
|
|
@ -510,6 +510,7 @@ static size_t _read(USBHAOAChannel *aoacp, uint8_t *bp, size_t n) {
|
|||
}
|
||||
|
||||
static const struct AOADriverVMT async_channel_vmt = {
|
||||
(size_t) 0,
|
||||
(size_t (*)(void *, const uint8_t *, size_t))_write,
|
||||
(size_t (*)(void *, uint8_t *, size_t))_read,
|
||||
(msg_t (*)(void *, uint8_t))_put,
|
||||
|
|
@ -517,7 +518,8 @@ static const struct AOADriverVMT async_channel_vmt = {
|
|||
(msg_t (*)(void *, uint8_t, systime_t))_put_timeout,
|
||||
(msg_t (*)(void *, systime_t))_get_timeout,
|
||||
(size_t (*)(void *, const uint8_t *, size_t, systime_t))_write_timeout,
|
||||
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout
|
||||
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout,
|
||||
(void*) 0 // FIXME: Implement CTL
|
||||
};
|
||||
|
||||
static void _stop_channelS(USBHAOAChannel *aoacp) {
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ alloc_ok:
|
|||
case 0x900: //232H;
|
||||
uinfo("FTDI: Type H chip");
|
||||
ftdip->type = USBHFTDI_TYPE_H;
|
||||
break;
|
||||
default:
|
||||
uerr("FTDI: Unrecognized chip type");
|
||||
return NULL;
|
||||
|
|
@ -615,6 +616,7 @@ static void _vt(void *p) {
|
|||
}
|
||||
|
||||
static const struct FTDIPortDriverVMT async_channel_vmt = {
|
||||
(size_t) 0,
|
||||
(size_t (*)(void *, const uint8_t *, size_t))_write,
|
||||
(size_t (*)(void *, uint8_t *, size_t))_read,
|
||||
(msg_t (*)(void *, uint8_t))_put,
|
||||
|
|
@ -622,7 +624,8 @@ static const struct FTDIPortDriverVMT async_channel_vmt = {
|
|||
(msg_t (*)(void *, uint8_t, systime_t))_put_timeout,
|
||||
(msg_t (*)(void *, systime_t))_get_timeout,
|
||||
(size_t (*)(void *, const uint8_t *, size_t, systime_t))_write_timeout,
|
||||
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout
|
||||
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout,
|
||||
(void*) 0 // FIXME: Implement CTL
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -683,6 +683,7 @@ static msd_result_t scsi_write10(USBHMassStorageLUNDriver *lunp, uint32_t lba, u
|
|||
USBHMassStorageLUNDriver MSBLKD[HAL_USBHMSD_MAX_LUNS];
|
||||
|
||||
static const struct USBHMassStorageDriverVMT blk_vmt = {
|
||||
(size_t)0,
|
||||
(bool (*)(void *))usbhmsdLUNIsInserted,
|
||||
(bool (*)(void *))usbhmsdLUNIsProtected,
|
||||
(bool (*)(void *))usbhmsdLUNConnect,
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ endif
|
|||
|
||||
# Enable this if you want link time optimizations (LTO)
|
||||
ifeq ($(USE_LTO),)
|
||||
USE_LTO = yes
|
||||
USE_LTO = no
|
||||
endif
|
||||
|
||||
# If enabled, this option allows to compile the application in THUMB mode.
|
||||
|
|
@ -88,6 +88,9 @@ PROJECT = ch
|
|||
# Imported source files and paths
|
||||
CHIBIOS = ../../../../../ChibiOS-RT
|
||||
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
|
||||
|
||||
# Licensing files.
|
||||
include $(CHIBIOS)/os/license/license.mk
|
||||
# Startup files.
|
||||
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
|
||||
# HAL-OSAL files (optional).
|
||||
|
|
@ -98,6 +101,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
|
|||
# RTOS files (optional).
|
||||
include $(CHIBIOS)/os/rt/rt.mk
|
||||
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
|
||||
# Auto-build files in ./source recursively.
|
||||
include $(CHIBIOS)/tools/mk/autobuild.mk
|
||||
# Other files (optional).
|
||||
include $(CHIBIOS)/test/lib/test.mk
|
||||
include $(CHIBIOS)/test/rt/rt_test.mk
|
||||
|
|
@ -111,17 +116,9 @@ LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld
|
|||
|
||||
# C sources that can be compiled in ARM or THUMB mode depending on the global
|
||||
# setting.
|
||||
CSRC = $(STARTUPSRC) \
|
||||
$(KERNSRC) \
|
||||
$(PORTSRC) \
|
||||
$(OSALSRC) \
|
||||
$(HALSRC) \
|
||||
$(PLATFORMSRC) \
|
||||
$(BOARDSRC) \
|
||||
$(TESTSRC) \
|
||||
CSRC = $(ALLCSRC) \
|
||||
$(TESTSRC) \
|
||||
$(FATFSSRC) \
|
||||
$(STREAMSSRC) \
|
||||
$(SHELLSRC) \
|
||||
main.c usbh_custom_class_example.c
|
||||
|
||||
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
|
||||
|
|
@ -152,10 +149,7 @@ TCPPSRC =
|
|||
ASMSRC =
|
||||
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
|
||||
|
||||
INCDIR = $(CHIBIOS)/os/license \
|
||||
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
||||
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
||||
$(STREAMSINC) $(SHELLINC) $(FATFSINC) \
|
||||
INCDIR = $(ALLINC) $(TESTINC) $(FATFSINC) \
|
||||
$(CHIBIOS_CONTRIB)/os/various
|
||||
|
||||
#
|
||||
|
|
@ -224,5 +218,6 @@ ULIBS =
|
|||
# End of user defines
|
||||
##############################################################################
|
||||
|
||||
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
|
||||
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk
|
||||
include $(RULESPATH)/arm-none-eabi.mk
|
||||
include $(RULESPATH)/rules.mk
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#define CHCONF_H
|
||||
|
||||
#define _CHIBIOS_RT_CONF_
|
||||
#define _CHIBIOS_RT_CONF_VER_5_0_
|
||||
#define _CHIBIOS_RT_CONF_VER_6_0_
|
||||
|
||||
/*===========================================================================*/
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue