nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 09:49:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move include/nuttx/i2c.h to include/nuttx/i2c/i2c_master.h

Browse source
This commit is contained in:
Gregory Nutt 2016-01-30 08:00:16 -06:00
parent 19feab1bd6
commit ceb415204e
41 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch

@ -1 +1 @@
Subproject commit 69b5f95ae5c4b953be4b6e1598a4e71f794afe52
Subproject commit ce5362e2daf21444768b5219eb0eca6fa7929ea1

2
configs

@ -1 +1 @@
Subproject commit f4d2471e1064a8c1dacfd3368aaa9229cc065274
Subproject commit 6b24789ace585ef78778cff3a3c894ad11db6166

2
drivers/Kconfig
View file

@ -268,7 +268,7 @@ menuconfig I2C
default n
---help---
This selection enables building of the "upper-half" I2C driver.
See include/nuttx/i2c.h for further I2C driver information.
See include/nuttx/i2c/i2c_master.h for further I2C driver information.
if I2C
source drivers/i2c/Kconfig

2
drivers/README.txt
View file

@ -69,7 +69,7 @@ eeprom/
the EEPROM drivers.
i2c/
I2C drivers and support logic. See include/nuttx/i2c.h
I2C drivers and support logic. See include/nuttx/i2c/i2c_master.h
input/
This directory holds implementations of human input device (HID)

2
drivers/audio/wm8904.c
View file

@ -62,7 +62,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/clock.h>
#include <nuttx/wqueue.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/audio/i2s.h>

2
drivers/i2c/i2c_read.c
View file

@ -41,7 +41,7 @@
#include <assert.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#if defined(CONFIG_I2C_TRANSFER)

2
drivers/i2c/i2c_write.c
View file

@ -41,7 +41,7 @@
#include <assert.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#if defined(CONFIG_I2C_TRANSFER)

2
drivers/i2c/i2c_writeread.c
View file

@ -41,7 +41,7 @@
#include <assert.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#if defined(CONFIG_I2C_TRANSFER)

2
drivers/input/mxt.c
View file

@ -61,7 +61,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/wqueue.h>
#include <nuttx/input/touchscreen.h>

2
drivers/input/stmpe811_tsc.c
View file

@ -60,7 +60,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/wqueue.h>
#include <nuttx/arch.h>

2
drivers/input/tsc2007.c
View file

@ -65,7 +65,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/wqueue.h>
#include <nuttx/input/touchscreen.h>

2
drivers/ioexpander/pca9555.c
View file

@ -48,7 +48,7 @@
#include <debug.h>
#include <nuttx/irq.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/kmalloc.h>
#include <nuttx/ioexpander/ioexpander.h>

2
drivers/ioexpander/pca9555.h
View file

@ -51,7 +51,7 @@
#include <nuttx/ioexpander/ioexpander.h>
#include <nuttx/ioexpander/pca9555.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/irq.h>
#if defined(CONFIG_IOEXPANDER) && defined(CONFIG_IOEXPANDER_PCA9555)

2
drivers/lcd/ssd1306_base.c
View file

@ -129,7 +129,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/spi/spi.h>
#include <nuttx/lcd/lcd.h>
#include <nuttx/lcd/ssd1306.h>

2
drivers/lcd/ssd1306_i2c.c
View file

@ -44,7 +44,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/lcd/ssd1306.h>
#include "ssd1306.h"

2
drivers/leds/pca9635pw.c
View file

@ -42,7 +42,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/kmalloc.h>
#include <nuttx/leds/pca9635pw.h>

2
drivers/mtd/at24xx.c
View file

@ -59,7 +59,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/mtd/mtd.h>
#ifdef CONFIG_MTD_AT24XX

2
drivers/power/bq2425x.c
View file

@ -53,7 +53,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/power/battery_charger.h>
#include <nuttx/power/battery_ioctl.h>
#include "bq2425x.h"

2
drivers/power/max1704x.c
View file

