Skip to content

Commit f68991a

Browse files
jukkarjukkar
committed
net: mgmt: Remove the _ from symbols
The _ is a reserved character in front of the symbols so remove it from network management event macros. The remaining string without the _ will identify the network API anyway so having underscore there is not needed. Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
1 parent d531580 commit f68991a

File tree

11 files changed

+265
-265
lines changed

11 files changed

+265
-265
lines changed

‎include/zephyr/net/coap_mgmt.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ extern "C" {
3030
/** @cond INTERNAL_HIDDEN */
3131

3232
/* CoAP events */
33-
#define _NET_COAP_LAYER NET_MGMT_LAYER_L4
34-
#define _NET_COAP_CODE 0x1c0
35-
#define _NET_COAP_IF_BASE (NET_MGMT_EVENT_BIT | \
36-
NET_MGMT_LAYER(_NET_COAP_LAYER) | \
37-
NET_MGMT_LAYER_CODE(_NET_COAP_CODE))
33+
#define NET_COAP_LAYER NET_MGMT_LAYER_L4
34+
#define NET_COAP_CODE 0x1c0
35+
#define NET_COAP_IF_BASE (NET_MGMT_EVENT_BIT | \
36+
NET_MGMT_LAYER(NET_COAP_LAYER) | \
37+
NET_MGMT_LAYER_CODE(NET_COAP_CODE))
3838

3939
struct coap_service;
4040
struct coap_resource;
@@ -55,25 +55,25 @@ enum net_event_coap_cmd {
5555
* @brief coap_mgmt event raised when a service has started
5656
*/
5757
#define NET_EVENT_COAP_SERVICE_STARTED \
58-
(_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STARTED)
58+
(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STARTED)
5959

6060
/**
6161
* @brief coap_mgmt event raised when a service has stopped
6262
*/
6363
#define NET_EVENT_COAP_SERVICE_STOPPED \
64-
(_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STOPPED)
64+
(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STOPPED)
6565

6666
/**
6767
* @brief coap_mgmt event raised when an observer has been added to a resource
6868
*/
6969
#define NET_EVENT_COAP_OBSERVER_ADDED \
70-
(_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_ADDED)
70+
(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_ADDED)
7171

7272
/**
7373
* @brief coap_mgmt event raised when an observer has been removed from a resource
7474
*/
7575
#define NET_EVENT_COAP_OBSERVER_REMOVED \
76-
(_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_REMOVED)
76+
(NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_REMOVED)
7777

7878
/**
7979
* @brief CoAP Service event structure.

‎include/zephyr/net/conn_mgr_connectivity.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ extern "C" {
3535
/** @cond INTERNAL_HIDDEN */
3636

3737
/* Connectivity Events */
38-
#define _NET_MGMT_CONN_LAYER NET_MGMT_LAYER(NET_MGMT_LAYER_L2)
39-
#define _NET_MGMT_CONN_CODE NET_MGMT_LAYER_CODE(0x207)
40-
#define _NET_MGMT_CONN_BASE (_NET_MGMT_CONN_LAYER | _NET_MGMT_CONN_CODE | \
38+
#define NET_MGMT_CONN_LAYER NET_MGMT_LAYER(NET_MGMT_LAYER_L2)
39+
#define NET_MGMT_CONN_CODE NET_MGMT_LAYER_CODE(0x207)
40+
#define NET_MGMT_CONN_BASE (NET_MGMT_CONN_LAYER | NET_MGMT_CONN_CODE | \
4141
NET_MGMT_EVENT_BIT)
42-
#define _NET_MGMT_CONN_IF_EVENT (NET_MGMT_IFACE_BIT | _NET_MGMT_CONN_BASE)
42+
#define NET_MGMT_CONN_IF_EVENT (NET_MGMT_IFACE_BIT | NET_MGMT_CONN_BASE)
4343

4444
enum net_event_conn_cmd {
4545
NET_EVENT_CONN_CMD_IF_TIMEOUT = 1,
@@ -52,13 +52,13 @@ enum net_event_conn_cmd {
5252
* @brief net_mgmt event raised when a connection attempt times out
5353
*/
5454
#define NET_EVENT_CONN_IF_TIMEOUT \
55-
(_NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_TIMEOUT)
55+
(NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_TIMEOUT)
5656

5757
/**
5858
* @brief net_mgmt event raised when a non-recoverable connectivity error occurs on an iface
5959
*/
6060
#define NET_EVENT_CONN_IF_FATAL_ERROR \
61-
(_NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_FATAL_ERROR)
61+
(NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_FATAL_ERROR)
6262

6363

6464
/**

‎include/zephyr/net/ethernet_mgmt.h‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ extern "C" {
3030

3131
/** @cond INTERNAL_HIDDEN */
3232

33-
#define _NET_ETHERNET_LAYER NET_MGMT_LAYER_L2
34-
#define _NET_ETHERNET_CODE 0x208
35-
#define _NET_ETHERNET_BASE (NET_MGMT_IFACE_BIT | \
36-
NET_MGMT_LAYER(_NET_ETHERNET_LAYER) | \
37-
NET_MGMT_LAYER_CODE(_NET_ETHERNET_CODE))
38-
#define _NET_ETHERNET_EVENT (_NET_ETHERNET_BASE | NET_MGMT_EVENT_BIT)
33+
#define NET_ETHERNET_LAYER NET_MGMT_LAYER_L2
34+
#define NET_ETHERNET_CODE 0x208
35+
#define NET_ETHERNET_BASE (NET_MGMT_IFACE_BIT | \
36+
NET_MGMT_LAYER(NET_ETHERNET_LAYER) | \
37+
NET_MGMT_LAYER_CODE(NET_ETHERNET_CODE))
38+
#define NET_ETHERNET_EVENT (NET_ETHERNET_BASE | NET_MGMT_EVENT_BIT)
3939

