ADC bugfixes plus new DAC logic from Lzyy
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3913 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
499f799858
commit
12d496667c
@ -88,3 +88,11 @@ ifeq ($(CONFIG_LPC17_ETHERNET),y)
|
||||
CHIP_CSRCS += lpc17_ethernet.c
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_LPC17_ADC),y)
|
||||
CHIP_CSRCS += lpc17_adc.c
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_LPC17_DAC),y)
|
||||
CHIP_CSRCS += lpc17_dac.c
|
||||
endif
|
||||
|
||||
268
arch/arm/src/lpc17xx/lpc17_adc.c
Normal file
268
arch/arm/src/lpc17xx/lpc17_adc.c
Normal file
@ -0,0 +1,268 @@
|
||||
/************************************************************************************
|
||||
* arch/arm/src/lpc17xx/lpc17_adc.c
|
||||
*
|
||||
* Copyright (C) 2011 Li Zhuoyi. All rights reserved.
|
||||
* Author: Li Zhuoyi <lzyy.cn@gmail.com>
|
||||
* History: 0.1 2011-08-05 initial version
|
||||
*
|
||||
* This file is a part of NuttX:
|
||||
*
|
||||
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <semaphore.h>
|
||||
#include <errno.h>
|
||||
#include <debug.h>
|
||||
|
||||
#include <arch/board/board.h>
|
||||
#include <nuttx/arch.h>
|
||||
#include <nuttx/analog/adc.h>
|
||||
|
||||
#include "up_internal.h"
|
||||
#include "up_arch.h"
|
||||
|
||||
#include "chip.h"
|
||||
#include "lpc17_internal.h"
|
||||
#include "lpc17_syscon.h"
|
||||
#include "lpc17_pinconn.h"
|
||||
#include "lpc17_adc.h"
|
||||
|
||||
#if defined(CONFIG_LPC17_ADC)
|
||||
|
||||
#ifndef CONFIG_ADC0_MASK
|
||||
#define CONFIG_ADC0_MASK 0x01
|
||||
#endif
|
||||
#ifndef CONFIG_ADC0_SPS
|
||||
#define CONFIG_ADC0_SPS 1000
|
||||
#endif
|
||||
#ifndef CONFIG_ADC0_AVERAGE
|
||||
#define CONFIG_ADC0_AVERAGE 200
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Types
|
||||
****************************************************************************/
|
||||
struct up_dev_s
|
||||
{
|
||||
uint8_t mask;
|
||||
uint32_t sps;
|
||||
int irq;
|
||||
int32_t buf[8];
|
||||
uint8_t count[8];
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
/* ADC methods */
|
||||
|
||||
static void adc_reset(FAR struct adc_dev_s *dev);
|
||||
static int adc_setup(FAR struct adc_dev_s *dev);
|
||||
static void adc_shutdown(FAR struct adc_dev_s *dev);
|
||||
static void adc_rxint(FAR struct adc_dev_s *dev, bool enable);
|
||||
static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg);
|
||||
static int adc_interrupt(int irq, void *context);
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Data
|
||||
****************************************************************************/
|
||||
|
||||
static const struct adc_ops_s g_adcops =
|
||||
{
|
||||
.ao_reset =adc_reset,
|
||||
.ao_setup = adc_setup,
|
||||
.ao_shutdown = adc_shutdown,
|
||||
.ao_rxint = adc_rxint,
|
||||
.ao_ioctl = adc_ioctl,
|
||||
};
|
||||
|
||||
static struct up_dev_s g_adcpriv =
|
||||
{
|
||||
.sps = CONFIG_ADC0_SPS,
|
||||
.mask = CONFIG_ADC0_MASK,
|
||||
.irq = LPC17_IRQ_ADC,
|
||||
};
|
||||
|
||||
static struct adc_dev_s g_adcdev =
|
||||
{
|
||||
.ad_ops = &g_adcops,
|
||||
.ad_priv= &g_adcpriv,
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Functions
|
||||
****************************************************************************/
|
||||
/* Reset the ADC device. Called early to initialize the hardware. This
|
||||
* is called, before ao_setup() and on error conditions.
|
||||
*/
|
||||
static void adc_reset(FAR struct adc_dev_s *dev)
|
||||
{
|
||||
irqstate_t flags;
|
||||
uint32_t regval;
|
||||
FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv;
|
||||
|
||||
flags = irqsave();
|
||||
|
||||
regval = getreg32(LPC17_SYSCON_PCONP);
|
||||
regval |= SYSCON_PCONP_PCADC;
|
||||
putreg32(regval, LPC17_SYSCON_PCONP);
|
||||
|
||||
putreg32(ADC_CR_PDN,LPC17_ADC_CR);
|
||||
|
||||
regval = getreg32(LPC17_SYSCON_PCLKSEL0);
|
||||
regval &= ~SYSCON_PCLKSEL0_ADC_MASK;
|
||||
regval |= (SYSCON_PCLKSEL_CCLK8 << SYSCON_PCLKSEL0_ADC_SHIFT);
|
||||
putreg32(regval, LPC17_SYSCON_PCLKSEL0);
|
||||
|
||||
uint32_t clkdiv=LPC17_CCLK/8/65/priv->sps;
|
||||
clkdiv<<=8;
|
||||
clkdiv&=0xff00;
|
||||
putreg32(ADC_CR_PDN|ADC_CR_BURST|clkdiv|priv->mask,LPC17_ADC_CR);
|
||||
|
||||
if(priv->mask&0x01)
|
||||
lpc17_configgpio(GPIO_AD0p0);
|
||||
else if(priv->mask&0x02)
|
||||
lpc17_configgpio(GPIO_AD0p1);
|
||||
else if(priv->mask&0x04)
|
||||
lpc17_configgpio(GPIO_AD0p2);
|
||||
else if(priv->mask&0x08)
|
||||
lpc17_configgpio(GPIO_AD0p3);
|
||||
else if(priv->mask&0x10)
|
||||
lpc17_configgpio(GPIO_AD0p4);
|
||||
else if(priv->mask&0x20)
|
||||
lpc17_configgpio(GPIO_AD0p5);
|
||||
else if(priv->mask&0x40)
|
||||
lpc17_configgpio(GPIO_AD0p6);
|
||||
else if(priv->mask&0x80)
|
||||
lpc17_configgpio(GPIO_AD0p7);
|
||||
|
||||
irqrestore(flags);
|
||||
}
|
||||
|
||||
/* Configure the ADC. This method is called the first time that the ADC
|
||||
* device is opened. This will occur when the port is first opened.
|
||||
* This setup includes configuring and attaching ADC interrupts. Interrupts
|
||||
* are all disabled upon return.
|
||||
*/
|
||||
static int adc_setup(FAR struct adc_dev_s *dev)
|
||||
{
|
||||
int i;
|
||||
FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv;
|
||||
int ret = irq_attach(priv->irq, adc_interrupt);
|
||||
if (ret == OK)
|
||||
{
|
||||
for(i=0;i<8;i++)
|
||||
{
|
||||
priv->buf[i]=0;
|
||||
priv->count[i]=0;
|
||||
}
|
||||
up_enable_irq(priv->irq);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Disable the ADC. This method is called when the ADC device is closed.
|
||||
* This method reverses the operation the setup method.
|
||||
*/
|
||||
static void adc_shutdown(FAR struct adc_dev_s *dev)
|
||||
{
|
||||
FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv;
|
||||
up_disable_irq(priv->irq);
|
||||
irq_detach(priv->irq);
|
||||
}
|
||||
|
||||
/* Call to enable or disable RX interrupts */
|
||||
static void adc_rxint(FAR struct adc_dev_s *dev, bool enable)
|
||||
{
|
||||
FAR struct up_dev_s *priv = (FAR struct up_dev_s *)dev->ad_priv;
|
||||
if (enable)
|
||||
putreg32(ADC_INTEN_GLOBAL,LPC17_ADC_INTEN);
|
||||
else
|
||||
putreg32(0x00,LPC17_ADC_INTEN);
|
||||
}
|
||||
|
||||
/* All ioctl calls will be routed through this method */
|
||||
static int adc_ioctl(FAR struct adc_dev_s *dev, int cmd, unsigned long arg)
|
||||
{
|
||||
dbg("Fix me:Not Implemented\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int adc_interrupt(int irq, void *context)
|
||||
{
|
||||
uint32_t regval;
|
||||
FAR struct up_dev_s *priv = (FAR struct up_dev_s *)g_adcdev.ad_priv;
|
||||
unsigned char ch;
|
||||
int32_t value;
|
||||
|
||||
regval=getreg32(LPC17_ADC_GDR);
|
||||
ch=(regval>>24)&0x07;
|
||||
priv->buf[ch]+=regval&0xfff0;
|
||||
priv->count[ch]++;
|
||||
if(priv->count[ch]>=CONFIG_ADC0_AVERAGE)
|
||||
{
|
||||
value=priv->buf[ch]/priv->count[ch];
|
||||
value<<=15;
|
||||
adc_receive(&g_adcdev,ch,value);
|
||||
priv->buf[ch]=0;
|
||||
priv->count[ch]=0;
|
||||
}
|
||||
return OK;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_adcinitialize
|
||||
*
|
||||
* Description:
|
||||
* Initialize the adc
|
||||
*
|
||||
* Returned Value:
|
||||
* Valid can device structure reference on succcess; a NULL on failure
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
FAR struct adc_dev_s *up_adcinitialize( )
|
||||
{
|
||||
return &g_adcdev;
|
||||
}
|
||||
#endif
|
||||
|
||||
190
arch/arm/src/lpc17xx/lpc17_dac.c
Normal file
190
arch/arm/src/lpc17xx/lpc17_dac.c
Normal file
@ -0,0 +1,190 @@
|
||||
/************************************************************************************
|
||||
* arch/arm/src/lpc17xx/lpc17_dac.c
|
||||
*
|
||||
* Copyright (C) 2011 Li Zhuoyi. All rights reserved.
|
||||
* Author: Li Zhuoyi <lzyy.cn@gmail.com>
|
||||
* History: 0.1 2011-08-05 initial version
|
||||
*
|
||||
* This file is a part of NuttX:
|
||||
*
|
||||
* Copyright (C) 2010 Gregory Nutt. All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <semaphore.h>
|
||||
#include <errno.h>
|
||||
#include <debug.h>
|
||||
|
||||
#include <arch/board/board.h>
|
||||
#include <nuttx/arch.h>
|
||||
#include <nuttx/analog/dac.h>
|
||||
|
||||
#include "up_internal.h"
|
||||
#include "up_arch.h"
|
||||
|
||||
#include "chip.h"
|
||||
#include "lpc17_internal.h"
|
||||
#include "lpc17_syscon.h"
|
||||
#include "lpc17_pinconn.h"
|
||||
#include "lpc17_dac.h"
|
||||
|
||||
#if defined(CONFIG_LPC17_DAC)
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Types
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Function Prototypes
|
||||
****************************************************************************/
|
||||
|
||||
/* DAC methods */
|
||||
|
||||
static void dac_reset(FAR struct dac_dev_s *dev);
|
||||
static int dac_setup(FAR struct dac_dev_s *dev);
|
||||
static void dac_shutdown(FAR struct dac_dev_s *dev);
|
||||
static void dac_txint(FAR struct dac_dev_s *dev, bool enable);
|
||||
static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg);
|
||||
static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg);
|
||||
static int dac_interrupt(int irq, void *context);
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Data
|
||||
****************************************************************************/
|
||||
|
||||
static const struct dac_ops_s g_dacops =
|
||||
{
|
||||
.ao_reset =dac_reset,
|
||||
.ao_setup = dac_setup,
|
||||
.ao_shutdown = dac_shutdown,
|
||||
.ao_txint = dac_txint,
|
||||
.ao_send = dac_send,
|
||||
.ao_ioctl = dac_ioctl,
|
||||
};
|
||||
|
||||
static struct dac_dev_s g_dacdev =
|
||||
{
|
||||
.ad_ops = &g_dacops,
|
||||
};
|
||||
|
||||
/****************************************************************************
|
||||
* ad_private Functions
|
||||
****************************************************************************/
|
||||
|
||||
/* Reset the DAC device. Called early to initialize the hardware. This
|
||||
* is called, before ao_setup() and on error conditions.
|
||||
*/
|
||||
static void dac_reset(FAR struct dac_dev_s *dev)
|
||||
{
|
||||
irqstate_t flags;
|
||||
uint32_t regval;
|
||||
|
||||
flags = irqsave();
|
||||
|
||||
regval = getreg32(LPC17_SYSCON_PCLKSEL0);
|
||||
regval &= ~SYSCON_PCLKSEL0_DAC_MASK;
|
||||
regval |= (SYSCON_PCLKSEL_CCLK8 << SYSCON_PCLKSEL0_DAC_SHIFT);
|
||||
putreg32(regval, LPC17_SYSCON_PCLKSEL0);
|
||||
|
||||
//putreg32(DAC_CTRL_DBLBUFEN,LPC17_DAC_CTRL); ?
|
||||
|
||||
lpc17_configgpio(GPIO_AOUT);
|
||||
|
||||
irqrestore(flags);
|
||||
|
||||
}
|
||||
|
||||
/* Configure the DAC. This method is called the first time that the DAC
|
||||
* device is opened. This will occur when the port is first opened.
|
||||
* This setup includes configuring and attaching DAC interrupts. Interrupts
|
||||
* are all disabled upon return.
|
||||
*/
|
||||
static int dac_setup(FAR struct dac_dev_s *dev)
|
||||
{
|
||||
return OK;
|
||||
}
|
||||
|
||||
/* Disable the DAC. This method is called when the DAC device is closed.
|
||||
* This method reverses the operation the setup method.
|
||||
*/
|
||||
static void dac_shutdown(FAR struct dac_dev_s *dev)
|
||||
{
|
||||
}
|
||||
|
||||
/* Call to enable or disable TX interrupts */
|
||||
static void dac_txint(FAR struct dac_dev_s *dev, bool enable)
|
||||
{
|
||||
}
|
||||
|
||||
static int dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg)
|
||||
{
|
||||
putreg32((msg->am_data>>16)&0xfffff,LPC17_DAC_CR);
|
||||
dac_txdone(&g_dacdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* All ioctl calls will be routed through this method */
|
||||
static int dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg)
|
||||
{
|
||||
dbg("Fix me:Not Implemented\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dac_interrupt(int irq, void *context)
|
||||
{
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_dacinitialize
|
||||
*
|
||||
* Description:
|
||||
* Initialize the DAC
|
||||
*
|
||||
* Returned Value:
|
||||
* Valid dac device structure reference on succcess; a NULL on failure
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
FAR struct dac_dev_s *up_dacinitialize()
|
||||
{
|
||||
return &g_dacdev;
|
||||
}
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user