net: mgmt: Convert the mgmt API to use 64-bit masks

Instead of using 32 bit enum values for event numbers, convert
the code to use 64 bit long bit fields. This means that the
user API is changed to use 64 bit event values instead of 32
bit event values.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>

Author: jukkar

include/zephyr/net/coap_mgmt.h

@@ -42,38 +42,43 @@ struct coap_observer;
 
 enum net_event_coap_cmd {
 	/* Service events */
-	NET_EVENT_COAP_CMD_SERVICE_STARTED = 1,
+	NET_EVENT_COAP_CMD_SERVICE_STARTED,
 	NET_EVENT_COAP_CMD_SERVICE_STOPPED,
 	/* Observer events */
 	NET_EVENT_COAP_CMD_OBSERVER_ADDED,
 	NET_EVENT_COAP_CMD_OBSERVER_REMOVED,
+
+	NET_EVENT_COAP_CMD_MAX
 };
 
+BUILD_ASSERT(NET_EVENT_COAP_CMD_MAX <= NET_MGMT_MAX_COMMANDS
+	     "Number of events in net_event_coap_cmd exceeds the limit");
+
 /** @endcond */
 
 /**
  * @brief coap_mgmt event raised when a service has started
  */
 #define NET_EVENT_COAP_SERVICE_STARTED			\
-	(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STARTED)
+	(NET_COAP_IF_BASE | BIT64(NET_EVENT_COAP_CMD_SERVICE_STARTED))
 
 /**
  * @brief coap_mgmt event raised when a service has stopped
  */
 #define NET_EVENT_COAP_SERVICE_STOPPED			\
-	(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STOPPED)
+	(NET_COAP_IF_BASE | BIT64(NET_EVENT_COAP_CMD_SERVICE_STOPPED))
 
 /**
  * @brief coap_mgmt event raised when an observer has been added to a resource
  */
 #define NET_EVENT_COAP_OBSERVER_ADDED			\
-	(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_ADDED)
+	(NET_COAP_IF_BASE | BIT64(NET_EVENT_COAP_CMD_OBSERVER_ADDED))
 
 /**
  * @brief coap_mgmt event raised when an observer has been removed from a resource
  */
 #define NET_EVENT_COAP_OBSERVER_REMOVED			\
-	(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_REMOVED)
+	(NET_COAP_IF_BASE | BIT64(NET_EVENT_COAP_CMD_OBSERVER_REMOVED))
 
 /**
  * @brief CoAP Service event structure.

include/zephyr/net/conn_mgr_connectivity.h

@@ -42,23 +42,28 @@ extern "C" {
 #define NET_MGMT_CONN_IF_EVENT			(NET_MGMT_IFACE_BIT | NET_MGMT_CONN_BASE)
 
 enum net_event_conn_cmd {
-	NET_EVENT_CONN_CMD_IF_TIMEOUT = 1,
+	NET_EVENT_CONN_CMD_IF_TIMEOUT,
 	NET_EVENT_CONN_CMD_IF_FATAL_ERROR,
+
+	NET_EVENT_CONN_CMD_MAX
 };
 
+BUILD_ASSERT(NET_EVENT_CONN_CMD_MAX <= NET_MGMT_MAX_COMMANDS,
+	     "Number of events in net_event_conn_cmd exceeds the limit");
+
 /** @endcond */
 
 /**
  * @brief net_mgmt event raised when a connection attempt times out
  */
 #define NET_EVENT_CONN_IF_TIMEOUT					\
-	(NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_TIMEOUT)
+	(NET_MGMT_CONN_IF_EVENT | BIT64(NET_EVENT_CONN_CMD_IF_TIMEOUT))
 
 /**
  * @brief net_mgmt event raised when a non-recoverable connectivity error occurs on an iface
  */
 #define NET_EVENT_CONN_IF_FATAL_ERROR					\
-	(NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_FATAL_ERROR)
+	(NET_MGMT_CONN_IF_EVENT | BIT64(NET_EVENT_CONN_CMD_IF_FATAL_ERROR))
 
 
 /**

include/zephyr/net/ethernet_mgmt.h

@@ -189,23 +189,28 @@ struct ethernet_req_params {
 };
 
 enum net_event_ethernet_cmd {
-	NET_EVENT_ETHERNET_CMD_CARRIER_ON = 1,
+	NET_EVENT_ETHERNET_CMD_CARRIER_ON,
 	NET_EVENT_ETHERNET_CMD_CARRIER_OFF,
 	NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED,
 	NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED,
+
+	NET_EVENT_ETHERNET_CMD_MAX
 };
 
+BUILD_ASSERT(NET_EVENT_ETHERNET_CMD_MAX <= NET_MGMT_MAX_COMMANDS
+	     "Number of events in net_event_ethernet_cmd exceeds the limit");
+
 #define NET_EVENT_ETHERNET_CARRIER_ON					\
-	(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_ON)
+	(NET_ETHERNET_EVENT | BIT64(NET_EVENT_ETHERNET_CMD_CARRIER_ON))
 
 #define NET_EVENT_ETHERNET_CARRIER_OFF					\
-	(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_OFF)
+	(NET_ETHERNET_EVENT | BIT64(NET_EVENT_ETHERNET_CMD_CARRIER_OFF))
 
 #define NET_EVENT_ETHERNET_VLAN_TAG_ENABLED				\
-	(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED)
+	(NET_ETHERNET_EVENT | BIT64(NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED))
 
 #define NET_EVENT_ETHERNET_VLAN_TAG_DISABLED				\
-	(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED)
+	(NET_ETHERNET_EVENT | BIT64(NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED))
 
 struct net_if;
 

include/zephyr/net/ieee802154_mgmt.h

@@ -256,9 +256,14 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_SECURITY_SETTINGS);
  */
 
 enum net_event_ieee802154_cmd {
-	NET_EVENT_IEEE802154_CMD_SCAN_RESULT = 1,
+	NET_EVENT_IEEE802154_CMD_SCAN_RESULT,
+
+	NET_EVENT_IEEE802154_CMD_MAX
 };
 
+BUILD_ASSERT(NET_EVENT_IEEE802154_CMD_MAX <= NET_MGMT_MAX_COMMANDS
+	     "Number of events in net_event_ieee802154_cmd exceeds the limit");
+
 /**
  * INTERNAL_HIDDEN @endcond
  */
@@ -282,7 +287,7 @@ enum net_event_ieee802154_cmd {
  * See @ref ieee802154_req_params for associated event parameters.
  */
 #define NET_EVENT_IEEE802154_SCAN_RESULT				\
-	(NET_IEEE802154_EVENT | NET_EVENT_IEEE802154_CMD_SCAN_RESULT)
+	(NET_IEEE802154_EVENT | BIT64(NET_EVENT_IEEE802154_CMD_SCAN_RESULT))
 
 /**
  * @}