Merge remote-tracking branch 'origin/master' into vnc

ChangeLog

@@ -11649,4 +11649,9 @@
 	  configurations (2015-04-14).
 	* Framebuffer driver:  Add a display number to each interface in order
 	  to support multiple display devices (2015-04-14).
-
+	* drivers/wireless/nrf24l01.c: Fix backward calculation of relative
+	  frequency.  Noted by Henry Zhang (2015-04-15).
+	* drivers/sensors/h1750fvi.c:  Add a character driver for Rohm Ambient
+	  Light Sensor BH1750FVI.  From Alan Carvalho de Assi (2016-04-15).
+	* configs/stm32f4discovery: Integrate BH1750FVI driver in the
+	  STM32F4Discovery board.  From Alan Carvalho de Assi (2016-04-15).

configs/stm32f4discovery/src/Makefile

@@ -52,6 +52,10 @@ ifeq ($(CONFIG_STM32_OTGFS),y)
 CSRCS += stm32_usb.c
 endif
 
+ifeq ($(CONFIG_BH1750FVI),y)
+CSRCS += stm32_bh1750fvi.c
+endif
+
 ifeq ($(CONFIG_BMP180),y)
 CSRCS += stm32_bmp180.c
 endif

configs/stm32f4discovery/src/stm32_bh1750fvi.c

@@ -0,0 +1,105 @@
+/************************************************************************************
+ * configs/stm32f4discovery/src/stm32_bh1750fvi.c
+ *
+ *   Copyright (C) 2016 Alan Carvalho de Assis. All rights reserved.
+ *   Author: Alan Carvalho de Assis <acassis@gmail.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 <errno.h>
+#include <debug.h>
+
+#include <nuttx/spi/spi.h>
+#include <nuttx/sensors/bh1750fvi.h>
+
+#include "stm32.h"
+#include "stm32_i2c.h"
+#include "stm32f4discovery.h"
+
+#if defined(CONFIG_I2C) && defined(CONFIG_BH1750FVI)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+#define BH1750FVI_I2C_PORTNO 1   /* On I2C1 */
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_bh1750initialize
+ *
+ * Description:
+ *   Initialize and register the MPL115A Pressure Sensor driver.
+ *
+ * Input parameters:
+ *   devpath - The full path to the driver to register. E.g., "/dev/light0"
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno value on failure.
+ *
+ ************************************************************************************/
+
+int stm32_bh1750initialize(FAR const char *devpath)
+{
+  FAR struct i2c_master_s *i2c;
+  int ret;
+
+  sndbg("Initializing BH1750FVI!\n");
+
+  /* Initialize I2C */
+
+  i2c = stm32_i2cbus_initialize(BH1750FVI_I2C_PORTNO);
+
+  if (!i2c)
+    {
+      return -ENODEV;
+    }
+
+  /* Then register the barometer sensor */
+
+  ret = bh1750fvi_register(devpath, i2c, BH1750FVI_I2C_ADDR);
+  if (ret < 0)
+    {
+      sndbg("Error registering BM180\n");
+    }
+
+  return ret;
+}
+
+#endif /* CONFIG_I2C && CONFIG_BH1750FVI && CONFIG_STM32_I2C1 */

configs/stm32f4discovery/src/stm32_bringup.c

@@ -98,6 +98,10 @@ int stm32_bringup(void)
 #endif
   int ret = OK;
 
+#ifdef CONFIG_BH1750FVI
+  stm32_bh1750initialize("/dev/light0");
+#endif
+
 #ifdef CONFIG_ZEROCROSS
   /* Configure the zero-crossing driver */
 

configs/stm32f4discovery/src/stm32f4discovery.h

@@ -355,6 +355,19 @@
 
 void weak_function stm32_spidev_initialize(void);
 
+/****************************************************************************
+ * Name: stm32_bh1750initialize
+ *
+ * Description:
+ *   Called to configure an I2C and to register BH1750FVI for the stm32f4discovery
+ *   board.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_BH1750FVI
+int stm32_bh1750initialize(FAR const char *devpath);
+#endif
+
 /****************************************************************************
  * Name: stm32_bmp180initialize
  *

drivers/mtd/ftl.c

@@ -1,7 +1,7 @@
 /****************************************************************************
  * drivers/mtd/ftl.c
  *
- *   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011-2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,9 @@ static const struct block_operations g_bops =
 #endif
   ftl_geometry, /* geometry */
   ftl_ioctl     /* ioctl    */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , 0           /* unlink   */
