Diff: MBEDEndpoint.h

Revision:

6:edf306673e54

Parent:

5:94d000e6fa70

Child:

11:c4d02616e10f

--- a/MBEDEndpoint.h	Fri Mar 28 17:53:14 2014 +0000
+++ b/MBEDEndpoint.h	Mon Mar 31 19:13:10 2014 +0000
@@ -19,9 +19,6 @@
 #ifndef _MBED_ENDPOINT_H_
 #define _MBED_ENDPOINT_H_
 
-// MBED Ethernet Interface
-#include "EthernetInterface.h"
-
 // BaseClass support
 #include "BaseClass.h"
 
@@ -36,10 +33,17 @@
 
 // Preferences Support
 #include "Preferences.h"
+
+#ifndef CELLULAR_NETWORK
+    // MBED Ethernet Interface
+    #include "EthernetInterface.h"
+#endif
   
 class MBEDEndpoint : public BaseClass {
     private:
+#ifndef CELLULAR_NETWORK
         EthernetInterface *m_ethernet;                                      // ethernet interface
+#endif
         Transport         *m_transports[NUM_TRANSPORTS];                    // our transport
         Personality       *m_personalities[NUM_PERSONALITY_INSTANCES];      // our personalities (at least 1 instance)
         char               m_endpoint_name[PERSONALITY_NAME_LEN+1];         // our endpoint name (personalities[0])
@@ -49,7 +53,7 @@
         int                m_instance_id;                                   // Instance ID for this endpoint
         
     public:
-        MBEDEndpoint(ErrorHandler *error_handler,EthernetInterface *ethernet);
+        MBEDEndpoint(ErrorHandler *error_handler,void *ethernet);
         virtual ~MBEDEndpoint();
         ResourceFactory *initResourceFactory();
         void run();
@@ -72,11 +76,13 @@
         bool initializeLights();
         bool initializeTransport(int index,char *key,Transport *transport);
         bool initializeTransports();
-        bool initializeEthernet(EthernetInterface *ethernet);
         bool closePersonalities();
         bool closeTransport(int index,char *key);
         bool closeTransports();
+#ifndef CELLULAR_NETWORK        
+        bool initializeEthernet(EthernetInterface *ethernet);
         bool closeEthernet(); 
+#endif
 };
 
 #endif // _MBED_ENDPOINT_H_