Cellular: change stack_type_supported to get_property

Change usage of AT_CellularContext::stack_type_supported to
AT_CellularBase::get_property. This way we can rid of
targets overriding stack_type_supported and delete
unnecessary classes and simplify new targets.

Author: Teppo Järvelin

UNITTESTS/features/cellular/framework/AT/at_cellularbase/at_cellularbasetest.cpp

@@ -40,6 +40,9 @@ class my_base : public AT_CellularBase {
             0,  // AT_CGSN_WITH_TYPE
             1,  // AT_CGDATA
             1,  // AT_CGAUTH
+            1,  // PROPERTY_IPV4_STACK
+            0,  // PROPERTY_IPV6_STACK
+            0,  // PROPERTY_IPV4V6_STACK
         };
 
         set_cellular_properties(cellular_properties);
@@ -116,7 +119,10 @@ TEST_F(TestAT_CellularBase, test_AT_CellularBase_set_cellular_properties)
         AT_CellularNetwork::RegistrationModeLAC,    // C_REG
         0,   // AT_CGSN_WITH_TYPE
         1,   // AT_CGDATA
-        1    // AT_CGAUTH
+        1,   // AT_CGAUTH
+        1,  // PROPERTY_IPV4_STACK
+        0,  // PROPERTY_IPV6_STACK
+        0,  // PROPERTY_IPV4V6_STACK
     };
     at.set_cellular_properties(cellular_properties);
 }

UNITTESTS/features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp

@@ -27,6 +27,7 @@
 #include "Semaphore_stub.h"
 #include "CellularDevice_stub.h"
 #include "equeue_stub.h"
+#include "AT_CellularBase_stub.h"
 
 using namespace mbed;
 using namespace events;
