Skip to content

enet_tasklet_disconnect() should generate event to tasklet. #9684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2019
Merged

enet_tasklet_disconnect() should generate event to tasklet. #9684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions features/nanostack/mbed-mesh-api/source/ethernet_tasklet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_configure_and_connect_to_network(void);
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.
* @param event, describes the sender, receiver and event type.
Expand Down Expand Up @@ -120,7 +121,7 @@ void enet_tasklet_main(arm_event_s *event)
case APPLICATION_EVENT:
if (event->event_id == APPL_EVENT_CONNECT) {
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) {
// Ethernet cable has been plugged in
arm_nwk_interface_configure_ipv6_bootstrap_set(
Expand All @@ -133,13 +134,26 @@ void enet_tasklet_main(arm_event_s *event)
}
tasklet_data_ptr->poll_network_status_timeout =
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
arm_nwk_interface_down(tasklet_data_ptr->network_interface_id);
eventOS_timeout_cancel(tasklet_data_ptr->poll_network_status_timeout);
tasklet_data_ptr->poll_network_status_timeout = NULL;
memset(tasklet_data_ptr->ip, 0x0, 16);
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;

Expand Down Expand Up @@ -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 status = -1;
if (tasklet_data_ptr != NULL) {
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;
enet_tasklet_generate_event(APPL_BACKHAUL_INTERFACE_PHY_DOWN, MESH_DISCONNECTED);
return 0;
}

void enet_tasklet_init(void)
Expand Down Expand Up @@ -333,13 +336,23 @@ int8_t enet_tasklet_network_init(int8_t device_id)
}

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 = {
.receiver = tasklet_data_ptr->tasklet,
.sender = tasklet_data_ptr->tasklet,
.event_type = APPLICATION_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);
}
3 changes: 2 additions & 1 deletion features/nanostack/mbed-mesh-api/source/include/mesh_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ extern "C" {
enum {
APPL_EVENT_CONNECT = 0x01,
APPL_BACKHAUL_INTERFACE_PHY_DOWN,
APPL_BACKHAUL_INTERFACE_PHY_UP
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't fully understand why we don't distinguish APPL_BACKHAUL_INTERFACE_PHY_UP (interface swithced on, but cable not necessarily connected) and APPL_BACKHAUL_LINK_UP (cable connected)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KariHaapalehto ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There haven't been need for that yet, from the connection staus point of view

APPL_BACKHAUL_LINK_DOWN,
APPL_BACKHAUL_LINK_UP
};

/*
Expand Down