2007-09-19 Daniel Hellstrom <daniel@gaisler.com>

* shared/can/occan.c: Fix Reenable command and fix typo.
This commit is contained in:
Joel Sherrill
2007-09-19 15:14:52 +00:00
parent a925b871a0
commit 81a54e64f7
2 changed files with 6 additions and 2 deletions

View File

@@ -1,3 +1,7 @@
2007-09-19 Daniel Hellstrom <daniel@gaisler.com>
* shared/can/occan.c: Fix Reenable command and fix typo.
2007-09-18 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-09-18 Joel Sherrill <joel.sherrill@OARcorp.com>
* shared/1553/b1553brm.c, shared/can/grcan.c: Remove include of sched.h * shared/1553/b1553brm.c, shared/can/grcan.c: Remove include of sched.h

View File

@@ -1625,7 +1625,7 @@ static void occan_interrupt(occan_priv *can){
} }
/* Re-Enable RX buffer for a new message */ /* Re-Enable RX buffer for a new message */
regs->cmd = READ_REG(&regs->cmd) | PELICAN_CMD_RELRXBUF; regs->cmd = PELICAN_CMD_RELRXBUF;
/* make message available to the user */ /* make message available to the user */
occan_fifo_put(can->rxfifo); occan_fifo_put(can->rxfifo);
@@ -1726,7 +1726,7 @@ static void occan_interrupt(occan_priv *can){
tx_error_cnt = READ_REG(&regs->tx_err_cnt); tx_error_cnt = READ_REG(&regs->tx_err_cnt);
rx_error_cnt = READ_REG(&regs->rx_err_cnt); rx_error_cnt = READ_REG(&regs->rx_err_cnt);
if ( (tx_error_cnt > 127) || (tx_error_cnt > 127) ){ if ( (tx_error_cnt > 127) || (rx_error_cnt > 127) ){
can->status |= OCCAN_STATUS_ERR_PASSIVE; can->status |= OCCAN_STATUS_ERR_PASSIVE;
}else{ }else{
can->status &= ~(OCCAN_STATUS_ERR_PASSIVE); can->status &= ~(OCCAN_STATUS_ERR_PASSIVE);