Revision 19:9fdf8b4e41bf, committed 2013-10-03

Comitter:

Kojto

Date:

Thu Oct 03 09:49:03 2013 +0200

Parent:

18:7e22775eadb9

Child:

20:30b6ed7bf8fd

Commit message:

return values from get_mac/set_mac

Changed in this revision

--- a/cc3000.cpp	Wed Oct 02 21:57:28 2013 +0000
+++ b/cc3000.cpp	Thu Oct 03 09:49:03 2013 +0200
@@ -141,9 +141,9 @@
         wait_ms(100);
 
     }
-    
+
     DBG_CC("Smartconfig finished");
-    
+
 #ifndef CC3000_UNENCRYPTED_SMART_CONFIG
     // create new entry for AES encryption key
     _nvmem.create_entry(NVMEM_AES128_KEY_FILEID, 16);
@@ -204,9 +204,9 @@
         /* timeout 10 seconds */
         if (t.read_ms() > 10000){
             ret = false;
-            
+
             DBG_CC("Connection to AP failed");
-            
+
             break;
         }
     }
@@ -259,12 +259,12 @@
     return _status.smart_config_complete;
 }
 
-void cc3000::get_mac_address(uint8_t address[6]) {
-    _nvmem.get_mac_address(address);
+uint8_t cc3000::get_mac_address(uint8_t address[6]) {
+    return _nvmem.get_mac_address(address);
 }
 
-void cc3000::set_mac_address(uint8_t address[6]) {
-    _nvmem.set_mac_address(address);
+uint8_t cc3000::set_mac_address(uint8_t address[6]) {
+    return _nvmem.set_mac_address(address);
 }
 
 void cc3000::get_user_file_info(uint8_t *info_file, size_t size) {

--- a/cc3000.h	Wed Oct 02 21:57:28 2013 +0000
+++ b/cc3000.h	Thu Oct 03 09:49:03 2013 +0200
@@ -595,14 +595,14 @@
     bool is_smart_confing_completed();
     /** Return the cc3000's mac address.
      *  \param address Retreived mac address.
-     *  \return none
+     *  \return
      */
-    void get_mac_address(uint8_t address[6]);
+    uint8_t get_mac_address(uint8_t address[6]);
     /** Set the cc3000's mac address
      *  \param address Mac address to be set
-     *  \return none
+     *  \return
      */
-    void set_mac_address(uint8_t address[6]);
+    uint8_t set_mac_address(uint8_t address[6]);
     /** Get user file info
      *  \param  info_file Pointer where info will be stored
      *  \param  size      Available size