Diff: PortIn.h

Revision:

7:73c5efe92a6c

Parent:

2:e9a661555b58

Child:

8:c14af7958ef5

diff -r 0d4e7384bff6 -r 73c5efe92a6c PortIn.h
--- a/PortIn.h	Fri Oct 12 10:06:08 2012 +0000
+++ b/PortIn.h	Tue Oct 23 09:20:18 2012 +0000
@@ -1,7 +1,6 @@
 /* mbed Microcontroller Library - PortInOut
  * Copyright (c) 2006-2011 ARM Limited. All rights reserved.
- */ 
- 
+ */
 #ifndef MBED_PORTIN_H
 #define MBED_PORTIN_H
 
@@ -9,8 +8,10 @@
 
 #if DEVICE_PORTIN
 
-#include "PortNames.h"
-#include "PinNames.h"
+#include "port_api.h"
+
+#include "platform.h"
+#include "Base.h"
 
 namespace mbed {
 
@@ -38,7 +39,6 @@
  */
 class PortIn {
 public:
-
     /* Constructor: PortIn
      *  Create an PortIn, connected to the specified port
      *
@@ -47,7 +47,7 @@
      *  mask - A bitmask to identify which bits in the port should be included (0 - ignore)
         */ 
     PortIn(PortName port, int mask = 0xFFFFFFFF);
-
+    
     /* Function: read
      *  Read the value currently output on the port
      *
@@ -55,7 +55,7 @@
      *  returns - An integer with each bit corresponding to associated port pin setting
      */
     int read();
-
+    
     /* Function: mode
      *  Set the input pin mode
      *
@@ -72,11 +72,7 @@
     }
 
 private:
-#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368)
-    LPC_GPIO_TypeDef    *_gpio;
-#endif
-    PortName            _port;
-    uint32_t            _mask;
+    port_object _port;
 };
 
 } // namespace mbed