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@1378 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2009-12-06 14:09:22 +00:00
parent aac691f35f
commit aa9f517f87
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/platforms/STM32/can_lld.c
View File

@ -59,6 +59,8 @@ CH_IRQ_HANDLER(Vector8C) {
/* No more events until a message is transmitted.*/ /* No more events until a message is transmitted.*/
CAN1->TSR = CAN_TSR_RQCP0 | CAN_TSR_RQCP1 | CAN_TSR_RQCP2; CAN1->TSR = CAN_TSR_RQCP0 | CAN_TSR_RQCP1 | CAN_TSR_RQCP2;
while (chSemGetCounterI(&CAND1.cd_txsem) < 0)
chSemSignalI(&CAND1.cd_txsem);
chEvtBroadcastI(&CAND1.cd_txempty_event); chEvtBroadcastI(&CAND1.cd_txempty_event);
CH_IRQ_EPILOGUE(); CH_IRQ_EPILOGUE();
@ -77,6 +79,8 @@ CH_IRQ_HANDLER(Vector90) {
if ((rf0r & CAN_RF0R_FMP0) > 0) { if ((rf0r & CAN_RF0R_FMP0) > 0) {
/* No more receive events until the queue 0 has been emptied.*/ /* No more receive events until the queue 0 has been emptied.*/
CAN1->IER &= ~CAN_IER_FMPIE0; CAN1->IER &= ~CAN_IER_FMPIE0;
while (chSemGetCounterI(&CAND1.cd_rxsem) < 0)
chSemSignalI(&CAND1.cd_rxsem);
chEvtBroadcastI(&CAND1.cd_rxfull_event); chEvtBroadcastI(&CAND1.cd_rxfull_event);
} }
if ((rf0r & CAN_RF0R_FOVR0) > 0) { if ((rf0r & CAN_RF0R_FOVR0) > 0) {

7
os/hal/src/can.c
View File

@ -98,6 +98,9 @@ void canStop(CANDriver *canp) {
"canStop(), #1", "canStop(), #1",
"invalid state"); "invalid state");
can_lld_stop(canp); can_lld_stop(canp);
chSemResetI(&canp->cd_rxsem, 0);
chSemResetI(&canp->cd_txsem, 0);
chSchRescheduleS();
canp->cd_state = CAN_STOP; canp->cd_state = CAN_STOP;
canp->cd_status = 0; canp->cd_status = 0;
chSysUnlock(); chSysUnlock();
@ -129,7 +132,7 @@ msg_t canTransmit(CANDriver *canp, const CANTxFrame *ctfp, systime_t timeout) {
chDbgAssert((canp->cd_state == CAN_READY) || (canp->cd_state == CAN_SLEEP), chDbgAssert((canp->cd_state == CAN_READY) || (canp->cd_state == CAN_SLEEP),
"canTransmit(), #1", "canTransmit(), #1",
"invalid state"); "invalid state");
if ((canp->cd_state == CAN_SLEEP) || !can_lld_can_transmit(canp)) { while ((canp->cd_state == CAN_SLEEP) || !can_lld_can_transmit(canp)) {
msg_t msg = chSemWaitTimeoutS(&canp->cd_txsem, timeout); msg_t msg = chSemWaitTimeoutS(&canp->cd_txsem, timeout);
if (msg != RDY_OK) { if (msg != RDY_OK) {
chSysUnlock(); chSysUnlock();
@ -169,7 +172,7 @@ msg_t canReceive(CANDriver *canp, CANRxFrame *crfp, systime_t timeout) {
chDbgAssert((canp->cd_state == CAN_READY) || (canp->cd_state == CAN_SLEEP), chDbgAssert((canp->cd_state == CAN_READY) || (canp->cd_state == CAN_SLEEP),
"canReceive(), #1", "canReceive(), #1",
"invalid state"); "invalid state");
if ((canp->cd_state == CAN_SLEEP) || !can_lld_can_receive(canp)) { while ((canp->cd_state == CAN_SLEEP) || !can_lld_can_receive(canp)) {
msg_t msg = chSemWaitTimeoutS(&canp->cd_rxsem, timeout); msg_t msg = chSemWaitTimeoutS(&canp->cd_rxsem, timeout);
if (msg != RDY_OK) { if (msg != RDY_OK) {
chSysUnlock(); chSysUnlock();