Diff: BusIn.h

Revision:

44:24d45a770a51

Parent:

43:e2ed12d17f06

Child:

54:71b101360fb9

--- a/BusIn.h	Fri Oct 26 17:40:46 2012 +0100
+++ b/BusIn.h	Wed Nov 21 10:49:56 2012 +0000
@@ -1,23 +1,38 @@
-/* mbed Microcontroller Library - DigitalIn
- * Copyright (c) 2007-2009 ARM Limited. All rights reserved.
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2012 ARM Limited
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
- 
 #ifndef MBED_BUSIN_H
 #define MBED_BUSIN_H
 
 #include "platform.h"
-#include "PinNames.h"
-#include "PeripheralNames.h"
-#include "Base.h"
 #include "DigitalIn.h"
 
 namespace mbed {
 
 /** A digital input bus, used for reading the state of a collection of pins
  */
-class BusIn : public Base {
+class BusIn {
 
 public:
+    /* Group: Configuration Methods */
 
     /** Create an BusIn, connected to the specified pins
      *
@@ -30,13 +45,12 @@
     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);
+          PinName p12 = NC, PinName p13 = NC, PinName p14 = NC, PinName p15 = NC);
 
-    BusIn(PinName pins[16], const char *name = NULL);
-        
+    BusIn(PinName pins[16]);
+    
     virtual ~BusIn();
-        
+    
     /** Read the value of the input bus
      *
      *  @returns
@@ -50,22 +64,10 @@
     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];
-
-#ifdef MBED_RPC    
-    static void construct(const char *arguments, char *res);
-#endif
-
 };
 
 } // namespace mbed
 
 #endif
-