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 3575657. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4751 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2012-10-13 09:30:13 +00:00
parent 3cc94a9621
commit 14d77f2af0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,6 +148,7 @@ msg_t macWaitTransmitDescriptor(MACDriver *macp,
MACTransmitDescriptor *tdp, MACTransmitDescriptor *tdp,
systime_t time) { systime_t time) {
msg_t msg; msg_t msg;
systime_t now;
chDbgCheck((macp != NULL) && (tdp != NULL), "macWaitTransmitDescriptor"); chDbgCheck((macp != NULL) && (tdp != NULL), "macWaitTransmitDescriptor");
chDbgAssert(macp->state == MAC_ACTIVE, "macWaitTransmitDescriptor(), #1", chDbgAssert(macp->state == MAC_ACTIVE, "macWaitTransmitDescriptor(), #1",
@ -156,7 +157,7 @@ msg_t macWaitTransmitDescriptor(MACDriver *macp,
while (((msg = mac_lld_get_transmit_descriptor(macp, tdp)) != RDY_OK) && while (((msg = mac_lld_get_transmit_descriptor(macp, tdp)) != RDY_OK) &&
(time > 0)) { (time > 0)) {
chSysLock(); chSysLock();
systime_t now = chTimeNow(); now = chTimeNow();
if ((msg = chSemWaitTimeoutS(&macp->tdsem, time)) == RDY_TIMEOUT) { if ((msg = chSemWaitTimeoutS(&macp->tdsem, time)) == RDY_TIMEOUT) {
chSysUnlock(); chSysUnlock();
break; break;
@ -206,6 +207,7 @@ msg_t macWaitReceiveDescriptor(MACDriver *macp,
MACReceiveDescriptor *rdp, MACReceiveDescriptor *rdp,
systime_t time) { systime_t time) {
msg_t msg; msg_t msg;
systime_t now;
chDbgCheck((macp != NULL) && (rdp != NULL), "macWaitReceiveDescriptor"); chDbgCheck((macp != NULL) && (rdp != NULL), "macWaitReceiveDescriptor");
chDbgAssert(macp->state == MAC_ACTIVE, "macWaitReceiveDescriptor(), #1", chDbgAssert(macp->state == MAC_ACTIVE, "macWaitReceiveDescriptor(), #1",
@ -214,7 +216,7 @@ msg_t macWaitReceiveDescriptor(MACDriver *macp,
while (((msg = mac_lld_get_receive_descriptor(macp, rdp)) != RDY_OK) && while (((msg = mac_lld_get_receive_descriptor(macp, rdp)) != RDY_OK) &&
(time > 0)) { (time > 0)) {
chSysLock(); chSysLock();
systime_t now = chTimeNow(); now = chTimeNow();
if ((msg = chSemWaitTimeoutS(&macp->rdsem, time)) == RDY_TIMEOUT) { if ((msg = chSemWaitTimeoutS(&macp->rdsem, time)) == RDY_TIMEOUT) {
chSysUnlock(); chSysUnlock();
break; break;

2
readme.txt
View File

@ -83,6 +83,8 @@
***************************************************************************** *****************************************************************************
*** 2.5.1 *** *** 2.5.1 ***
- FIX: Fixed mac.c won't compile due to misplaced declarations (bug 3575657)
(backported to 2.4.3).
- FIX: Fixed STM32F4 ADC prescaler incorrectly initialized (bug 3575297) - FIX: Fixed STM32F4 ADC prescaler incorrectly initialized (bug 3575297)
(backported to 2.4.3). (backported to 2.4.3).
- FIX: Fixed RCC_APB2ENR_IOPEEN undeclared on STM32F10X_LD_VL devices (bug - FIX: Fixed RCC_APB2ENR_IOPEEN undeclared on STM32F10X_LD_VL devices (bug