Diff: MBEDUbloxCellRadio.h

Revision:

5:a8fd1fa0f0d0

Parent:

4:0cc421d46a2b

Child:

9:c5db2b63ed05

--- a/MBEDUbloxCellRadio.h	Mon Mar 31 05:46:08 2014 +0000
+++ b/MBEDUbloxCellRadio.h	Mon Mar 31 18:47:26 2014 +0000
@@ -21,48 +21,25 @@
   
  #include "mbed.h"
  #include "C027.h"
- #include "UbloxModem.h"
- 
- // ErrorHandler support
- #include "ErrorHandler.h"
- 
- #ifndef MODEM_APN
- #warning APN not specified, using "internet"
- #define MODEM_APN "internet"
- #endif
+ #include "UbloxUSBGSMModem.h"
+ #include "UbloxUSBCDMAModem.h"
 
- #ifndef MODEM_USERNAME
- #warning username not specified
- #define MODEM_USERNAME NULL
- #endif
-
- #ifndef MODEM_PASSWORD
- #warning password not specified
- #define MODEM_PASSWORD NULL
- #endif
- 
- #ifndef PPP_SUPPORT
- #warning PPP not enabled
- #endif
+ // BaseClass support
+ #include "BaseClass.h"
   
- class MBEDUbloxCellRadio {
+ class MBEDUbloxCellRadio : public BaseClass {
      private: 
-        ErrorHandler      *m_error_handler;
-        void              *m_endpoint;
         UBLOX_MODEM       *m_modem;
         C027              *m_c027;
         bool               m_connected;
         
      public:
         MBEDUbloxCellRadio(ErrorHandler *error_handler, void *endpoint);
-       ~MBEDUbloxCellRadio();
+        virtual ~MBEDUbloxCellRadio();
        
        bool connect();
-       bool disconnect();
-       
-    private:
-        ErrorHandler *logger();
- };
+       bool disconnect();      
+  };
  
  #endif // _MBED_UBLOX_CELL_RADIO_H_