michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net/ieee802154: Rename <SET/GET>_CHAN to <SET/GET>_CHANNEL

Browse source 
It's more readable and along with other part of the system.

Change-Id: Ib4be787d74310d838f38b1f1d5624e7357da8969
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2017-03-15 17:00:43 +01:00
commit 35dd54d1d7
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/net/ieee802154.h
View file

@ -75,8 +75,8 @@ enum net_request_ieee802154_cmd {
NET_REQUEST_IEEE802154_CMD_CANCEL_SCAN,
NET_REQUEST_IEEE802154_CMD_ASSOCIATE,
NET_REQUEST_IEEE802154_CMD_DISASSOCIATE,
NET_REQUEST_IEEE802154_CMD_SET_CHAN,
NET_REQUEST_IEEE802154_CMD_GET_CHAN,
NET_REQUEST_IEEE802154_CMD_SET_CHANNEL,
NET_REQUEST_IEEE802154_CMD_GET_CHANNEL,
NET_REQUEST_IEEE802154_CMD_SET_PAN_ID,
NET_REQUEST_IEEE802154_CMD_GET_PAN_ID,
NET_REQUEST_IEEE802154_CMD_SET_EXT_ADDR,
@ -123,15 +123,15 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_ASSOCIATE);
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_DISASSOCIATE);
#define NET_REQUEST_IEEE802154_SET_CHAN \
(_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_CHAN)
#define NET_REQUEST_IEEE802154_SET_CHANNEL \
(_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_CHANNEL)
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_CHAN);
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_CHANNEL);
#define NET_REQUEST_IEEE802154_GET_CHAN \
(_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_CHAN)
#define NET_REQUEST_IEEE802154_GET_CHANNEL \
(_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_CHANNEL)
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_CHAN);
NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_CHANNEL);
#define NET_REQUEST_IEEE802154_SET_PAN_ID \
(_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_PAN_ID)

8
subsys/net/ip/l2/ieee802154/ieee802154_mgmt.c
View file

@ -386,7 +386,7 @@ static int ieee802154_set_parameters(uint32_t mgmt_request,
value = *((uint16_t *) data);
if (mgmt_request == NET_REQUEST_IEEE802154_SET_CHAN) {
if (mgmt_request == NET_REQUEST_IEEE802154_SET_CHANNEL) {
if (ctx->channel != value) {
ret = radio->set_channel(iface->dev, value);
if (!ret) {
@ -424,7 +424,7 @@ static int ieee802154_set_parameters(uint32_t mgmt_request,
return ret;
}
NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_CHAN,
NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_CHANNEL,
ieee802154_set_parameters);
NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_PAN_ID,
@ -450,7 +450,7 @@ static int ieee802154_get_parameters(uint32_t mgmt_request,
value = (uint16_t *)data;
if (mgmt_request == NET_REQUEST_IEEE802154_GET_CHAN) {
if (mgmt_request == NET_REQUEST_IEEE802154_GET_CHANNEL) {
*value = ctx->channel;
} else if (mgmt_request == NET_REQUEST_IEEE802154_GET_PAN_ID) {
*value = ctx->pan_id;
@ -467,7 +467,7 @@ static int ieee802154_get_parameters(uint32_t mgmt_request,
return 0;
}
NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_CHAN,
NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_CHANNEL,
ieee802154_get_parameters);
NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_PAN_ID,

4
subsys/net/ip/l2/ieee802154/ieee802154_shell.c
View file

@ -214,7 +214,7 @@ static int shell_cmd_set_chan(int argc, char *argv[])
struct net_if *iface = net_if_get_default();
uint16_t channel = (uint16_t) atoi(argv[1]);
if (net_mgmt(NET_REQUEST_IEEE802154_SET_CHAN, iface,
if (net_mgmt(NET_REQUEST_IEEE802154_SET_CHANNEL, iface,
&channel, sizeof(uint16_t))) {
printk("Could not set channel %u\n", channel);
} else {
@ -229,7 +229,7 @@ static int shell_cmd_get_chan(int argc, char *argv[])
struct net_if *iface = net_if_get_default();
uint16_t channel;
if (net_mgmt(NET_REQUEST_IEEE802154_GET_CHAN, iface,
if (net_mgmt(NET_REQUEST_IEEE802154_GET_CHANNEL, iface,
&channel, sizeof(uint16_t))) {
printk("Could not get channel\n");
} else {