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

enet_tasklet_disconnect() should generate event to tasklet. 

enet_tasklet_disconnect() is now generating event to ethernet_tasklet,
which will then handle it.
pull/9684/head
Kari Haapalehto 2019-02-12 13:57:19 +02:00
parent 091509705f
commit 31c40130d6
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
features/nanostack/mbed-mesh-api/source/ethernet_tasklet.c
View File

@ -79,6 +79,7 @@ static void enet_tasklet_network_state_changed(mesh_connection_status_t status);
static void enet_tasklet_parse_network_event(arm_event_s *event); static void enet_tasklet_parse_network_event(arm_event_s *event);
static void enet_tasklet_configure_and_connect_to_network(void); static void enet_tasklet_configure_and_connect_to_network(void);
static void enet_tasklet_poll_network_status(void *param); static void enet_tasklet_poll_network_status(void *param);
static void enet_tasklet_generate_event(uint8_t link_status, mesh_connection_status_t mesh_status);
/* /*
* \brief A function which will be eventually called by NanoStack OS when ever the OS has an event to deliver. * \brief A function which will be eventually called by NanoStack OS when ever the OS has an event to deliver.
* @param event, describes the sender, receiver and event type. * @param event, describes the sender, receiver and event type.
@ -120,7 +121,7 @@ void enet_tasklet_main(arm_event_s *event)
case APPLICATION_EVENT: case APPLICATION_EVENT:
if (event->event_id == APPL_EVENT_CONNECT) { if (event->event_id == APPL_EVENT_CONNECT) {
enet_tasklet_configure_and_connect_to_network(); enet_tasklet_configure_and_connect_to_network();
} else if (event->event_id == APPL_BACKHAUL_INTERFACE_PHY_UP } else if (event->event_id == APPL_BACKHAUL_LINK_UP
&& tasklet_data_ptr->tasklet_state != TASKLET_STATE_BOOTSTRAP_STARTED) { && tasklet_data_ptr->tasklet_state != TASKLET_STATE_BOOTSTRAP_STARTED) {
// Ethernet cable has been plugged in // Ethernet cable has been plugged in
arm_nwk_interface_configure_ipv6_bootstrap_set( arm_nwk_interface_configure_ipv6_bootstrap_set(
@ -133,13 +134,26 @@ void enet_tasklet_main(arm_event_s *event)
} }
tasklet_data_ptr->poll_network_status_timeout = tasklet_data_ptr->poll_network_status_timeout =
eventOS_timeout_every_ms(enet_tasklet_poll_network_status, 2000, NULL); eventOS_timeout_every_ms(enet_tasklet_poll_network_status, 2000, NULL);
} else if (event->event_id == APPL_BACKHAUL_INTERFACE_PHY_DOWN) { } else if (event->event_id == APPL_BACKHAUL_LINK_DOWN) {
// Ethernet cable has been removed // Ethernet cable has been removed
arm_nwk_interface_down(tasklet_data_ptr->network_interface_id); arm_nwk_interface_down(tasklet_data_ptr->network_interface_id);
eventOS_timeout_cancel(tasklet_data_ptr->poll_network_status_timeout); eventOS_timeout_cancel(tasklet_data_ptr->poll_network_status_timeout);
tasklet_data_ptr->poll_network_status_timeout = NULL; tasklet_data_ptr->poll_network_status_timeout = NULL;
memset(tasklet_data_ptr->ip, 0x0, 16); memset(tasklet_data_ptr->ip, 0x0, 16);
enet_tasklet_network_state_changed(MESH_BOOTSTRAP_STARTED); enet_tasklet_network_state_changed(MESH_BOOTSTRAP_STARTED);
} else if (event->event_id == APPL_BACKHAUL_INTERFACE_PHY_DOWN) {
// disconnect called
if (tasklet_data_ptr != NULL) {
if (tasklet_data_ptr->network_interface_id != INVALID_INTERFACE_ID) {
if (tasklet_data_ptr->connection_status != MESH_BOOTSTRAP_STARTED) {
arm_nwk_interface_down(tasklet_data_ptr->network_interface_id);
}
tasklet_data_ptr->network_interface_id = INVALID_INTERFACE_ID;
enet_tasklet_network_state_changed(MESH_DISCONNECTED);
}
tasklet_data_ptr->mesh_api_cb = NULL;
eventOS_timeout_cancel(tasklet_data_ptr->poll_network_status_timeout);
}
} }
break; break;
@ -290,19 +304,8 @@ int8_t enet_tasklet_connect(mesh_interface_cb callback, int8_t nwk_interface_id)
int8_t enet_tasklet_disconnect(bool send_cb) int8_t enet_tasklet_disconnect(bool send_cb)
{ {
int8_t status = -1; enet_tasklet_generate_event(APPL_BACKHAUL_INTERFACE_PHY_DOWN, MESH_DISCONNECTED);
if (tasklet_data_ptr != NULL) { return 0;
if (tasklet_data_ptr->network_interface_id != INVALID_INTERFACE_ID) {
status = arm_nwk_interface_down(tasklet_data_ptr->network_interface_id);
tasklet_data_ptr->network_interface_id = INVALID_INTERFACE_ID;
if (send_cb) {
enet_tasklet_network_state_changed(MESH_DISCONNECTED);
}
}
tasklet_data_ptr->mesh_api_cb = NULL;
eventOS_timeout_cancel(tasklet_data_ptr->poll_network_status_timeout);
}
return status;
} }
void enet_tasklet_init(void) void enet_tasklet_init(void)
@ -333,13 +336,23 @@ int8_t enet_tasklet_network_init(int8_t device_id)
} }
void enet_tasklet_link_state_changed(bool up) void enet_tasklet_link_state_changed(bool up)
{
if (up) {
enet_tasklet_generate_event(APPL_BACKHAUL_LINK_UP, MESH_BOOTSTRAP_STARTED);
} else {
enet_tasklet_generate_event(APPL_BACKHAUL_LINK_DOWN, MESH_BOOTSTRAP_STARTED);
}
}
static void enet_tasklet_generate_event(uint8_t link_status, mesh_connection_status_t mesh_status)
{ {
arm_event_s event = { arm_event_s event = {
.receiver = tasklet_data_ptr->tasklet, .receiver = tasklet_data_ptr->tasklet,
.sender = tasklet_data_ptr->tasklet, .sender = tasklet_data_ptr->tasklet,
.event_type = APPLICATION_EVENT, .event_type = APPLICATION_EVENT,
.priority = ARM_LIB_LOW_PRIORITY_EVENT, .priority = ARM_LIB_LOW_PRIORITY_EVENT,
.event_id = up ? APPL_BACKHAUL_INTERFACE_PHY_UP : APPL_BACKHAUL_INTERFACE_PHY_DOWN, .event_id = link_status,
.event_data = mesh_status
}; };
eventOS_event_send(&event); eventOS_event_send(&event);
} }

3
features/nanostack/mbed-mesh-api/source/include/mesh_system.h
View File

@ -28,7 +28,8 @@ extern "C" {
enum { enum {
APPL_EVENT_CONNECT = 0x01, APPL_EVENT_CONNECT = 0x01,
APPL_BACKHAUL_INTERFACE_PHY_DOWN, APPL_BACKHAUL_INTERFACE_PHY_DOWN,
APPL_BACKHAUL_INTERFACE_PHY_UP APPL_BACKHAUL_LINK_DOWN,
APPL_BACKHAUL_LINK_UP
}; };
/* /*