Fix static variable names
Fixed static variable names according to the ESP-IDF C code formatting guide. Refs #1085 and fixes #1103
This commit is contained in:
@@ -48,22 +48,22 @@ typedef struct {
|
||||
} relay_chn_notify_msg_t;
|
||||
|
||||
// The list that holds references to the registered listeners.
|
||||
static List_t listeners;
|
||||
static List_t s_listeners;
|
||||
|
||||
static QueueHandle_t notify_msg_queue = NULL;
|
||||
static TaskHandle_t notify_task_handle = NULL;
|
||||
static QueueHandle_t s_notify_queue = NULL;
|
||||
static TaskHandle_t s_notify_task = NULL;
|
||||
|
||||
static void relay_chn_notify_task(void *arg);
|
||||
|
||||
|
||||
esp_err_t relay_chn_notify_init(void)
|
||||
{
|
||||
if (notify_msg_queue != NULL) {
|
||||
if (s_notify_queue != NULL) {
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
notify_msg_queue = xQueueCreate(RELAY_CHN_NOTIFY_QUEUE_LEN, sizeof(relay_chn_notify_msg_t));
|
||||
if (!notify_msg_queue) {
|
||||
s_notify_queue = xQueueCreate(RELAY_CHN_NOTIFY_QUEUE_LEN, sizeof(relay_chn_notify_msg_t));
|
||||
if (!s_notify_queue) {
|
||||
ESP_LOGE(TAG, "Failed to create notify queue");
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
@@ -71,34 +71,34 @@ esp_err_t relay_chn_notify_init(void)
|
||||
// Create the notify dispatcher task
|
||||
BaseType_t ret = xTaskCreate(relay_chn_notify_task, "task_rlch_ntfy",
|
||||
RELAY_CHN_NOTIFY_TASK_STACK, NULL,
|
||||
RELAY_CHN_NOTIFY_TASK_PRIO, ¬ify_task_handle);
|
||||
RELAY_CHN_NOTIFY_TASK_PRIO, &s_notify_task);
|
||||
if (ret != pdPASS) {
|
||||
ESP_LOGE(TAG, "Failed to create notify task");
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
|
||||
// Init the state listener list
|
||||
vListInitialise(&listeners);
|
||||
vListInitialise(&s_listeners);
|
||||
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
void relay_chn_notify_deinit(void)
|
||||
{
|
||||
if (notify_task_handle != NULL) {
|
||||
vTaskDelete(notify_task_handle);
|
||||
notify_task_handle = NULL;
|
||||
if (s_notify_task != NULL) {
|
||||
vTaskDelete(s_notify_task);
|
||||
s_notify_task = NULL;
|
||||
}
|
||||
|
||||
if (notify_msg_queue != NULL) {
|
||||
vQueueDelete(notify_msg_queue);
|
||||
notify_msg_queue = NULL;
|
||||
if (s_notify_queue != NULL) {
|
||||
vQueueDelete(s_notify_queue);
|
||||
s_notify_queue = NULL;
|
||||
}
|
||||
|
||||
if (!listLIST_IS_EMPTY(&listeners)) {
|
||||
if (!listLIST_IS_EMPTY(&s_listeners)) {
|
||||
// Free the listeners
|
||||
while (listCURRENT_LIST_LENGTH(&listeners) > 0) {
|
||||
ListItem_t *pxItem = listGET_HEAD_ENTRY(&listeners);
|
||||
while (listCURRENT_LIST_LENGTH(&s_listeners) > 0) {
|
||||
ListItem_t *pxItem = listGET_HEAD_ENTRY(&s_listeners);
|
||||
relay_chn_listener_entry_t *entry = listGET_LIST_ITEM_OWNER(pxItem);
|
||||
uxListRemove(pxItem);
|
||||
free(entry);
|
||||
@@ -118,14 +118,14 @@ void relay_chn_notify_deinit(void)
|
||||
*/
|
||||
static relay_chn_listener_entry_t* find_listener_entry(relay_chn_state_listener_t listener)
|
||||
{
|
||||
if (listLIST_IS_EMPTY(&listeners)) {
|
||||
if (listLIST_IS_EMPTY(&s_listeners)) {
|
||||
ESP_LOGD(TAG, "No listeners registered");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// Iterate through the linked list of listeners
|
||||
for (ListItem_t *pxListItem = listGET_HEAD_ENTRY(&listeners);
|
||||
pxListItem != listGET_END_MARKER(&listeners);
|
||||
for (ListItem_t *pxListItem = listGET_HEAD_ENTRY(&s_listeners);
|
||||
pxListItem != listGET_END_MARKER(&s_listeners);
|
||||
pxListItem = listGET_NEXT(pxListItem)) {
|
||||
|
||||
relay_chn_listener_entry_t *entry = (relay_chn_listener_entry_t *) listGET_LIST_ITEM_OWNER(pxListItem);
|
||||
@@ -154,7 +154,7 @@ static void do_add_listener(relay_chn_state_listener_t listener)
|
||||
entry->listener = listener;
|
||||
vListInitialiseItem(&(entry->list_item));
|
||||
listSET_LIST_ITEM_OWNER(&(entry->list_item), (void *)entry);
|
||||
vListInsertEnd(&listeners, &(entry->list_item));
|
||||
vListInsertEnd(&s_listeners, &(entry->list_item));
|
||||
ESP_LOGD(TAG, "Registered listener %p", listener);
|
||||
}
|
||||
|
||||
@@ -170,19 +170,19 @@ static void do_remove_listener(relay_chn_state_listener_t listener)
|
||||
ESP_LOGD(TAG, "Listener %p not found for unregistration.", listener);
|
||||
}
|
||||
|
||||
if (listLIST_IS_EMPTY(&listeners)) {
|
||||
if (listLIST_IS_EMPTY(&s_listeners)) {
|
||||
// Flush all pending notifications in the queue
|
||||
xQueueReset(notify_msg_queue);
|
||||
xQueueReset(s_notify_queue);
|
||||
}
|
||||
}
|
||||
|
||||
esp_err_t relay_chn_notify_add_listener(relay_chn_state_listener_t listener)
|
||||
{
|
||||
ESP_RETURN_ON_FALSE(listener, ESP_ERR_INVALID_ARG, TAG, "Listener cannot be NULL");
|
||||
ESP_RETURN_ON_FALSE(notify_msg_queue, ESP_ERR_INVALID_STATE, TAG, "Notify module not initialized");
|
||||
ESP_RETURN_ON_FALSE(s_notify_queue, ESP_ERR_INVALID_STATE, TAG, "Notify module not initialized");
|
||||
|
||||
relay_chn_notify_msg_t msg = { .cmd = RELAY_CHN_NOTIFY_CMD_ADD_LISTENER, .payload.listener = listener };
|
||||
if (xQueueSend(notify_msg_queue, &msg, 0) != pdTRUE) {
|
||||
if (xQueueSend(s_notify_queue, &msg, 0) != pdTRUE) {
|
||||
ESP_LOGE(TAG, "Notify queue is full, failed to queue add_listener");
|
||||
return ESP_FAIL;
|
||||
}
|
||||
@@ -195,20 +195,20 @@ void relay_chn_notify_remove_listener(relay_chn_state_listener_t listener)
|
||||
ESP_LOGD(TAG, "Cannot unregister a NULL listener.");
|
||||
return;
|
||||
}
|
||||
if (!notify_msg_queue) {
|
||||
if (!s_notify_queue) {
|
||||
ESP_LOGE(TAG, "Notify module not initialized, cannot remove listener");
|
||||
return;
|
||||
}
|
||||
|
||||
relay_chn_notify_msg_t msg = { .cmd = RELAY_CHN_NOTIFY_CMD_REMOVE_LISTENER, .payload.listener = listener };
|
||||
if (xQueueSendToFront(notify_msg_queue, &msg, 0) != pdTRUE) {
|
||||
if (xQueueSendToFront(s_notify_queue, &msg, 0) != pdTRUE) {
|
||||
ESP_LOGW(TAG, "Notify queue is full, failed to queue remove_listener");
|
||||
}
|
||||
}
|
||||
|
||||
esp_err_t relay_chn_notify_state_change(uint8_t chn_id, relay_chn_state_t old_state, relay_chn_state_t new_state)
|
||||
{
|
||||
if (!notify_msg_queue) {
|
||||
if (!s_notify_queue) {
|
||||
return ESP_ERR_INVALID_STATE;
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ esp_err_t relay_chn_notify_state_change(uint8_t chn_id, relay_chn_state_t old_st
|
||||
};
|
||||
|
||||
// Try to send, do not wait if the queue is full
|
||||
if (xQueueSend(notify_msg_queue, &msg, 0) != pdTRUE) {
|
||||
if (xQueueSend(s_notify_queue, &msg, 0) != pdTRUE) {
|
||||
ESP_LOGW(TAG, "Notify queue is full, dropping event: %d -> %d for #%d", old_state, new_state, chn_id);
|
||||
return ESP_FAIL;
|
||||
}
|
||||
@@ -231,8 +231,8 @@ static void do_notify(relay_chn_notify_event_data_t *event_data)
|
||||
{
|
||||
// Iterate through the linked list of listeners and notify them.
|
||||
// No mutex is needed as this is the only task accessing the list.
|
||||
for (ListItem_t *pxListItem = listGET_HEAD_ENTRY(&listeners);
|
||||
pxListItem != listGET_END_MARKER(&listeners);
|
||||
for (ListItem_t *pxListItem = listGET_HEAD_ENTRY(&s_listeners);
|
||||
pxListItem != listGET_END_MARKER(&s_listeners);
|
||||
pxListItem = listGET_NEXT(pxListItem)) {
|
||||
relay_chn_listener_entry_t *entry = (relay_chn_listener_entry_t *) listGET_LIST_ITEM_OWNER(pxListItem);
|
||||
if (entry && entry->listener) {
|
||||
@@ -247,7 +247,7 @@ static void relay_chn_notify_task(void *arg)
|
||||
{
|
||||
relay_chn_notify_msg_t msg;
|
||||
for (;;) {
|
||||
if (xQueueReceive(notify_msg_queue, &msg, portMAX_DELAY) == pdTRUE) {
|
||||
if (xQueueReceive(s_notify_queue, &msg, portMAX_DELAY) == pdTRUE) {
|
||||
switch (msg.cmd) {
|
||||
case RELAY_CHN_NOTIFY_CMD_BROADCAST: {
|
||||
do_notify(&msg.payload.event_data);
|
||||
|
||||
Reference in New Issue
Block a user