Diff: BusIn.h

Revision:

11:1c1ebd0324fa

Parent:

5:62573be585e9

Child:

27:7110ebee3484

--- a/BusIn.h	Thu May 14 14:44:00 2009 +0000
+++ b/BusIn.h	Fri Aug 28 12:10:11 2009 +0000
@@ -1,10 +1,14 @@
-/* mbed Microcontroller Library - BusIn
- * Copyright (c) 2007-2008, sford
+/* mbed Microcontroller Library - DigitalIn
+ * Copyright (c) 2007-2009 ARM Limited. All rights reserved.
+ * sford, rmeyer
  */
  
 #ifndef MBED_BUSIN_H
 #define MBED_BUSIN_H
 
+#include "platform.h"
+#include "PinNames.h"
+#include "PeripheralNames.h"
 #include "Base.h"
 #include "DigitalIn.h"
 
@@ -17,25 +21,25 @@
 
 public:
 
-	/* Group: Configuration Methods */
+    /* Group: Configuration Methods */
 
-	/* Constructor: BusIn
-	 *  Create an BusIn, connected to the specified pins
-	 *
-	 * Variables:
-	 *  p<n> - DigitalIn pin to connect to bus bit <n> (5-30, NOT_CONNECTED)
+    /* Constructor: BusIn
+     *  Create an BusIn, connected to the specified pins
+     *
+     * Variables:
+     *  p<n> - DigitalIn pin to connect to bus bit <n> (p5-p30, NC)
      *
      * Note:
      *  It is only required to specify as many pin variables as is required
-     *  for the bus; the rest will default to NOT_CONNECTED
-	 */ 
-    BusIn(int p0, int p1 = NOT_CONNECTED, int p2 = NOT_CONNECTED, int p3 = NOT_CONNECTED,
-          int p4 = NOT_CONNECTED, int p5 = NOT_CONNECTED, int p6 = NOT_CONNECTED, int p7 = NOT_CONNECTED,
-          int p8 = NOT_CONNECTED, int p9 = NOT_CONNECTED, int p10 = NOT_CONNECTED, int p11 = NOT_CONNECTED,
-          int p12 = NOT_CONNECTED, int p13 = NOT_CONNECTED, int p14 = NOT_CONNECTED, int p15 = NOT_CONNECTED, 
+     *  for the bus; the rest will default to NC (not connected)
+     */ 
+    BusIn(PinName p0, PinName p1 = NC, PinName p2 = NC, PinName p3 = NC,
+          PinName p4 = NC, PinName p5 = NC, PinName p6 = NC, PinName p7 = NC,
+          PinName p8 = NC, PinName p9 = NC, PinName p10 = NC, PinName p11 = NC,
+          PinName p12 = NC, PinName p13 = NC, PinName p14 = NC, PinName p15 = NC, 
           const char *name = NULL);
 
-    BusIn(int pins[16], const char *name = NULL);
+    BusIn(PinName pins[16], const char *name = NULL);
 		
 	virtual ~BusIn();
 	
@@ -48,26 +52,32 @@
 	 *  returns - An integer with each bit corresponding to the value read from the associated DigitalIn pin
 	 */
     int read();
-	
-	/* Group: Access Method Shorthand */
+
+#ifdef MBED_OPERATORS
+    /* Group: Access Method Shorthand */
 		
-	/* Function: operator int()
-	 *  A shorthand for <read>
-	 */
-	operator int();
+    /* Function: operator int()
+     *  A shorthand for <read>
+     */
+    operator int();
+#endif
 
+#ifdef MBED_RPC
     virtual const struct rpc_method *get_rpc_methods();
     static struct rpc_class *get_rpc_class();
+#endif
 
 protected:
 	
-	DigitalIn* _pin[16];
+    DigitalIn* _pin[16];
 
-        static void construct(const char *arguments, char *res);
-	
+#ifdef MBED_RPC    
+    static void construct(const char *arguments, char *res);
+#endif
+
 };
 
-}
+} // namespace mbed
 
 #endif