Changeset 629:b641b3511145

Timestamp:

08/15/08 19:25:11 (3 months ago)

Author:

David Anderson <dave@…>

Branch:

default

Message:

Make nx_rs485_shutdown only work when the driver is idle.

Shutting down the driver while a communication is in progress is now a
programming error.

Location:

nxos

Files:

• base/drivers/rs485.c (modified) (2 diffs)
• base/drivers/rs485.h (modified) (1 diff)
• systems/rs485_rx/main.c (modified) (1 diff)

nxos/base/drivers/rs485.c

@@ -179 +179 @@
 }
 
-bool nx_rs485_stop(void) {
-  NX_ASSERT(rs485_state.status != RS485_UNINITIALIZED);
-  if (rs485_state.status != RS485_IDLE) {
-    return FALSE;
-  }
+void nx_rs485_shutdown(void) {
+  NX_ASSERT(rs485_state.status == RS485_IDLE);
 
   *AT91C_US0_CR = AT91C_US_RSTTX  |      /* Transmitter reset */
@@ -193 +190 @@
 
   rs485_state.status = RS485_UNINITIALIZED;
-  return TRUE;
 }
 

nxos/base/drivers/rs485.h

@@ -48 +48 @@
  * @note Once the RS485 interface is shut down, port 4 may be used as a
  * normal sensor port again.
+ *
+ * @warning The RS485 driver should only be shutdown after all
+ * in-progress transmissions have completed.
  */
-bool nx_rs485_stop(void);
+void nx_rs485_shutdown(void);
 
 /** Asynchronously transmit data on the RS485 bus.

nxos/systems/rs485_rx/main.c

@@ -56 +56 @@
   }
 }
-