Diff: targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.h

Revision:

188:bcfe06ba3d64

Parent:

186:707f6e361f3e

Child:

189:f392fc9709a3

--- a/targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.h	Thu Sep 06 13:40:20 2018 +0100
+++ b/targets/TARGET_Realtek/TARGET_AMEBA/RTWInterface.h	Thu Nov 08 11:46:34 2018 +0000
@@ -24,6 +24,7 @@
 #include "netif.h"
 #include "rtw_emac.h"
 #include "OnboardNetworkStack.h"
+#include "EMACInterface.h"
 #include "LWIPStack.h"
 
 // Forward declaration
@@ -32,7 +33,7 @@
 /** Realtek Wlan (RTW) interface class
  *  Implementation of the NetworkStack for Ameba
  */
-class RTWInterface: public WiFiInterface
+class RTWInterface: public WiFiInterface, public EMACInterface
 {
 public:
     /** RTWWlanInterface lifetime
@@ -43,28 +44,6 @@
 
     ~RTWInterface();
 
-    /** Set a static IP address
-     *
-     *  Configures this network interface to use a static IP address.
-     *  Implicitly disables DHCP, which can be enabled in set_dhcp.
-     *  Requires that the network is disconnected.
-     *
-     *  @param address  Null-terminated representation of the local IP address
-     *  @param netmask  Null-terminated representation of the local network mask
-     *  @param gateway  Null-terminated representation of the local gateway
-     *  @return         0 on success, negative error code on failure
-     */
-    virtual nsapi_error_t set_network(const char *ip_address, const char *netmask, const char *gateway);
-
-    /** Enable or disable DHCP on the network
-     *
-     *  Requires that the network is disconnected
-     *
-     *  @param dhcp     False to disable dhcp (defaults to enabled)
-     *  @return         0 on success, negative error code on failure
-     */
-    virtual nsapi_error_t set_dhcp(bool dhcp);
-
     /** Set the WiFi network credentials
      *
      *  @param ssid      Name of the network to connect to
@@ -112,42 +91,10 @@
      *  @return          Number of entries in @a, or if @a count was 0 number of available networks, negative on error
      *  see @a nsapi_error
      */
-     virtual nsapi_size_or_error_t scan(WiFiAccessPoint *res, unsigned count);
-
-     virtual nsapi_error_t set_channel(uint8_t channel);
-     virtual int8_t get_rssi();
-
-    /** Get the local MAC address
-     *
-     *  Provided MAC address is intended for info or debug purposes and
-     *  may not be provided if the underlying network interface does not
-     *  provide a MAC address
-     *  
-     *  @return         Null-terminated representation of the local MAC address
-     *                  or null if no MAC address is available
-     */
-    virtual const char *get_mac_address();
+    virtual nsapi_size_or_error_t scan(WiFiAccessPoint *res, unsigned count);
 
-    /** Get the local IP address
-     *
-     *  @return         Null-terminated representation of the local IP address
-     *                  or null if no IP address has been recieved
-     */
-    virtual const char *get_ip_address();
-
-    /** Get the local network mask
-     *
-     *  @return         Null-terminated representation of the local network mask 
-     *                  or null if no network mask has been recieved
-     */
-    virtual const char *get_netmask();
-
-    /** Get the local gateways
-     *
-     *  @return         Null-terminated representation of the local gateway
-     *                  or null if no network mask has been recieved
-     */
-    virtual const char *get_gateway();
+    virtual nsapi_error_t set_channel(uint8_t channel);
+    virtual int8_t get_rssi();
 
     RTW_EMAC &get_emac() const { return rtw_emac; }
 
@@ -161,15 +108,9 @@
     virtual NetworkStack *get_stack();
     RTW_EMAC &rtw_emac;
     OnboardNetworkStack &rtw_obn_stack;
-    OnboardNetworkStack::Interface *rtw_interface;
-    bool _dhcp;
     char _ssid[256];
     char _pass[256];
     nsapi_security_t _security;
     uint8_t _channel;
-    char _ip_address[IPADDR_STRLEN_MAX];
-    char _netmask[NSAPI_IPv4_SIZE];
-    char _gateway[NSAPI_IPv4_SIZE];  
-    char _mac_address[NSAPI_MAC_SIZE];
 };
 #endif