From 81a54e64f7a0d305efb4ca9d3c4a19850238cc6d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 19 Sep 2007 15:14:52 +0000 Subject: 2007-09-19 Daniel Hellstrom * shared/can/occan.c: Fix Reenable command and fix typo. --- c/src/lib/libbsp/sparc/shared/can/occan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'c/src/lib/libbsp/sparc/shared/can/occan.c') diff --git a/c/src/lib/libbsp/sparc/shared/can/occan.c b/c/src/lib/libbsp/sparc/shared/can/occan.c index 6b9dd47601..b5b6e51885 100644 --- a/c/src/lib/libbsp/sparc/shared/can/occan.c +++ b/c/src/lib/libbsp/sparc/shared/can/occan.c @@ -1625,7 +1625,7 @@ static void occan_interrupt(occan_priv *can){ } /* Re-Enable RX buffer for a new message */ - regs->cmd = READ_REG(®s->cmd) | PELICAN_CMD_RELRXBUF; + regs->cmd = PELICAN_CMD_RELRXBUF; /* make message available to the user */ occan_fifo_put(can->rxfifo); @@ -1726,7 +1726,7 @@ static void occan_interrupt(occan_priv *can){ tx_error_cnt = READ_REG(®s->tx_err_cnt); rx_error_cnt = READ_REG(®s->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; }else{ can->status &= ~(OCCAN_STATUS_ERR_PASSIVE); -- cgit v1.2.3