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

Merged in merlin17/apps/develop (pull request #96)

Browse Source 
ieee802154: Adds reset command, adds resp_waittime option to associate, and a few other minor tweaks

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2017-07-02 21:53:27 +00:00 committed by Gregory Nutt
commit 8fd7e5110d
11 changed files with 160 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wireless/ieee802154.h
View File

@ -68,7 +68,7 @@ int ieee802154_get_req(int fd, FAR struct ieee802154_get_req_s *req);
int ieee802154_gts_req(int fd, FAR struct ieee802154_gts_req_s *req);
int ieee802154_orphan_resp(int fd,
FAR struct ieee802154_orphan_resp_s *resp);
int ieee802154_reset_req(int fd, FAR struct ieee802154_reset_req_s *req);
int ieee802154_reset_req(int fd, bool resetattr);
int ieee802154_rxenable_req(int fd,
FAR struct ieee802154_rxenable_req_s *req);
int ieee802154_scan_req(int fd, FAR struct ieee802154_scan_req_s *req);

1
wireless/ieee802154/i8sak/Makefile
View File

@ -49,6 +49,7 @@ STACKSIZE = 4096
ASRCS =
CSRCS = i8sak_acceptassoc.c i8sak_assoc.c i8sak_scan.c i8sak_blaster.c i8sak_poll.c
CSRCS += i8sak_sniffer.c i8sak_startpan.c i8sak_tx.c i8sak_chan.c i8sak_coordinfo.c
CSRCS += i8sak_reset.c
CSRCS += wpanlistener.c
MAINSRC = i8sak_main.c

5
wireless/ieee802154/i8sak/i8sak.h
View File

@ -103,10 +103,10 @@
#define PRINT_COORDEADDR(eaddr) \
printf(" Coordinator EADDR: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n", \
eaddr[0], eaddr[1], eaddr[2], eaddr[3], eaddr[4], eaddr[5], eaddr[6], eaddr[7]);
eaddr[0], eaddr[1], eaddr[2], eaddr[3], eaddr[4], eaddr[5], eaddr[6], eaddr[7])
#define PRINT_COORDSADDR(saddr) \
printf(" Coordinator SADDR: %02X:%02X\n", saddr[0], saddr[1]);
printf(" Coordinator SADDR: %02X:%02X\n", saddr[0], saddr[1])
/****************************************************************************
* Public Types
@ -193,6 +193,7 @@ void i8sak_sniffer_cmd (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[
void i8sak_blaster_cmd (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
void i8sak_chan_cmd (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
void i8sak_coordinfo_cmd (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
void i8sak_reset_cmd (FAR struct i8sak_s *i8sak, int argc, FAR char *argv[]);
/****************************************************************************
* Inline Functions

19
wireless/ieee802154/i8sak/i8sak_assoc.c
View File

@ -83,6 +83,7 @@ void i8sak_assoc_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
struct ieee802154_assoc_req_s assocreq;
struct wpanlistener_eventfilter_s filter;
FAR struct ieee802154_pandesc_s *pandesc;
struct ieee802154_set_req_s setreq;
bool retry = false;
int maxretries = 0;
int retrycnt;
@ -92,6 +93,9 @@ void i8sak_assoc_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
int ret;
uint8_t resindex;
setreq.attr = IEEE802154_ATTR_MAC_RESPONSE_WAIT_TIME;
setreq.attrval.mac.resp_waittime = 32;
/* If the addresses has never been automatically or manually set before, set
* it assuming that we are the default device address and the endpoint is the
* default PAN Coordinator address. This is actually the way the i8sak settings
@ -104,7 +108,7 @@ void i8sak_assoc_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
}
optcnt = 0;
while ((option = getopt(argc, argv, ":hr:s:e:w:")) != ERROR)
while ((option = getopt(argc, argv, ":hr:s:e:w:t:")) != ERROR)
{
optcnt++;
switch (option)
@ -115,6 +119,9 @@ void i8sak_assoc_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
" -h = this help menu\n"
" -w = wait and retry on failure\n"
" -r = use scan result index\n"
" -s = coordinator short address"
" -e = coordinator ext address"
" -t = response wait time"
, argv[0]);
/* Must manually reset optind if we are going to exit early */
@ -143,7 +150,7 @@ void i8sak_assoc_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
break;
case 's':
/* Parse extended address and put it into the i8sak instance */
/* Parse short address and put it into the i8sak instance */
i8sak_str2saddr(optarg, i8sak->ep.saddr);
i8sak->ep.mode= IEEE802154_ADDRMODE_SHORT;
@ -155,6 +162,12 @@ void i8sak_assoc_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
i8sak_str2eaddr(optarg, i8sak->ep.eaddr);
i8sak->ep.mode = IEEE802154_ADDRMODE_EXTENDED;
break;
case 't':
/* Parse wait time and set the paremeter in the request */
setreq.attrval.mac.resp_waittime = i8sak_str2luint8(optarg);
break;
case 'w':
/* Wait and retry if we fail to associate */
@ -197,6 +210,8 @@ void i8sak_assoc_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
i8sak_cmd_error(i8sak);
}
ieee802154_set_req(fd, &setreq);
/* Register new callback for receiving the association notifications. */
memset(&filter, 0, sizeof(struct wpanlistener_eventfilter_s));

29
wireless/ieee802154/i8sak/i8sak_main.c
View File

@ -111,6 +111,7 @@ static const struct i8sak_command_s g_i8sak_commands[] =
{"blaster", (CODE void *)i8sak_blaster_cmd},
{"chan", (CODE void *)i8sak_chan_cmd},
{"coordinfo", (CODE void *)i8sak_coordinfo_cmd},
{"reset", (CODE void *)i8sak_reset_cmd},
};
#define NCOMMANDS (sizeof(g_i8sak_commands) / sizeof(struct i8sak_command_s))
@ -528,23 +529,24 @@ static void i8sak_switch_instance(FAR char *devname)
}
sq_addlast((FAR sq_entry_t *)i8sak, &g_i8sak_instances);
/* Update our "sticky" i8sak instance. Must come before call to setup so that
* the shared active global i8sak is correct.
*/
g_activei8sak = i8sak;
if (i8sak_setup(i8sak, devname) < 0)
{
exit(EXIT_FAILURE);
}
}
/* Update our "sticky" i8sak instance. Must come before call to setup so that
* the shared active global i8sak is correct.
*/
g_activei8sak = i8sak;
if (!g_activei8sak_set)
else
{
g_activei8sak_set = true;
g_activei8sak = i8sak;
}
if (i8sak_setup(i8sak, devname) < 0)
{
exit(EXIT_FAILURE);
}
g_activei8sak_set = true;
}
static int i8sak_setup(FAR struct i8sak_s *i8sak, FAR const char *devname)
@ -741,6 +743,7 @@ static int i8sak_showusage(FAR const char *progname, int exitcode)
" sniffer [-h|q]\n"
" chan [-h|g] [<chan>]\n"
" coordinfo [-h|a|e|s]\n"
" reset [-h]\n"
, progname);
exit(exitcode);
}

111
wireless/ieee802154/i8sak/i8sak_reset.c Normal file
View File

@ -0,0 +1,111 @@
/****************************************************************************
* apps/wireless/ieee802154/i8sak/i8sak_reset.c
* IEEE 802.15.4 Swiss Army Knife
*
* Copyright (C) 2017 Verge Inc. All rights reserved.
* Author: Anthony Merlino <anthony@vergeaero.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include "i8sak.h"
#include <nuttx/wireless/ieee802154/ieee802154_ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name : i8sak_reset_cmd
*
* Description :
* Reset the MAC layer
****************************************************************************/
void i8sak_reset_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
{
int option;
int fd;
while ((option = getopt(argc, argv, ":h")) != ERROR)
{
switch (option)
{
case 'h':
fprintf(stderr, "Resets the MAC layer\n"
"Usage: %s [-h]\n"
" -h = this help menu\n"
, argv[0]);
/* Must manually reset optind if we are going to exit early */
optind = -1;
return;
case ':':
fprintf(stderr, "ERROR: missing argument\n");
/* Must manually reset optind if we are going to exit early */
optind = -1;
i8sak_cmd_error(i8sak); /* This exits for us */
case '?':
fprintf(stderr, "ERROR: unknown argument\n");
/* Must manually reset optind if we are going to exit early */
optind = -1;
i8sak_cmd_error(i8sak); /* This exits for us */
}
}
fd = open(i8sak->devname, O_RDWR);
if (fd < 0)
{
printf("cannot open %s, errno=%d\n", i8sak->devname, errno);
i8sak_cmd_error(i8sak);
}
ieee802154_reset_req(fd, true);
close(fd);
}

2
wireless/ieee802154/i8sak/i8sak_scan.c
View File

@ -142,7 +142,7 @@ void i8sak_scan_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
i8sak_cmd_error(i8sak);
}
scan.duration = 5;
scan.duration = 8;
scan.chpage = i8sak->chpage;
/* Parse channel list */

6
wireless/ieee802154/i8sak/i8sak_startpan.c
View File

@ -71,7 +71,6 @@
void i8sak_startpan_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
{
struct ieee802154_reset_req_s resetreq;
struct ieee802154_start_req_s startreq;
bool beaconenabled = false;
int option;
@ -120,8 +119,7 @@ void i8sak_startpan_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
/* Reset the MAC layer */
printf("\ni8sak: resetting MAC layer\n");
resetreq.rst_pibattr = true;
ieee802154_reset_req(fd, &resetreq);
ieee802154_reset_req(fd, true);
/* Make sure receiver is always on */
@ -194,7 +192,7 @@ void i8sak_startpan_cmd(FAR struct i8sak_s *i8sak, int argc, FAR char *argv[])
if (beaconenabled)
{
startreq.beaconorder = 6;
startreq.beaconorder = 8;
startreq.superframeorder = 5;
}
else

2
wireless/ieee802154/i8sak/wpanlistener.c
View File

@ -742,7 +742,7 @@ static pthread_addr_t wpanlistener_eventthread(pthread_addr_t arg)
}
if (notif.notiftype == IEEE802154_NOTIFY_IND_BEACONNOTIFY &&
receiver->filter.indevents.beaconnotify)
receiver->filter.indevents.beacon)
{
receiver->cb(&notif, receiver->arg);

2
wireless/ieee802154/i8sak/wpanlistener.h
View File

@ -84,7 +84,7 @@ struct wpanlistener_eventfilter_s
{
uint32_t assoc : 1;
uint32_t disassoc : 1;
uint32_t beaconnotify : 1;
uint32_t beacon : 1;
uint32_t commstatus : 1;
uint32_t gts : 1;
uint32_t orphan : 1;

9
wireless/ieee802154/libmac/ieee802154_resetreq.c
View File

@ -53,11 +53,14 @@
* Public Functions
****************************************************************************/
int ieee802154_reset_req(int fd, FAR struct ieee802154_reset_req_s *req)
{
int ieee802154_reset_req(int fd, bool resetattr)
{
FAR struct ieee802154_reset_req_s req;
int ret;
ret = ioctl(fd, MAC802154IOC_MLME_RESET_REQUEST, (unsigned long)((uintptr_t)req));
req.resetattr = resetattr;
ret = ioctl(fd, MAC802154IOC_MLME_RESET_REQUEST, (unsigned long)((uintptr_t)&req));
if (ret < 0)
{
ret = -errno;