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

Merge pull request #99 from pl4nkton/stm32_fixes 

Stm32 fixes
This commit is contained in:
Uladzimir Pylinski 2016-11-10 20:38:24 +03:00 committed by GitHub
parent 8f00b3af4d ff515eec71
commit a9bd529ab5
39 changed files with 598 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
View File

@ -119,7 +119,7 @@ CSRC = $(STARTUPSRC) \
$(STREAMSSRC) \ $(STREAMSSRC) \
$(SHELLSRC) \ $(SHELLSRC) \
$(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd/ili9341.c \ $(CHIBIOS_CONTRIB)/os/various/devices_lib/lcd/ili9341.c \
main.c \ main.c usbcfg.c \
wolf3d_palette.c \ wolf3d_palette.c \
res/wolf3d_vgagraph_chunk87.c res/wolf3d_vgagraph_chunk87.c

4
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf.h
View File

@ -139,7 +139,7 @@
* @brief Enables the SERIAL over USB subsystem. * @brief Enables the SERIAL over USB subsystem.
*/ */
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
#define HAL_USE_SERIAL_USB FALSE #define HAL_USE_SERIAL_USB TRUE
#endif #endif
/** /**
@ -160,7 +160,7 @@
* @brief Enables the USB subsystem. * @brief Enables the USB subsystem.
*/ */
#if !defined(HAL_USE_USB) || defined(__DOXYGEN__) #if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
#define HAL_USE_USB FALSE #define HAL_USE_USB TRUE
#endif #endif
/** /**

7
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -66,7 +66,6 @@
#define HAL_USE_RNG FALSE #define HAL_USE_RNG FALSE
#endif #endif
/*===========================================================================*/ /*===========================================================================*/
/* FSMCNAND driver related settings. */ /* FSMCNAND driver related settings. */
/*===========================================================================*/ /*===========================================================================*/
@ -94,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

13
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c
View File

@ -288,6 +288,7 @@ const SPIConfig spi_cfg5 = {
GPIOC, GPIOC,
GPIOC_SPI5_LCD_CS, GPIOC_SPI5_LCD_CS,
(((1 << 3) & SPI_CR1_BR) | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_MSTR), (((1 << 3) & SPI_CR1_BR) | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_MSTR),
0
}; };
extern SPIDriver SPID5; extern SPIDriver SPID5;
@ -473,10 +474,6 @@ static void dma2d_test(void) {
/* Command line related. */ /* Command line related. */
/*===========================================================================*/ /*===========================================================================*/
#if (HAL_USE_SERIAL_USB == TRUE)
/* Virtual serial port over USB.*/
SerialUSBDriver SDU1;
#endif
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048) #define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
#define TEST_WA_SIZE THD_WORKING_AREA_SIZE(256) #define TEST_WA_SIZE THD_WORKING_AREA_SIZE(256)
@ -500,7 +497,7 @@ static const ShellCommand commands[] = {
static const ShellConfig shell_cfg1 = { static const ShellConfig shell_cfg1 = {
#if (HAL_USE_SERIAL_USB == TRUE) #if (HAL_USE_SERIAL_USB == TRUE)
(BaseSequentialStream *)&SDU1, (BaseSequentialStream *)&SDU2,
#else #else
(BaseSequentialStream *)&SD1, (BaseSequentialStream *)&SD1,
#endif #endif
@ -536,8 +533,8 @@ int main(void) {
/* /*
* Initializes a serial-over-USB CDC driver. * Initializes a serial-over-USB CDC driver.
*/ */
sduObjectInit(&SDU1); sduObjectInit(&SDU2);
sduStart(&SDU1, &serusbcfg); sduStart(&SDU2, &serusbcfg);
/* /*
* Activates the USB driver and then the USB bus pull-up on D+. * Activates the USB driver and then the USB bus pull-up on D+.
@ -594,7 +591,7 @@ int main(void) {
while (true) { while (true) {
if (!shelltp) { if (!shelltp) {
#if (HAL_USE_SERIAL_USB == TRUE) #if (HAL_USE_SERIAL_USB == TRUE)
if (SDU1.config->usbp->state == USB_ACTIVE) { if (SDU2.config->usbp->state == USB_ACTIVE) {
/* Spawns a new shell.*/ /* Spawns a new shell.*/
shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE, "shell", NORMALPRIO, shellThread, (void *) &shell_cfg1); shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE, "shell", NORMALPRIO, shellThread, (void *) &shell_cfg1);
} }

6
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/mcuconf.h
View File

@ -243,8 +243,8 @@
*/ */
#define STM32_SDC_SDIO_DMA_PRIORITY 3 #define STM32_SDC_SDIO_DMA_PRIORITY 3
#define STM32_SDC_SDIO_IRQ_PRIORITY 9 #define STM32_SDC_SDIO_IRQ_PRIORITY 9
#define STM32_SDC_WRITE_TIMEOUT_MS 250 #define STM32_SDC_WRITE_TIMEOUT_MS 1000
#define STM32_SDC_READ_TIMEOUT_MS 25 #define STM32_SDC_READ_TIMEOUT_MS 1000
#define STM32_SDC_CLOCK_ACTIVATION_DELAY 10 #define STM32_SDC_CLOCK_ACTIVATION_DELAY 10
#define STM32_SDC_SDIO_UNALIGNED_SUPPORT TRUE #define STM32_SDC_SDIO_UNALIGNED_SUPPORT TRUE
#define STM32_SDC_SDIO_DMA_STREAM STM32_DMA_STREAM_ID(2, 3) #define STM32_SDC_SDIO_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
@ -345,7 +345,7 @@
* USB driver system settings. * USB driver system settings.
*/ */
#define STM32_USB_USE_OTG1 FALSE #define STM32_USB_USE_OTG1 FALSE
#define STM32_USB_USE_OTG2 FALSE #define STM32_USB_USE_OTG2 TRUE
#define STM32_USB_OTG1_IRQ_PRIORITY 14 #define STM32_USB_OTG1_IRQ_PRIORITY 14
#define STM32_USB_OTG2_IRQ_PRIORITY 14 #define STM32_USB_OTG2_IRQ_PRIORITY 14
#define STM32_USB_OTG1_RX_FIFO_SIZE 512 #define STM32_USB_OTG1_RX_FIFO_SIZE 512

