ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolved comments.

pull/13757/head
Debdeep Saha 2020-09-03 21:24:26 +05:30 committed by Arto Kinnunen
parent 6c84032a33
commit 986f9dd946
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/WisunInterface.h
View File

@ -538,10 +538,12 @@ public:
* *
* Function reads CCA threshold table from nanostack. * Function reads CCA threshold table from nanostack.
* *
* \return pointer to ws_cca_threshold_table_t structure on success. ** \param ws_cca_threshold_table_t Structure given to stack where information will be stored
* \return NULL in case of failure. **
* \return MESH_ERROR_NONE on success.
* \return MESH_ERROR_UNKNOWN in case of failure.
* */ * */
const ws_cca_threshold_table_t *cca_threshold_table_get(void); mesh_error_t cca_threshold_table_get(ws_cca_threshold_table_t *table);
protected: protected:
Nanostack::WisunInterface *get_interface() const; Nanostack::WisunInterface *get_interface() const;

26
connectivity/nanostack/mbed-mesh-api/source/WisunInterface.cpp
View File

@ -488,13 +488,8 @@ mesh_error_t WisunInterface::get_device_min_sens(uint8_t *device_min_sens)
return MESH_ERROR_PARAM; return MESH_ERROR_PARAM;
} }
ws_stack_info_t stack_info = {0}; /* To-Do :: Update this when device_min_sense get API is available */
*device_min_sens = 0;
if (ws_stack_info_get(get_interface_id(), &stack_info)) {
return MESH_ERROR_UNKNOWN;
}
*device_min_sens = stack_info.device_min_sens;
return MESH_ERROR_NONE; return MESH_ERROR_NONE;
} }
@ -673,11 +668,22 @@ mesh_error_t WisunInterface::stack_info_get(ws_stack_state_t *stack_info_ptr)
return MESH_ERROR_NONE; return MESH_ERROR_NONE;
} }
const ws_cca_threshold_table_t *WisunInterface::cca_threshold_table_get(void) mesh_error_t WisunInterface::cca_threshold_table_get(ws_cca_threshold_table_t *table)
{ {
const cca_threshold_table_s *cca_threshold_table = arm_nwk_get_cca_threshold_table(get_interface_id()); if (table == NULL) {
return MESH_ERROR_PARAM;
}
return (const ws_cca_threshold_table_t *)cca_threshold_table; const cca_threshold_table_s *cca_table = arm_nwk_get_cca_threshold_table(get_interface_id());
if (cca_table != NULL) {
table->number_of_channels = cca_table->number_of_channels;
table->cca_threshold_table = cca_table->cca_threshold_table;
} else {
return MESH_ERROR_UNKNOWN;
}
return MESH_ERROR_NONE;
} }
#define WISUN 0x2345 #define WISUN 0x2345