mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 00:14:22 +08:00
Merge remote-tracking branch 'origin/master' into ieee802154
This commit is contained in:
Gregory Nutt
@@ -367,7 +367,7 @@ static void rng_buf_internal(FAR void *bytes, size_t nbytes)
|
||||
|
||||
static void rng_init(void)
|
||||
{
|
||||
crypinfo("Initializing RNG\n");
|
||||
cryptinfo("Initializing RNG\n");
|
||||
|
||||
memset(&g_rng, 0, sizeof(struct rng_s));
|
||||
sem_init(&g_rng.rd_sem, 0, 1);
|
||||
|
||||
@@ -552,6 +552,16 @@ if USBHOST
|
||||
source drivers/usbhost/Kconfig
|
||||
endif # USBHOST
|
||||
|
||||
menuconfig USBMISC
|
||||
bool "USB Miscellaneous drivers"
|
||||
default n
|
||||
---help---
|
||||
USB Miscellaneous drivers.
|
||||
|
||||
if USBMISC
|
||||
source drivers/usbmisc/Kconfig
|
||||
endif # USBMISC
|
||||
|
||||
config HAVE_USBTRACE
|
||||
bool
|
||||
default n
|
||||
|
||||
@@ -72,6 +72,7 @@ include syslog$(DELIM)Make.defs
|
||||
include timers$(DELIM)Make.defs
|
||||
include usbdev$(DELIM)Make.defs
|
||||
include usbhost$(DELIM)Make.defs
|
||||
include usbmisc$(DELIM)Make.defs
|
||||
include usbmonitor$(DELIM)Make.defs
|
||||
include video$(DELIM)Make.defs
|
||||
include wireless$(DELIM)Make.defs
|
||||
|
||||
+24
-7
@@ -33,11 +33,11 @@ config BMP180
|
||||
Enable driver support for the Bosch BMP180 barometer sensor.
|
||||
|
||||
config HTS221
|
||||
bool "ST HTS221 humidity sensor"
|
||||
bool "STMicro HTS221 humidity sensor"
|
||||
default n
|
||||
select I2C
|
||||
---help---
|
||||
Enable driver support for the ST HTS221 humidity sensor.
|
||||
Enable driver support for the STMicro HTS221 humidity sensor.
|
||||
|
||||
if HTS221
|
||||
|
||||
@@ -56,11 +56,11 @@ config HTS221_NPOLLWAITERS
|
||||
endif # HTS221
|
||||
|
||||
config SENSORS_L3GD20
|
||||
bool "ST L3GD20 Gyroscope Sensor support"
|
||||
bool "STMicro L3GD20 Gyroscope Sensor support"
|
||||
default n
|
||||
select SPI
|
||||
---help---
|
||||
Enable driver support for the ST L3GD20 gyroscope sensor.
|
||||
Enable driver support for the STMicro L3GD20 gyroscope sensor.
|
||||
|
||||
config SENSOR_KXTJ9
|
||||
bool "Kionix KXTJ9 Accelerometer support"
|
||||
@@ -83,7 +83,7 @@ config LIS3DSH
|
||||
Enable driver support for the STMicro LIS3DSH 3-Axis acclerometer.
|
||||
|
||||
config LIS331DL
|
||||
bool "ST LIS331DL device support"
|
||||
bool "STMicro LIS331DL device support"
|
||||
default n
|
||||
select I2C
|
||||
|
||||
@@ -106,6 +106,23 @@ config LSM9DS1_I2C_FREQUENCY
|
||||
range 1 400000
|
||||
depends on SN_LSM9DS1
|
||||
|
||||
config LPS25H
|
||||
bool "STMicro LPS25H pressure sensor"
|
||||
default n
|
||||
select I2C
|
||||
---help---
|
||||
Enable driver support for the STMicro LPS25H barometer sensor.
|
||||
|
||||
if LPS25H
|
||||
|
||||
config DEBUG_LPS25H
|
||||
bool "Debug support for the LPS25H"
|
||||
default n
|
||||
---help---
|
||||
Enables debug features for the LPS25H
|
||||
|
||||
endif # LPS25H
|
||||
|
||||
config MB7040
|
||||
bool "MaxBotix MB7040 Sonar support"
|
||||
default n
|
||||
@@ -209,7 +226,7 @@ endif # SENSORS_ADXL345
|
||||
config MAX31855
|
||||
bool "Maxim MAX31855 Driver"
|
||||
default n
|
||||
select SPI
|
||||
select SPI
|
||||
---help---
|
||||
Enables support for the MAX31855 driver
|
||||
|
||||
@@ -229,7 +246,7 @@ config LIS3MDL
|
||||
default n
|
||||
select SPI
|
||||
---help---
|
||||
Enable driver support for the ST LIS3MDL 3-axis magnetometer.
|
||||
Enable driver support for the STMicro LIS3MDL 3-axis magnetometer.
|
||||
|
||||
config LM75
|
||||
bool "STMicro LM-75 Temperature Sensor support"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
############################################################################
|
||||
# drivers/sensors/Make.defs
|
||||
#
|
||||
# Copyright (C) 2011-2012, 2015-2016 Gregory Nutt. All rights reserved.
|
||||
# Copyright (C) 2011-2012, 2015-2017 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@@ -65,6 +65,10 @@ ifeq ($(CONFIG_SN_LSM9DS1),y)
|
||||
CSRCS += lsm9ds1.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_LPS25H),y)
|
||||
CSRCS += lps25h.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ADXL345_I2C),y)
|
||||
CSRCS += adxl345_i2c.c
|
||||
endif
|
||||
|
||||
+22
-24
@@ -174,13 +174,11 @@ static const struct file_operations g_humidityops =
|
||||
#endif
|
||||
};
|
||||
|
||||
static struct hts221_dev_s *g_humid_data;
|
||||
|
||||
/****************************************************************************
|
||||
* Private Functions
|
||||
****************************************************************************/
|
||||
|
||||
static int hts221_do_transfer(FAR struct hts221_dev_s *dev,
|
||||
static int hts221_do_transfer(FAR struct hts221_dev_s *priv,
|
||||
FAR struct i2c_msg_s *msgv,
|
||||
size_t nmsg)
|
||||
{
|
||||
@@ -189,7 +187,7 @@ static int hts221_do_transfer(FAR struct hts221_dev_s *dev,
|
||||
|
||||
for (retries = 0; retries < HTS221_I2C_RETRIES; retries++)
|
||||
{
|
||||
ret = I2C_TRANSFER(dev->i2c, msgv, nmsg);
|
||||
ret = I2C_TRANSFER(priv->i2c, msgv, nmsg);
|
||||
if (ret >= 0)
|
||||
{
|
||||
return 0;
|
||||
@@ -203,7 +201,7 @@ static int hts221_do_transfer(FAR struct hts221_dev_s *dev,
|
||||
break;
|
||||
}
|
||||
|
||||
ret = up_i2creset(dev->i2c);
|
||||
ret = up_i2creset(priv->i2c);
|
||||
if (ret < 0)
|
||||
{
|
||||
hts221_dbg("up_i2creset failed: %d\n", ret);
|
||||
@@ -217,51 +215,51 @@ static int hts221_do_transfer(FAR struct hts221_dev_s *dev,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int32_t hts221_write_reg8(FAR struct hts221_dev_s *dev,
|
||||
static int32_t hts221_write_reg8(FAR struct hts221_dev_s *priv,
|
||||
const uint8_t *command)
|
||||
{
|
||||
struct i2c_msg_s msgv[2] =
|
||||
{
|
||||
{
|
||||
.addr = dev->addr,
|
||||
.addr = priv->addr,
|
||||
.flags = 0,
|
||||
.buffer = (FAR void *)&command[0],
|
||||
.length = 1
|
||||
},
|
||||
{
|
||||
.addr = dev->addr,
|
||||
.addr = priv->addr,
|
||||
.flags = I2C_M_NORESTART,
|
||||
.buffer = (FAR void *)&command[1],
|
||||
.length = 1
|
||||
}
|
||||
};
|
||||
|
||||
return hts221_do_transfer(dev, msgv, 2);
|
||||
return hts221_do_transfer(priv, msgv, 2);
|
||||
}
|
||||
|
||||
static int hts221_read_reg(FAR struct hts221_dev_s *dev,
|
||||
static int hts221_read_reg(FAR struct hts221_dev_s *priv,
|
||||
FAR const uint8_t *command, FAR uint8_t *value)
|
||||
{
|
||||
struct i2c_msg_s msgv[2] =
|
||||
{
|
||||
{
|
||||
.addr = dev->addr,
|
||||
.addr = priv->addr,
|
||||
.flags = 0,
|
||||
.buffer = (FAR void *)command,
|
||||
.length = 1
|
||||
},
|
||||
{
|
||||
.addr = dev->addr,
|
||||
.addr = priv->addr,
|
||||
.flags = I2C_M_READ,
|
||||
.buffer = value,
|
||||
.length = 1
|
||||
}
|
||||
};
|
||||
|
||||
return hts221_do_transfer(dev, msgv, 2);
|
||||
return hts221_do_transfer(priv, msgv, 2);
|
||||
}
|
||||
|
||||
static int hts221_get_id(FAR struct hts221_dev_s *priv, uint8_t * value)
|
||||
static int hts221_get_id(FAR struct hts221_dev_s *priv, uint8_t *value)
|
||||
{
|
||||
int ret = OK;
|
||||
uint8_t cmd = HTS221_WHO_AM_I;
|
||||
@@ -362,7 +360,7 @@ static int hts221_config_ctrl_reg2(FAR struct hts221_dev_s *priv,
|
||||
}
|
||||
|
||||
static int hts221_config_ctrl_reg1(FAR struct hts221_dev_s *priv,
|
||||
FAR hts221_settings_t * settings)
|
||||
FAR hts221_settings_t *settings)
|
||||
{
|
||||
int ret = OK;
|
||||
uint8_t regval = 0;
|
||||
@@ -420,7 +418,7 @@ static int hts221_power_on_off(FAR struct hts221_dev_s *priv, bool on)
|
||||
}
|
||||
|
||||
static int hts221_config(FAR struct hts221_dev_s *priv,
|
||||
FAR hts221_settings_t * cfgr)
|
||||
FAR hts221_settings_t *cfgr)
|
||||
{
|
||||
int ret = OK;
|
||||
|
||||
@@ -477,7 +475,7 @@ static int hts221_start_conversion(FAR struct hts221_dev_s *priv)
|
||||
}
|
||||
|
||||
static int hts221_check_status(FAR struct hts221_dev_s *priv,
|
||||
FAR hts221_status_t * status)
|
||||
FAR hts221_status_t *status)
|
||||
{
|
||||
int ret = OK;
|
||||
uint8_t addr = HTS221_STATUS_REG;
|
||||
@@ -498,7 +496,7 @@ static int hts221_check_status(FAR struct hts221_dev_s *priv,
|
||||
}
|
||||
|
||||
static int hts221_read_raw_data(FAR struct hts221_dev_s *priv,
|
||||
FAR hts221_raw_data_t * data)
|
||||
FAR hts221_raw_data_t *data)
|
||||
{
|
||||
int ret = OK;
|
||||
uint8_t addr_humid_low = HTS221_HUM_OUT_L;
|
||||
@@ -1069,13 +1067,14 @@ out:
|
||||
|
||||
static int hts221_int_handler(int irq, FAR void *context, FAR void *arg)
|
||||
{
|
||||
if (!g_humid_data)
|
||||
return OK;
|
||||
FAR struct hts221_dev_s *priv = (FAR struct hts221_dev_s *)arg;
|
||||
|
||||
g_humid_data->int_pending = true;
|
||||
DEBUGASSERT(priv != NULL);
|
||||
|
||||
priv->int_pending = true;
|
||||
hts221_dbg("Hts221 interrupt\n");
|
||||
#ifndef CONFIG_DISABLE_POLL
|
||||
hts221_notify(g_humid_data);
|
||||
hts221_notify(priv);
|
||||
#endif
|
||||
|
||||
return OK;
|
||||
@@ -1095,7 +1094,6 @@ int hts221_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
g_humid_data = priv;
|
||||
priv->addr = addr;
|
||||
priv->i2c = i2c;
|
||||
priv->config = config;
|
||||
@@ -1125,7 +1123,7 @@ int hts221_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
|
||||
priv->config->irq_clear(priv->config);
|
||||
}
|
||||
|
||||
priv->config->irq_attach(priv->config, hts221_int_handler);
|
||||
priv->config->irq_attach(priv->config, hts221_int_handler, priv);
|
||||
priv->config->irq_enable(priv->config, false);
|
||||
return OK;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,29 @@
|
||||
#
|
||||
# For a description of the syntax of this configuration file,
|
||||
# see misc/tools/kconfig-language.txt.
|
||||
#
|
||||
|
||||
comment "USB Miscellaneous drivers"
|
||||
|
||||
config FUSB301
|
||||
bool "Fairchild FUSB301 USB type-C controller support"
|
||||
default n
|
||||
select I2C
|
||||
---help---
|
||||
Enable device driver for Fairchild USB type-C controller
|
||||
|
||||
if FUSB301
|
||||
|
||||
config DEBUG_FUSB301
|
||||
bool "Enable debug support for the FUSB301"
|
||||
default n
|
||||
---help---
|
||||
Enables debug support for the FUSB301
|
||||
|
||||
config FUSB301_NPOLLWAITERS
|
||||
int "Number of waiters to poll"
|
||||
default 2
|
||||
---help---
|
||||
Maximum number of threads that can be waiting on poll()
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,49 @@
|
||||
############################################################################
|
||||
# drivers/usbmisc/Make.defs
|
||||
#
|
||||
# Copyright (C) 2017 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
ifeq ($(CONFIG_USBMISC),y)
|
||||
|
||||
# Include USB miscellaneous drivers
|
||||
|
||||
ifeq ($(CONFIG_FUSB301),y)
|
||||
CSRCS += fusb301.c
|
||||
endif
|
||||
|
||||
# Include USB miscellaneous build support
|
||||
|
||||
DEPPATH += --dep-path usbmisc
|
||||
VPATH += :usbmisc
|
||||
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmisc}
|
||||
endif
|
||||
File diff suppressed because it is too large
Load Diff
@@ -86,8 +86,9 @@
|
||||
#define _SPIBASE (0x2100) /* SPI driver commands */
|
||||
#define _GPIOBASE (0x2200) /* GPIO driver commands */
|
||||
#define _CLIOCBASE (0x2300) /* Contactless modules ioctl commands */
|
||||
#define _MAC802154BASE (0x2400) /* 802.15.4 MAC ioctl commands */
|
||||
#define _PHY802154BASE (0x2500) /* 802.15.4 Radio ioctl commands */
|
||||
#define _USBCBASE (0x2400) /* USB-C controller ioctl commands */
|
||||
#define _MAC802154BASE (0x2500) /* 802.15.4 MAC ioctl commands */
|
||||
#define _PHY802154BASE (0x2600) /* 802.15.4 Radio ioctl commands */
|
||||
|
||||
/* boardctl() commands share the same number space */
|
||||
|
||||
@@ -397,19 +398,25 @@
|
||||
#define _GPIOCVALID(c) (_IOC_TYPE(c)==_GPIOBASE)
|
||||
#define _GPIOC(nr) _IOC(_GPIOBASE,nr)
|
||||
|
||||
/* Contactless driver ioctl definitions ****************************************/
|
||||
/* Contactless driver ioctl definitions *************************************/
|
||||
/* (see nuttx/include/contactless/ioctl.h */
|
||||
|
||||
#define _CLIOCVALID(c) (_IOC_TYPE(c)==_CLIOCBASE)
|
||||
#define _CLIOC(nr) _IOC(_CLIOCBASE,nr)
|
||||
|
||||
/* 802.15.4 MAC driver ioctl definitions *******************************************/
|
||||
/* USB-C controller driver ioctl definitions ********************************/
|
||||
/* (see nuttx/include/usb/xxx.h */
|
||||
|
||||
#define _USBCIOCVALID(c) (_IOC_TYPE(c)==_USBCBASE)
|
||||
#define _USBCIOC(nr) _IOC(_USBCBASE,nr)
|
||||
|
||||
/* 802.15.4 MAC driver ioctl definitions ************************************/
|
||||
/* (see nuttx/include/wireless/ieee802154/ieee802154_mac.h */
|
||||
|
||||
#define _MAC802154IOCVALID(c) (_IOC_TYPE(c)==_MAC802154BASE)
|
||||
#define _MAC802154IOC(nr) _IOC(_MAC802154BASE,nr)
|
||||
|
||||
/* 802.15.4 Radio driver ioctl definitions *******************************************/
|
||||
/* 802.15.4 Radio driver ioctl definitions **********************************/
|
||||
/* (see nuttx/ieee802154/wireless/ieee802154_radio.h */
|
||||
|
||||
#define _PHY802154IOCVALID(c) (_IOC_TYPE(c)==_PHY802154BASE)
|
||||
|
||||
@@ -116,6 +116,22 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_NET_6LOWPAN_FRAG
|
||||
# undef CONFIG_NET_6LOWPAN_MTU
|
||||
# undef CONFIG_NET_6LOWPAN_TCP_RECVWNDO
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_NET_6LOWPAN_MTU
|
||||
# undef CONFIG_NET_6LOWPAN_TCP_RECVWNDO
|
||||
# ifdef CONFIG_NET_6LOWPAN_FRAG
|
||||
# define CONFIG_NET_6LOWPAN_MTU 1294
|
||||
# define CONFIG_NET_6LOWPAN_TCP_RECVWNDO 1220
|
||||
# else
|
||||
# define CONFIG_NET_6LOWPAN_MTU CONFIG_NET_6LOWPAN_FRAMELEN
|
||||
# define CONFIG_NET_6LOWPAN_TCP_RECVWNDO (CONFIG_NET_6LOWPAN_FRAMELEN - 25)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_NET_MULTILINK)
|
||||
/* We are supporting multiple network devices using different link layer
|
||||
* protocols. Get the size of the link layer header from the device
|
||||
@@ -142,15 +158,23 @@
|
||||
# endif
|
||||
|
||||
# ifdef CONFIG_NET_SLIP
|
||||
# define _MIN_SLIP_MTU MIN(_MIN_LO_MTU,CONFIG_NET_SLIP_MTU)
|
||||
# define _MAX_SLIP_MTU MAX(_MAX_LO_MTU,CONFIG_NET_SLIP_MTU)
|
||||
# define _MIN_SLIP_MTU MIN(_MIN_LO_MTU,CONFIG_NET_6LOWPAN_MTU)
|
||||
# define _MAX_SLIP_MTU MAX(_MAX_LO_MTU,CONFIG_NET_6LOWPAN_MTU)
|
||||
# else
|
||||
# define _MIN_SLIP_MTU _MIN_LO_MTU
|
||||
# define _MAX_SLIP_MTU _MAX_LO_MTU
|
||||
# endif
|
||||
|
||||
# define MIN_NET_DEV_MTU _MIN_SLIP_MTU
|
||||
# define MAX_NET_DEV_MTU _MAX_SLIP_MTU
|
||||
# ifdef CONFIG_NET_6LOWPAN
|
||||
# define _MIN_6LOWPAN_MTU MIN(_MIN_LO_MTU,CONFIG_NET_SLIP_MTU)
|
||||
# define _MAX_6LOWPAN_MTU MAX(_MAX_LO_MTU,CONFIG_NET_SLIP_MTU)
|
||||
# else
|
||||
# define _MIN_6LOWPAN_MTU _MIN_LO_MTU
|
||||
# define _MAX_6LOWPAN_MTU _MAX_LO_MTU
|
||||
# endif
|
||||
|
||||
# define MIN_NET_DEV_MTU _MIN_6LOWPAN_MTU
|
||||
# define MAX_NET_DEV_MTU _MAX_6LOWPAN_MTU
|
||||
|
||||
/* For the loopback device, we will use the largest MTU */
|
||||
|
||||
@@ -190,8 +214,20 @@
|
||||
# define MIN_NET_DEV_MTU NET_LO_MTU
|
||||
# define MAX_NET_DEV_MTU NET_LO_MTU
|
||||
|
||||
#elif defined(CONFIG_NET_6LOWPAN)
|
||||
/* There is no link layer header with SLIP */
|
||||
|
||||
# ifndef CONFIG_NET_IPv6
|
||||
# error 6loWPAN requires IPv support
|
||||
# endif
|
||||
|
||||
# define NET_LL_HDRLEN(d) 0
|
||||
# define NET_DEV_MTU(d) CONFIG_NET_6LOWPAN_MTU
|
||||
# define MIN_NET_DEV_MTU CONFIG_NET_6LOWPAN_MTU
|
||||
# define MAX_NET_DEV_MTU CONFIG_NET_6LOWPAN_MTU
|
||||
|
||||
#else
|
||||
/* Perhaps only Unix domain sockets of the loopback device */
|
||||
/* Perhaps only Unix domain sockets or the loopback device */
|
||||
|
||||
# define NET_LL_HDRLEN(d) 0
|
||||
# define NET_DEV_MTU(d) 0
|
||||
|
||||
@@ -340,9 +340,12 @@ struct rimeaddr_s
|
||||
* 5) On network input RX oprations, both buffers must be provided. The size
|
||||
* of the i_frame buffer is, again, greater than or equal to
|
||||
* CONFIG_NET_6LOWPAN_FRAMELEN. The larger dev.d_buf must have a size
|
||||
* of at least <tbd>. The dev.d_buf is used for de-compressing each
|
||||
* frame and reassembling any fragmented packets to create the full input
|
||||
* packet that is provided to the applicatino.
|
||||
* of at least the advertised MTU of the protocol, CONFIG_NET_6LOWPAN_MTU.
|
||||
* If fragmentation is enabled, then the logical packet size may be
|
||||
* significantly larger than the size of the frame buffer. The dev.d_buf
|
||||
* is used for de-compressing each frame and reassembling any fragmented
|
||||
* packets to create the full input packet that is provided to the
|
||||
* application.
|
||||
*
|
||||
* Frame Organization:
|
||||
*
|
||||
|
||||
@@ -117,10 +117,11 @@ typedef struct hts221_settings_s
|
||||
typedef struct hts221_config_s
|
||||
{
|
||||
int irq;
|
||||
CODE int (*irq_attach)(FAR struct hts221_config_s * state, xcpt_t isr);
|
||||
CODE void (*irq_enable)(FAR const struct hts221_config_s * state,
|
||||
CODE int (*irq_attach)(FAR struct hts221_config_s * state, xcpt_t isr,
|
||||
FAR void *arg);
|
||||
CODE void (*irq_enable)(FAR const struct hts221_config_s *state,
|
||||
bool enable);
|
||||
CODE void (*irq_clear)(FAR const struct hts221_config_s * state);
|
||||
CODE void (*irq_clear)(FAR const struct hts221_config_s *state);
|
||||
CODE int (*set_power)(FAR const struct hts221_config_s *state, bool on);
|
||||
} hts221_config_t;
|
||||
|
||||
|
||||
@@ -125,4 +125,12 @@
|
||||
#define SNIOC_READ_CONVERT_DATA _SNIOC(0x002f)
|
||||
#define SNIOC_DUMP_REGS _SNIOC(0x0030)
|
||||
|
||||
/* IOCTL commands unique to the LPS25H */
|
||||
|
||||
#define SNIOC_GET_DEV_ID _SNIOC(0x0031)
|
||||
#define SNIOC_CFGR _SNIOC(0x0032)
|
||||
#define SNIOC_TEMPERATURE_OUT _SNIOC(0x0033)
|
||||
#define SNIOC_PRESSURE_OUT _SNIOC(0x0034)
|
||||
#define SNIOC_SENSOR_OFF _SNIOC(0x0035)
|
||||
|
||||
#endif /* __INCLUDE_NUTTX_SENSORS_IOCTL_H */
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
/****************************************************************************
|
||||
* include/nuttx/sensors/lps25h.h
|
||||
*
|
||||
* Copyright (C) 2014, 2017 Haltian Ltd. All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __INCLUDE_NUTT_SENSORS_LPS25H_H
|
||||
#define __INCLUDE_NUTT_SENSORS_LPS25H_H
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/sensors/ioctl.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
#define LPS25H_TEMPER_DIVIDER 1000
|
||||
|
||||
#define LPS25H_VALID_WHO_AM_I 0xbd
|
||||
|
||||
/****************************************************************************
|
||||
* Public Types
|
||||
****************************************************************************/
|
||||
|
||||
typedef struct lps25h_temper_data_s
|
||||
{
|
||||
int32_t int_temper; /* int_temper value must be divided by
|
||||
* LPS25H_TEMPER_DIVIDER in your app code */
|
||||
int16_t raw_data;
|
||||
} lps25h_temper_data_t;
|
||||
|
||||
typedef struct lps25h_pressure_data_s
|
||||
{
|
||||
uint32_t pressure_int_hP;
|
||||
uint32_t pressure_Pa;
|
||||
uint32_t raw_data;
|
||||
} lps25h_pressure_data_t;
|
||||
|
||||
typedef struct lps25h_who_am_i_data
|
||||
{
|
||||
uint8_t who_am_i;
|
||||
} lps25h_who_am_i_data;
|
||||
|
||||
typedef struct lps25h_config_s
|
||||
{
|
||||
/* Device characterization */
|
||||
|
||||
int irq; /* IRQ number received by interrupt handler. */
|
||||
|
||||
/* IRQ/GPIO access callbacks. These operations all hidden behind callbacks
|
||||
* to isolate the driver from differences in GPIO interrupt handling
|
||||
* by varying boards and MCUs.
|
||||
* irq_attach - Attach the interrupt handler to the GPIO interrupt
|
||||
* irq_enable - Enable or disable the GPIO
|
||||
* irq_clear - Acknowledge/clear any pending GPIO interrupt
|
||||
* set_power - Ask board to turn on regulator
|
||||
*/
|
||||
|
||||
CODE int (*irq_attach)(FAR struct lps25h_config_s *state, xcpt_t isr,
|
||||
FAR void *arg);
|
||||
CODE void (*irq_enable)(FAR const struct lps25h_config_s *state,
|
||||
bool enable);
|
||||
CODE void (*irq_clear)(FAR const struct lps25h_config_s *state);
|
||||
CODE int (*set_power)(FAR const struct lps25h_config_s *state, bool on);
|
||||
} lps25h_config_t;
|
||||
|
||||
/****************************************************************************
|
||||
* Public Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
int lps25h_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
|
||||
uint8_t addr, FAR lps25h_config_t *config);
|
||||
|
||||
#endif /* __INCLUDE_NUTT_SENSORS_LPS25H_H */
|
||||
@@ -0,0 +1,243 @@
|
||||
/****************************************************************************
|
||||
* include/nuttx/usb/fusb301.h
|
||||
* FUSB301 USB type-C controller driver
|
||||
*
|
||||
* Copyright (C) 2016-2017 Haltian Ltd. All rights reserved.
|
||||
* Authors: Harri Luhtala <harri.luhtala@haltian.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.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __INCLUDE_NUTTX_USB_FUSB301_H
|
||||
#define __INCLUDE_NUTTX_USB_FUSB301_H
|
||||
|
||||
#include <nuttx/fs/ioctl.h>
|
||||
|
||||
/************************************************************************************
|
||||
* Pre-Processor Declarations
|
||||
************************************************************************************/
|
||||
|
||||
#undef EXTERN
|
||||
#if defined(__cplusplus)
|
||||
#define EXTERN extern "C"
|
||||
extern "C"
|
||||
{
|
||||
#else
|
||||
#define EXTERN extern
|
||||
#endif
|
||||
|
||||
/************************************************************************************
|
||||
* Pre-processor Definitions
|
||||
************************************************************************************/
|
||||
|
||||
/* IOCTL Commands ***********************************************************/
|
||||
|
||||
#define USBCIOC_READ_DEVID _USBCIOC(0x0001) /* Arg: uint8_t* pointer */
|
||||
#define USBCIOC_SETUP _USBCIOC(0x0002) /* Arg: uint8_t* pointer */
|
||||
#define USBCIOC_SET_MODE _USBCIOC(0x0003) /* Arg: uint8_t value */
|
||||
#define USBCIOC_SET_STATE _USBCIOC(0x0004) /* Arg: uint8_t value */
|
||||
#define USBCIOC_READ_STATUS _USBCIOC(0x0005) /* Arg: uint8_t* pointer*/
|
||||
#define USBCIOC_READ_DEVTYPE _USBCIOC(0x0006) /* Arg: uint8_t* pointer*/
|
||||
#define USBCIOC_RESET _USBCIOC(0x0007) /* Arg: None */
|
||||
|
||||
/************************************************************************************
|
||||
* Public Types
|
||||
************************************************************************************/
|
||||
|
||||
enum fusb301_reg_address_e
|
||||
{
|
||||
FUSB301_DEV_ID_REG = 0x01,
|
||||
FUSB301_MODE_REG,
|
||||
FUSB301_CONTROL_REG,
|
||||
FUSB301_MANUAL_REG,
|
||||
FUSB301_RESET_REG,
|
||||
FUSB301_MASK_REG = 0x10,
|
||||
FUSB301_STATUS_REG,
|
||||
FUSB301_TYPE_REG,
|
||||
FUSB301_INTERRUPT_REG
|
||||
};
|
||||
|
||||
/* Device ID - 0x01 */
|
||||
|
||||
enum fusb301_devid_mask_e
|
||||
{
|
||||
DEV_ID_REVISION_MASK = 0x0F,
|
||||
DEV_ID_VERSION_MASK = 0xF0
|
||||
};
|
||||
|
||||
#define DEV_ID_VER_A 0x10
|
||||
#define DEV_ID_REV_C 0x02
|
||||
|
||||
/* Modes - 0x02 */
|
||||
|
||||
enum fusb301_mode_e
|
||||
{
|
||||
MODE_SRC = (1 << 0),
|
||||
MODE_SRC_ACC = (1 << 1),
|
||||
MODE_SNK = (1 << 2),
|
||||
MODE_SNK_ACC = (1 << 3),
|
||||
MODE_DRP = (1 << 4),
|
||||
MODE_DRP_ACC = (1 << 5)
|
||||
};
|
||||
|
||||
/* Control - 0x03 */
|
||||
|
||||
enum fusb301_control_e
|
||||
{
|
||||
CONTROL_INT_ENABLE = (0 << 0),
|
||||
CONTROL_INT_DISABLE = (1 << 0),
|
||||
CONTROL_CUR_DISABLED = (0 << 1),
|
||||
CONTROL_CUR_DEFAULT = (1 << 1),
|
||||
CONTROL_CUR_1500 = (2 << 1),
|
||||
CONTROL_CUR_3000 = (3 << 1),
|
||||
CONTROL_TGL_35_15MS = (0 << 4),
|
||||
CONTROL_TGL_30_20MS = (1 << 4),
|
||||
CONTROL_TGL_25_25MS = (2 << 4),
|
||||
CONTROL_TGL_20_30MS = (3 << 4)
|
||||
};
|
||||
|
||||
/* Manual - 0x04 */
|
||||
|
||||
enum fusb301_manual_e
|
||||
{
|
||||
MANUAL_ERROR_REC = (1 << 0),
|
||||
MANUAL_DISABLED = (1 << 1),
|
||||
MANUAL_UNATT_SRC = (1 << 2),
|
||||
MANUAL_UNATT_SNK = (1 << 3)
|
||||
};
|
||||
|
||||
/* Reset - 0x05 */
|
||||
|
||||
enum fusb301_reset_e
|
||||
{
|
||||
RESET_SW_RES = (1 << 0)
|
||||
};
|
||||
|
||||
/* Interrupt mask - 0x10 */
|
||||
|
||||
enum fusb301_int_mask_e
|
||||
{
|
||||
INT_MASK_ATTACK = (1 << 0),
|
||||
INT_MASK_DETACH = (1 << 1),
|
||||
INT_MASK_BC_LVL = (1 << 2),
|
||||
INT_MASK_ACC_CH = (1 << 3)
|
||||
};
|
||||
|
||||
/* Status - 0x11 */
|
||||
|
||||
enum fusb301_status_e
|
||||
{
|
||||
STATUS_ATTACH = (1 << 0),
|
||||
STATUS_BC_SINK_UNATT = (0 << 1),
|
||||
STATUS_BC_SINK_DEF = (1 << 1),
|
||||
STATUS_BC_SINK_1500 = (2 << 1),
|
||||
STATUS_BC_SINK_3000 = (3 << 1),
|
||||
STATUS_VBUS_OK = (1 << 3),
|
||||
STATUS_CC_NO_CONN = (0 << 4),
|
||||
STATUS_CC_1 = (1 << 4),
|
||||
STATUS_CC_2 = (2 << 4),
|
||||
STATUS_CC_FAULT = (3 << 4)
|
||||
};
|
||||
|
||||
/* Type - 0x12 */
|
||||
|
||||
enum fusb301_type_e
|
||||
{
|
||||
TYPE_AUDIOACC = (1 << 0),
|
||||
TYPE_DEBUGACC = (1 << 1),
|
||||
TYPE_SOURCE = (1 << 3),
|
||||
TYPE_SINK = (1 << 4)
|
||||
};
|
||||
|
||||
/* Interrupt - 0x13 */
|
||||
|
||||
enum fusb301_interrupt_e
|
||||
{
|
||||
INTERRUPT_ATTACH = (1 << 0),
|
||||
INTERRUPT_DETACH = (1 << 1),
|
||||
INTERRUPT_BC_LVL = (1 << 2),
|
||||
INTERRUPT_ACC_CH = (1 << 3)
|
||||
};
|
||||
|
||||
struct fusb301_result_s
|
||||
{
|
||||
uint8_t status;
|
||||
uint8_t dev_type;
|
||||
};
|
||||
|
||||
struct fusb301_setup_s
|
||||
{
|
||||
uint8_t drp_toggle_timing;
|
||||
uint8_t host_current;
|
||||
uint8_t int_mask;
|
||||
bool global_int_mask;
|
||||
};
|
||||
|
||||
struct fusb301_config_s
|
||||
{
|
||||
/* Device characterization */
|
||||
|
||||
int irq;
|
||||
|
||||
CODE int (*irq_attach)(FAR struct fusb301_config_s *state, xcpt_t isr,
|
||||
FAR void *arg);
|
||||
CODE void (*irq_enable)(FAR struct fusb301_config_s *state, bool enable);
|
||||
CODE void (*irq_clear)(FAR struct fusb301_config_s *state);
|
||||
};
|
||||
|
||||
/************************************************************************************
|
||||
* Public Function Prototypes
|
||||
************************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: fusb301_register
|
||||
*
|
||||
* Description:
|
||||
* Register the FUSB301 character device as 'devpath'
|
||||
*
|
||||
* Input Parameters:
|
||||
* devpath - The full path to the driver to register. E.g., "/dev/usbc0"
|
||||
* i2c - An instance of the I2C interface to use to communicate with FUSB301
|
||||
* addr - The I2C address of the FUSB301. The I2C address of the FUSB301 is 0x25.
|
||||
* config - Pointer to FUSB301 configuration
|
||||
*
|
||||
* Returned Value:
|
||||
* Zero (OK) on success; a negated errno value on failure.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
int fusb301_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
|
||||
uint8_t addr, FAR struct fusb301_config_s *config);
|
||||
|
||||
#undef EXTERN
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __INCLUDE_NUTTX_USB_FUSB301_H */
|
||||
@@ -229,8 +229,8 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype)
|
||||
|
||||
#ifdef CONFIG_NET_6LOWPAN
|
||||
case NET_LL_IEEE802154: /* IEEE 802.15.4 MAC */
|
||||
dev->d_llhdrlen = 0; /* REVISIT */
|
||||
dev->d_mtu = CONFIG_NET_6LOWPAN_FRAMELEN;
|
||||
dev->d_llhdrlen = 0;
|
||||
dev->d_mtu = CONFIG_NET_6LOWPAN_MTU;
|
||||
#ifdef CONFIG_NET_TCP
|
||||
dev->d_recvwndo = CONFIG_NET_6LOWPAN_TCP_RECVWNDO;
|
||||
#endif
|
||||
|
||||
+21
-4
@@ -159,15 +159,32 @@ config NET_6LOWPAN_MAXPAYLOAD
|
||||
of a 802.15.4 frame) - 25 bytes (for the 802.15.4 MAClayer header). This
|
||||
can be increased for systems with larger packet sizes.
|
||||
|
||||
config NET_6LOWPAN_MTU
|
||||
int "6LoWPAN packet buffer size"
|
||||
default 1294
|
||||
range 590 1518
|
||||
depends on NET_6LOWPAN_FRAG
|
||||
---help---
|
||||
Packet buffer size. This size includes the TCP/UDP payload plus the
|
||||
size of TCP/UDP header, the IP header, and the Ethernet header.
|
||||
This value is normally referred to as the MTU (Maximum Transmission
|
||||
Unit); the payload is the MSS (Maximum Segment Size).
|
||||
|
||||
NOTE that this option depends on fragmentation support. By
|
||||
supporting fragmentation, we can handle quite large "logical" packet
|
||||
sizes. Without fragmentation support, the MTU is equal to the frame
|
||||
size and that has already been selected.
|
||||
|
||||
config NET_6LOWPAN_TCP_RECVWNDO
|
||||
int "6LoWPAN TCP receive window size"
|
||||
default 102
|
||||
default 1220 if NET_6LOWPAN_FRAG
|
||||
default 102 if !NET_6LOWPAN_FRAG
|
||||
depends on NET_TCP
|
||||
---help---
|
||||
The size of the advertised receiver's window. Should be set low
|
||||
(i.e., to the size of the IEEE802.15.4 frame payload) if the application
|
||||
is slow to process incoming data, or high (32768 bytes) if the
|
||||
application processes data quickly. REVISIT!
|
||||
(i.e., to the size of the IEEE802.15.4 MTU or frame payload) if
|
||||
the application is slow to process incoming data, or high (32768
|
||||
bytes) if the application processes data quickly.
|
||||
|
||||
config NET_6LOWPAN_SNIFFER
|
||||
default n
|
||||
|
||||
@@ -54,6 +54,7 @@
|
||||
#include <errno.h>
|
||||
#include <debug.h>
|
||||
|
||||
#include "nuttx/net/iob.h"
|
||||
#include "nuttx/net/netdev.h"
|
||||
#include "nuttx/net/ip.h"
|
||||
#include "nuttx/net/tcp.h"
|
||||
@@ -61,6 +62,7 @@
|
||||
#include "nuttx/net/icmpv6.h"
|
||||
#include "nuttx/net/sixlowpan.h"
|
||||
|
||||
#include "iob/iob.h"
|
||||
#include "netdev/netdev.h"
|
||||
#include "socket/socket.h"
|
||||
#include "tcp/tcp.h"
|
||||
@@ -69,6 +71,26 @@
|
||||
|
||||
#ifdef CONFIG_NET_6LOWPAN
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/* Configuration ************************************************************/
|
||||
|
||||
/* A single IOB must be big enough to hold a full frame */
|
||||
|
||||
#if CONFIG_IOB_BUFSIZE < CONFIG_NET_6LOWPAN_FRAMELEN
|
||||
# error IOBs must be large enough to hold full IEEE802.14.5 frame
|
||||
#endif
|
||||
|
||||
/* There must be at least enough IOBs to hold the full MTU. Probably still
|
||||
* won't work unless there are a few more.
|
||||
*/
|
||||
|
||||
#if CONFIG_NET_6LOWPAN_MTU > (CONFIG_IOB_BUFSIZE * CONFIG_IOB_NBUFFERS)
|
||||
# error Not enough IOBs to hold one full IEEE802.14.5 packet
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Private Functions
|
||||
****************************************************************************/
|
||||
@@ -177,14 +199,15 @@ static void sixlowpan_compress_ipv6hdr(FAR struct ieee802154_driver_s *ieee,
|
||||
*
|
||||
* Input Parameters:
|
||||
* ieee - Pointer to IEEE802.15.4 MAC driver structure.
|
||||
* ipv6 - Pointer to the IPv6 header to "compress"
|
||||
* iobq - The list of frames to send.
|
||||
*
|
||||
* Returned Value:
|
||||
* None
|
||||
* Zero (OK) on success; otherwise a negated errno value is returned.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
static int sixlowpan_send_frame(FAR struct ieee802154_driver_s *ieee)
|
||||
static int sixlowpan_send_frame(FAR struct ieee802154_driver_s *ieee,
|
||||
FAR struct iob_s *iobq)
|
||||
{
|
||||
/* Prepare the frame */
|
||||
#warning Missing logic
|
||||
@@ -247,10 +270,10 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
|
||||
size_t len, FAR const struct rimeaddr_s *raddr)
|
||||
{
|
||||
FAR struct ieee802154_driver_s *ieee = (FAR struct ieee802154_driver_s *)dev;
|
||||
|
||||
int framer_hdrlen; /* Framer header length */
|
||||
struct rimeaddr_s dest; /* The MAC address of the destination of the packet */
|
||||
uint16_t outlen = 0; /* Number of bytes processed. */
|
||||
FAR struct iob_s *iob;
|
||||
int framer_hdrlen;
|
||||
struct rimeaddr_s dest;
|
||||
uint16_t outlen = 0;
|
||||
|
||||
/* Initialize device-specific data */
|
||||
|
||||
@@ -356,7 +379,7 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
|
||||
if (framer_hdrlen < 0)
|
||||
{
|
||||
/* Failed to determine the size of the header failed. */
|
||||
|
||||
|
||||
nerr("ERROR: sixlowpan_framecreate() failed: %d\n", framer_hdrlen);
|
||||
return framer_hdrlen;
|
||||
}
|
||||
@@ -368,6 +391,13 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
|
||||
(int)ieee->i_rime_hdrlen)
|
||||
{
|
||||
#if CONFIG_NET_6LOWPAN_FRAG
|
||||
/* qhead will hold the generated frames; Subsequent frames will be
|
||||
* added at qtail.
|
||||
*/
|
||||
|
||||
FAR struct iob_s *qhead;
|
||||
FAR struct iob_s *qtail;
|
||||
|
||||
/* The outbound IPv6 packet is too large to fit into a single 15.4
|
||||
* packet, so we fragment it into multiple packets and send them.
|
||||
* The first fragment contains frag1 dispatch, then
|
||||
@@ -377,6 +407,11 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
|
||||
|
||||
ninfo("Fragmentation sending packet len %d\n", len);
|
||||
|
||||
/* Allocate an IOB to hold the first fragment, waiting if necessary. */
|
||||
|
||||
iob = iob_alloc(false);
|
||||
DEBUGASSERT(iob != NULL);
|
||||
|
||||
/* Create 1st Fragment */
|
||||
# warning Missing logic
|
||||
|
||||
@@ -390,13 +425,19 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
|
||||
|
||||
/* Copy payload and send */
|
||||
# warning Missing logic
|
||||
|
||||
|
||||
/* Check TX result. */
|
||||
# warning Missing logic
|
||||
|
||||
/* Set outlen to what we already sent from the IP payload */
|
||||
# warning Missing logic
|
||||
|
||||
/* Add the first frame to the IOB queue */
|
||||
|
||||
qhead = iob;
|
||||
qtail = iob;
|
||||
iob->io_flink = NULL;
|
||||
|
||||
/* Create following fragments
|
||||
* Datagram tag is already in the buffer, we need to set the
|
||||
* FRAGN dispatch and for each fragment, the offset
|
||||
@@ -405,20 +446,31 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
|
||||
|
||||
while (outlen < len)
|
||||
{
|
||||
/* Copy payload and send */
|
||||
/* Allocate an IOB to hold the next fragment, waiting if
|
||||
* necessary.
|
||||
*/
|
||||
|
||||
iob = iob_alloc(false);
|
||||
DEBUGASSERT(iob != NULL);
|
||||
|
||||
/* Copy payload */
|
||||
# warning Missing logic
|
||||
|
||||
ninfo("sixlowpan output: fragment offset %d, len %d, tag %d\n",
|
||||
outlen >> 3, g_rime_payloadlen, g_mytag);
|
||||
|
||||
# warning Missing logic
|
||||
sixlowpan_send_frame(ieee);
|
||||
/* Add the next frame to the tail of the IOB queue */
|
||||
|
||||
qtail->io_flink = iob;
|
||||
iob->io_flink = NULL;
|
||||
|
||||
/* Check tx result. */
|
||||
# warning Missing logic
|
||||
}
|
||||
|
||||
return -ENOSYS;
|
||||
/* Send the list of frames */
|
||||
|
||||
return sixlowpan_send_frame(ieee, qhead);
|
||||
#else
|
||||
nerr("ERROR: Packet too large: %d\n", len);
|
||||
nerr(" Cannot to be sent without fragmentation support\n");
|
||||
@@ -433,10 +485,19 @@ int sixlowpan_send(FAR struct net_driver_s *dev,
|
||||
* and send in one frame.
|
||||
*/
|
||||
|
||||
return sixlowpan_send_frame(ieee);
|
||||
}
|
||||
/* Allocate an IOB to hold the frame, waiting if necessary. */
|
||||
|
||||
return -ENOSYS;
|
||||
iob = iob_alloc(false);
|
||||
DEBUGASSERT(iob != NULL);
|
||||
|
||||
/* Format the single frame */
|
||||
# warning Missing logic
|
||||
|
||||
/* Send the single frame */
|
||||
|
||||
iob->io_flink = NULL;
|
||||
return sixlowpan_send_frame(ieee, iob);
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* CONFIG_NET_6LOWPAN */
|
||||
|
||||
Reference in New Issue
Block a user