Networking: Add support for some packet radio IOCTL commands; Spirit: Fix a few bugs from testing.

This commit is contained in:
Gregory Nutt
2017-08-02 11:52:44 -06:00
parent 42b3ee4cfc
commit 1ae9748170
8 changed files with 340 additions and 20 deletions
@@ -1566,19 +1566,92 @@ static int spirit_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
static int spirit_ioctl(FAR struct net_driver_s *dev, int cmd,
unsigned long arg)
{
FAR struct spirit_driver_s *priv = (FAR struct spirit_driver_s *)dev->d_private;
int ret;
FAR struct pktradio_ifreq_s *cmddata;
FAR struct spirit_driver_s *priv;
int ret = -ENOTTY;
/* Decode and dispatch the driver-specific IOCTL command */
DEBUGASSERT(dev != NULL && dev->d_private != NULL && arg != 0ul);
priv = (FAR struct spirit_driver_s *)dev->d_private;
cmddata = (FAR struct pktradio_ifreq_s *)((uintptr_t)arg);
spirit_lock(priv);
switch (cmd)
{
/* Add cases here to support the IOCTL commands */
/* SIOCPKTRADIOGGPROPS
* Description: Get the radio properties
* Input: Pointer to read-write instance of struct
* pktradio_ifreq_s
* Output: Properties returned in struct pktradio_ifreq_s
* instance
*/
case SIOCPKTRADIOGGPROPS:
{
FAR struct sixlowpan_driver_s *radio =
(FAR struct sixlowpan_driver_s *)dev;
FAR struct sixlowpan_properties_s *props =
(FAR struct sixlowpan_properties_s *)&cmddata->pifr_props;
ret = spirit_properties(radio, props);
}
break;
/* SIOCPKTRADIOSNODE
* Description: Set the radio node address
* Input: Pointer to read-only instance of struct
* pktradio_ifreq_s
* Output: None
*/
case SIOCPKTRADIOSNODE:
{
FAR const struct pktradio_addr_s *newaddr =
(FAR const struct pktradio_addr_s *)&cmddata->pifr_hwaddr;
if (newaddr->pa_addrlen != 1)
{
ret = -EINVAL;
}
else
{
FAR struct netdev_varaddr_s *devaddr = &dev->d_mac.sixlowpan;
devaddr->nv_addrlen = 1;
devaddr->nv_addr[0] = newaddr->pa_addr[0];
#if CONFIG_PKTRADIO_ADDRLEN > 1
memset(&devaddr->pa_addr[1], 0, CONFIG_PKTRADIO_ADDRLEN - 1);
#endif
ret = OK;
}
}
break;
/* SIOCPKTRADIOGNODE
* Description: Get the radio node address
* Input: Pointer to read-write instance of
* struct pktradio_ifreq_s
* Output: Node address return in struct pktradio_ifreq_s
* instance
*/
case SIOCPKTRADIOGNODE:
{
FAR struct pktradio_addr_s *retaddr =
(FAR struct pktradio_addr_s *)&cmddata->pifr_hwaddr;
FAR struct netdev_varaddr_s *devaddr = &dev->d_mac.sixlowpan;
retaddr->pa_addrlen = devaddr->nv_addrlen;
retaddr->pa_addr[0] = devaddr->nv_addr[0];
#if CONFIG_PKTRADIO_ADDRLEN > 1
memset(&addr->pa_addr[1], 0, CONFIG_PKTRADIO_ADDRLEN - 1);
#endif
ret = OK;
}
break;
default:
wlerr("ERROR: Unrecognized IOCTL command: %02x\n", cmd);
ret = -ENOTTY; /* Special return value for this case */
wlwarn("WARNING: Unrecognized IOCTL command: %02x\n", cmd);
break;
}
spirit_unlock(priv);
@@ -41,6 +41,7 @@
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h>
#include <math.h>
#include <assert.h>
#include <errno.h>