Rebuild variants

Author: facchinm

cores/arduino/mbed/connectivity/cellular/include/cellular/framework/API/ATHandler.h

@@ -356,6 +356,12 @@ class ATHandler {
      */
     void write_hex_string(const char *str, size_t size, bool quote_string = true);
 
+    /** Get the error detected during read_int()
+     *
+     *  @return the latest negative integer error got from read_int().
+     */
+    int32_t get_last_read_error();
+
     /** Reads as string and converts result to integer. Supports only non-negative integers.
      *
      *  @return the non-negative integer or -1 in case of error.
@@ -638,6 +644,7 @@ class ATHandler {
     rtos::Kernel::Clock::time_point _start_time;
     // eventqueue event id
     int _event_id;
+    int32_t _last_read_error;
 
     char _cmd_buffer[MBED_CONF_CELLULAR_AT_HANDLER_BUFFER_SIZE];
 };

cores/arduino/mbed/connectivity/cellular/include/cellular/framework/API/CellularContext.h

@@ -29,6 +29,12 @@
  *
  */
 
+/* Radio Access Technology type  */
+enum RadioAccessTechnologyType {
+    CATM1 = 7,
+    CATNB = 8
+};
+
 namespace mbed {
 
 /**
@@ -153,6 +159,7 @@ class CellularContext : public CellularInterface {
     virtual nsapi_error_t connect(const char *sim_pin, const char *apn = 0, const char *uname = 0,
                                   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 bool is_connected() = 0;
 
     /** Same as NetworkInterface::get_default_instance()

cores/arduino/mbed/connectivity/cellular/include/cellular/framework/API/CellularDevice.h

@@ -73,6 +73,8 @@ class CellularDevice {
      */
     static CellularDevice *get_default_instance();
 
+    mbed::Callback<void(void)> enableCMUXChannel = nullptr;
+
     /** Return target onboard instance of CellularDevice
      *
      *  @remark Mbed OS target shall override (non-weak) this function for an onboard modem.
@@ -216,6 +218,13 @@ class CellularDevice {
      */
     virtual nsapi_error_t get_sim_state(SimState &state) = 0;
 
+    virtual nsapi_error_t enable_cmux() = 0;
+
+
+    virtual bool is_cmux_enabled() = 0;
+
+    virtual void set_cmux_status_flag(bool cmux_status) = 0;
+
     /** Creates a new CellularContext interface.
      *
      *  @param fh       file handle used in communication to modem. This can be, for example, UART handle. If null, then the default
@@ -342,6 +351,12 @@ class CellularDevice {
      */
     virtual void set_timeout(int timeout) = 0;
 
+    virtual unsigned long get_time() = 0;
+
+    virtual unsigned long get_local_time() = 0;
+
+    virtual bool set_time(unsigned long const epoch, int const timezone = 0) = 0;
+
 
 public: //Common functions
 

cores/arduino/mbed/connectivity/cellular/include/cellular/framework/AT/AT_CellularContext.h

@@ -47,6 +47,7 @@ class AT_CellularContext : public CellularContext {
     virtual nsapi_error_t connect(const char *sim_pin, const char *apn = 0, const char *uname = 0,
                                   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);
 
 // from CellularContext
     virtual nsapi_error_t get_pdpcontext_params(pdpContextList_t &params_list);
@@ -107,6 +108,8 @@ class AT_CellularContext : public CellularContext {
      *  @return     NIDD context text, e.g. Non-IP or NONIP
      */
     virtual const char *get_nonip_context_type_str();
+    virtual void enable_access_technology();
+    virtual void set_cid(int cid);
 
 private:
 #if NSAPI_PPP_AVAILABLE
@@ -123,7 +126,6 @@ class AT_CellularContext : public CellularContext {
     nsapi_error_t check_operation(nsapi_error_t err, ContextOperation op);
     void ciot_opt_cb(mbed::CellularNetwork::CIoT_Supported_Opt ciot_opt);
     virtual void do_connect_with_retry();
-    void set_cid(int cid);
 
 private:
     ContextOperation _current_op;
@@ -132,6 +134,7 @@ class AT_CellularContext : public CellularContext {
 
     PinName _dcd_pin;
     bool _active_high;
+    RadioAccessTechnologyType _rat;
 
 protected:
     char _found_apn[MAX_APN_LENGTH];

cores/arduino/mbed/connectivity/cellular/include/cellular/framework/AT/AT_CellularDevice.h

@@ -84,6 +84,14 @@ class AT_CellularDevice : public CellularDevice {
 
     virtual nsapi_error_t get_sim_state(SimState &state);
 
+    nsapi_error_t enable_cmux();
+
+    nsapi_error_t config_cmux();
+
+    void set_cmux_status_flag(bool cmux_status);
+
+    virtual bool is_cmux_enabled();
+
     virtual CellularContext *create_context(const char *apn = NULL, bool cp_req = false, bool nonip_req = false);
 
     virtual void delete_context(CellularContext *context);
@@ -98,6 +106,12 @@ class AT_CellularDevice : public CellularDevice {
 
     virtual void set_timeout(int timeout);
 
+    virtual unsigned long get_time();
+
+    virtual unsigned long get_local_time();
+
+    virtual bool set_time(unsigned long const epoch, int const timezone = 0);
+
     virtual void modem_debug_on(bool on);
 
     virtual nsapi_error_t init();
@@ -184,6 +198,7 @@ class AT_CellularDevice : public CellularDevice {
 private:
     void urc_nw_deact();
     void urc_pdn_deact();
+    nsapi_error_t set_authomatic_time_zone_update();
 
 protected:
     ATHandler _at;
@@ -199,6 +214,7 @@ class AT_CellularDevice : public CellularDevice {
 
     std::chrono::duration<int, std::milli> _default_timeout;
     bool _modem_debug_on;
+    bool _cmux_status;
     const intptr_t *_property_array;
 };
 

cores/arduino/mbed/connectivity/cellular/include/cellular/framework/AT/AT_CellularStack.h

@@ -88,21 +88,6 @@ class AT_CellularStack : public NetworkStack {
 
     virtual void socket_attach(nsapi_socket_t handle, void (*callback)(void *), void *data);
 
-
-    nsapi_size_or_error_t socket_sendto_control(nsapi_socket_t handle, const SocketAddress &address,
-                                                const void *data, nsapi_size_t size,
-                                                nsapi_msghdr_t *control, nsapi_size_t control_size) override
-    {
-        return NSAPI_ERROR_UNSUPPORTED;
-    }
-
-    nsapi_size_or_error_t socket_recvfrom_control(nsapi_socket_t handle, SocketAddress *address,
-                                                  void *data, nsapi_size_t size,
-                                                  nsapi_msghdr_t *control, nsapi_size_t control_size) override
-    {
-        return NSAPI_ERROR_UNSUPPORTED;
-    }
-
 protected:
     class CellularSocket {
     public:

cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION.h

@@ -44,12 +44,14 @@ class GEMALTO_CINTERION : public AT_CellularDevice {
         ModuleBGS2,
         ModuleEMS31,
         ModuleEHS5E,
+        ModuleTX62,
     };
     static Module get_module();
 
 protected: // AT_CellularDevice
     virtual AT_CellularContext *create_context_impl(ATHandler &at, const char *apn, bool cp_req = false, bool nonip_req = false);
     virtual AT_CellularInformation *open_information_impl(ATHandler &at);
+    virtual AT_CellularNetwork *open_network_impl(ATHandler &at);
 
 protected:
     virtual nsapi_error_t init();
@@ -60,6 +62,7 @@ class GEMALTO_CINTERION : public AT_CellularDevice {
     void init_module_els61();
     void init_module_ems31();
     void init_module_ehs5e();
+    void init_module_tx62();
 };
 
 } // namespace mbed

cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularContext.h

@@ -25,11 +25,15 @@ class GEMALTO_CINTERION_CellularContext: public AT_CellularContext {
 public:
     GEMALTO_CINTERION_CellularContext(ATHandler &at, CellularDevice *device, const char *apn, bool cp_req = false, bool nonip_req = false);
     virtual ~GEMALTO_CINTERION_CellularContext();
+    virtual nsapi_error_t connect(const char *sim_pin, const char *apn = 0, const char *uname = 0,
+                                  const char *pwd = 0);
+    virtual bool get_context();
 
 protected:
 #if !NSAPI_PPP_AVAILABLE
     virtual NetworkStack *get_stack();
 #endif // NSAPI_PPP_AVAILABLE
+    virtual nsapi_error_t do_user_authentication();
 };
 
 } /* namespace mbed */

cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularNetwork.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef GEMALTO_CINTERION_CELLULARNETWORK_H_
+#define GEMALTO_CINTERION_CELLULARNETWORK_H_
+
+#include "AT_CellularNetwork.h"
+
+namespace mbed {
+
+class GEMALTO_CINTERION_CellularNetwork: public AT_CellularNetwork {
+public:
+    GEMALTO_CINTERION_CellularNetwork(ATHandler &at, AT_CellularDevice &device);
+    virtual ~GEMALTO_CINTERION_CellularNetwork();
+    virtual nsapi_error_t set_attach();
+    virtual void get_context_state_command();
+
+
+protected:
+};
+
+} /* namespace mbed */
+
+#endif // GEMALTO_CINTERION_CELLULARNETWORK_H_

cores/arduino/mbed/connectivity/drivers/cellular/GEMALTO/CINTERION/GEMALTO_CINTERION_CellularStack.h

@@ -58,14 +58,21 @@ class GEMALTO_CINTERION_CellularStack : public AT_CellularStack {
 
     virtual nsapi_error_t socket_connect(nsapi_socket_t handle, const SocketAddress &address);
 
+#ifdef MBED_CONF_CELLULAR_OFFLOAD_DNS_QUERIES
+    virtual nsapi_error_t gethostbyname(const char *host, SocketAddress *address, nsapi_version_t version, const char *interface_name);
+#endif
+
 private:
     // socket URC handlers as per Cinterion AT manuals
     void urc_sis();
     void urc_sisw();
+    void urc_sysstart();
     void sisw_urc_handler(int sock_id, int urc_code);
     void urc_sisr();
     void sisr_urc_handler(int sock_id, int urc_code);
 
+    void urc_gnss();
+
     // sockets need a connection profile, one profile is enough to support single stack sockets
     nsapi_error_t create_connection_profile(int connection_profile_id);
     void close_connection_profile(int connection_profile_id);
@@ -77,6 +84,14 @@ class GEMALTO_CINTERION_CellularStack : public AT_CellularStack {
     const char *_apn;
     const char *_user;
     const char *_password;
+    bool _engine;
+
+    mbed::Callback<void(char*)> _gnss_cb;
+
+#ifdef MBED_CONF_CELLULAR_OFFLOAD_DNS_QUERIES
+    hostbyname_cb_t _dns_callback;
+    nsapi_version_t _dns_version;
+#endif
 };
 
 } // namespace mbed