modem: cmux: Combine state and event

Refactor internal event bits to use state enum values
and define set_state() and wait_state() so we don't need
two set of variables to maintain.

Signed-off-by: Seppo Takalo <[email protected]>

Author: SeppoTakalo

subsys/modem/modem_cmux.c

@@ -103,6 +103,22 @@ static int modem_cmux_wrap_command(struct modem_cmux_command **command, const ui
 	return 0;
 }
 
+static void set_state(struct modem_cmux *cmux, enum modem_cmux_state state)
+{
+	cmux->state = state;
+	k_event_set(&cmux->event, BIT(state));
+}
+
+static bool wait_state(struct modem_cmux *cmux, enum modem_cmux_state state, k_timeout_t timeout)
+{
+	return k_event_wait(&cmux->event, BIT(state), false, timeout) == BIT(state);
+}
+
+static bool is_connected(struct modem_cmux *cmux)
+{
+	return cmux->state == MODEM_CMUX_STATE_CONNECTED;
+}
+
 static struct modem_cmux_command *modem_cmux_command_wrap(const uint8_t *data)
 {
 	return (struct modem_cmux_command *)data;
@@ -452,14 +468,12 @@ static void modem_cmux_on_cld_command(struct modem_cmux *cmux, struct modem_cmux
 	}
 
 	LOG_DBG("CMUX disconnected");
-	cmux->state = MODEM_CMUX_STATE_DISCONNECTED;
+	set_state(cmux, MODEM_CMUX_STATE_DISCONNECTED);
 	k_mutex_lock(&cmux->transmit_rb_lock, K_FOREVER);
 	cmux->flow_control_on = false;
 	k_mutex_unlock(&cmux->transmit_rb_lock);
 
 	modem_cmux_raise_event(cmux, MODEM_CMUX_EVENT_DISCONNECTED);
-	k_event_clear(&cmux->event, MODEM_CMUX_EVENT_CONNECTED_BIT);
-	k_event_post(&cmux->event, MODEM_CMUX_EVENT_DISCONNECTED_BIT);
 }
 
 static void modem_cmux_on_control_frame_ua(struct modem_cmux *cmux)
@@ -470,15 +484,13 @@ static void modem_cmux_on_control_frame_ua(struct modem_cmux *cmux)
 	}
 
 	LOG_DBG("CMUX connected");
-	cmux->state = MODEM_CMUX_STATE_CONNECTED;
+	set_state(cmux, MODEM_CMUX_STATE_CONNECTED);
 	cmux->initiator = true;
 	k_mutex_lock(&cmux->transmit_rb_lock, K_FOREVER);
 	cmux->flow_control_on = true;
 	k_mutex_unlock(&cmux->transmit_rb_lock);
 	k_work_cancel_delayable(&cmux->connect_work);
 	modem_cmux_raise_event(cmux, MODEM_CMUX_EVENT_CONNECTED);
-	k_event_clear(&cmux->event, MODEM_CMUX_EVENT_DISCONNECTED_BIT);
-	k_event_post(&cmux->event, MODEM_CMUX_EVENT_CONNECTED_BIT);
 }
 
 static void modem_cmux_respond_unsupported_cmd(struct modem_cmux *cmux)
@@ -606,21 +618,19 @@ static void modem_cmux_on_control_frame_sabm(struct modem_cmux *cmux)
 
 	LOG_DBG("CMUX connection request received");
 	cmux->initiator = false;
-	cmux->state = MODEM_CMUX_STATE_CONNECTED;
+	set_state(cmux, MODEM_CMUX_STATE_CONNECTED);
 	modem_cmux_connect_response_transmit(cmux);
 	k_mutex_lock(&cmux->transmit_rb_lock, K_FOREVER);
 	cmux->flow_control_on = true;
 	k_mutex_unlock(&cmux->transmit_rb_lock);
 	modem_cmux_raise_event(cmux, MODEM_CMUX_EVENT_CONNECTED);