41
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/usbcfg.c
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -17,6 +17,9 @@
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
/* Virtual serial port over USB.*/
SerialUSBDriver SDU2;
/* /*
* Endpoints to be used for USBD2. * Endpoints to be used for USBD2.
*/ */
@ -262,11 +265,9 @@ static const USBEndpointConfig ep2config = {
* Handles the USB driver global events. * Handles the USB driver global events.
*/ */
static void usb_event(USBDriver *usbp, usbevent_t event) { static void usb_event(USBDriver *usbp, usbevent_t event) {
extern SerialUSBDriver SDU1; extern SerialUSBDriver SDU2;
switch (event) { switch (event) {
case USB_EVENT_RESET:
return;
case USB_EVENT_ADDRESS: case USB_EVENT_ADDRESS:
return; return;
case USB_EVENT_CONFIGURED: case USB_EVENT_CONFIGURED:
@ -279,13 +280,29 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
usbInitEndpointI(usbp, USBD2_INTERRUPT_REQUEST_EP, &ep2config); usbInitEndpointI(usbp, USBD2_INTERRUPT_REQUEST_EP, &ep2config);
/* Resetting the state of the CDC subsystem.*/ /* Resetting the state of the CDC subsystem.*/
sduConfigureHookI(&SDU1); sduConfigureHookI(&SDU2);
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_RESET:
/* Falls into.*/
case USB_EVENT_UNCONFIGURED:
/* Falls into.*/
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
chSysLockFromISR();
/* Disconnection event on suspend.*/
sduSuspendHookI(&SDU2);
chSysUnlockFromISR();
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
chSysLockFromISR();
/* Disconnection event on suspend.*/
sduWakeupHookI(&SDU2);
chSysUnlockFromISR();
return; return;
case USB_EVENT_STALLED: case USB_EVENT_STALLED:
return; return;
@ -293,6 +310,18 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
return; return;
} }
/*
* Handles the USB driver global events.
*/
static void sof_handler(USBDriver *usbp) {
(void)usbp;
osalSysLockFromISR();
sduSOFHookI(&SDU2);
osalSysUnlockFromISR();
}
/* /*
* USB driver configuration. * USB driver configuration.
*/ */
@ -300,7 +329,7 @@ const USBConfig usbcfg = {
usb_event, usb_event,
get_descriptor, get_descriptor,
sduRequestsHook, sduRequestsHook,
NULL sof_handler
}; };
/* /*

9
demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/usbcfg.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -14,12 +14,13 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _USBCFG_H_ #ifndef USBCFG_H
#define _USBCFG_H_ #define USBCFG_H
extern const USBConfig usbcfg; extern const USBConfig usbcfg;
extern SerialUSBConfig serusbcfg; extern SerialUSBConfig serusbcfg;
extern SerialUSBDriver SDU2;
#endif /* _USBCFG_H_ */ #endif /* USBCFG_H */
/** @} */ /** @} */

7
demos/STM32/RT-STM32F429-DISCOVERY-TRIBUF/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -66,7 +66,6 @@
#define HAL_USE_RNG FALSE #define HAL_USE_RNG FALSE
#endif #endif
/*===========================================================================*/ /*===========================================================================*/
/* FSMCNAND driver related settings. */ /* FSMCNAND driver related settings. */
/*===========================================================================*/ /*===========================================================================*/
@ -94,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

3
os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h
View File

@ -230,6 +230,9 @@ typedef struct {
defined(STM32F7)) defined(STM32F7))
#define FSMC_BCR_CCLKEN ((uint32_t)1 << 20) #define FSMC_BCR_CCLKEN ((uint32_t)1 << 20)
#endif #endif
#if (defined(STM32F7))
#define FSMC_BCR_WFDIS ((uint32_t)1 << 21)
#endif
/*===========================================================================*/ /*===========================================================================*/
/* Driver pre-compile time settings. */ /* Driver pre-compile time settings. */

16
os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.c
View File

@ -194,24 +194,24 @@ void qei_lld_start(QEIDriver *qeip) {
#endif #endif
} }
/* Timer configuration.*/ /* Timer configuration.*/
qeip->tim->CR1 = 0; /* Initially stopped. */ qeip->tim->CR1 = 0; /* Initially stopped. */
qeip->tim->CR2 = 0; qeip->tim->CR2 = 0;
qeip->tim->PSC = 0; qeip->tim->PSC = 0;
qeip->tim->DIER = 0; qeip->tim->DIER = 0;
qeip->tim->ARR = 0xFFFF; qeip->tim->ARR = 0xFFFF;
/* Set Capture Compare 1 and Capture Compare 2 as input. */ /* Set Capture Compare 1 and Capture Compare 2 as input. */
qeip->tim->CCMR1 |= TIM_CCMR1_CC1S_0 | TIM_CCMR1_CC2S_0; qeip->tim->CCMR1 |= TIM_CCMR1_CC1S_0 | TIM_CCMR1_CC2S_0;
if (qeip->config->mode == QEI_MODE_QUADRATURE) { if (qeip->config->mode == QEI_MODE_QUADRATURE) {
if (qeip->config->resolution == QEI_BOTH_EDGES) if (qeip->config->resolution == QEI_BOTH_EDGES)
qeip->tim->SMCR = TIM_SMCR_SMS_1 | TIM_SMCR_SMS_0; qeip->tim->SMCR = TIM_SMCR_SMS_1 | TIM_SMCR_SMS_0;
else else
qeip->tim->SMCR = TIM_SMCR_SMS_0; qeip->tim->SMCR = TIM_SMCR_SMS_0;
} else { } else {
/* Direction/Clock mode. /* Direction/Clock mode.
* Direction input on TI1, Clock input on TI2. */ * Direction input on TI1, Clock input on TI2. */
qeip->tim->SMCR = TIM_SMCR_SMS_0; qeip->tim->SMCR = TIM_SMCR_SMS_0;
} }
if (qeip->config->dirinv == QEI_DIRINV_TRUE) if (qeip->config->dirinv == QEI_DIRINV_TRUE)
@ -230,7 +230,7 @@ void qei_lld_start(QEIDriver *qeip) {
void qei_lld_stop(QEIDriver *qeip) { void qei_lld_stop(QEIDriver *qeip) {
if (qeip->state == QEI_READY) { if (qeip->state == QEI_READY) {
qeip->tim->CR1 = 0; /* Timer disabled. */ qeip->tim->CR1 = 0; /* Timer disabled. */
/* Clock deactivation.*/ /* Clock deactivation.*/
#if STM32_QEI_USE_TIM1 #if STM32_QEI_USE_TIM1
@ -275,7 +275,7 @@ void qei_lld_stop(QEIDriver *qeip) {
*/ */
void qei_lld_enable(QEIDriver *qeip) { void qei_lld_enable(QEIDriver *qeip) {
qeip->tim->CR1 = TIM_CR1_CEN; /* Timer enabled. */ qeip->tim->CR1 = TIM_CR1_CEN; /* Timer enabled. */
} }
/** /**
@ -287,7 +287,7 @@ void qei_lld_enable(QEIDriver *qeip) {
*/ */
void qei_lld_disable(QEIDriver *qeip) { void qei_lld_disable(QEIDriver *qeip) {
qeip->tim->CR1 = 0; /* Timer disabled. */ qeip->tim->CR1 = 0; /* Timer disabled. */
} }
#endif /* HAL_USE_QEI */ #endif /* HAL_USE_QEI */

22
os/hal/src/usbh/hal_usbh_debug.c
View File

@ -111,7 +111,7 @@ static char *ftoa(char *p, double num, unsigned long precision, bool dot) {
static inline void _put(char c) { static inline void _put(char c) {
input_queue_t *iqp = &USBH_DEBUG_USBHD.iq; input_queue_t *iqp = &USBH_DEBUG_USBHD.iq;
if (chIQIsFullI(iqp)) if (iqIsFullI(iqp))
return; return;
iqp->q_counter++; iqp->q_counter++;
@ -407,8 +407,8 @@ void usbDbgReset(void) {
const char *msg = "\r\n\r\n==== DEBUG OUTPUT RESET ====\r\n"; const char *msg = "\r\n\r\n==== DEBUG OUTPUT RESET ====\r\n";
syssts_t sts = chSysGetStatusAndLockX(); syssts_t sts = chSysGetStatusAndLockX();
chIQResetI(&USBH_DEBUG_USBHD.iq); iqResetI(&USBH_DEBUG_USBHD.iq);
chOQResetI(&USBH_DEBUG_SD.oqueue); oqResetI(&USBH_DEBUG_SD.oqueue);
while (*msg) { while (*msg) {
*USBH_DEBUG_SD.oqueue.q_wrptr++ = *msg++; *USBH_DEBUG_SD.oqueue.q_wrptr++ = *msg++;
USBH_DEBUG_SD.oqueue.q_counter--; USBH_DEBUG_SD.oqueue.q_counter--;
@ -478,7 +478,7 @@ static void usb_debug_thread(void *p) {
chRegSetThreadName("USBH_DBG"); chRegSetThreadName("USBH_DBG");
while (true) { while (true) {
msg_t c = chIQGet(&host->iq); msg_t c = iqGet(&host->iq);
if (c < 0) goto reset; if (c < 0) goto reset;
if (state == 0) { if (state == 0) {
@ -491,16 +491,16 @@ static void usb_debug_thread(void *p) {
uint32_t hfnum; uint32_t hfnum;
hfir = c; hfir = c;
c = chIQGet(&host->iq); if (c < 0) goto reset; c = iqGet(&host->iq); if (c < 0) goto reset;
hfir |= c << 8; hfir |= c << 8;
c = chIQGet(&host->iq); if (c < 0) goto reset; c = iqGet(&host->iq); if (c < 0) goto reset;
hfnum = c; hfnum = c;
c = chIQGet(&host->iq); if (c < 0) goto reset; c = iqGet(&host->iq); if (c < 0) goto reset;
hfnum |= c << 8; hfnum |= c << 8;
c = chIQGet(&host->iq); if (c < 0) goto reset; c = iqGet(&host->iq); if (c < 0) goto reset;
hfnum |= c << 16; hfnum |= c << 16;
c = chIQGet(&host->iq); if (c < 0) goto reset; c = iqGet(&host->iq); if (c < 0) goto reset;
hfnum |= c << 24; hfnum |= c << 24;
uint32_t f = hfnum & 0xffff; uint32_t f = hfnum & 0xffff;
@ -508,7 +508,7 @@ static void usb_debug_thread(void *p) {
chprintf((BaseSequentialStream *)&USBH_DEBUG_SD, "%05d.%03d ", f, p); chprintf((BaseSequentialStream *)&USBH_DEBUG_SD, "%05d.%03d ", f, p);
while (true) { while (true) {
c = chIQGet(&host->iq); if (c < 0) goto reset; c = iqGet(&host->iq); if (c < 0) goto reset;
if (!c) { if (!c) {
sdPut(&USBH_DEBUG_SD, '\r'); sdPut(&USBH_DEBUG_SD, '\r');
sdPut(&USBH_DEBUG_SD, '\n'); sdPut(&USBH_DEBUG_SD, '\n');
@ -528,7 +528,7 @@ reset:
void usbDbgInit(USBHDriver *host) { void usbDbgInit(USBHDriver *host) {
if (host != &USBH_DEBUG_USBHD) if (host != &USBH_DEBUG_USBHD)
return; return;
chIQObjectInit(&USBH_DEBUG_USBHD.iq, USBH_DEBUG_USBHD.dbg_buff, sizeof(USBH_DEBUG_USBHD.dbg_buff), 0, 0); iqObjectInit(&USBH_DEBUG_USBHD.iq, USBH_DEBUG_USBHD.dbg_buff, sizeof(USBH_DEBUG_USBHD.dbg_buff), 0, 0);
chThdCreateStatic(USBH_DEBUG_USBHD.waDebug, sizeof(USBH_DEBUG_USBHD.waDebug), NORMALPRIO, usb_debug_thread, &USBH_DEBUG_USBHD); chThdCreateStatic(USBH_DEBUG_USBHD.waDebug, sizeof(USBH_DEBUG_USBHD.waDebug), NORMALPRIO, usb_debug_thread, &USBH_DEBUG_USBHD);
} }
#endif #endif

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

@ -15,6 +15,7 @@
limitations under the License. limitations under the License.
*/ */
#include <string.h>
#include "hal.h" #include "hal.h"
#include "hal_usbh.h" #include "hal_usbh.h"
#include "usbh/internal.h" #include "usbh/internal.h"

6
testhal/STM32/STM32F0xx/crc/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -113,6 +113,6 @@
#define CRC_USE_MUTUAL_EXCLUSION TRUE #define CRC_USE_MUTUAL_EXCLUSION TRUE
#endif #endif
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

6
testhal/STM32/STM32F0xx/crc/mcuconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _MCUCONF_COMMUNITY_H_ #ifndef MCUCONF_COMMUNITY_H
#define _MCUCONF_COMMUNITY_H_ #define MCUCONF_COMMUNITY_H
/* /*
* CRC driver system settings. * CRC driver system settings.
@ -30,4 +30,4 @@
#define CRCSW_CRC16_TABLE TRUE #define CRCSW_CRC16_TABLE TRUE
#define CRCSW_PROGRAMMABLE TRUE #define CRCSW_PROGRAMMABLE TRUE
#endif #endif /* MCUCONF_COMMUNITY_H */

4
testhal/STM32/STM32F0xx/onewire/Makefile
View File

@ -75,7 +75,7 @@ endif
PROJECT = ch 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
TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire
# Startup files. # Startup files.
@ -104,7 +104,7 @@ CSRC = $(STARTUPSRC) \
$(TESTSRC) \ $(TESTSRC) \
main.c \ main.c \
$(TESTHAL)/testhal_onewire.c $(TESTHAL)/testhal_onewire.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
# setting. # setting.
CPPSRC = CPPSRC =

66
testhal/STM32/STM32F0xx/onewire/halconf.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -25,8 +25,8 @@
* @{ * @{
*/ */
#ifndef _HALCONF_H_ #ifndef HALCONF_H
#define _HALCONF_H_ #define HALCONF_H
#include "mcuconf.h" #include "mcuconf.h"
@ -44,13 +44,6 @@
#define HAL_USE_ADC FALSE #define HAL_USE_ADC FALSE
#endif #endif
/**
* @brief Enables the DAC subsystem.
*/
#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
#define HAL_USE_DAC FALSE
#endif
/** /**
* @brief Enables the CAN subsystem. * @brief Enables the CAN subsystem.
*/ */
@ -58,6 +51,13 @@
#define HAL_USE_CAN FALSE #define HAL_USE_CAN FALSE
#endif #endif
/**
* @brief Enables the DAC subsystem.
*/
#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
#define HAL_USE_DAC FALSE
#endif
/** /**
* @brief Enables the EXT subsystem. * @brief Enables the EXT subsystem.
*/ */
@ -294,7 +294,7 @@
* @brief Serial buffers size. * @brief Serial buffers size.
* @details Configuration parameter, you can change the depth of the queue * @details Configuration parameter, you can change the depth of the queue
* buffers depending on the requirements of your application. * buffers depending on the requirements of your application.
* @note The default is 64 bytes for both the transmission and receive * @note The default is 16 bytes for both the transmission and receive
* buffers. * buffers.
*/ */
#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) #if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
@ -309,13 +309,21 @@
* @brief Serial over USB buffers size. * @brief Serial over USB buffers size.
* @details Configuration parameter, the buffer size must be a multiple of * @details Configuration parameter, the buffer size must be a multiple of
* the USB data endpoint maximum packet size. * the USB data endpoint maximum packet size.
* @note The default is 64 bytes for both the transmission and receive * @note The default is 256 bytes for both the transmission and receive
* buffers. * buffers.
*/ */
#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__) #if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
#define SERIAL_USB_BUFFERS_SIZE 256 #define SERIAL_USB_BUFFERS_SIZE 256
#endif #endif
/**
* @brief Serial over USB number of buffers.
* @note The default is 2 buffers.
*/
#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
#define SERIAL_USB_BUFFERS_NUMBER 2
#endif
/*===========================================================================*/ /*===========================================================================*/
/* SPI driver related settings. */ /* SPI driver related settings. */
/*===========================================================================*/ /*===========================================================================*/
@ -336,12 +344,44 @@
#define SPI_USE_MUTUAL_EXCLUSION TRUE #define SPI_USE_MUTUAL_EXCLUSION TRUE
#endif #endif
/*===========================================================================*/
/* UART driver related settings. */
/*===========================================================================*/
/**
* @brief Enables synchronous APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
#define UART_USE_WAIT FALSE
#endif
/**
* @brief Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
#define UART_USE_MUTUAL_EXCLUSION FALSE
#endif
/*===========================================================================*/
/* USB driver related settings. */
/*===========================================================================*/
/**
* @brief Enables synchronous APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
#define USB_USE_WAIT FALSE
#endif
/*===========================================================================*/ /*===========================================================================*/
/* Community drivers's includes */ /* Community drivers's includes */
/*===========================================================================*/ /*===========================================================================*/
#include "halconf_community.h" #include "halconf_community.h"
#endif /* _HALCONF_H_ */ #endif /* HALCONF_H */
/** @} */ /** @} */

6
testhal/STM32/STM32F0xx/onewire/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -93,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

12
testhal/STM32/STM32F0xx/onewire/mcuconf.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -14,6 +14,9 @@
limitations under the License. limitations under the License.
*/ */
#ifndef MCUCONF_H
#define MCUCONF_H
/* /*
* STM32F0xx drivers configuration. * STM32F0xx drivers configuration.
* The following settings override the default settings present in * The following settings override the default settings present in
@ -155,7 +158,14 @@
#define STM32_UART_USART2_DMA_PRIORITY 0 #define STM32_UART_USART2_DMA_PRIORITY 0
#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure") #define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure")
/*
* WDG driver system settings.
*/
#define STM32_WDG_USE_IWDG FALSE
/* /*
* header for community drivers. * header for community drivers.
*/ */
#include "mcuconf_community.h" #include "mcuconf_community.h"
#endif /* MCUCONF_H */

66
testhal/STM32/STM32F1xx/onewire/halconf.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -25,8 +25,8 @@
* @{ * @{
*/ */
#ifndef _HALCONF_H_ #ifndef HALCONF_H
#define _HALCONF_H_ #define HALCONF_H
#include "mcuconf.h" #include "mcuconf.h"
@ -44,13 +44,6 @@
#define HAL_USE_ADC FALSE #define HAL_USE_ADC FALSE
#endif #endif
/**
* @brief Enables the DAC subsystem.
*/
#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
#define HAL_USE_DAC FALSE
#endif
/** /**
* @brief Enables the CAN subsystem. * @brief Enables the CAN subsystem.
*/ */
@ -58,6 +51,13 @@
#define HAL_USE_CAN FALSE #define HAL_USE_CAN FALSE
#endif #endif
/**
* @brief Enables the DAC subsystem.
*/
#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
#define HAL_USE_DAC FALSE
#endif
/** /**
* @brief Enables the EXT subsystem. * @brief Enables the EXT subsystem.
*/ */
@ -294,7 +294,7 @@
* @brief Serial buffers size. * @brief Serial buffers size.
* @details Configuration parameter, you can change the depth of the queue * @details Configuration parameter, you can change the depth of the queue
* buffers depending on the requirements of your application. * buffers depending on the requirements of your application.
* @note The default is 64 bytes for both the transmission and receive * @note The default is 16 bytes for both the transmission and receive
* buffers. * buffers.
*/ */
#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) #if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
@ -309,13 +309,21 @@
* @brief Serial over USB buffers size. * @brief Serial over USB buffers size.
* @details Configuration parameter, the buffer size must be a multiple of * @details Configuration parameter, the buffer size must be a multiple of
* the USB data endpoint maximum packet size. * the USB data endpoint maximum packet size.
* @note The default is 64 bytes for both the transmission and receive * @note The default is 256 bytes for both the transmission and receive
* buffers. * buffers.
*/ */
#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__) #if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
#define SERIAL_USB_BUFFERS_SIZE 256 #define SERIAL_USB_BUFFERS_SIZE 256
#endif #endif
/**
* @brief Serial over USB number of buffers.
* @note The default is 2 buffers.
*/
#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
#define SERIAL_USB_BUFFERS_NUMBER 2
#endif
/*===========================================================================*/ /*===========================================================================*/
/* SPI driver related settings. */ /* SPI driver related settings. */
/*===========================================================================*/ /*===========================================================================*/
@ -336,12 +344,44 @@
#define SPI_USE_MUTUAL_EXCLUSION TRUE #define SPI_USE_MUTUAL_EXCLUSION TRUE
#endif #endif
/*===========================================================================*/
/* UART driver related settings. */
/*===========================================================================*/
/**
* @brief Enables synchronous APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
#define UART_USE_WAIT FALSE
#endif
/**
* @brief Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
#define UART_USE_MUTUAL_EXCLUSION FALSE
#endif
/*===========================================================================*/
/* USB driver related settings. */
/*===========================================================================*/
/**
* @brief Enables synchronous APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
#define USB_USE_WAIT FALSE
#endif
/*===========================================================================*/ /*===========================================================================*/
/* Community drivers's includes */ /* Community drivers's includes */
/*===========================================================================*/ /*===========================================================================*/
#include "halconf_community.h" #include "halconf_community.h"
#endif /* _HALCONF_H_ */ #endif /* HALCONF_H */
/** @} */ /** @} */

6
testhal/STM32/STM32F1xx/onewire/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -93,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

8
testhal/STM32/STM32F3xx/EEProm/halconf.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -25,8 +25,8 @@
* @{ * @{
*/ */
#ifndef _HALCONF_H_ #ifndef HALCONF_H
#define _HALCONF_H_ #define HALCONF_H
#include "mcuconf.h" #include "mcuconf.h"
@ -382,6 +382,6 @@
#include "halconf_community.h" #include "halconf_community.h"
#endif /* _HALCONF_H_ */ #endif /* HALCONF_H */
/** @} */ /** @} */

11
testhal/STM32/STM32F3xx/EEProm/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -100,7 +100,7 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
/*===========================================================================*/ /*===========================================================================*/
/* EEProm driver related settings. */ /* EEProm driver related settings. */
/*===========================================================================*/ /*===========================================================================*/
@ -109,13 +109,12 @@
* @note Disabling this option saves both code and data space. * @note Disabling this option saves both code and data space.
*/ */
#define EEPROM_USE_EE24XX TRUE #define EEPROM_USE_EE24XX TRUE
/** /**
* @brief Enables 25xx series SPI eeprom device driver. * @brief Enables 25xx series SPI eeprom device driver.
* @note Disabling this option saves both code and data space. * @note Disabling this option saves both code and data space.
*/ */
#define EEPROM_USE_EE25XX TRUE #define EEPROM_USE_EE25XX TRUE
#endif /* HALCONF_COMMUNITY_H */
#endif /* _HALCONF_COMMUNITY_H_ */
/** @} */ /** @} */

8
testhal/STM32/STM32F3xx/EEProm/mcuconf.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _MCUCONF_H_ #ifndef MCUCONF_H
#define _MCUCONF_H_ #define MCUCONF_H
/* /*
* STM32F3xx drivers configuration. * STM32F3xx drivers configuration.
@ -255,4 +255,4 @@
*/ */
#include "mcuconf_community.h" #include "mcuconf_community.h"
#endif /* _MCUCONF_H_ */ #endif /* MCUCONF_H */

8
testhal/STM32/STM32F3xx/TIMCAP/halconf.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -25,8 +25,8 @@
* @{ * @{
*/ */
#ifndef _HALCONF_H_ #ifndef HALCONF_H
#define _HALCONF_H_ #define HALCONF_H
#include "mcuconf.h" #include "mcuconf.h"
@ -382,6 +382,6 @@
#include "halconf_community.h" #include "halconf_community.h"
#endif /* _HALCONF_H_ */ #endif /* HALCONF_H */
/** @} */ /** @} */

9
testhal/STM32/STM32F3xx/TIMCAP/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -107,7 +107,7 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
/*===========================================================================*/ /*===========================================================================*/
/* EEProm driver related settings. */ /* EEProm driver related settings. */
/*===========================================================================*/ /*===========================================================================*/
@ -122,7 +122,6 @@
*/ */
#define EEPROM_USE_EE25XX TRUE #define EEPROM_USE_EE25XX TRUE
#endif /* HALCONF_COMMUNITY_H */
#endif /* _HALCONF_COMMUNITY_H_ */
/** @} */ /** @} */

8
testhal/STM32/STM32F3xx/TIMCAP/mcuconf.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _MCUCONF_H_ #ifndef MCUCONF_H
#define _MCUCONF_H_ #define MCUCONF_H
/* /*
* STM32F3xx drivers configuration. * STM32F3xx drivers configuration.
@ -255,4 +255,4 @@
*/ */
#include "mcuconf_community.h" #include "mcuconf_community.h"
#endif /* _MCUCONF_H_ */ #endif /* MCUCONF_H */

6
testhal/STM32/STM32F4xx/EICU/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -93,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM FALSE #define ONEWIRE_USE_SEARCH_ROM FALSE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

6
testhal/STM32/STM32F4xx/FSMC_NAND/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -93,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

6
testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -93,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

6
testhal/STM32/STM32F4xx/FSMC_SRAM/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -93,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

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

@ -46,7 +46,7 @@ endif
# If enabled, this option makes the build process faster by not compiling # If enabled, this option makes the build process faster by not compiling
# modules not used in the current configuration. # modules not used in the current configuration.
ifeq ($(USE_SMART_BUILD),) ifeq ($(USE_SMART_BUILD),)
USE_SMART_BUILD = no USE_SMART_BUILD = yes
endif endif
# #
@ -105,7 +105,7 @@ include $(CHIBIOS)/os/various/shell/shell.mk
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
# Define linker script file here # Define linker script file here
LDSCRIPT = $(STARTUPLD)/STM32F407xG.ld 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.

1
testhal/STM32/STM32F4xx/USB_HOST/fatfs_diskio.c
View File

@ -9,7 +9,6 @@
#include "ffconf.h" #include "ffconf.h"
#include "diskio.h" #include "diskio.h"
#include "usbh.h"
#include "usbh/dev/msd.h" #include "usbh/dev/msd.h"
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/

461
testhal/STM32/STM32F4xx/USB_HOST/ff.c
View File

File diff suppressed because it is too large Load Diff

9
testhal/STM32/STM32F4xx/USB_HOST/ff.h
View File

@ -1,5 +1,5 @@
/*---------------------------------------------------------------------------/ /*---------------------------------------------------------------------------/
/ FatFs - FAT file system module include file R0.10c (C)ChaN, 2014 / FatFs - FAT file system module include file R0.10b (C)ChaN, 2014
/----------------------------------------------------------------------------/ /----------------------------------------------------------------------------/
/ FatFs module is a generic FAT file system module for small embedded systems. / FatFs module is a generic FAT file system module for small embedded systems.
/ This is a free software that opened for education, research and commercial / This is a free software that opened for education, research and commercial
@ -15,7 +15,7 @@
/----------------------------------------------------------------------------*/ /----------------------------------------------------------------------------*/
#ifndef _FATFS #ifndef _FATFS
#define _FATFS 80376 /* Revision ID */ #define _FATFS 8051 /* Revision ID */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -23,6 +23,7 @@ extern "C" {
#include "integer.h" /* Basic integer types */ #include "integer.h" /* Basic integer types */
#include "ffconf.h" /* FatFs configuration options */ #include "ffconf.h" /* FatFs configuration options */
#if _FATFS != _FFCONF #if _FATFS != _FFCONF
#error Wrong configuration file (ffconf.h). #error Wrong configuration file (ffconf.h).
#endif #endif
@ -235,7 +236,7 @@ int f_puts (const TCHAR* str, FIL* cp); /* Put a string to the file */
int f_printf (FIL* fp, const TCHAR* str, ...); /* Put a formatted string to the file */ int f_printf (FIL* fp, const TCHAR* str, ...); /* Put a formatted string to the file */
TCHAR* f_gets (TCHAR* buff, int len, FIL* fp); /* Get a string from the file */ TCHAR* f_gets (TCHAR* buff, int len, FIL* fp); /* Get a string from the file */
#define f_eof(fp) ((int)((fp)->fptr == (fp)->fsize)) #define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)
#define f_error(fp) ((fp)->err) #define f_error(fp) ((fp)->err)
#define f_tell(fp) ((fp)->fptr) #define f_tell(fp) ((fp)->fptr)
#define f_size(fp) ((fp)->fsize) #define f_size(fp) ((fp)->fsize)
@ -251,7 +252,7 @@ TCHAR* f_gets (TCHAR* buff, int len, FIL* fp); /* Get a string from the fil
/* Additional user defined functions */ /* Additional user defined functions */
/* RTC function */ /* RTC function */
#if !_FS_READONLY && !_FS_NORTC #if !_FS_READONLY
DWORD get_fattime (void); DWORD get_fattime (void);
#endif #endif

237
testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
View File

@ -1,31 +1,33 @@
/*---------------------------------------------------------------------------/ /* CHIBIOS FIX */
/ FatFs - FAT file system module configuration file R0.10c (C)ChaN, 2014
/---------------------------------------------------------------------------*/
#include "ch.h" #include "ch.h"
#define _FFCONF 80376 /* Revision ID */ /*---------------------------------------------------------------------------/
/ FatFs - FAT file system module configuration file R0.10b (C)ChaN, 2014
/---------------------------------------------------------------------------*/
#ifndef _FFCONF
#define _FFCONF 8051 /* Revision ID */
/*---------------------------------------------------------------------------/ /*---------------------------------------------------------------------------/
/ Functions and Buffer Configurations / Functions and Buffer Configurations
/---------------------------------------------------------------------------*/ /---------------------------------------------------------------------------*/
#define _FS_TINY 0 #define _FS_TINY 0 /* 0:Normal or 1:Tiny */
/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny) /* When _FS_TINY is set to 1, it reduces memory consumption _MAX_SS bytes each
/ At the tiny configuration, size of the file object (FIL) is reduced _MAX_SS / file object. For file data transfer, FatFs uses the common sector buffer in
/ bytes. Instead of private sector buffer eliminated from the file object, / the file system object (FATFS) instead of private sector buffer eliminated
/ common sector buffer in the file system object (FATFS) is used for the file / from the file object (FIL). */
/ data transfer. */
#define _FS_READONLY 0 #define _FS_READONLY 0 /* 0:Read/Write or 1:Read only */
/* This option switches read-only configuration. (0:Read/Write or 1:Read-only) /* Setting _FS_READONLY to 1 defines read only configuration. This removes
/ Read-only configuration removes basic writing API functions, f_write(), / writing functions, f_write(), f_sync(), f_unlink(), f_mkdir(), f_chmod(),
/ f_sync(), f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), / f_rename(), f_truncate() and useless f_getfree(). */
/ f_getfree() and optional writing functions as well. */
#define _FS_MINIMIZE 0 #define _FS_MINIMIZE 0 /* 0 to 3 */
/* This option defines minimization level to remove some API functions. /* The _FS_MINIMIZE option defines minimization level to remove API functions.
/ /
/ 0: All basic functions are enabled. / 0: All basic functions are enabled.
/ 1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_chmod(), f_utime(), / 1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_chmod(), f_utime(),
@ -34,40 +36,32 @@
/ 3: f_lseek() function is removed in addition to 2. */ / 3: f_lseek() function is removed in addition to 2. */
#define _USE_STRFUNC 0 #define _USE_STRFUNC 0 /* 0:Disable or 1-2:Enable */
/* This option switches string functions, f_gets(), f_putc(), f_puts() and /* To enable string functions, set _USE_STRFUNC to 1 or 2. */
/ f_printf().
/
/ 0: Disable string functions.
/ 1: Enable without LF-CRLF conversion.
/ 2: Enable with LF-CRLF conversion. */
#define _USE_MKFS 0 #define _USE_MKFS 0 /* 0:Disable or 1:Enable */
/* This option switches f_mkfs() function. (0:Disable or 1:Enable) /* To enable f_mkfs() function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */
/ To enable it, also _FS_READONLY need to be set to 0. */
#define _USE_FASTSEEK 0 #define _USE_FASTSEEK 0 /* 0:Disable or 1:Enable */
/* This option switches fast seek feature. (0:Disable or 1:Enable) */ /* To enable fast seek feature, set _USE_FASTSEEK to 1. */
#define _USE_LABEL 0 #define _USE_LABEL 0 /* 0:Disable or 1:Enable */
/* This option switches volume label functions, f_getlabel() and f_setlabel(). /* To enable volume label functions, set _USE_LAVEL to 1 */
/ (0:Disable or 1:Enable) */
#define _USE_FORWARD 0 #define _USE_FORWARD 0 /* 0:Disable or 1:Enable */
/* This option switches f_forward() function. (0:Disable or 1:Enable) */ /* To enable f_forward() function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */
/* To enable it, also _FS_TINY need to be set to 1. */
/*---------------------------------------------------------------------------/ /*---------------------------------------------------------------------------/
/ Locale and Namespace Configurations / Locale and Namespace Configurations
/---------------------------------------------------------------------------*/ /---------------------------------------------------------------------------*/
#define _CODE_PAGE 437 #define _CODE_PAGE 1252
/* This option specifies the OEM code page to be used on the target system. /* The _CODE_PAGE specifies the OEM code page to be used on the target system.
/ Incorrect setting of the code page can cause a file open failure. / Incorrect setting of the code page can cause a file open failure.
/ /
/ 932 - Japanese Shift_JIS (DBCS, OEM, Windows) / 932 - Japanese Shift_JIS (DBCS, OEM, Windows)
@ -95,11 +89,11 @@
/ 857 - Turkish (OEM) / 857 - Turkish (OEM)
/ 862 - Hebrew (OEM) / 862 - Hebrew (OEM)
/ 874 - Thai (OEM, Windows) / 874 - Thai (OEM, Windows)
/ 1 - ASCII (No extended character. Valid for only non-LFN configuration.) */ / 1 - ASCII (Valid for only non-LFN configuration) */
#define _USE_LFN 0 #define _USE_LFN 3 /* 0 to 3 */
#define _MAX_LFN 255 #define _MAX_LFN 255 /* Maximum LFN length to handle (12 to 255) */
/* The _USE_LFN option switches the LFN feature. /* The _USE_LFN option switches the LFN feature.
/ /
/ 0: Disable LFN feature. _MAX_LFN has no effect. / 0: Disable LFN feature. _MAX_LFN has no effect.
@ -107,86 +101,77 @@
/ 2: Enable LFN with dynamic working buffer on the STACK. / 2: Enable LFN with dynamic working buffer on the STACK.
/ 3: Enable LFN with dynamic working buffer on the HEAP. / 3: Enable LFN with dynamic working buffer on the HEAP.
/ /
/ When enable the LFN feature, Unicode handling functions (option/unicode.c) must / When enable LFN feature, Unicode handling functions ff_convert() and ff_wtoupper()
/ be added to the project. The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. / function must be added to the project.
/ When use stack for the working buffer, take care on stack overflow. When use heap / The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. When use stack for the
/ memory for the working buffer, memory management functions, ff_memalloc() and / working buffer, take care on stack overflow. When use heap memory for the working
/ ff_memfree(), must be added to the project. */ / buffer, memory management functions, ff_memalloc() and ff_memfree(), must be added
/ to the project. */
#define _LFN_UNICODE 0 #define _LFN_UNICODE 0 /* 0:ANSI/OEM or 1:Unicode */
/* This option switches character encoding on the API. (0:ANSI/OEM or 1:Unicode) /* To switch the character encoding on the FatFs API (TCHAR) to Unicode, enable LFN
/ To use Unicode string for the path name, enable LFN feature and set _LFN_UNICODE / feature and set _LFN_UNICODE to 1. This option affects behavior of string I/O
/ to 1. This option also affects behavior of string I/O functions. */ / functions. This option must be 0 when LFN feature is not enabled. */
#define _STRF_ENCODE 3 #define _STRF_ENCODE 3 /* 0:ANSI/OEM, 1:UTF-16LE, 2:UTF-16BE, 3:UTF-8 */
/* When _LFN_UNICODE is 1, this option selects the character encoding on the file to /* When Unicode API is enabled by _LFN_UNICODE option, this option selects the character
/ be read/written via string I/O functions, f_gets(), f_putc(), f_puts and f_printf(). / encoding on the file to be read/written via string I/O functions, f_gets(), f_putc(),
/ / f_puts and f_printf(). This option has no effect when Unicode API is not enabled. */
/ 0: ANSI/OEM
/ 1: UTF-16LE
/ 2: UTF-16BE
/ 3: UTF-8
/
/ When _LFN_UNICODE is 0, this option has no effect. */
#define _FS_RPATH 0 #define _FS_RPATH 0 /* 0 to 2 */
/* This option configures relative path feature. /* The _FS_RPATH option configures relative path feature.
/ /
/ 0: Disable relative path feature and remove related functions. / 0: Disable relative path feature and remove related functions.
/ 1: Enable relative path feature. f_chdir() and f_chdrive() are available. / 1: Enable relative path. f_chdrive() and f_chdir() function are available.
/ 2: f_getcwd() function is available in addition to 1. / 2: f_getcwd() function is available in addition to 1.
/ /
/ Note that directory items read via f_readdir() are affected by this option. */ / Note that output of the f_readdir() fnction is affected by this option. */
/*---------------------------------------------------------------------------/ /*---------------------------------------------------------------------------/
/ Drive/Volume Configurations / Drive/Volume Configurations
/---------------------------------------------------------------------------*/ /---------------------------------------------------------------------------*/
#define _VOLUMES 1 #define _VOLUMES 1
/* Number of volumes (logical drives) to be used. */ /* Number of volumes (logical drives) to be used. */
#define _STR_VOLUME_ID 0 #define _STR_VOLUME_ID 0 /* 0:Use only 0-9 for drive ID, 1:Use strings for drive ID */
#define _VOLUME_STRS "RAM","NAND","CF","SD1","SD2","USB1","USB2","USB3" #define _VOLUME_STRS "RAM","NAND","CF","SD1","SD2","USB1","USB2","USB3"
/* _STR_VOLUME_ID option switches string volume ID feature. /* When _STR_VOLUME_ID is set to 1, also pre-defined strings can be used as drive
/ When _STR_VOLUME_ID is set to 1, also pre-defined strings can be used as drive / number in the path name. _VOLUME_STRS defines the drive ID strings for each logical
/ number in the path name. _VOLUME_STRS defines the drive ID strings for each / drives. Number of items must be equal to _VOLUMES. Valid characters for the drive ID
/ logical drives. Number of items must be equal to _VOLUMES. Valid characters for / strings are: 0-9 and A-Z. */
/ the drive ID strings are: A-Z and 0-9. */
#define _MULTI_PARTITION 0 #define _MULTI_PARTITION 0 /* 0:Single partition, 1:Enable multiple partition */
/* This option switches multi-partition feature. By default (0), each logical drive /* By default(0), each logical drive number is bound to the same physical drive number
/ number is bound to the same physical drive number and only an FAT volume found on / and only a FAT volume found on the physical drive is mounted. When it is set to 1,
/ the physical drive will be mounted. When multi-partition feature is enabled (1), / each logical drive number is bound to arbitrary drive/partition listed in VolToPart[].
/ each logical drive number is bound to arbitrary physical drive and partition */
/ listed in the VolToPart[]. Also f_fdisk() funciton will be enabled. */
#define _MIN_SS 512 #define _MIN_SS 512
#define _MAX_SS 512 #define _MAX_SS 512
/* These options configure the range of sector size to be supported. (512, 1024, /* These options configure the range of sector size to be supported. (512, 1024, 2048 or
/ 2048 or 4096) Always set both 512 for most systems, all type of memory cards and / 4096) Always set both 512 for most systems, all memory card and harddisk. But a larger
/ harddisk. But a larger value may be required for on-board flash memory and some / value may be required for on-board flash memory and some type of optical media.
/ type of optical media. When _MAX_SS is larger than _MIN_SS, FatFs is configured / When _MAX_SS is larger than _MIN_SS, FatFs is configured to variable sector size and
/ to variable sector size and GET_SECTOR_SIZE command must be implemented to the / GET_SECTOR_SIZE command must be implemented to the disk_ioctl() function. */
/ disk_ioctl() function. */
#define _USE_TRIM 0 #define _USE_ERASE 0 /* 0:Disable or 1:Enable */
/* This option switches ATA-TRIM feature. (0:Disable or 1:Enable) /* To enable sector erase feature, set _USE_ERASE to 1. Also CTRL_ERASE_SECTOR command
/ To enable Trim feature, also CTRL_TRIM command should be implemented to the / should be added to the disk_ioctl() function. */
/ disk_ioctl() function. */
#define _FS_NOFSINFO 0 #define _FS_NOFSINFO 0 /* 0 to 3 */
/* If you need to know correct free space on the FAT32 volume, set bit 0 of this /* If you need to know correct free space on the FAT32 volume, set bit 0 of this option
/ option, and f_getfree() function at first time after volume mount will force / and f_getfree() function at first time after volume mount will force a full FAT scan.
/ a full FAT scan. Bit 1 controls the use of last allocated cluster number. / Bit 1 controls the last allocated cluster number as bit 0.
/ /
/ bit0=0: Use free cluster count in the FSINFO if available. / bit0=0: Use free cluster count in the FSINFO if available.
/ bit0=1: Do not trust free cluster count in the FSINFO. / bit0=1: Do not trust free cluster count in the FSINFO.
@ -200,72 +185,46 @@
/ System Configurations / System Configurations
/---------------------------------------------------------------------------*/ /---------------------------------------------------------------------------*/
#define _FS_NORTC 0 #define _FS_LOCK 0 /* 0:Disable or >=1:Enable */
#define _NORTC_MON 11 /* To enable file lock control feature, set _FS_LOCK to non-zero value.
#define _NORTC_MDAY 9 / The value defines how many files/sub-directories can be opened simultaneously
#define _NORTC_YEAR 2014 / with file lock control. This feature uses bss _FS_LOCK * 12 bytes. */
/* The _FS_NORTC option switches timestamp feature. If the system does not have
/ an RTC function or valid timestamp is not needed, set _FS_NORTC to 1 to disable
/ the timestamp feature. All objects modified by FatFs will have a fixed timestamp
/ defined by _NORTC_MON, _NORTC_MDAY and _NORTC_YEAR.
/ When timestamp feature is enabled (_FS_NORTC == 0), get_fattime() function need
/ to be added to the project to read current time form RTC. _NORTC_MON,
/ _NORTC_MDAY and _NORTC_YEAR have no effect.
/ These options have no effect at read-only configuration (_FS_READONLY == 1). */
#define _FS_LOCK 0 #define _FS_REENTRANT 0 /* 0:Disable or 1:Enable */
/* The _FS_LOCK option switches file lock feature to control duplicated file open #define _FS_TIMEOUT MS2ST(1000) /* Timeout period in unit of time tick */
/ and illegal operation to open objects. This option must be 0 when _FS_READONLY #define _SYNC_t semaphore_t* /* O/S dependent sync object type. e.g. HANDLE, OS_EVENT*, ID, SemaphoreHandle_t and etc.. */
/ is 1. /* The _FS_REENTRANT option switches the re-entrancy (thread safe) of the FatFs module.
/
/ 0: Disable file lock feature. To avoid volume corruption, application program
/ should avoid illegal open, remove and rename to the open objects.
/ >0: Enable file lock feature. The value defines how many files/sub-directories
/ can be opened simultaneously under file lock control. Note that the file
/ lock feature is independent of re-entrancy. */
#define _FS_REENTRANT 0
#define _FS_TIMEOUT S2ST(10)
typedef semaphore_t * _SYNC_t;
/* The _FS_REENTRANT option switches the re-entrancy (thread safe) of the FatFs
/ module itself. Note that regardless of this option, file access to different
/ volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
/ and f_fdisk() function, are always not re-entrant. Only file/directory access
/ to the same volume is under control of this feature.
/ /
/ 0: Disable re-entrancy. _FS_TIMEOUT and _SYNC_t have no effect. / 0: Disable re-entrancy. _FS_TIMEOUT and _SYNC_t have no effect.
/ 1: Enable re-entrancy. Also user provided synchronization handlers, / 1: Enable re-entrancy. Also user provided synchronization handlers,
/ ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj() / ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
/ function, must be added to the project. Samples are available in / function must be added to the project.
/ option/syscall.c. */
/
/ The _FS_TIMEOUT defines timeout period in unit of time tick.
/ The _SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
/ SemaphoreHandle_t and etc.. */
#define _WORD_ACCESS 0 #define _WORD_ACCESS 0 /* 0 or 1 */
/* The _WORD_ACCESS option is an only platform dependent option. It defines /* The _WORD_ACCESS option is an only platform dependent option. It defines
/ which access method is used to the word data on the FAT volume. / which access method is used to the word data on the FAT volume.
/ /
/ 0: Byte-by-byte access. Always compatible with all platforms. / 0: Byte-by-byte access. Always compatible with all platforms.
/ 1: Word access. Do not choose this unless under both the following conditions. / 1: Word access. Do not choose this unless under both the following conditions.
/ /
/ * Address misaligned memory access is always allowed to ALL instructions. / * Address misaligned memory access is always allowed for ALL instructions.
/ * Byte order on the memory is little-endian. / * Byte order on the memory is little-endian.
/ /
/ If it is the case, _WORD_ACCESS can also be set to 1 to reduce code size. / If it is the case, _WORD_ACCESS can also be set to 1 to improve performance and
/ Following table shows allowable settings of some processor types. / reduce code size. Following table shows an example of some processor types.
/ /
/ ARM7TDMI 0 ColdFire 0 V850E 0 / ARM7TDMI 0 ColdFire 0 V850E2 0
/ Cortex-M3 0 Z80 0/1 V850ES 0/1 / Cortex-M3 0 Z80 0/1 V850ES 0/1
/ Cortex-M0 0 x86 0/1 TLCS-870 0/1 / Cortex-M0 0 RX600(LE) 0/1 TLCS-870 0/1
/ AVR 0/1 RX600(LE) 0/1 TLCS-900 0/1 / AVR 0/1 RX600(BE) 0 TLCS-900 0/1
/ AVR32 0 RL78 0 R32C 0 / AVR32 0 RL78 0 R32C 0
/ PIC18 0/1 SH-2 0 M16C 0/1 / PIC18 0/1 SH-2 0 M16C 0/1
/ PIC24 0 H8S 0 MSP430 0 / PIC24 0 H8S 0 MSP430 0
/ PIC32 0 H8/300H 0 8051 0/1 / PIC32 0 H8/300H 0 x86 0/1
*/ */
#endif /* _FFCONF */

6
testhal/STM32/STM32F4xx/USB_HOST/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -190,6 +190,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */

71
testhal/STM32/STM32F4xx/USB_HOST/main.c
View File

@ -17,14 +17,12 @@
#include "ch.h" #include "ch.h"
#include "hal.h" #include "hal.h"
#include "ff.h" #include "ff.h"
#include "usbh.h"
#include <string.h> #include <string.h>
#if HAL_USBH_USE_FTDI #if HAL_USBH_USE_FTDI
#include "usbh/dev/ftdi.h" #include "usbh/dev/ftdi.h"
#include "test.h"
#include "shell.h" #include "shell.h"
#include "chprintf.h" #include "chprintf.h"
@ -51,56 +49,6 @@ static uint8_t buf[] =
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"; "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
size_t n, size;
(void)argv;
if (argc > 0) {
chprintf(chp, "Usage: mem\r\n");
return;
}
n = chHeapStatus(NULL, &size);
chprintf(chp, "core free memory : %u bytes\r\n", chCoreGetStatusX());
chprintf(chp, "heap fragments : %u\r\n", n);
chprintf(chp, "heap free total : %u bytes\r\n", size);
}
static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
static const char *states[] = {CH_STATE_NAMES};
thread_t *tp;
(void)argv;
if (argc > 0) {
chprintf(chp, "Usage: threads\r\n");
return;
}
chprintf(chp, " addr stack prio refs state\r\n");
tp = chRegFirstThread();
do {
chprintf(chp, "%08lx %08lx %4lu %4lu %9s\r\n",
(uint32_t)tp, (uint32_t)tp->p_ctx.r13,
(uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),
states[tp->p_state]);
tp = chRegNextThread(tp);
} while (tp != NULL);
}
static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
thread_t *tp;
(void)argv;
if (argc > 0) {
chprintf(chp, "Usage: test\r\n");
return;
}
tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),
TestThread, chp);
if (tp == NULL) {
chprintf(chp, "out of memory\r\n");
return;
}
chThdWait(tp);
}
static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) { static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
@ -115,15 +63,12 @@ static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
} }
while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) { while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) {
chSequentialStreamWrite(&FTDIPD[0], buf, sizeof buf - 1); streamWrite(&FTDIPD[0], buf, sizeof buf - 1);
} }
chprintf(chp, "\r\n\nstopped\r\n"); chprintf(chp, "\r\n\nstopped\r\n");
} }
static const ShellCommand commands[] = { static const ShellCommand commands[] = {
{"mem", cmd_mem},
{"threads", cmd_threads},
{"test", cmd_test},
{"write", cmd_write}, {"write", cmd_write},
{NULL, NULL} {NULL, NULL}
}; };
@ -159,12 +104,12 @@ start:
//loopback //loopback
if (0) { if (0) {
for(;;) { for(;;) {
msg_t m = chSequentialStreamGet(ftdipp); msg_t m = streamGet(ftdipp);
if (m < MSG_OK) { if (m < MSG_OK) {
usbDbgPuts("FTDI: Disconnected"); usbDbgPuts("FTDI: Disconnected");
goto start; goto start;
} }
chSequentialStreamPut(ftdipp, (uint8_t)m); streamPut(ftdipp, (uint8_t)m);
if (m == 'q') if (m == 'q')
break; break;
} }
@ -177,7 +122,7 @@ start:
if (ftdipp->state != USBHFTDIP_STATE_READY) if (ftdipp->state != USBHFTDIP_STATE_READY)
goto start; goto start;
if (!shelltp) { if (!shelltp) {
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO); shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE, "shell", NORMALPRIO, shellThread, (void *) &shell_cfg1);
} else if (chThdTerminatedX(shelltp)) { } else if (chThdTerminatedX(shelltp)) {
chThdRelease(shelltp); chThdRelease(shelltp);
if (ftdipp->state != USBHFTDIP_STATE_READY) if (ftdipp->state != USBHFTDIP_STATE_READY)
@ -191,7 +136,7 @@ start:
//FTDI uart RX to debug TX bridge //FTDI uart RX to debug TX bridge
if (0) { if (0) {
for(;;) { for(;;) {
msg_t m = chSequentialStreamGet(ftdipp); msg_t m = streamGet(ftdipp);
if (m < MSG_OK) { if (m < MSG_OK) {
usbDbgPuts("FTDI: Disconnected"); usbDbgPuts("FTDI: Disconnected");
goto start; goto start;
@ -215,14 +160,14 @@ start:
uint32_t times = bytes / 1024; uint32_t times = bytes / 1024;
st = chVTGetSystemTimeX(); st = chVTGetSystemTimeX();
while (times--) { while (times--) {
if (chSequentialStreamWrite(ftdipp, buf, 1024) < 1024) { if (streamWrite(ftdipp, buf, 1024) < 1024) {
usbDbgPuts("FTDI: Disconnected"); usbDbgPuts("FTDI: Disconnected");
goto start; goto start;
} }
bytes -= 1024; bytes -= 1024;
} }
if (bytes) { if (bytes) {
if (chSequentialStreamWrite(ftdipp, buf, bytes) < bytes) { if (streamWrite(ftdipp, buf, bytes) < bytes) {
usbDbgPuts("FTDI: Disconnected"); usbDbgPuts("FTDI: Disconnected");
goto start; goto start;
} }
@ -235,7 +180,7 @@ start:
//single character write test (tests the timer) //single character write test (tests the timer)
if (0) { if (0) {
for (;;) { for (;;) {
if (chSequentialStreamPut(ftdipp, 'A') != MSG_OK) { if (streamPut(ftdipp, 'A') != MSG_OK) {
usbDbgPuts("FTDI: Disconnected"); usbDbgPuts("FTDI: Disconnected");
goto start; goto start;
} }

24
testhal/STM32/STM32F4xx/USB_HOST/mcuconf_community.h
View File

@ -48,19 +48,19 @@
/* /*
* USBH driver system settings. * USBH driver system settings.
*/ */
#define STM32_OTG1_CHANNELS_NUMBER 8 #define STM32_OTG1_CHANNELS_NUMBER 8
#define STM32_OTG2_CHANNELS_NUMBER 12 #define STM32_OTG2_CHANNELS_NUMBER 12
#define STM32_USBH_USE_OTG1 1 #define STM32_USBH_USE_OTG1 1
#define STM32_OTG1_RXFIFO_SIZE 1024 #define STM32_OTG1_RXFIFO_SIZE 1024
#define STM32_OTG1_PTXFIFO_SIZE 128 #define STM32_OTG1_PTXFIFO_SIZE 128
#define STM32_OTG1_NPTXFIFO_SIZE 128 #define STM32_OTG1_NPTXFIFO_SIZE 128
#define STM32_USBH_USE_OTG2 0 #define STM32_USBH_USE_OTG2 0
#define STM32_OTG2_RXFIFO_SIZE 2048 #define STM32_OTG2_RXFIFO_SIZE 2048
#define STM32_OTG2_PTXFIFO_SIZE 1024 #define STM32_OTG2_PTXFIFO_SIZE 1024
#define STM32_OTG2_NPTXFIFO_SIZE 1024 #define STM32_OTG2_NPTXFIFO_SIZE 1024
#define STM32_USBH_MIN_QSPACE 4 #define STM32_USBH_MIN_QSPACE 4
#define STM32_USBH_CHANNELS_NP 4 #define STM32_USBH_CHANNELS_NP 4

6
testhal/STM32/STM32F4xx/onewire/halconf_community.h
View File

@ -14,8 +14,8 @@
limitations under the License. limitations under the License.
*/ */
#ifndef _HALCONF_COMMUNITY_H_ #ifndef HALCONF_COMMUNITY_H
#define _HALCONF_COMMUNITY_H_ #define HALCONF_COMMUNITY_H
/** /**
* @brief Enables the community overlay. * @brief Enables the community overlay.
@ -93,6 +93,6 @@
*/ */
#define ONEWIRE_USE_SEARCH_ROM TRUE #define ONEWIRE_USE_SEARCH_ROM TRUE
#endif /* _HALCONF_COMMUNITY_H_ */ #endif /* HALCONF_COMMUNITY_H */
/** @} */ /** @} */