zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 3302420. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2964 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2011-05-15 13:05:47 +00:00
parent c2693bcad0
commit b793081d96
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/arch/sys_arch.c
View File

@ -91,11 +91,12 @@ void sys_sem_signal(sys_sem_t sem) {
} }
u32_t sys_arch_sem_wait(sys_sem_t sem, u32_t timeout) { u32_t sys_arch_sem_wait(sys_sem_t sem, u32_t timeout) {
systime_t time; systime_t time, tmo;
chSysLock(); chSysLock();
tmo = timeout > 0 ? (systime_t)timeout : TIME_INFINITE;
time = chTimeNow(); time = chTimeNow();
if (chSemWaitTimeoutS(sem, (systime_t)timeout) != RDY_OK) if (chSemWaitTimeoutS(sem, tmo) != RDY_OK)
time = SYS_ARCH_TIMEOUT; time = SYS_ARCH_TIMEOUT;
else else
time = chTimeNow() - time; time = chTimeNow() - time;
@ -135,11 +136,12 @@ err_t sys_mbox_trypost(sys_mbox_t mbox, void *msg) {
} }
u32_t sys_arch_mbox_fetch(sys_mbox_t mbox, void **msg, u32_t timeout) { u32_t sys_arch_mbox_fetch(sys_mbox_t mbox, void **msg, u32_t timeout) {
systime_t time; systime_t time, tmo;
chSysLock(); chSysLock();
tmo = timeout > 0 ? (systime_t)timeout : TIME_INFINITE;
time = chTimeNow(); time = chTimeNow();
if (chMBFetchS(mbox, (msg_t *)msg, (systime_t)timeout) != RDY_OK) if (chMBFetchS(mbox, (msg_t *)msg, tmo) != RDY_OK)
time = SYS_ARCH_TIMEOUT; time = SYS_ARCH_TIMEOUT;
else else
time = chTimeNow() - time; time = chTimeNow() - time;

2
demos/ARM7-AT91SAM7X-LWIP-GCC/lwip/lwipthread.c
View File

@ -142,7 +142,7 @@ static struct pbuf *low_level_input(struct netif *netif) {
(void)netif; (void)netif;
if (macWaitReceiveDescriptor(&ETH1, &rd, TIME_IMMEDIATE) == RDY_OK) { if (macWaitReceiveDescriptor(&ETH1, &rd, TIME_IMMEDIATE) == RDY_OK) {
len = (u16_t)rd.rd_size; len = (u16_t)rd.size;
#if ETH_PAD_SIZE #if ETH_PAD_SIZE
len += ETH_PAD_SIZE; /* allow room for Ethernet padding */ len += ETH_PAD_SIZE; /* allow room for Ethernet padding */

2
docs/Doxyfile_chm
View File

@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 2.3.2 PROJECT_NUMBER = 2.3.3
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

2
docs/Doxyfile_html
View File

@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 2.3.2 PROJECT_NUMBER = 2.3.3
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer # for a project that appears at the top of each page and should give viewer

4
os/kernel/include/ch.h
View File

@ -40,7 +40,7 @@
/** /**
* @brief Kernel version string. * @brief Kernel version string.
*/ */
#define CH_KERNEL_VERSION "2.3.2unstable" #define CH_KERNEL_VERSION "2.3.3unstable"
/** /**
* @brief Kernel version major number. * @brief Kernel version major number.
@ -55,7 +55,7 @@
/** /**
* @brief Kernel version patch number. * @brief Kernel version patch number.
*/ */
#define CH_KERNEL_PATCH 2 #define CH_KERNEL_PATCH 3
/* /*
* Common values. * Common values.

4
readme.txt
View File

@ -70,6 +70,10 @@
*** Releases *** *** Releases ***
***************************************************************************** *****************************************************************************
*** 2.3.3 ***
- FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420)
(backported to 2.2.4).
*** 2.3.2 *** *** 2.3.2 ***
- FIX: Fixed invalid BRR() macro in AVR serial driver (bug 3299306)(backported - FIX: Fixed invalid BRR() macro in AVR serial driver (bug 3299306)(backported
to 2.2.4). to 2.2.4).