-	k_event_clear(&cmux->event, MODEM_CMUX_EVENT_DISCONNECTED_BIT);
-	k_event_post(&cmux->event, MODEM_CMUX_EVENT_CONNECTED_BIT);
 }
 
 static void modem_cmux_on_control_frame(struct modem_cmux *cmux)
 {
 	modem_cmux_log_received_frame(&cmux->frame);
 
-	if (cmux->state == MODEM_CMUX_STATE_CONNECTED && cmux->frame.cr == cmux->initiator) {
+	if (is_connected(cmux) && cmux->frame.cr == cmux->initiator) {
 		LOG_DBG("Received a response frame, dropping");
 		return;
 	}
@@ -1105,7 +1115,7 @@ static void modem_cmux_connect_handler(struct k_work *item)
 	dwork = k_work_delayable_from_work(item);
 	cmux = CONTAINER_OF(dwork, struct modem_cmux, connect_work);
 
-	cmux->state = MODEM_CMUX_STATE_CONNECTING;
+	set_state(cmux, MODEM_CMUX_STATE_CONNECTING);
 	cmux->initiator = true;
 
 	static const struct modem_cmux_frame frame = {
@@ -1128,7 +1138,7 @@ static void modem_cmux_disconnect_handler(struct k_work *item)
 	struct modem_cmux_command *command;
 	uint8_t data[2];
 
-	cmux->state = MODEM_CMUX_STATE_DISCONNECTING;
+	set_state(cmux, MODEM_CMUX_STATE_DISCONNECTING);
 
 	command = modem_cmux_command_wrap(data);
 	command->type.ea = 1;
@@ -1362,16 +1372,14 @@ void modem_cmux_init(struct modem_cmux *cmux, const struct modem_cmux_config *co
 	cmux->receive_buf = config->receive_buf;
 	cmux->receive_buf_size = config->receive_buf_size;
 	sys_slist_init(&cmux->dlcis);
-	cmux->state = MODEM_CMUX_STATE_DISCONNECTED;
 	ring_buf_init(&cmux->transmit_rb, config->transmit_buf_size, config->transmit_buf);
 	k_mutex_init(&cmux->transmit_rb_lock);
 	k_work_init_delayable(&cmux->receive_work, modem_cmux_receive_handler);
 	k_work_init_delayable(&cmux->transmit_work, modem_cmux_transmit_handler);
 	k_work_init_delayable(&cmux->connect_work, modem_cmux_connect_handler);
 	k_work_init_delayable(&cmux->disconnect_work, modem_cmux_disconnect_handler);
 	k_event_init(&cmux->event);
-	k_event_clear(&cmux->event, MODEM_CMUX_EVENT_CONNECTED_BIT);
-	k_event_post(&cmux->event, MODEM_CMUX_EVENT_DISCONNECTED_BIT);
+	set_state(cmux, MODEM_CMUX_STATE_DISCONNECTED);
 
 #if CONFIG_MODEM_STATS
 	modem_cmux_init_buf_stats(cmux);
@@ -1433,8 +1441,7 @@ int modem_cmux_connect(struct modem_cmux *cmux)
 		return ret;
 	}
 
-	if (k_event_wait(&cmux->event, MODEM_CMUX_EVENT_CONNECTED_BIT, false,
-			 MODEM_CMUX_T2_TIMEOUT) == 0) {
+	if (!wait_state(cmux, MODEM_CMUX_STATE_CONNECTED, MODEM_CMUX_T2_TIMEOUT)) {
 		return -EAGAIN;
 	}
 
@@ -1445,7 +1452,7 @@ int modem_cmux_connect_async(struct modem_cmux *cmux)
 {
 	int ret = 0;
 
-	if (k_event_test(&cmux->event, MODEM_CMUX_EVENT_CONNECTED_BIT)) {
+	if (cmux->state != MODEM_CMUX_STATE_DISCONNECTED) {
 		return -EALREADY;
 	}
 
@@ -1472,8 +1479,7 @@ int modem_cmux_disconnect(struct modem_cmux *cmux)
 		return ret;
 	}
 
-	if (k_event_wait(&cmux->event, MODEM_CMUX_EVENT_DISCONNECTED_BIT, false,
-			 MODEM_CMUX_T2_TIMEOUT) == 0) {
+	if (!wait_state(cmux, MODEM_CMUX_STATE_DISCONNECTED, MODEM_CMUX_T2_TIMEOUT)) {
 		return -EAGAIN;
 	}
 
@@ -1484,7 +1490,7 @@ int modem_cmux_disconnect_async(struct modem_cmux *cmux)
 {
 	int ret = 0;
 
-	if (k_event_test(&cmux->event, MODEM_CMUX_EVENT_DISCONNECTED_BIT)) {
+	if (cmux->state == MODEM_CMUX_STATE_DISCONNECTED) {
 		return -EALREADY;
 	}
 
@@ -1531,7 +1537,6 @@ void modem_cmux_release(struct modem_cmux *cmux)
 	/* Unreference pipe */
 	cmux->pipe = NULL;
 
-	/* Reset events */
-	k_event_clear(&cmux->event, MODEM_CMUX_EVENT_CONNECTED_BIT);
-	k_event_post(&cmux->event, MODEM_CMUX_EVENT_DISCONNECTED_BIT);
+	/* Reset state */
+	set_state(cmux, MODEM_CMUX_STATE_DISCONNECTED);
 }