Skip to content
Snippets Groups Projects
Commit cbb78071 authored by Gregory Nutt's avatar Gregory Nutt
Browse files

Rename ioexpander/ directories to discrete/

parent 0032b91f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ChangeLog
+ 3
− 0
View file @ cbb78071
......@@ -11049,4 +11049,7 @@
* Many files: Standardize naming of the user LED interface functions.
The new user LED interface functions are now prototyped in only in
include/nuttx/board.h and have name like board_userled_* (2015-11-01).
* Rename ioexpander/ directories to discrete/. This expands the
namespace so that other discrete I/O drivers can reside there as
well (2015-11-01).
 
drivers/Kconfig
+ 7
− 7
View file @ cbb78071
......@@ -292,16 +292,16 @@ if INPUT
source drivers/input/Kconfig
endif # INPUT
menuconfig IOEXPANDER
bool "IO Expanders Support"
menuconfig DISCRETE_IO
bool "Discrete I/O"
default n
---help---
This directory holds implementations of IO expander drivers.
See include/nuttx/ioexpander/ioexpander.h for registration information.
This directory holds implementations of IO expander and other
discrete I/O drivers.
if IOEXPANDER
source drivers/ioexpander/Kconfig
endif # IOEXPANDER
if DISCRETE_IO
source drivers/discrete/Kconfig
endif # DISCRETE_IO
menuconfig LCD
bool "LCD Driver Support"
......
drivers/Makefile
+ 1
− 1
View file @ cbb78071
......@@ -53,7 +53,7 @@ include analog$(DELIM)Make.defs
include audio$(DELIM)Make.defs
include bch$(DELIM)Make.defs
include input$(DELIM)Make.defs
include ioexpander$(DELIM)Make.defs
include discrete$(DELIM)Make.defs
include lcd$(DELIM)Make.defs
include mmcsd$(DELIM)Make.defs
include mtd$(DELIM)Make.defs
......
drivers/ioexpander/Kconfig → drivers/discrete/Kconfig
+ 10
− 0
View file @ cbb78071
......@@ -3,6 +3,15 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
menuconfig IOEXPANDER
bool "IO Expander Support"
default n
---help---
This directory holds implementations of IO expander drivers.
See include/nuttx/discrete/ioexpander.h for registration information.
if IOEXPANDER
config IOEXPANDER_MULTIPIN
bool "Support multi-pin access routines"
default n
......@@ -32,3 +41,4 @@ config PCA9555_INT_DISABLE
Disable driver interrupt functionality
endif # IOEXPANDER_PCA9555
endif # IOEXPANDER
drivers/ioexpander/Make.defs → drivers/discrete/Make.defs
+ 4
− 4
View file @ cbb78071
############################################################################
# drivers/ioexpander/Make.defs
# drivers/discrete/Make.defs
#
# Copyright (C) 2015 Gregory Nutt. All rights reserved.
# Author: Sebastien Lorquet <sebastien@lorquet.fr>
......@@ -45,8 +45,8 @@ endif
# Include io expander device driver build support
DEPPATH += --dep-path ioexpander
VPATH += :ioexpander
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
DEPPATH += --dep-path discrete
VPATH += :discrete
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)discrete}
endif
drivers/ioexpander/pca9555.c → drivers/discrete/pca9555.c
+ 13
− 12
View file @ cbb78071
/****************************************************************************
* drivers/ioexpander/pca9555.c
* drivers/discrete/pca9555.c
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr>
......@@ -48,7 +48,8 @@
#include <debug.h>
#include <nuttx/i2c.h>
#include <nuttx/ioexpander/ioexpander.h>
#include <nuttx/kmalloc.h>
#include <nuttx/discrete/ioexpander.h>
#include "pca9555.h"
......@@ -208,7 +209,7 @@ static int pca9555_getbit(FAR struct i2c_dev_s *i2c, uint8_t addr,
* Name: pca9555_direction
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......@@ -224,12 +225,12 @@ static int pca9555_direction(FAR struct ioexpander_dev_s *dev, uint8_t pin,
* Name: pca9555_option
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
static int pca9555_option(FAR struct ioexpander_dev_s *dev, uint8_t pin,
int opt, void *val)
int opt, FAR void *val)
{
FAR struct pca9555_dev_s *pca = (FAR struct pca9555_dev_s *)dev;
int ival = (int)val;
......@@ -246,7 +247,7 @@ static int pca9555_option(FAR struct ioexpander_dev_s *dev, uint8_t pin,
* Name: pca9555_write
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......@@ -261,7 +262,7 @@ static int pca9555_write(FAR struct ioexpander_dev_s *dev, uint8_t pin,
* Name: pca9555_readpin
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......@@ -276,7 +277,7 @@ static int pca9555_readpin(FAR struct ioexpander_dev_s *dev, uint8_t pin,
* Name: pca9555_readbuf
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......@@ -340,7 +341,7 @@ static int pca9555_getmultibits(FAR struct i2c_dev_s *i2c, uint8_t addr,
* Name: pca9555_multiwrite
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......@@ -402,7 +403,7 @@ static int pca9555_multiwrite(FAR struct ioexpander_dev_s *dev,
* Name: pca9555_multireadpin
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......@@ -419,7 +420,7 @@ static int pca9555_multireadpin(FAR struct ioexpander_dev_s *dev,
* Name: pca9555_multireadbuf
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......@@ -440,7 +441,7 @@ static int pca9555_multireadbuf(FAR struct ioexpander_dev_s *dev,
* Name: pca9555_gpioworker
*
* Description:
* See include/nuttx/ioexpander/ioexpander.h
* See include/nuttx/discrete/ioexpander.h
*
****************************************************************************/
......
drivers/ioexpander/pca9555.h → drivers/discrete/pca9555.h
+ 6
− 6
View file @ cbb78071
/********************************************************************************************
* drivers/ioexpander/pca9555.h
* drivers/discrete/pca9555.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr>
......@@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __DRIVERS_IOEXPANDER_PCA9555_H
#define __DRIVERS_IOEXPANDER_PCA9555_H
#ifndef __DRIVERS_DISCRETE_PCA9555_H
#define __DRIVERS_DISCRETE_PCA9555_H
/********************************************************************************************
* Included Files
......@@ -49,8 +49,8 @@
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
#include <nuttx/wqueue.h>
#include <nuttx/ioexpander/ioexpander.h>
#include <nuttx/ioexpander/pca9555.h>
#include <nuttx/discrete/ioexpander.h>
#include <nuttx/discrete/pca9555.h>
#include <nuttx/i2c.h>
#include <nuttx/irq.h>
......@@ -139,4 +139,4 @@ struct pca9555_dev_s
};
#endif /* CONFIG_IOEXPANDER && CONFIG_IOEXPANDER_PCA9555 */
#endif /* __DRIVERS_IOEXPANDER_PCA9555_H */
#endif /* __DRIVERS_DISCRETE_PCA9555_H */
include/nuttx/ioexpander/ioexpander.h → include/nuttx/discrete/ioexpander.h
+ 4
− 4
View file @ cbb78071
/****************************************************************************
* include/nuttx/ioexpander/ioexpander.h
* include/nuttx/discrete/ioexpander.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr>
......@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_IOEXPANDER_IOEXPANDER_H
#define __INCLUDE_NUTTX_IOEXPANDER_IOEXPANDER_H
#ifndef __INCLUDE_NUTTX_DISCRETE_IOEXPANDER_H
#define __INCLUDE_NUTTX_DISCRETE_IOEXPANDER_H
/****************************************************************************
* Included Files
......@@ -252,5 +252,5 @@ struct ioexpander_dev_s
};
#endif //CONFIG_IOEXPANDER
#endif //__INCLUDE_NUTTX_IOEXPANDER_IOEXPANDER_H
#endif //__INCLUDE_NUTTX_DISCRETE_IOEXPANDER_H
include/nuttx/ioexpander/pca9555.h → include/nuttx/discrete/pca9555.h
+ 4
− 4
View file @ cbb78071
/********************************************************************************************
* include/nuttx/ioexpander/pca9555.h
* include/nuttx/discrete/pca9555.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr>
......@@ -37,8 +37,8 @@
*
********************************************************************************************/
#ifndef __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
#define __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
#ifndef __INCLUDE_NUTTX_DISCRETE_PCA9555_H
#define __INCLUDE_NUTTX_DISCRETE_PCA9555_H
#include <nuttx/i2c.h>
......@@ -120,4 +120,4 @@ FAR struct ioexpander_dev_s* pca9555_initialize(FAR struct i2c_dev_s *dev,
}
#endif
#endif /* __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H */
#endif /* __INCLUDE_NUTTX_DISCRETE_PCA9555_H */
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment