sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various fixes for problems discovered in testing.

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-21 16:24:28 -06:00
parent 450f962602
commit fc4e819d21
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netutils/netlib/netlib_getpanid.c
View File

@ -83,7 +83,7 @@ int netlib_getpanid(FAR const char *ifname, FAR uint16_t *panid)
{ {
/* Use the helper provided in libradio */ /* Use the helper provided in libradio */
ret = ieee802154_getpanid(sockfd, ifname, panid); ret = sixlowpan_getpanid(sockfd, ifname, panid);
close(sockfd); close(sockfd);
} }
} }

3
netutils/netlib/netlib_setpanid.c
View File

@ -46,6 +46,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "wireless/ieee802154.h"
#include "netutils/netlib.h" #include "netutils/netlib.h"
#if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0 #if defined(CONFIG_NET_6LOWPAN) && CONFIG_NSOCKET_DESCRIPTORS > 0
@ -82,7 +83,7 @@ int netlib_setpanid(FAR const char *ifname, uint16_t panid)
{ {
/* Use the helper provided in libradio */ /* Use the helper provided in libradio */
ret = ieee802154_setpanid(sockfd, ifname, panid); ret = sixlowpan_setpanid(sockfd, ifname, panid);
close(sockfd); close(sockfd);
} }
} }

2
wireless/ieee802154/libradio/Makefile
View File

@ -51,7 +51,7 @@ CSRCS += ieee802154_setcca.c ieee802154_getcca.c
CSRCS += ieee802154_energydetect.c CSRCS += ieee802154_energydetect.c
ifeq ($(CONFIG_NET_6LOWPAN),y) ifeq ($(CONFIG_NET_6LOWPAN),y)
CSRCS = sixlowpan_setchan.c sixlowpan_getchan.c CSRCS += sixlowpan_setchan.c sixlowpan_getchan.c
CSRCS += sixlowpan_setpanid.c sixlowpan_getpanid.c CSRCS += sixlowpan_setpanid.c sixlowpan_getpanid.c
CSRCS += sixlowpan_setsaddr.c sixlowpan_getsaddr.c CSRCS += sixlowpan_setsaddr.c sixlowpan_getsaddr.c
CSRCS += sixlowpan_seteaddr.c sixlowpan_geteaddr.c CSRCS += sixlowpan_seteaddr.c sixlowpan_geteaddr.c

2
wireless/ieee802154/libradio/ieee802154_setsaddr.c
View File

@ -64,7 +64,7 @@ int ieee802154_setsaddr(int fd, uint16_t saddr)
ret = ioctl(fd, PHY802154IOC_SET_SADDR, (unsigned long)((uintptr_t)&arg)); ret = ioctl(fd, PHY802154IOC_SET_SADDR, (unsigned long)((uintptr_t)&arg));
if (ret < 0) if (ret < 0)
{ {
errcode = errno; int errcode = errno;
printf("PHY802154IOC_SET_SADDR failed: %d\n", errcode); printf("PHY802154IOC_SET_SADDR failed: %d\n", errcode);
} }

3
wireless/iwpan/src/Make.defs
View File

@ -37,10 +37,7 @@
ifeq ($(CONFIG_WIRELESS_IWPAN),y) ifeq ($(CONFIG_WIRELESS_IWPAN),y)
CSRCS = CSRCS =
ifeq ($(CONFIG_WIRELESS_IWPAN_CMDTOOL),y)
MAINSRC = iwpan.c MAINSRC = iwpan.c
endif
DEPPATH += --dep-path src DEPPATH += --dep-path src
VPATH += :src VPATH += :src