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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9970 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
Giovanni Di Sirio 2016-12-19 10:05:14 +00:00
parent 20c2e7e4c4
commit 459e31fac9
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/Makefile
View File

@ -115,6 +115,7 @@ CSRC = $(STARTUPSRC) \
$(BOARDSRC) \
$(TESTSRC) \
$(LWSRC) \
$(CHIBIOS)/os/various/evtimer.c \
web/web.c main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global

4
demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/chconf.h
View File

@ -48,7 +48,7 @@
* @details Frequency of the system timer that drives the system ticks. This
* setting also defines the system tick time unit.
*/
#define CH_CFG_ST_FREQUENCY 10000
#define CH_CFG_ST_FREQUENCY 1000
/**
* @brief Time delta constant for the tick-less mode.
@ -58,7 +58,7 @@
* The value one is not valid, timeouts are rounded up to
* this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
#define CH_CFG_ST_TIMEDELTA 0
/** @} */

6
demos/STM32/RT-STM32F107-OLIMEX_P107-LWIP/main.c
View File

@ -25,8 +25,8 @@
/*
* Green LED blinker thread, times are in milliseconds.
*/
static WORKING_AREA(waThread1, 128);
static msg_t Thread1(void *arg) {
static THD_WORKING_AREA(waThread1, 128);
static THD_FUNCTION(Thread1, arg) {
(void)arg;
chRegSetThreadName("blinker");
@ -76,7 +76,7 @@ int main(void) {
*/
while (true) {
if (palReadPad(GPIOC, GPIOC_SWITCH_TAMPER) == 0)
TestThread(&SD3);
test_execute((BaseSequentialStream *)&SD3);
chThdSleepMilliseconds(500);
}
}

17
os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.c
View File

@ -36,6 +36,23 @@
#define BUFFER_SIZE ((((STM32_MAC_BUFFERS_SIZE - 1) | 3) + 1) / 4)
/* Fixing inconsistencies in ST headers.*/
#if !defined(ETH_MACMIIAR_CR_Div102) && defined(ETH_MACMIIAR_CR_DIV102)
#define ETH_MACMIIAR_CR_Div102 ETH_MACMIIAR_CR_DIV102
#endif
#if !defined(ETH_MACMIIAR_CR_Div62) && defined(ETH_MACMIIAR_CR_DIV62)
#define ETH_MACMIIAR_CR_Div62 ETH_MACMIIAR_CR_DIV62
#endif
#if !defined(ETH_MACMIIAR_CR_Div42) && defined(ETH_MACMIIAR_CR_DIV42)
#define ETH_MACMIIAR_CR_Div42 ETH_MACMIIAR_CR_DIV42
#endif
#if !defined(ETH_MACMIIAR_CR_Div26) && defined(ETH_MACMIIAR_CR_DIV26)
#define ETH_MACMIIAR_CR_Div26 ETH_MACMIIAR_CR_DIV26
#endif
#if !defined(ETH_MACMIIAR_CR_Div16) && defined(ETH_MACMIIAR_CR_DIV16)
#define ETH_MACMIIAR_CR_Div16 ETH_MACMIIAR_CR_DIV16
#endif
/* MII divider optimal value.*/
#if (STM32_HCLK >= 150000000)
#define MACMIIDR_CR ETH_MACMIIAR_CR_Div102

4
os/hal/ports/STM32/LLD/MACv1/hal_mac_lld.h
View File

@ -190,10 +190,6 @@
/* Derived constants and error checks. */
/*===========================================================================*/
#if (STM32_MAC_PHY_TIMEOUT > 0) && !HAL_IMPLEMENTS_COUNTERS
#error "STM32_MAC_PHY_TIMEOUT requires the realtime counter service"
#endif
/*===========================================================================*/
/* Driver data structures and types. */
/*===========================================================================*/