Remove band from Cinterion driver (for now, doesn't seem to be needed)

Author: multiplemonomials

connectivity/cellular/include/cellular/framework/API/CellularContext.h

@@ -43,25 +43,8 @@ namespace mbed {
 
 /// Radio Access Technology type
 enum RadioAccessTechnologyType {
-    CATM1 = 7, ///< LTE CAT-M or LTE-M
-    CATNB = 8 ///< NB-IoT (Narrowband IoT)
-};
-
-enum FrequencyBand {
-    BAND_1 = 0x01,
-    BAND_2 = 0x02,
-    BAND_3 = 0x04,
-    BAND_4 = 0x08,
-    BAND_5 = 0x10,
-    BAND_8 = 0x80,
-    BAND_12 = 0x800,
-    BAND_13 = 0x1000,
-    BAND_18 = 0x20000,
-    BAND_19 = 0x40000,
-    BAND_20 = 0x80000,
-    BAND_25 = 0x1000000,
-    BAND_26 = 0x2000000,
-    BAND_28 = 0x8000000
+    CATM1, ///< LTE CAT-M or LTE-M
+    CATNB  ///< NB-IoT (Narrowband IoT)
 };
 
 /// CellularContext is CellularInterface/NetworkInterface with extensions for cellular connectivity
@@ -182,7 +165,6 @@ class CellularContext : public CellularInterface {
                                   const char *pwd = 0) = 0;
     virtual void set_credentials(const char *apn, const char *uname = 0, const char *pwd = 0) = 0;
     virtual void set_access_technology(RadioAccessTechnologyType rat = CATM1) = 0;
-    virtual void set_band(FrequencyBand band = BAND_20) = 0;
     virtual bool is_connected() = 0;
 
     /** Same as NetworkInterface::get_default_instance()

connectivity/cellular/include/cellular/framework/AT/AT_CellularContext.h

@@ -56,7 +56,6 @@ class AT_CellularContext : public CellularContext {
                                   const char *pwd = 0);
     virtual void set_credentials(const char *apn, const char *uname = 0, const char *pwd = 0);
     virtual void set_access_technology(RadioAccessTechnologyType rat = CATM1);
-    virtual void set_band(FrequencyBand band = BAND_20);
 
 // from CellularContext
     virtual nsapi_error_t get_pdpcontext_params(pdpContextList_t &params_list);
@@ -157,7 +156,6 @@ class AT_CellularContext : public CellularContext {
     bool _is_connected;
     ATHandler &_at;
     std::optional<RadioAccessTechnologyType> _rat;
-    std::optional<FrequencyBand> _band;
 };
 
 /**

connectivity/cellular/source/framework/AT/AT_CellularContext.cpp

@@ -296,11 +296,6 @@ void AT_CellularContext::set_access_technology(RadioAccessTechnologyType rat)
     _rat = rat;
 }
 
-void AT_CellularContext::set_band(FrequencyBand band)
-{
-    _band = band;
-}
-
 // PDP Context handling
 void AT_CellularContext::delete_current_context()
 {

connectivity/drivers/cellular/GEMALTO/COMPONENT_GEMALTO_CINTERION/GEMALTO_CINTERION_CellularContext.cpp

@@ -76,27 +76,24 @@ void GEMALTO_CINTERION_CellularContext::enable_access_technology()
     switch (*_rat)
     {
     case CATM1:
-        _at.at_cmd_discard("^SXRAT", "=","%d", *_rat);
-        _at.cmd_start_stop("^SCFG", "=","%s%d", "Radio/Band/CatM", *_band);
-        _at.resp_start("^SCFG");
-        _at.cmd_start_stop("^SCFG", "=","%s%d%d", "Radio/Band/CatNB",0,0);
+        _at.at_cmd_discard("^SXRAT", "=","%d", 7); // 7 = CAT.M1
+
+        // Ensure all bands are enabled by setting ^SCFG to the bitmask of all valid bands
+        _at.cmd_start_stop("^SCFG", "=","%s%d", "Radio/Band/CatM", "F0E189F");
         _at.resp_start("^SCFG");
         break;
 
     case CATNB:
-        _at.at_cmd_discard("^SXRAT", "=","%d", *_rat);
-        _at.cmd_start_stop("^SCFG", "=","%s%d", "Radio/Band/CatNB", *_band);
-        _at.resp_start("^SCFG");
-        _at.cmd_start_stop("^SCFG", "=","%s%d%d", "Radio/Band/CatM",0,0);
+        _at.at_cmd_discard("^SXRAT", "=","%d", 8); // 8 = CAT.NB1
+
+        // Ensure all bands are enabled by setting ^SCFG to the bitmask of all valid bands
+        _at.cmd_start_stop("^SCFG", "=","%s%s", "Radio/Band/CatNB", "10000200000000");
         _at.resp_start("^SCFG");
         break;
 
     default:
         break;
     }
-
-    _at.cmd_start_stop("^SCFG", "=", "%s%s", "Tcp/withURCs", "on");
-    _at.resp_start("^SCFG");
 }
 
 } /* namespace mbed */