Changeset 205 for rtos_arduino/trunk

Timestamp:

Apr 1, 2016, 10:33:32 AM (8 years ago)

Author:

ertl-honda

Message:

修正

File:

• rtos_arduino/trunk/arduino_lib/libraries/NcesCan/mcp_can.cpp (modified) (3 diffs)

rtos_arduino/trunk/arduino_lib/libraries/NcesCan/mcp_can.cpp

@@ -874 +874 @@
 INT8U MCP_CAN::checkReceive(INT8U rxbid)
 {
-    INT8U res = CAN_NOMSG;
+    INT8U stat, res = CAN_NOMSG;
     CHECK_RXBID(rxbid);
     
     ENTER_CRITICAL;
-    res = mcp2515_readStatus();                                         /* RXnIF in Bit 1 and 0         */
+    stat = mcp2515_readStatus();                                         /* RXnIF in Bit 1 and 0         */
     if (rxbid == 0) {
-        if ( (res & MCP_STAT_RX0IF) == MCP_STAT_RX0IF) {
+        if ( (stat & MCP_STAT_RX0IF) == MCP_STAT_RX0IF) {
             res = CAN_MSGAVAIL;
         }
     }
     else if (rxbid == 1) {
-        if ( (res & MCP_STAT_RX1IF) == MCP_STAT_RX1IF ) {
+        if ( (stat & MCP_STAT_RX1IF) == MCP_STAT_RX1IF ) {
             res = CAN_MSGAVAIL;
-        }        
+        }
     }
     LEAVE_CRITICAL;
@@ -900 +900 @@
 INT8U MCP_CAN::checkSend(INT8U txbid)
 {
-    INT8U res = CAN_NOSENDWAIT;
+    INT8U stat, res = CAN_NOSENDWAIT;
     INT8U txbx_ctrl[MCP_N_TXBUFFERS] = { MCP_TXB0CTRL, MCP_TXB1CTRL, MCP_TXB2CTRL };
     
@@ -906 +906 @@
     
     ENTER_CRITICAL;    
-    res = mcp2515_readRegister(txbx_ctrl[txbid]);
-
-    if ( (res & MCP_TXB_TXREQ_M) == MCP_TXB_TXREQ_M) {
+    stat = mcp2515_readRegister(txbx_ctrl[txbid]);
+
+    if ( (stat & MCP_TXB_TXREQ_M) == MCP_TXB_TXREQ_M) {
         res = CAN_SENDWAIT;
     }
     LEAVE_CRITICAL;
     
-    return CAN_NOSENDWAIT;
+    return res;
 }