summaryrefslogtreecommitdiff
path: root/nuttx/drivers
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-19 18:51:02 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-04-19 18:51:02 +0000
commit0a237f936cc0145ea529c8ecca596061a044450d (patch)
tree4ee007a262bfaaeee2f9f4f2f51aeee3da83db47 /nuttx/drivers
parent4ee8e4abfb4fb9e46ea6ce2e3685312a684c67d5 (diff)
downloadpx4-nuttx-0a237f936cc0145ea529c8ecca596061a044450d.tar.gz
px4-nuttx-0a237f936cc0145ea529c8ecca596061a044450d.tar.bz2
px4-nuttx-0a237f936cc0145ea529c8ecca596061a044450d.zip
Rename i2c directories to sensors
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3525 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
-rw-r--r--nuttx/drivers/Makefile68
-rw-r--r--nuttx/drivers/sensors/Make.defs (renamed from nuttx/drivers/i2c/Make.defs)10
-rw-r--r--nuttx/drivers/sensors/st_lis331dl.c (renamed from nuttx/drivers/i2c/st_lis331dl.c)4
3 files changed, 41 insertions, 41 deletions
diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile
index 68f342754..45dbe761a 100644
--- a/nuttx/drivers/Makefile
+++ b/nuttx/drivers/Makefile
@@ -36,74 +36,72 @@
-include $(TOPDIR)/Make.defs
ifeq ($(WINTOOL),y)
-INCDIROPT = -w
+INCDIROPT = -w
endif
ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
include serial/Make.defs
-ROOTDEPPATH = --dep-path .
-SERIALDEPPATH = --dep-path serial
+ROOTDEPPATH = --dep-path .
+SERIALDEPPATH = --dep-path serial
endif
ifeq ($(CONFIG_NET),y)
include net/Make.defs
-ROOTDEPPATH = --dep-path .
-NETDEPPATH = --dep-path net
+ROOTDEPPATH = --dep-path .
+NETDEPPATH = --dep-path net
endif
ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
include pipes/Make.defs
-ROOTDEPPATH = --dep-path .
-PIPEDEPPATH = --dep-path pipes
+ROOTDEPPATH = --dep-path .
+PIPEDEPPATH = --dep-path pipes
endif
ifeq ($(CONFIG_USBDEV),y)
include usbdev/Make.defs
-ROOTDEPPATH = --dep-path .
-USBDEVDEPPATH = --dep-path usbdev
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/usbdev}
+ROOTDEPPATH = --dep-path .
+USBDEVDEPPATH = --dep-path usbdev
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/usbdev}
endif
ifeq ($(CONFIG_USBHOST),y)
include usbhost/Make.defs
-ROOTDEPPATH = --dep-path .
-USBHOSTDEPPATH = --dep-path usbhost
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/usbhost}
+ROOTDEPPATH = --dep-path .
+USBHOSTDEPPATH = --dep-path usbhost
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/usbhost}
endif
include mmcsd/Make.defs
-ROOTDEPPATH = --dep-path .
-MMCSDDEPPATH = --dep-path mmcsd
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/mmcsd}
+ROOTDEPPATH = --dep-path .
+MMCSDDEPPATH = --dep-path mmcsd
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/mmcsd}
include lcd/Make.defs
-ROOTDEPPATH = --dep-path .
-LCDDEPPATH = --dep-path lcd
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/lcd}
+ROOTDEPPATH = --dep-path .
+LCDDEPPATH = --dep-path lcd
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/lcd}
ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
ifneq ($(CONFIG_DISABLE_MOUNTPOINT),y)
include bch/Make.defs
-ROOTDEPPATH = --dep-path .
-BCHDEPPATH = --dep-path bch
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/bch}
+ROOTDEPPATH = --dep-path .
+BCHDEPPATH = --dep-path bch
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/bch}
endif
endif
include mtd/Make.defs
-ROOTDEPPATH = --dep-path .
-MTDDEPPATH = --dep-path mtd
-
-ifeq ($(CONFIG_I2C),y)
-include i2c/Make.defs
-ROOTDEPPATH = --dep-path .
-I2CDEPPATH = --dep-path i2c
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/i2c}
-endif
+ROOTDEPPATH = --dep-path .
+MTDDEPPATH = --dep-path mtd
+
+include sensors/Make.defs
+ROOTDEPPATH = --dep-path .
+SENSORDEPPATH = --dep-path sensors
+CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/sensors}
ASRCS = $(SERIAL_ASRCS) $(NET_ASRCS) $(PIPE_ASRCS) $(USBDEV_ASRCS) \
$(USBHOST_ASRCS) $(MMCSD_ASRCS) $(LCD_ASRCS) $(BCH_ASRCS) \
- $(MTD_ASRCS)
+ $(MTD_ASRCS) $(SENSOR_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS =
@@ -115,7 +113,7 @@ endif
endif
CSRCS += $(SERIAL_CSRCS) $(NET_CSRCS) $(PIPE_CSRCS) $(USBDEV_CSRCS) \
$(USBHOST_CSRCS) $(MMCSD_CSRCS) $(LCD_CSRCS) $(BCH_CSRCS) \
- $(MTD_CSRCS) $(I2C_CSRCS)
+ $(MTD_CSRCS) $(SENSOR_CSRCS)
COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
@@ -123,7 +121,7 @@ OBJS = $(AOBJS) $(COBJS)
BIN = libdrivers$(LIBEXT)
-VPATH = serial:net:pipes:usbdev:usbhost:mmcsd:lcd:bch:mtd:i2c
+VPATH = serial:net:pipes:usbdev:usbhost:mmcsd:lcd:bch:mtd:sensors
all: $(BIN)
@@ -141,7 +139,7 @@ $(BIN): $(OBJS)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(SERIALDEPPATH) $(NETDEPPATH) $(PIPEDEPPATH) \
$(USBDEVDEPPATH) $(USBHOSTDEPPATH) $(MMCSDDEPPATH) $(LCDDEPPATH) \
- $(BCHDEPPATH) $(MTDDEPPATH) $(I2CDEPPATH)\
+ $(BCHDEPPATH) $(MTDDEPPATH) $(SENSORDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@
diff --git a/nuttx/drivers/i2c/Make.defs b/nuttx/drivers/sensors/Make.defs
index 2358d533b..61badadc2 100644
--- a/nuttx/drivers/i2c/Make.defs
+++ b/nuttx/drivers/sensors/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# drivers/i2c/Make.defs
+# drivers/sensors/Make.defs
#
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,10 +33,12 @@
#
############################################################################
-I2C_ASRCS =
-I2C_CSRCS =
+SENSOR_ASRCS =
+SENSOR_CSRCS =
+
+# These drivers depend on I2C support
ifeq ($(CONFIG_I2C),y)
-I2C_CSRCS += st_lis331dl.c
+SENSOR_CSRCS += st_lis331dl.c
endif
diff --git a/nuttx/drivers/i2c/st_lis331dl.c b/nuttx/drivers/sensors/st_lis331dl.c
index 7d5cdc4a2..19f7dd755 100644
--- a/nuttx/drivers/i2c/st_lis331dl.c
+++ b/nuttx/drivers/sensors/st_lis331dl.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * drivers/i2c/st_lis331dl.c
+ * drivers/sensors/st_lis331dl.c
*
* Copyright (C) 2011 Uros Platise. All rights reserved.
*
@@ -47,7 +47,7 @@
#include <stdio.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/i2c/st_lis331dl.h>
+#include <nuttx/sensors/st_lis331dl.h>
/************************************************************************************
* Private Data Types