Rebuild variants with ns_cmdline patch

Author: facchinm

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

@@ -356,12 +356,6 @@ 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.
@@ -644,7 +638,6 @@ 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,12 +29,6 @@
  *
  */
 
-/* Radio Access Technology type  */
-enum RadioAccessTechnologyType {
-    CATM1 = 7,
-    CATNB = 8
-};
-
 namespace mbed {
 
 /**
@@ -159,7 +153,6 @@ 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

@@ -342,12 +342,6 @@ 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,7 +47,6 @@ 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);
@@ -108,8 +107,6 @@ 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
@@ -126,6 +123,7 @@ 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;
@@ -134,7 +132,6 @@ 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

@@ -98,12 +98,6 @@ 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();
@@ -190,7 +184,6 @@ 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;

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

@@ -88,6 +88,21 @@ 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,14 +44,12 @@ 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();
@@ -62,7 +60,6 @@ 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,15 +25,11 @@ 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

@@ -34,13 +34,6 @@ class GEMALTO_CINTERION_CellularStack : public AT_CellularStack {
      */
     nsapi_error_t socket_stack_init();
 
-    void lock();
-    void unlock();
-    void beginGNSS(mbed::Callback<void(char*)> gnss_cb);
-    void endGNSS();
-    void startGNSS();
-    void stopGNSS();
-
 protected:
 
     virtual nsapi_error_t socket_close_impl(int sock_id);
@@ -55,21 +48,14 @@ 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);
@@ -81,14 +67,6 @@ 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

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

@@ -163,6 +163,9 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
         static void netif_status_irq(struct netif *netif);
         static Interface *our_if_from_netif(struct netif *netif);
         static void delete_interface(OnboardNetworkStack::Interface **interface_out);
+        NetworkInterface *network_if_from_netif_id(int id);
+        int netif_id_from_network_if(NetworkInterface *userInterface);
+
 
 #if LWIP_ETHERNET
         static err_t emac_low_level_output(struct netif *netif, struct pbuf *p);
@@ -222,6 +225,8 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
             void *hw; /**< alternative implementation pointer - used for PPP */
         };
 
+        NetworkInterface *user_network_interface;
+
         mbed_rtos_storage_semaphore_t remove_interface_sem;
         osSemaphoreId_t remove_interface;
         mbed_rtos_storage_semaphore_t linked_sem;
@@ -265,7 +270,7 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
      * @param[out] interface_out    pointer to stack interface object controlling the EMAC
      * @return                      NSAPI_ERROR_OK on success, or error code
      */
-    nsapi_error_t add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out) override;
+    nsapi_error_t add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out, NetworkInterface *user_network_interface = NULL) override;
 
     /** Register a network interface with the IP stack
      *
@@ -450,6 +455,27 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
     nsapi_size_or_error_t socket_send(nsapi_socket_t handle,
                                       const void *data, nsapi_size_t size) override;
 
+    /** Send a packet with ancillary data over a UDP socket
+      *
+      *  Sends data to the specified address. Returns the number of bytes
+      *  sent from the buffer.
+      *
+      *  This call is non-blocking. If sendto would block,
+      *  NSAPI_ERROR_WOULD_BLOCK is returned immediately.
+      *
+      *  @param handle        Socket handle
+      *  @param address       The SocketAddress of the remote host
+      *  @param data          Buffer of data to send to the host
+      *  @param size          Size of the buffer in bytes
+      *  @param control       Ancillary data storage
+      *  @param control_size  Size of the Ancillary data in bytes
+      *  @return              Number of sent bytes on success, negative error
+      *                       code on failure
+      */
+    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;
+
     /** Receive data over a TCP socket
      *
      *  The socket must be connected to a remote host. Returns the number of
@@ -493,6 +519,7 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
      *  This call is non-blocking. If recvfrom would block,
      *  NSAPI_ERROR_WOULD_BLOCK is returned immediately.
      *
+     *  It uses socket_recvfrom_control with  zero ancillary data.
      *  @param handle   Socket handle
      *  @param address  Destination for the source address or NULL
      *  @param buffer   Destination buffer for data received from the host
@@ -503,6 +530,27 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
     nsapi_size_or_error_t socket_recvfrom(nsapi_socket_t handle, SocketAddress *address,
                                           void *buffer, nsapi_size_t size) override;
 
+    /** Receive a packet with ancillary data over a UDP socket
+    *
+    *  Receives data and stores the source address in address if address
+    *  is not NULL. Returns the number of bytes received into the buffer.
+    *
+    *  This call is non-blocking. If recvfrom would block,
+    *  NSAPI_ERROR_WOULD_BLOCK is returned immediately.
+    *
+    *  @param handle   Socket handle
+    *  @param address  Destination for the source address or NULL
+    *  @param buffer   Destination buffer for data received from the host
+    *  @param size     Size of the buffer in bytes
+    *  @param control     Ancillary data storage
+    *  @param control_size   Size of the Ancillary data in bytes
+    *  @return         Number of received bytes on success, negative error
+    *                  code on failure
+    */
+    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;
+
     /** Register a callback on state change of the socket
      *
      *  The specified callback will be called on state changes such as when

cores/arduino/mbed/connectivity/lwipstack/include/lwipstack/LWIPStack.h

@@ -311,6 +311,8 @@
 
 #endif
 
+#define LWIP_NETBUF_RECVINFO            MBED_CONF_LWIP_NETBUF_RECVINFO_ENABLED
+
 // Make sure we default these to off, so
 // LWIP doesn't default to on
 #ifndef LWIP_ARP

cores/arduino/mbed/connectivity/lwipstack/include/lwipstack/lwipopts.h

@@ -46,7 +46,7 @@
 #define LWIP_NETCONN                    !NO_SYS
 #define LWIP_SOCKET                     !NO_SYS
 #define LWIP_NETCONN_FULLDUPLEX         LWIP_SOCKET
-#define LWIP_NETBUF_RECVINFO            1
+#define LWIP_NETBUF_RECVINFO            MBED_CONF_NETBUF_RECVINFO_ENABLED
 #define LWIP_HAVE_LOOPIF                1
 #define TCPIP_THREAD_TEST