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

Fixed bug 3179783. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@2736 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2011-02-13 15:54:51 +00:00
parent d417697df5
commit 6a2f114aab
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/src/mac.c
View File

@ -130,8 +130,10 @@ msg_t macWaitTransmitDescriptor(MACDriver *macp,
(time > 0)) { (time > 0)) {
chSysLock(); chSysLock();
systime_t now = chTimeNow(); systime_t now = chTimeNow();
if ((msg = chSemWaitTimeoutS(&macp->md_tdsem, time)) == RDY_TIMEOUT) if ((msg = chSemWaitTimeoutS(&macp->md_tdsem, time)) == RDY_TIMEOUT) {
chSysUnlock();
break; break;
}
if (time != TIME_INFINITE) if (time != TIME_INFINITE)
time -= (chTimeNow() - now); time -= (chTimeNow() - now);
chSysUnlock(); chSysUnlock();
@ -180,8 +182,10 @@ msg_t macWaitReceiveDescriptor(MACDriver *macp,
(time > 0)) { (time > 0)) {
chSysLock(); chSysLock();
systime_t now = chTimeNow(); systime_t now = chTimeNow();
if ((msg = chSemWaitTimeoutS(&macp->md_rdsem, time)) == RDY_TIMEOUT) if ((msg = chSemWaitTimeoutS(&macp->md_rdsem, time)) == RDY_TIMEOUT) {
chSysUnlock();
break; break;
}
if (time != TIME_INFINITE) if (time != TIME_INFINITE)
time -= (chTimeNow() - now); time -= (chTimeNow() - now);
chSysUnlock(); chSysUnlock();

1
readme.txt
View File

@ -69,6 +69,7 @@
***************************************************************************** *****************************************************************************
*** 2.2.1 *** *** 2.2.1 ***
- FIX: Error in MAC driver (bug 3179783).
- FIX: Fixed wrong serial driver macros (bug 3173336). - FIX: Fixed wrong serial driver macros (bug 3173336).
*** 2.2.0 *** *** 2.2.0 ***