Diff: MBEDEndpoint.h

Revision:

18:8ab7aa1dbb41

Parent:

16:4cc5df8bf10c

Child:

23:34086bc15b02

diff -r 36a4ab911aaa -r 8ab7aa1dbb41 MBEDEndpoint.h
--- a/MBEDEndpoint.h	Mon Mar 31 21:03:09 2014 +0000
+++ b/MBEDEndpoint.h	Tue Apr 01 03:19:47 2014 +0000
@@ -41,14 +41,22 @@
 // Preferences Support
 #include "Preferences.h"
 
-// Ethernet Interface
-#ifndef CELLULAR_NETWORK
+// network selection
+#ifdef CELLULAR_NETWORK
+    // Cellular
+    #include "MBEDUbloxCellRadio.h"
+    #include "MBEDUbloxGPS.h"
+#else
+    // Ethernet
     #include "EthernetInterface.h"
 #endif
   
 class MBEDEndpoint : public BaseClass {
     private:
-#ifndef CELLULAR_NETWORK
+#ifdef CELLULAR_NETWORK
+        MBEDUbloxCellRadio   *m_cellular_modem;                            // cell modem
+        MBEDUbloxGPS         *m_gps;                                       // GPS receiver
+#else
         EthernetInterface    *m_ethernet;                                  // ethernet interface
 #endif
         Transport            *m_transports[NUM_TRANSPORTS];                // our transport
@@ -102,9 +110,14 @@
         bool closeTransport(int index,char *key);
         bool closeTransports();
 
-#ifndef CELLULAR_NETWORK
-       bool initializeEthernet(EthernetInterface *ethernet);
-       bool closeEthernet();
+#ifdef CELLULAR_NETWORK
+        bool initializeCellularModem();
+        bool initializeGPSReceiver();
+        bool closeCellularModem();
+        bool closeGPSReceiver();
+#else
+        bool initializeEthernet(EthernetInterface *ethernet);
+        bool closeEthernet();
 #endif 
 };