PSOC6: apply astyle to WHD EMAC driver implementation

Author: vmedcy

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSTAInterface.cpp

@@ -1,5 +1,6 @@
 /* WHD implementation of NetworkInterfaceAPI
- * Copyright (c) 2017 ARM Limited
+ * Copyright (c) 2017-2019 ARM Limited
+ * 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.
@@ -17,8 +18,8 @@
 #ifndef WHD_STA_INTERFACE_H
 #define WHD_STA_INTERFACE_H
 
-#include "mbed.h"
-#include "EthernetInterface.h"
+#include "netsocket/WiFiInterface.h"
+#include "netsocket/EMACInterface.h"
 #include "netsocket/OnboardNetworkStack.h"
 #include "whd_emac.h"
 #include "whd_types_int.h"
@@ -28,29 +29,36 @@ struct ol_desc;
 /** WhdSTAInterface class
  *  Implementation of the NetworkStack for the WHD
  */
-class WhdSTAInterface : public WiFiInterface, public EMACInterface
-{
+class WhdSTAInterface : public WiFiInterface, public EMACInterface {
 public:
 
-    class OlmInterface
-    {
+    class OlmInterface {
     public:
         /** Get the default OLM interface. */
         static OlmInterface &get_default_instance();
 
         OlmInterface(struct ol_desc *list = NULL) {}
 
-        virtual int init_ols(void *whd, void *ip) { return 0; }
-        virtual int sleep() { return 0; }
-        virtual int wake() { return 0; }
+        virtual int init_ols(void *whd, void *ip)
+        {
+            return 0;
+        }
+        virtual int sleep()
+        {
+            return 0;
+        }
+        virtual int wake()
+        {
+            return 0;
+        }
 
         virtual void deinit_ols(void) {}
     };
 
     WhdSTAInterface(
-            WHD_EMAC &emac = WHD_EMAC::get_instance(),
-            OnboardNetworkStack &stack = OnboardNetworkStack::get_default_instance(),
-            OlmInterface &olm = OlmInterface::get_default_instance());
+        WHD_EMAC &emac = WHD_EMAC::get_instance(),
+        OnboardNetworkStack &stack = OnboardNetworkStack::get_default_instance(),
+        OlmInterface &olm = OlmInterface::get_default_instance());
 
     static WhdSTAInterface *get_default_instance();
 
@@ -100,7 +108,8 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface
      *  @param channel   Channel on which the connection is to be made, or 0 for any (Default: 0)
      *  @return          Not supported, returns NSAPI_ERROR_UNSUPPORTED
      */
-    nsapi_error_t set_channel(uint8_t channel) {
+    nsapi_error_t set_channel(uint8_t channel)
+    {
         if (channel != 0) {
             return NSAPI_ERROR_UNSUPPORTED;
         }
@@ -135,28 +144,28 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface
     /* print WHD log (this routine will malloc/free a buffer
      * You need to enable printing with WHD_LOGGING_BUFFER_ENABLE
      */
-    int whd_log_print ( void );
+    int whd_log_print(void);
 
     /* read WHD log */
-    int whd_log_read ( char *buffer, int buffer_size );
+    int whd_log_read(char *buffer, int buffer_size);
 
     /* Get EDCF AC params */
-    nsapi_error_t wifi_get_ac_params_sta(void * ac_param );
+    nsapi_error_t wifi_get_ac_params_sta(void *ac_param);
 
     /* get iovar value */
-    int wifi_get_iovar_value ( const char *iovar, uint32_t *value );
+    int wifi_get_iovar_value(const char *iovar, uint32_t *value);
 
     /* set iovar value */
-    int wifi_set_iovar_value ( const char *iovar, uint32_t value  );
+    int wifi_set_iovar_value(const char *iovar, uint32_t value);
 
     /* set ioctl value */
-    int wifi_set_ioctl_value( uint32_t ioctl, uint32_t value ) ;
+    int wifi_set_ioctl_value(uint32_t ioctl, uint32_t value) ;
 
     /* set wifi interface up */
-    int wifi_set_up (void );
+    int wifi_set_up(void);
 
     /* set wifi interface down */
-    int wifi_set_down (void );
+    int wifi_set_down(void);
 
     /** Set Offload Manager Information
      *  NOTE: Only allowed while disconnected
@@ -165,9 +174,9 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface
      * @return          true if completed successfully
      *                  false if Interface is connected
      */
-    int set_olm(OlmInterface *olm) {
-        if (get_connection_status() == NSAPI_STATUS_DISCONNECTED)
-        {
+    int set_olm(OlmInterface *olm)
+    {
+        if (get_connection_status() == NSAPI_STATUS_DISCONNECTED) {
             _olm = olm;
             return true;
         }
@@ -178,7 +187,8 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface
      *
      * @return          0 if successful
      */
-    int net_suspended() {
+    int net_suspended()
+    {
         int ret = _olm->sleep();
         return ret;
     }
@@ -187,7 +197,8 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface
      *
      * @return          0 if successful
      */
-    int net_resuming() {
+    int net_resuming()
+    {
         int ret = _olm->wake();
         return ret;
     }
@@ -196,9 +207,9 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface
     char _ssid[33]; /* The longest possible name (defined in 802.11) +1 for the \0 */
     char _pass[64]; /* The longest allowed passphrase + 1 */
     nsapi_security_t _security;
-    WHD_EMAC& _whd_emac;
+    WHD_EMAC &_whd_emac;
     OlmInterface *_olm;
 };
 
-extern int wiced_leave_ap      ( int interface );
+extern int wiced_leave_ap(int interface);
 #endif

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSTAInterface.h

@@ -1,5 +1,6 @@
 /* Wiced implementation of NetworkInterfaceAPI
- * Copyright (c) 2017 ARM Limited
+ * Copyright (c) 2017-2019 ARM Limited
+ * 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.
@@ -36,14 +37,14 @@ static uint16_t ap_event_entry = 2;
 
 WhdSoftAPInterface::WhdSoftAPInterface(WHD_EMAC &emac, OnboardNetworkStack &stack)
     : EMACInterface(emac, stack),
-    _whd_emac(emac)
+      _whd_emac(emac)
 {
 
 }
 
 
 int WhdSoftAPInterface::start(const char *ssid, const char *pass, nsapi_security_t security, uint8_t channel,
-    bool start_dhcp_server, const whd_custom_ie_info_t* ie_info)
+                              bool start_dhcp_server, const whd_custom_ie_info_t *ie_info)
 {
     nsapi_error_t        err;
 
@@ -59,24 +60,24 @@ int WhdSoftAPInterface::start(const char *ssid, const char *pass, nsapi_security
 
     // setup ssid
     whd_ssid_t whd_ssid;
-    strncpy((char*)whd_ssid.value, ssid, SSID_NAME_SIZE);
-    whd_ssid.value[SSID_NAME_SIZE-1] = '\0';
-    whd_ssid.length = strlen((char*)whd_ssid.value);
+    strncpy((char *)whd_ssid.value, ssid, SSID_NAME_SIZE);
+    whd_ssid.value[SSID_NAME_SIZE - 1] = '\0';
+    whd_ssid.length = strlen((char *)whd_ssid.value);
 
     // choose network security
     whd_security_t whd_security = whd_fromsecurity(security);
 
     /* set up the AP info */
-    err = whd_wifi_init_ap(_whd_emac.ifp, &whd_ssid, whd_security, (const uint8_t*)pass, 
-        strlen(pass), channel);
+    err = whd_wifi_init_ap(_whd_emac.ifp, &whd_ssid, whd_security, (const uint8_t *)pass,
+                           strlen(pass), channel);
     if (err != NSAPI_ERROR_OK) {
         printf("whd_wifi_init_ap() ERROR: %d\n", err);
         return err;
     }
 
     if (ie_info) {
         err = whd_wifi_manage_custom_ie(_whd_emac.ifp, WHD_ADD_CUSTOM_IE, (const uint8_t *)ie_info->oui,
-            ie_info->subtype, (const void *)ie_info->data, ie_info->length, ie_info->which_packets);
+                                        ie_info->subtype, (const void *)ie_info->data, ie_info->length, ie_info->which_packets);
         if (err != NSAPI_ERROR_OK) {
             printf("whd_wifi_manage_custom_ie() ERROR: %d\n", err);
             return err;
@@ -88,20 +89,20 @@ int WhdSoftAPInterface::start(const char *ssid, const char *pass, nsapi_security
         printf("whd_wifi_start_ap() ERROR: %d\n", err);
         return err;
     }
-    
+
     // Set static IP address for SoftAP and bring up
     set_dhcp(false);
 
-    if(whd_wifi_is_ready_to_transceive(_whd_emac.ifp) == WHD_SUCCESS) {
+    if (whd_wifi_is_ready_to_transceive(_whd_emac.ifp) == WHD_SUCCESS) {
         whd_emac_wifi_link_state_changed(true, _whd_emac.ifp);
     }
 
     // bring up
     err = _interface->bringup(_dhcp,
-            _ip_address[0] ? _ip_address : 0,
-            _netmask[0] ? _netmask : 0,
-            _gateway[0] ? _gateway : 0,
-            DEFAULT_STACK);
+                              _ip_address[0] ? _ip_address : 0,
+                              _netmask[0] ? _netmask : 0,
+                              _gateway[0] ? _gateway : 0,
+                              DEFAULT_STACK);
     if (err != NSAPI_ERROR_OK) {
         printf("bringup() ERROR: %d\n", err);
     }
@@ -115,15 +116,15 @@ int WhdSoftAPInterface::stop(void)
     return whd_wifi_stop_ap(_whd_emac.ifp);
 }
 
-int WhdSoftAPInterface::remove_custom_ie(const whd_custom_ie_info_t* ie_info)
+int WhdSoftAPInterface::remove_custom_ie(const whd_custom_ie_info_t *ie_info)
 {
     return whd_wifi_manage_custom_ie(_whd_emac.ifp, WHD_REMOVE_CUSTOM_IE, (const uint8_t *)ie_info->oui,
-        ie_info->subtype, (const void *)ie_info->data, ie_info->length, ie_info->which_packets);
+                                     ie_info->subtype, (const void *)ie_info->data, ie_info->length, ie_info->which_packets);
 }
 
-int WhdSoftAPInterface::get_associated_client_list(void* client_list_buffer, uint16_t buffer_length)
+int WhdSoftAPInterface::get_associated_client_list(void *client_list_buffer, uint16_t buffer_length)
 {
-    
+
     return whd_wifi_get_associated_client_list(_whd_emac.ifp, client_list_buffer, buffer_length);
 }
 

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSoftAPInterface.cpp

@@ -1,5 +1,6 @@
 /* WHD SoftAP implementation of SoftAPInterface
- * Copyright (c) 2017 ARM Limited
+ * Copyright (c) 2017-2019 ARM Limited
+ * 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.
@@ -17,20 +18,18 @@
 #ifndef WHD_SOFTAP_INTERFACE_H
 #define WHD_SOFTAP_INTERFACE_H
 
-#include "mbed.h"
-#include "EthernetInterface.h"
+#include "netsocket/EMACInterface.h"
 #include "netsocket/OnboardNetworkStack.h"
 #include "whd_emac.h"
 
 
 /**
  * Vendor IE details
  */
-typedef struct
-{
+typedef struct {
     uint8_t         oui[WIFI_IE_OUI_LENGTH];     /**< Unique identifier for the IE */
     uint8_t         subtype;                     /**< Sub-type of the IE */
-    void*           data;                        /**< Pointer to IE data */
+    void           *data;                        /**< Pointer to IE data */
     uint16_t        length;                      /**< IE data length */
     uint16_t        which_packets;               /**< Mask of the packet in which this IE details to be included */
 } whd_custom_ie_info_t;
@@ -40,14 +39,13 @@ typedef struct
 /** WhdSoftAPInterface class
  *  Implementation of the SoftAPInterface for the Whd
  */
-class WhdSoftAPInterface : public EMACInterface
-{
+class WhdSoftAPInterface : public EMACInterface {
 public:
-    /** Construct SoftAP interface 
+    /** Construct SoftAP interface
      *  @return  pointer to default WhdSoftAPInterface instance
      */
     WhdSoftAPInterface(WHD_EMAC &emac = WHD_EMAC::get_instance(WHD_AP_ROLE),
-            OnboardNetworkStack &stack = OnboardNetworkStack::get_default_instance());
+                       OnboardNetworkStack &stack = OnboardNetworkStack::get_default_instance());
 
     /** Get the default WhdSoftAPInterface instance.
      *  @return  pointer to default WhdSoftAPInterface instance
@@ -79,7 +77,7 @@ class WhdSoftAPInterface : public EMACInterface
      *                  see @a nsapi_error
      */
     int start(const char *ssid, const char *pass, nsapi_security_t security, uint8_t channel,
-                       bool start_dhcp_server = true, const whd_custom_ie_info_t* ie_info = NULL);
+              bool start_dhcp_server = true, const whd_custom_ie_info_t *ie_info = NULL);
 
     /**
      * Remove Wi-Fi custom IE
@@ -89,15 +87,15 @@ class WhdSoftAPInterface : public EMACInterface
      *  @return          0 on success, or error code on failure
      *                  see @a nsapi_error
      */
-    int remove_custom_ie(const whd_custom_ie_info_t* ie_info);
+    int remove_custom_ie(const whd_custom_ie_info_t *ie_info);
 
     /** Stop the Software Access Point
      *
      *  @return          0 on success, or error code on failure
      *                  see @a nsapi_error
      */
     int stop(void);
-    
+
     /**
      * Gets information about associated clients.
      *
@@ -109,7 +107,7 @@ class WhdSoftAPInterface : public EMACInterface
      *  @return          0 on success, or error code on failure
      *                  see @a nsapi_error
      */
-    int get_associated_client_list(void* client_list_buffer, uint16_t buffer_length);
+    int get_associated_client_list(void *client_list_buffer, uint16_t buffer_length);
 
 
     /**
@@ -132,7 +130,7 @@ class WhdSoftAPInterface : public EMACInterface
 
 
 protected:
-    WHD_EMAC& _whd_emac;
+    WHD_EMAC &_whd_emac;
 };
 
 #endif

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSoftAPInterface.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Arm Limited and affiliates.
+ * Copyright (c) 2018-2019, Arm Limited and affiliates.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

features/netsocket/emac-drivers/TARGET_WHD/interface/default_wifi_interface.cpp

@@ -7,7 +7,7 @@
  * 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.
@@ -43,7 +43,7 @@ extern "C"
 
 typedef whd_buffer_t    whd_eapol_packet_t;
 
-typedef void (*eapol_packet_handler_t) (whd_interface_t interface, whd_buffer_t buffer);
+typedef void (*eapol_packet_handler_t)(whd_interface_t interface, whd_buffer_t buffer);
 
 /******************************************************
  *                    Structures
@@ -56,8 +56,8 @@ typedef void (*eapol_packet_handler_t) (whd_interface_t interface, whd_buffer_t
 /******************************************************
  *               Function Declarations
  ******************************************************/
-whd_result_t emac_register_eapol_packet_handler  ( eapol_packet_handler_t eapol_packet_handler );
-void         emac_unregister_eapol_packet_handler( void );
+whd_result_t emac_register_eapol_packet_handler(eapol_packet_handler_t eapol_packet_handler);
+void         emac_unregister_eapol_packet_handler(void);
 
 #ifdef __cplusplus
 }     /* extern "C" */