+#endif
 };
 
 /****************************************************************************

drivers/sensors/Kconfig

@@ -11,6 +11,13 @@ config AS5048B
 	---help---
 		Enable driver support for the AMS AS5048B magnetic rotary encoder.
 
+config BH1750FVI
+	bool "Rohm BH1750FVI Ambient Light Sensor support"
+	default n
+	select I2C
+	---help---
+		Enable driver support for the Rohm BH1750FVI light sensor.
+
 config BMP180
 	bool "Bosch BMP180 Barometer Sensor support"
 	default n

drivers/sensors/Make.defs

@@ -61,6 +61,10 @@ ifeq ($(CONFIG_ADXL345_I2C),y)
   CSRCS += adxl345_i2c.c
 endif
 
+ifeq ($(CONFIG_BH1750FVI),y)
+  CSRCS += bh1750fvi.c
+endif
+
 ifeq ($(CONFIG_BMP180),y)
   CSRCS += bmp180.c
 endif

drivers/sensors/bh1750fvi.c

@@ -0,0 +1,459 @@
+/****************************************************************************
+ * drivers/sensors/bh1750fvi.c
+ * Character driver for the Rohm Ambient Light Sensor BH1750FVI
+ *
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ *   Copyright (C) 2016 Alan Carvalho de Assis. All rights reserved.
+ *   Author: Alan Carvalho de Assis <acassis@gmail.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 <errno.h>
+#include <debug.h>
+#include <stdlib.h>
+
+#include <nuttx/kmalloc.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/sensors/bh1750fvi.h>
+
+#if defined(CONFIG_I2C) && defined(CONFIG_BH1750FVI)
+
+/****************************************************************************
+ * Pre-process Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_BH1750FVI_I2C_FREQUENCY
+#  define CONFIG_BH1750FVI_I2C_FREQUENCY 400000
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct bh1750fvi_dev_s
+{
+  FAR struct i2c_master_s *i2c; /* I2C interface */
+  uint8_t addr;                 /* I2C address */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* I2C Helpers */
+
+static int     bh1750fvi_read16(FAR struct bh1750fvi_dev_s *priv,
+                 FAR uint16_t *regval);
+static int     bh1750fvi_write8(FAR struct bh1750fvi_dev_s *priv,
+                 uint8_t regval);
+
+/* Character driver methods */
+
+static int     bh1750fvi_open(FAR struct file *filep);
+static int     bh1750fvi_close(FAR struct file *filep);
+static ssize_t bh1750fvi_read(FAR struct file *filep, FAR char *buffer,
+                  size_t buflen);
+static ssize_t bh1750fvi_write(FAR struct file *filep,
+                  FAR const char *buffer, size_t buflen);
+static int     bh1750fvi_ioctl(FAR struct file *filep, int cmd,
+                  unsigned long arg);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct file_operations g_bh1750fvi_fops =
+{
+  bh1750fvi_open,   /* open */
+  bh1750fvi_close,  /* close */
+  bh1750fvi_read,   /* read */
+  bh1750fvi_write,  /* write */
+  NULL,             /* seek */
+  bh1750fvi_ioctl   /* ioctl */
+#ifndef CONFIG_DISABLE_POLL
+  , NULL            /* poll */
+#endif
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL            /* unlink */
+#endif
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: bh1750fvi_read16
+ *
+ * Description:
+ *   Read 16-bit register
+ *
+ ****************************************************************************/
+
+static int bh1750fvi_read16(FAR struct bh1750fvi_dev_s *priv,
+                            FAR uint16_t *regval)
+{
+  struct i2c_config_s config;
+  uint8_t buffer[2];
+  int ret = -1;
+
+  /* Set up the I2C configuration */
+
+  config.frequency = CONFIG_BH1750FVI_I2C_FREQUENCY;
+  config.address   = priv->addr;
+  config.addrlen   = 7;
+
+  /* Read 16-bits from the device */
+
+  ret = i2c_read(priv->i2c, &config, buffer, 2);
+  if (ret < 0)
+    {
+      sndbg ("i2c_read failed: %d\n", ret);
+      return ret;
+    }
+
+  /* Copy the content of the buffer to the location of the uint16_t pointer */
+
+  *regval = (uint16_t)((buffer[0]<<8) | (buffer[1]));
+
+  sndbg("value: %08x ret: %d\n", *regval, ret);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: bh1750fvi_write8
+ *
+ * Description:
+ *   Write from an 8-bit register
+ *
+ ****************************************************************************/
+
+static int bh1750fvi_write8(FAR struct bh1750fvi_dev_s *priv, uint8_t regval)
+{
+  struct i2c_config_s config;
+  int ret;
+
+  sndbg("value: %02x\n", regval);
+
+  /* Set up the I2C configuration */
+
+  config.frequency = CONFIG_BH1750FVI_I2C_FREQUENCY;
+  config.address   = priv->addr;
+  config.addrlen   = 7;
+
+  /* Write 8 bits to device */
+
+  ret = i2c_write(priv->i2c, &config, &regval, 1);
+  if (ret < 0)
+    {
+      sndbg("i2c_write failed: %d\n", ret);
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: bh1750fvi_open
+ *
+ * Description:
+ *   This function is called whenever the BH1750FVI device is opened.
+ *
+ ****************************************************************************/
+
+static int bh1750fvi_open(FAR struct file *filep)
+{
+  return OK;
+}
+
+/****************************************************************************
+ * Name: bh1750fvi_close
+ *
+ * Description:
+ *   This routine is called when the BH1750FVI device is closed.
+ *
+ ****************************************************************************/
+
+static int bh1750fvi_close(FAR struct file *filep)
+{
+  return OK;
+}
+
+/****************************************************************************
+ * Name: bh1750fvi_read
+ ****************************************************************************/
+
+static ssize_t bh1750fvi_read(FAR struct file *filep, FAR char *buffer,
+                              size_t buflen)
+{
+  int ret;
+  FAR struct inode         *inode;
+  FAR struct bh1750fvi_dev_s *priv;
+  uint16_t lux = 0;
+
+  DEBUGASSERT(filep);
+  inode = filep->f_inode;
+
+  DEBUGASSERT(inode && inode->i_private);
+  priv  = (FAR struct bh1750fvi_dev_s *)inode->i_private;
+
+  /* Check if the user is reading the right size */
+
+  if (buflen != 2)
+    {
+      sndbg("You need to read 2 bytes from this sensor!\n");
+      return -EINVAL;
+    }
+
+  ret = bh1750fvi_read16(priv, &lux);
+  if (ret < 0)
+    {
+      sndbg("Error reading light sensor!\n");
+      return ret;
+    }
+
+  buffer[0] = lux & 0xFF;
+  buffer[1] = (lux & 0xFF00) >> 8;
+
+  return buflen;
+}
+
+/****************************************************************************
+ * Name: bh1750fvi_write
+ ****************************************************************************/
+
+static ssize_t bh1750fvi_write(FAR struct file *filep,
+                               FAR const char *buffer, size_t buflen)
+{
+  return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: bh1750fvi_ioctl
+ ****************************************************************************/
+
+static int bh1750fvi_ioctl(FAR struct file *filep, int cmd,
+                           unsigned long arg)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct bh1750fvi_dev_s *priv  = inode->i_private;
+  int ret = OK;
+
+  switch (cmd)
+    {
+      /* Set device to Continuously H-Resolution Mode */
+
+      case SNIOC_CHRM:
+        {
+          ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM);
+          if (ret < 0)
+            {
+              sndbg("Cannot change to Continuously H-Resolution Mode!\n");
+            }
+        }
+        break;
+
+      /* Set device to Continuously H-Resolution Mode2 */
+
+      case SNIOC_CHRM2:
+        {
+          ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM2);
+          if (ret < 0)
+            {
+              sndbg("Cannot change to Continuously H-Resolution Mode2!\n");
+            }
+        }
+        break;
+
+      /* Set device to Continuously L-Resolution Mode */
+
+      case SNIOC_CLRM:
+        {
+          ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_LRM);
+          if (ret < 0)
+            {
+              sndbg("Cannot change to Continuously L-Resolution Mode!\n");
+            }
+        }
+        break;
+
+      /* Set device to One Time H-Resolution Mode */
+
+      case SNIOC_OTHRM:
+        {
+          ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_HRM);
+          if (ret < 0)
+            {
+              sndbg("Cannot change to One Time H-Resolution Mode!\n");
+            }
+        }
+        break;
+
+      /* Set device to One Time H-Resolution Mode 2 */
+
+      case SNIOC_OTHRM2:
+        {
+          ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_HRM2);
+          if (ret < 0)
+            {
+              sndbg("Cannot change to One Time H-Resolution Mode2!\n");
+            }
+        }
+        break;
+
+      /* Set device to One Time L-Resolution Mode */
+
+      case SNIOC_OTLRM:
+        {
+          ret = bh1750fvi_write8(priv, BH1750FVI_ONETIME_LRM);
+          if (ret < 0)
+            {
+              sndbg("Cannot change to One Time L-Resolution Mode!\n");
+            }
+        }
+        break;
+
+      /* Change the Measurement Time */
+
+      case SNIOC_CHMEATIME:
+        {
+          FAR uint8_t *ptr = (FAR uint8_t *)((uintptr_t)arg);
+          uint8_t reg;
+          DEBUGASSERT(ptr != NULL);
+
+          reg = BH1750FVI_MEASURE_TIMEH | ((*ptr & 0xE0) >> 5);
+
+          ret = bh1750fvi_write8(priv, reg);
+          if (ret < 0)
+            {
+              sndbg("Cannot Change Measure Time at MEASURE_TIMEH!\n");
+            }
+
+          reg = BH1750FVI_MEASURE_TIMEL | (*ptr & 0x1F);
+
+          ret = bh1750fvi_write8(priv, reg);
+          if (ret < 0)
+            {
+              sndbg("Cannot Change Measure Time at MEASURE_TIMEL!\n");
+            }
+        }
+        break;
+
+      default:
+        sndbg("Unrecognized cmd: %d\n", cmd);
+        ret = -ENOTTY;
+        break;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: bh1750fvi_register
+ *
+ * Description:
+ *   Register the BH1750FVI character device as 'devpath'
+ *
+ * Input Parameters:
+ *   devpath - The full path to the driver to register. E.g., "/dev/light0"
+ *   i2c - An instance of the I2C interface to use to communicate with BH1750FVI
+ *   addr - The I2C address of the BH1750FVI.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
+                       uint8_t addr)
+{
+  int ret;
+
+  /* Sanity check */
+
+  DEBUGASSERT(i2c != NULL);
+
+  /* Initialize the BH1750FVI device structure */
+
+  FAR struct bh1750fvi_dev_s *priv =
+    (FAR struct bh1750fvi_dev_s *)kmm_malloc(sizeof(struct bh1750fvi_dev_s));
+
+  if (priv == NULL)
+    {
+      sndbg("Failed to allocate instance\n");
+      return -ENOMEM;
+    }
+
+  priv->i2c  = i2c;
+  priv->addr = addr;
+
+  /* Power on the device */
+
+  ret = bh1750fvi_write8(priv, BH1750FVI_POWERON);
+  if (ret < 0)
+    {
+      sndbg("Failed to power-on the BH1750FVI!\n");
+      return ret;
+    }
+
+  /* Set Continuosly H-Resolution Mode */
+
+  ret = bh1750fvi_write8(priv, BH1750FVI_CONTINUOUS_HRM);
+  if (ret < 0)
+    {
+      sndbg("Failed to enable the Continuosly H-Resolution Mode!\n");
+      return ret;
+    }
+
+  /* Register the character driver */
+
+  ret = register_driver(devpath, &g_bh1750fvi_fops, 0666, priv);
+  if (ret < 0)
+    {
+      sndbg("Failed to register driver: %d\n", ret);
+      kmm_free(priv);
+    }
+
+  return ret;
+}
+
+#endif /* CONFIG_I2C && CONFIG_BH1750FVI */

