rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MegabytePhreak/ChibiOS-Contrib

This commit is contained in:
Diego Ismirlian 2018-08-20 21:16:55 -03:00
parent 0936be2541 9692d1b7ae
commit dd1799beda
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/src/usbh/hal_usbh_aoa.c
View File

@ -510,6 +510,7 @@ static size_t _read(USBHAOAChannel *aoacp, uint8_t *bp, size_t n) {
} }
static const struct AOADriverVMT async_channel_vmt = { static const struct AOADriverVMT async_channel_vmt = {
(size_t) 0,
(size_t (*)(void *, const uint8_t *, size_t))_write, (size_t (*)(void *, const uint8_t *, size_t))_write,
(size_t (*)(void *, uint8_t *, size_t))_read, (size_t (*)(void *, uint8_t *, size_t))_read,
(msg_t (*)(void *, uint8_t))_put, (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 *, uint8_t, systime_t))_put_timeout,
(msg_t (*)(void *, systime_t))_get_timeout, (msg_t (*)(void *, systime_t))_get_timeout,
(size_t (*)(void *, const uint8_t *, size_t, systime_t))_write_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) { static void _stop_channelS(USBHAOAChannel *aoacp) {

5
os/hal/src/usbh/hal_usbh_ftdi.c
View File

@ -150,6 +150,7 @@ alloc_ok:
case 0x900: //232H; case 0x900: //232H;
uinfo("FTDI: Type H chip"); uinfo("FTDI: Type H chip");
ftdip->type = USBHFTDI_TYPE_H; ftdip->type = USBHFTDI_TYPE_H;
break;
default: default:
uerr("FTDI: Unrecognized chip type"); uerr("FTDI: Unrecognized chip type");
return NULL; return NULL;
@ -615,6 +616,7 @@ static void _vt(void *p) {
} }
static const struct FTDIPortDriverVMT async_channel_vmt = { static const struct FTDIPortDriverVMT async_channel_vmt = {
(size_t) 0,
(size_t (*)(void *, const uint8_t *, size_t))_write, (size_t (*)(void *, const uint8_t *, size_t))_write,
(size_t (*)(void *, uint8_t *, size_t))_read, (size_t (*)(void *, uint8_t *, size_t))_read,
(msg_t (*)(void *, uint8_t))_put, (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 *, uint8_t, systime_t))_put_timeout,
(msg_t (*)(void *, systime_t))_get_timeout, (msg_t (*)(void *, systime_t))_get_timeout,
(size_t (*)(void *, const uint8_t *, size_t, systime_t))_write_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
}; };

1
os/hal/src/usbh/hal_usbh_msd.c
View File

@ -683,6 +683,7 @@ static msd_result_t scsi_write10(USBHMassStorageLUNDriver *lunp, uint32_t lba, u
USBHMassStorageLUNDriver MSBLKD[HAL_USBHMSD_MAX_LUNS]; USBHMassStorageLUNDriver MSBLKD[HAL_USBHMSD_MAX_LUNS];
static const struct USBHMassStorageDriverVMT blk_vmt = { static const struct USBHMassStorageDriverVMT blk_vmt = {
(size_t)0,
(bool (*)(void *))usbhmsdLUNIsInserted, (bool (*)(void *))usbhmsdLUNIsInserted,
(bool (*)(void *))usbhmsdLUNIsProtected, (bool (*)(void *))usbhmsdLUNIsProtected,
(bool (*)(void *))usbhmsdLUNConnect, (bool (*)(void *))usbhmsdLUNConnect,

27
testhal/STM32/STM32F4xx/USB_HOST/Makefile
View File

@ -30,7 +30,7 @@ endif
# Enable this if you want link time optimizations (LTO) # Enable this if you want link time optimizations (LTO)
ifeq ($(USE_LTO),) ifeq ($(USE_LTO),)
USE_LTO = yes USE_LTO = no
endif endif
# If enabled, this option allows to compile the application in THUMB mode. # If enabled, this option allows to compile the application in THUMB mode.
@ -88,6 +88,9 @@ PROJECT = ch
# Imported source files and paths # Imported source files and paths
CHIBIOS = ../../../../../ChibiOS-RT CHIBIOS = ../../../../../ChibiOS-RT
CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
# Licensing files.
include $(CHIBIOS)/os/license/license.mk
# Startup files. # Startup files.
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
# HAL-OSAL files (optional). # HAL-OSAL files (optional).
@ -98,6 +101,8 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional). # RTOS files (optional).
include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/rt/rt.mk
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.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). # Other files (optional).
include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/lib/test.mk
include $(CHIBIOS)/test/rt/rt_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 # C sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CSRC = $(STARTUPSRC) \ CSRC = $(ALLCSRC) \
$(KERNSRC) \ $(TESTSRC) \
$(PORTSRC) \
$(OSALSRC) \
$(HALSRC) \
$(PLATFORMSRC) \
$(BOARDSRC) \
$(TESTSRC) \
$(FATFSSRC) \ $(FATFSSRC) \
$(STREAMSSRC) \
$(SHELLSRC) \
main.c usbh_custom_class_example.c main.c usbh_custom_class_example.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -152,10 +149,7 @@ TCPPSRC =
ASMSRC = ASMSRC =
ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM) ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(CHIBIOS)/os/license \ INCDIR = $(ALLINC) $(TESTINC) $(FATFSINC) \
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
$(STREAMSINC) $(SHELLINC) $(FATFSINC) \
$(CHIBIOS_CONTRIB)/os/various $(CHIBIOS_CONTRIB)/os/various
# #
@ -224,5 +218,6 @@ ULIBS =
# End of user defines # 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 include $(RULESPATH)/rules.mk

2
testhal/STM32/STM32F4xx/USB_HOST/chconf.h
View File

@ -29,7 +29,7 @@
#define CHCONF_H #define CHCONF_H
#define _CHIBIOS_RT_CONF_ #define _CHIBIOS_RT_CONF_
#define _CHIBIOS_RT_CONF_VER_5_0_ #define _CHIBIOS_RT_CONF_VER_6_0_
/*===========================================================================*/ /*===========================================================================*/
/** /**