@@ -114,12 +115,12 @@ class my_stack : public AT_CellularStack {
 class my_AT_CTX : public AT_CellularContext {
 public:
     my_AT_CTX(ATHandler &at, CellularDevice *device, const char *apn = MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN) :
-        AT_CellularContext(at, device, apn), _st(at) {}
-    virtual ~my_AT_CTX() {}
-    virtual bool stack_type_supported(nsapi_ip_stack_t stack_type)
+        AT_CellularContext(at, device, apn), _st(at)
     {
-        return false;
+        AT_CellularBase_stub::supported_bool = false;
     }
+    virtual ~my_AT_CTX() {}
+
     virtual NetworkStack *get_stack()
     {
         return &_st;

UNITTESTS/stubs/AT_CellularBase_stub.cpp

@@ -47,6 +47,8 @@ intptr_t AT_CellularBase::get_property(CellularProperty key)
         return AT_CellularNetwork::RegistrationModeDisable;
     } else if (key == PROPERTY_C_REG || key == PROPERTY_C_EREG) {
         return AT_CellularNetwork::RegistrationModeEnable;
+    } else if (key == PROPERTY_AT_CGAUTH) {
+        return true;
     }
 
     return AT_CellularBase_stub::supported_bool;

UNITTESTS/stubs/AT_CellularContext_stub.cpp

@@ -135,9 +135,15 @@ const char *AT_CellularContext::get_gateway()
     return NULL;
 }
 
-bool AT_CellularContext::stack_type_supported(nsapi_ip_stack_t stack_type)
-{
-    return true;
+AT_CellularBase::CellularProperty AT_CellularContext::nsapi_ip_stack_t_to_cellular_property(nsapi_ip_stack_t stack)
+{
+    AT_CellularBase::CellularProperty prop = PROPERTY_IPV4_STACK;
+    if (stack == IPV6_STACK) {
+        prop = PROPERTY_IPV6_STACK;
+    } else if (stack == IPV4V6_STACK) {
+        prop = PROPERTY_IPV4V6_STACK;
+    }
+    return prop;
 }
 
 nsapi_ip_stack_t AT_CellularContext::get_stack_type()

features/cellular/framework/AT/AT_CellularBase.h

@@ -43,12 +43,15 @@ class AT_CellularBase {
     device_err_t get_device_error() const;
 
     enum CellularProperty {
-        PROPERTY_C_EREG,             // AT_CellularNetwork::RegistrationMode. What support modem has for this registration type.
-        PROPERTY_C_GREG,             // AT_CellularNetwork::RegistrationMode. What support modem has for this registration type.
-        PROPERTY_C_REG,              // AT_CellularNetwork::RegistrationMode. What support modem has for this registration type.
-        PROPERTY_AT_CGSN_WITH_TYPE,  // 0 = not supported, 1 = supported. AT+CGSN without type is likely always supported similar to AT+GSN.
-        PROPERTY_AT_CGDATA,          // 0 = not supported, 1 = supported. Alternative is to support only ATD*99***<cid>#
-        PROPERTY_AT_CGAUTH,          // 0 = not supported, 1 = supported. APN authentication AT commands supported
+        PROPERTY_C_EREG,            // AT_CellularNetwork::RegistrationMode. What support modem has for this registration type.
+        PROPERTY_C_GREG,            // AT_CellularNetwork::RegistrationMode. What support modem has for this registration type.
+        PROPERTY_C_REG,             // AT_CellularNetwork::RegistrationMode. What support modem has for this registration type.
+        PROPERTY_AT_CGSN_WITH_TYPE, // 0 = not supported, 1 = supported. AT+CGSN without type is likely always supported similar to AT+GSN.
+        PROPERTY_AT_CGDATA,         // 0 = not supported, 1 = supported. Alternative is to support only ATD*99***<cid>#
+        PROPERTY_AT_CGAUTH,         // 0 = not supported, 1 = supported. APN authentication AT commands supported
+        PROPERTY_IPV4_STACK,        // 0 = not supported, 1 = supported
+        PROPERTY_IPV6_STACK,        // 0 = not supported, 1 = supported
+        PROPERTY_IPV4V6_STACK,      // 0 = not supported, 1 = supported
         PROPERTY_MAX
     };
 

features/cellular/framework/AT/AT_CellularContext.cpp

@@ -239,15 +239,6 @@ void AT_CellularContext::set_credentials(const char *apn, const char *uname, con
     _pwd = pwd;
 }
 
-bool AT_CellularContext::stack_type_supported(nsapi_ip_stack_t stack_type)
-{
-    if (stack_type == _ip_stack_type) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
 nsapi_ip_stack_t AT_CellularContext::get_stack_type()
 {
     return _ip_stack_type;
@@ -306,6 +297,17 @@ nsapi_error_t AT_CellularContext::do_user_authentication()
     return NSAPI_ERROR_OK;
 }
 
+AT_CellularBase::CellularProperty AT_CellularContext::nsapi_ip_stack_t_to_cellular_property(nsapi_ip_stack_t stack)
+{
+    AT_CellularBase::CellularProperty prop = PROPERTY_IPV4_STACK;
+    if (stack == IPV6_STACK) {
+        prop = PROPERTY_IPV6_STACK;
+    } else if (stack == IPV4V6_STACK) {
+        prop = PROPERTY_IPV4V6_STACK;
+    }
+    return prop;
+}
+
 bool AT_CellularContext::get_context()
 {
     _at.cmd_start("AT+CGDCONT?");
@@ -316,8 +318,8 @@ bool AT_CellularContext::get_context()
     char apn[MAX_ACCESSPOINT_NAME_LENGTH];
     int apn_len = 0;
 
-    bool modem_supports_ipv6 = stack_type_supported(IPV6_STACK);
-    bool modem_supports_ipv4 = stack_type_supported(IPV4_STACK);
+    bool modem_supports_ipv6 = get_property(PROPERTY_IPV6_STACK);
+    bool modem_supports_ipv4 = get_property(PROPERTY_IPV4_STACK);
 
     while (_at.info_resp()) {
         int cid = _at.read_int();
@@ -334,7 +336,8 @@ bool AT_CellularContext::get_context()
                 }
                 nsapi_ip_stack_t pdp_stack = string_to_stack_type(pdp_type_from_context);
                 // Accept dual PDP context for IPv4/IPv6 only modems
-                if (pdp_stack != DEFAULT_STACK && (stack_type_supported(pdp_stack) || pdp_stack == IPV4V6_STACK)) {
+                if (pdp_stack != DEFAULT_STACK && (get_property(nsapi_ip_stack_t_to_cellular_property(pdp_stack))
+                                                   || pdp_stack == IPV4V6_STACK)) {
                     if (_ip_stack_type_requested == IPV4_STACK) {
                         if (pdp_stack == IPV4_STACK || pdp_stack == IPV4V6_STACK) {
                             _ip_stack_type = _ip_stack_type_requested;
@@ -399,8 +402,8 @@ bool AT_CellularContext::set_new_context(int cid)
     nsapi_ip_stack_t tmp_stack = _ip_stack_type_requested;
 
     if (tmp_stack == DEFAULT_STACK) {
-        bool modem_supports_ipv6 = stack_type_supported(IPV6_STACK);
-        bool modem_supports_ipv4 = stack_type_supported(IPV4_STACK);
+        bool modem_supports_ipv6 = get_property(PROPERTY_IPV6_STACK);
+        bool modem_supports_ipv4 = get_property(PROPERTY_IPV4_STACK);
 
         if (modem_supports_ipv6 && modem_supports_ipv4) {
             tmp_stack = IPV4V6_STACK;

features/cellular/framework/AT/AT_CellularContext.h

@@ -75,12 +75,6 @@ class AT_CellularContext : public CellularContext, public AT_CellularBase {
      */
     virtual void do_connect();
 
-    /** Check if modem supports the given stack type. Can be overridden by the modem.
-     *
-     *  @return true if supported
-     */
-    virtual bool stack_type_supported(nsapi_ip_stack_t stack_type);
-
     /** Get the operation specific timeout. Used in synchronous mode when setting the maximum
      *   waiting time. Modem specific implementation can override this to provide different timeouts.
      *
@@ -107,6 +101,7 @@ class AT_CellularContext : public CellularContext, public AT_CellularBase {
     nsapi_ip_stack_t string_to_stack_type(const char *pdp_type);
     nsapi_ip_stack_t get_stack_type();
     nsapi_error_t check_operation(nsapi_error_t err, ContextOperation op);
+    AT_CellularBase::CellularProperty nsapi_ip_stack_t_to_cellular_property(nsapi_ip_stack_t stack);
 
 private:
     nsapi_ip_stack_t _ip_stack_type_requested;

features/cellular/framework/AT/AT_CellularNetwork.cpp

@@ -71,8 +71,8 @@ static const char *const rat_str[AT_CellularNetwork::RAT_MAX] = {
 
 
 AT_CellularNetwork::AT_CellularNetwork(ATHandler &atHandler) : AT_CellularBase(atHandler),
-    _connection_status_cb(NULL), _op_act(RAT_UNKNOWN), _connect_status(NSAPI_STATUS_DISCONNECTED),
-    _ciotopt_network_support_cb(NULL), _supported_network_opt(CIOT_OPT_MAX)
+    _connection_status_cb(NULL), _ciotopt_network_support_cb(NULL), _op_act(RAT_UNKNOWN),
+    _connect_status(NSAPI_STATUS_DISCONNECTED), _supported_network_opt(CIOT_OPT_MAX)
 {
 
     _urc_funcs[C_EREG] = callback(this, &AT_CellularNetwork::urc_cereg);

features/cellular/framework/targets/GEMALTO/CINTERION/GEMALTO_CINTERION.cpp

@@ -95,6 +95,9 @@ void GEMALTO_CINTERION::init_module_bgs2()
         0,  // AT_CGSN_WITH_TYPE
         1,  // AT_CGDATA
         1,  // AT_CGAUTH
+        1,  // PROPERTY_IPV4_STACK
+        0,  // PROPERTY_IPV6_STACK
+        0,  // PROPERTY_IPV4V6_STACK
     };
     AT_CellularBase::set_cellular_properties(cellular_properties);
     _module = ModuleBGS2;
@@ -110,6 +113,9 @@ void GEMALTO_CINTERION::init_module_els61()
         0,  // AT_CGSN_WITH_TYPE
         1,  // AT_CGDATA
         1,  // AT_CGAUTH
+        1,  // PROPERTY_IPV4_STACK
+        1,  // PROPERTY_IPV6_STACK
+        0,  // PROPERTY_IPV4V6_STACK
     };
     AT_CellularBase::set_cellular_properties(cellular_properties);
     _module = ModuleELS61;
@@ -125,6 +131,9 @@ void GEMALTO_CINTERION::init_module_ems31()
         1,  // AT_CGSN_WITH_TYPE
         1,  // AT_CGDATA
         1,  // AT_CGAUTH
+        1,  // PROPERTY_IPV4_STACK
+        1,  // PROPERTY_IPV6_STACK
+        1,  // PROPERTY_IPV4V6_STACK
     };
     AT_CellularBase::set_cellular_properties(cellular_properties);
     _module = ModuleEMS31;

features/cellular/framework/targets/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularContext.cpp

@@ -16,7 +16,6 @@
  */
 #include "GEMALTO_CINTERION_CellularContext.h"
 #include "GEMALTO_CINTERION_CellularStack.h"
-#include "GEMALTO_CINTERION.h"
 
 namespace mbed {
 
@@ -39,12 +38,4 @@ NetworkStack *GEMALTO_CINTERION_CellularContext::get_stack()
 }
 #endif // NSAPI_PPP_AVAILABLE
 
-bool GEMALTO_CINTERION_CellularContext::stack_type_supported(nsapi_ip_stack_t requested_stack)
-{
-    if (GEMALTO_CINTERION::get_module() == GEMALTO_CINTERION::ModuleBGS2) {
-        return (requested_stack == IPV4_STACK);
-    }
-    return (requested_stack == IPV4_STACK || requested_stack == IPV6_STACK);
-}
-
 } /* namespace mbed */