drivers/wireless/nrf24l01.c

@@ -1590,7 +1590,7 @@ int nrf24l01_setradiofreq(FAR struct nrf24l01_dev_s *dev, uint32_t freq)
 
   CHECK_ARGS(dev && freq >= NRF24L01_MIN_FREQ && freq <= NRF24L01_MAX_FREQ);
 
-  value = NRF24L01_MIN_FREQ - freq;
+  value = freq - NRF24L01_MIN_FREQ;
   nrf24l01_lock(dev->spi);
   nrf24l01_writeregbyte(dev, NRF24L01_RF_CH, value);
   nrf24l01_unlock(dev->spi);

include/nuttx/sensors/bh1750fvi.h

@@ -0,0 +1,123 @@
+/****************************************************************************
+ * include/nuttx/input/bh1750fvi.h
+ *
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Alan Carvalho de Assis. All rights reserved.
+ *   Author: Alan Carvalho de Assis <acassis@gmail.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_SENSORS_BH1750FVI_H
+#define __INCLUDE_NUTTX_SENSORS_BH1750FVI_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/irq.h>
+
+#if defined(CONFIG_BH1750FVI)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* IOCTL Commands ***********************************************************/
+
+#define SNIOC_CHRM          _SNIOC(0x0001) /* Contin. H-Res Mode Arg: None   */
+#define SNIOC_CHRM2         _SNIOC(0x0002) /* Contin. H-Res Mode2 Arg: None  */
+#define SNIOC_CLRM          _SNIOC(0x0003) /* Contin. L-Res Mode Arg: None   */
+#define SNIOC_OTHRM         _SNIOC(0x0004) /* One Time H-Res Mode Arg: None  */
+#define SNIOC_OTHRM2        _SNIOC(0x0005) /* One Time H-Res Mode2 Arg: None */
+#define SNIOC_OTLRM         _SNIOC(0x0006) /* One Time L-Res Mode Arg: None  */
+#define SNIOC_CHMEATIME     _SNIOC(0x0007) /* Change Meas. Time Arg: uint8_t */
+
+/* Device I2C Address*/
+
+#define BH1750FVI_I2C_ADDR        0x23
+
+/* Instruction Set Architecture */
+
+#define BH1750FVI_POWERDOWN       0x00
+#define BH1750FVI_POWERON         0x01
+#define BH1750FVI_RESET           0x07
+#define BH1750FVI_CONTINUOUS_HRM  0x10 /* Continuously H-Resolution Mode */
+#define BH1750FVI_CONTINUOUS_HRM2 0x11 /* Continuously H-Resolution Mode 2 */
+#define BH1750FVI_CONTINUOUS_LRM  0x12 /* Continuously L-Resolution Mode */
+#define BH1750FVI_ONETIME_HRM     0x20 /* One Time H-Resolution Mode */
+#define BH1750FVI_ONETIME_HRM2    0x21 /* One Time H-Resolution Mode 2 */
+#define BH1750FVI_ONETIME_LRM     0x23 /* One Time L-Resolution Mode */
+#define BH1750FVI_MEASURE_TIMEH   0x40 /* Change Measure Time 01000_MT[7,6,5] */
+#define BH1750FVI_MEASURE_TIMEL   0x60 /* Change Measute Time 011_MT[4,3,2,1,0] */
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Name: bh1750fvi_register
+ *
+ * Description:
+ *   Register the BH1750FVI character device as 'devpath'
+ *
+ * Input Parameters:
+ *   devpath - The full path to the driver to register. E.g., "/dev/light0"
+ *   i2c     - An instance of the I2C interface to use to communicate with
+ *              BH1750FVI
+ *   addr    - The I2C address of the BH1750FVI.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+int bh1750fvi_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
+                       uint8_t addr);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_BH1750FVI */
+#endif /* __INCLUDE_NUTTX_SENSORS_BH1750FVI_H */

libc/stdio/lib_meminstream.c

@@ -100,5 +100,3 @@ void lib_meminstream(FAR struct lib_meminstream_s *instream,
   instream->buffer      = bufstart;   /* Start of buffer */
   instream->buflen      = buflen;     /* Length of the buffer */
 }
-
-