diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-07-25 18:58:45 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-07-25 18:58:45 +0000 |
| commit | 7e70b4bdf69bb74db1f779b0bfdc07f83f98db5a (patch) | |
| tree | 5dcec345cb88947eaf93995f409b89ea499bbe90 /nuttx/drivers | |
| parent | cf48e3c73f884d28b715db676a6777c32af702dc (diff) | |
| download | px4-firmware-7e70b4bdf69bb74db1f779b0bfdc07f83f98db5a.tar.gz px4-firmware-7e70b4bdf69bb74db1f779b0bfdc07f83f98db5a.tar.bz2 px4-firmware-7e70b4bdf69bb74db1f779b0bfdc07f83f98db5a.zip | |
PGA11x driver belongs in analog/ not input/
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4978 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/drivers')
| -rw-r--r-- | nuttx/drivers/analog/Make.defs | 6 | ||||
| -rw-r--r-- | nuttx/drivers/analog/pga11x.c (renamed from nuttx/drivers/input/pga11x.c) | 8 | ||||
| -rw-r--r-- | nuttx/drivers/input/Make.defs | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/nuttx/drivers/analog/Make.defs b/nuttx/drivers/analog/Make.defs index 8c868a84f..10b0db478 100644 --- a/nuttx/drivers/analog/Make.defs +++ b/nuttx/drivers/analog/Make.defs @@ -58,6 +58,12 @@ ifeq ($(CONFIG_ADC),y) CSRCS += adc.c +# Amplifiers/multiplexers + +ifeq ($(CONFIG_ADC_PGA11X),y) + CSRCS += pga11x.c +endif + # Include ADC device drivers ifeq ($(CONFIG_ADC_ADS125X),y) diff --git a/nuttx/drivers/input/pga11x.c b/nuttx/drivers/analog/pga11x.c index e2edb4f3d..18dcfc5ba 100644 --- a/nuttx/drivers/input/pga11x.c +++ b/nuttx/drivers/analog/pga11x.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/input/pga11x.c + * drivers/analog/pga11x.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -48,9 +48,9 @@ #include <errno.h> #include <debug.h> -#include <nuttx/input/pga11x.h> +#include <nuttx/analog/pga11x.h> -#if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_PGA11X) +#if defined(CONFIG_ADC) && defined(CONFIG_ADC_PGA11X) /**************************************************************************** * Pre-processor Definitions @@ -576,5 +576,5 @@ int pga11x_enable(PGA11X_HANDLE handle) return OK; } -#endif /* CONFIG_INPUT && CONFIG_INPUT_PGA11X */ +#endif /* CONFIG_ADC && CONFIG_ADC_PGA11X */ diff --git a/nuttx/drivers/input/Make.defs b/nuttx/drivers/input/Make.defs index cd9174087..aaf08b827 100644 --- a/nuttx/drivers/input/Make.defs +++ b/nuttx/drivers/input/Make.defs @@ -63,10 +63,6 @@ ifneq ($(CONFIG_INPUT_STMPE811_TEMP_DISABLE),y) endif endif -ifeq ($(CONFIG_INPUT_PGA11X),y) - CSRCS += pga11x.c -endif - # Include input device driver build support DEPPATH += --dep-path input |