@ -54,7 +54,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/power/battery_gauge.h>
/* This driver requires:

2
drivers/sensors/adxl345_i2c.c
View file

@ -46,7 +46,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/adxl345.h>
#include "adxl345.h"

2
drivers/sensors/as5048b.c
View file

@ -46,7 +46,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/as5048b.h>
#if defined(CONFIG_I2C) && defined(CONFIG_QENCODER) && defined(CONFIG_AS5048B)

2
drivers/sensors/bmp180.c
View file

@ -49,7 +49,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/bmp180.h>
#if defined(CONFIG_I2C) && defined(CONFIG_BMP180)

2
drivers/sensors/lis331dl.c
View file

@ -46,7 +46,7 @@
#include <stdio.h>
#include <nuttx/kmalloc.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/lis331dl.h>
#if defined(CONFIG_I2C) && defined(CONFIG_I2C_TRANSFER) && defined(CONFIG_LIS331DL)

2
drivers/sensors/lm75.c
View file

@ -47,7 +47,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/lm75.h>
#if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75)

2
drivers/sensors/lm92.c
View file

@ -49,7 +49,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/lm92.h>
#if defined(CONFIG_I2C) && defined(CONFIG_LM92)

2
drivers/sensors/lsm9ds1.c
View file

@ -45,7 +45,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/lsm9ds1.h>
#if defined(CONFIG_I2C) && defined(CONFIG_SN_LSM9DS1)

2
drivers/sensors/mb7040.c
View file

@ -46,7 +46,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/mb7040.h>
#if defined(CONFIG_I2C) && defined(CONFIG_MB7040)

2
drivers/sensors/mcp9844.c
View file

@ -45,7 +45,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/mcp9844.h>
#if defined(CONFIG_I2C) && defined(CONFIG_MCP9844)

2
drivers/sensors/ms58xx.c
View file

@ -48,7 +48,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/sensors/ms58xx.h>
#if defined(CONFIG_I2C) && defined(CONFIG_MS58XX)

2
drivers/timers/cs2100-cp.c
View file

@ -46,7 +46,7 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/timers/cs2100-cp.h>
#ifdef CONFIG_TIMERS_CS2100CP

2
drivers/timers/ds3231.c
View file

@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/timers/ds3231.h>
#include "ds3231.h"

2
drivers/timers/pcf85263.c
View file

@ -45,7 +45,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/timers/pcf85263.h>
#include "pcf85263.h"

2
drivers/video/ov2640.c
View file

@ -53,7 +53,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/video/ov2640.h>
/****************************************************************************

2
include/nuttx/audio/wm8904.h
View file

@ -214,7 +214,7 @@ extern "C"
*
****************************************************************************/
struct i2c_dev_s; /* Forward reference. Defined in include/nuttx/i2c.h */
struct i2c_dev_s; /* Forward reference. Defined in include/nuttx/i2c/i2c_master.h */
struct i2s_dev_s; /* Forward reference. Defined in include/nuttx/audio/i2s.h */
struct audio_lowerhalf_s; /* Forward reference. Defined in nuttx/audio/audio.h */

8
include/nuttx/i2c.h → include/nuttx/i2c/i2c_master.h
View file

@ -1,5 +1,5 @@
/****************************************************************************
* include/nuttx/i2c.h
* include/nuttx/i2c/i2c_master.h
*
* Copyright(C) 2009-2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_I2C_H
#define __INCLUDE_NUTTX_I2C_H
#ifndef __INCLUDE_NUTTX_I2C_I2C_MASTER_H
#define __INCLUDE_NUTTX_I2C_I2C_MASTER_H
/****************************************************************************
* Included Files
@ -417,4 +417,4 @@ int i2c_read(FAR struct i2c_dev_s *dev, FAR const struct i2c_config_s *config,
#if defined(__cplusplus)
}
#endif
#endif /* __INCLUDE_NUTTX_I2C_H */
#endif /* __INCLUDE_NUTTX_I2C_I2C_MASTER_H */

2
include/nuttx/input/ads7843e.h
View file

@ -46,7 +46,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_ADS7843E)

2
include/nuttx/input/mxt.h
View file

@ -45,7 +45,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_MXT)

2
include/nuttx/input/stmpe811.h
View file

@ -46,7 +46,7 @@
#include <nuttx/config.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/spi/spi.h>
#include <nuttx/irq.h>

2
include/nuttx/input/tsc2007.h
View file

@ -51,7 +51,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_TSC2007)

2
include/nuttx/ioexpander/pca9555.h
View file

@ -40,7 +40,7 @@
#ifndef __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
#define __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
/* A reference to a structure of this type must be passed to the PCA9555 driver when the
* driver is instantiated. This structure provides information about the configuration of

2
include/nuttx/timers/cs2100-cp.h
View file

@ -43,7 +43,7 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <nuttx/i2c.h>
#include <nuttx/i2c/i2c_master.h>
#ifdef CONFIG_TIMERS_CS2100CP