4040
enum net_request_ethernet_cmd {
4141
NET_REQUEST_ETHERNET_CMD_SET_AUTO_NEGOTIATION = 1,
@@ -60,97 +60,97 @@ enum net_request_ethernet_cmd {
6060
};
6161

6262
#define NET_REQUEST_ETHERNET_SET_AUTO_NEGOTIATION \
63-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_AUTO_NEGOTIATION)
63+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_AUTO_NEGOTIATION)
6464

6565
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_AUTO_NEGOTIATION);
6666

6767
#define NET_REQUEST_ETHERNET_SET_LINK \
68-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_LINK)
68+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_LINK)
6969

7070
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_LINK);
7171

7272
#define NET_REQUEST_ETHERNET_SET_DUPLEX \
73-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_DUPLEX)
73+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_DUPLEX)
7474

7575
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_DUPLEX);
7676

7777
#define NET_REQUEST_ETHERNET_SET_MAC_ADDRESS \
78-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_ADDRESS)
78+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_ADDRESS)
7979

8080
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_MAC_ADDRESS);
8181

8282
#define NET_REQUEST_ETHERNET_SET_QAV_PARAM \
83-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QAV_PARAM)
83+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QAV_PARAM)
8484

8585
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_QAV_PARAM);
8686

8787
#define NET_REQUEST_ETHERNET_GET_PORTS_NUM \
88-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PORTS_NUM)
88+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PORTS_NUM)
8989

9090
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_PORTS_NUM);
9191

9292
#define NET_REQUEST_ETHERNET_SET_QBV_PARAM \
93-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBV_PARAM)
93+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBV_PARAM)
9494

9595
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_QBV_PARAM);
9696

9797
#define NET_REQUEST_ETHERNET_SET_QBU_PARAM \
98-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBU_PARAM)
98+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBU_PARAM)
9999

100100
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_QBU_PARAM);
101101

102102
#define NET_REQUEST_ETHERNET_SET_TXTIME_PARAM \
103-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXTIME_PARAM)
103+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXTIME_PARAM)
104104

105105
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_TXTIME_PARAM);
106106

107107
#define NET_REQUEST_ETHERNET_SET_PROMISC_MODE \
108-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_PROMISC_MODE)
108+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_PROMISC_MODE)
109109

110110
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_PROMISC_MODE);
111111

112112
#define NET_REQUEST_ETHERNET_GET_PRIORITY_QUEUES_NUM \
113-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PRIORITY_QUEUES_NUM)
113+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PRIORITY_QUEUES_NUM)
114114

115115
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_PRIORITY_QUEUES_NUM);
116116

117117
#define NET_REQUEST_ETHERNET_GET_QAV_PARAM \
118-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QAV_PARAM)
118+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QAV_PARAM)
119119

120120
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_QAV_PARAM);
121121

122122
#define NET_REQUEST_ETHERNET_GET_QBV_PARAM \
123-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBV_PARAM)
123+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBV_PARAM)
124124

125125
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_QBV_PARAM);
126126

127127
#define NET_REQUEST_ETHERNET_GET_QBU_PARAM \
128-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBU_PARAM)
128+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBU_PARAM)
129129

130130
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_QBU_PARAM);
131131

132132
#define NET_REQUEST_ETHERNET_GET_TXTIME_PARAM \
133-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXTIME_PARAM)
133+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXTIME_PARAM)
134134

135135
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_TXTIME_PARAM);
136136

137137
#define NET_REQUEST_ETHERNET_SET_T1S_PARAM \
138-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_T1S_PARAM)
138+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_T1S_PARAM)
139139

140140
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_T1S_PARAM);
141141

142142
#define NET_REQUEST_ETHERNET_SET_TXINJECTION_MODE \
143-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXINJECTION_MODE)
143+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXINJECTION_MODE)
144144

145145
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_TXINJECTION_MODE);
146146

147147
#define NET_REQUEST_ETHERNET_GET_TXINJECTION_MODE \
148-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXINJECTION_MODE)
148+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXINJECTION_MODE)
149149

150150
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_TXINJECTION_MODE);
151151

152152
#define NET_REQUEST_ETHERNET_SET_MAC_FILTER \
153-
(_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_FILTER)
153+
(NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_FILTER)
154154

155155
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_MAC_FILTER);
156156

@@ -196,16 +196,16 @@ enum net_event_ethernet_cmd {
196196
};
197197

198198
#define NET_EVENT_ETHERNET_CARRIER_ON \
199-
(_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_ON)
199+
(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_ON)
200200

201201
#define NET_EVENT_ETHERNET_CARRIER_OFF \
202-
(_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_OFF)
202+
(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_OFF)
203203

204204
#define NET_EVENT_ETHERNET_VLAN_TAG_ENABLED \
205-
(_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED)
205+
(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED)
206206

207207
#define NET_EVENT_ETHERNET_VLAN_TAG_DISABLED \
208-
(_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED)
208+
(NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED)
209209

210210
struct net_if;
211211

0 commit comments

Comments
 (0)