9
0
Fork 0

Revised CAN driver

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3839 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2011-08-03 04:36:59 +00:00
parent 54261bcfaa
commit a4d4808e98
2 changed files with 253 additions and 114 deletions

View File

@ -1967,3 +1967,8 @@
Add new line drawing interfaces (untested).
6.8 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* arch/arm/src/lpc17xx/chip.h: Fix some chip memory configuration errors
for the LPC1764, LPC1756, and LPC1754 (submitted by Li Zhuoy (Lzzy))
* arch/arm/src/lpc17xx/lpc17_can.h: Revised CAN driver submitted by
Li Zhuoy (Lzzy).

View File

@ -3,6 +3,8 @@
*
* Copyright (C) 2011 Li Zhuoyi. All rights reserved.
* Author: Li Zhuoyi <lzyy.cn@gmail.com>
* History: 0.1 2011-07-12 initial version
* 0.2 2011-08-03 support CAN1/CAN2
*
* This file is a part of NuttX:
*
@ -60,13 +62,16 @@
#include "lpc17_pinconn.h"
#include "lpc17_can.h"
#if HAVE_CAN
#define CAN2_RATE 500000
#if defined(CONFIG_LPC17_CAN1) || defined(CONFIG_LPC17_CAN2)
/****************************************************************************
* Private Types
****************************************************************************/
struct up_dev_s
{
int port;
int baud; /* Configured baud */
};
/****************************************************************************
* Private Function Prototypes
@ -102,10 +107,33 @@ static const struct can_ops_s g_canops =
.co_txempty = can_txempty,
};
static struct can_dev_s g_candev =
#ifdef CONFIG_LPC17_CAN1
static struct up_dev_s g_can1priv =
{
.port = 1,
.baud = CONFIG_CAN1_BAUD,
};
static struct can_dev_s g_can1dev =
{
.cd_ops = &g_canops,
.cd_priv= &g_can1priv,
};
#endif
#ifdef CONFIG_LPC17_CAN2
static struct up_dev_s g_can2priv =
{
.port = 2,
.baud = CONFIG_CAN2_BAUD,
};
static struct can_dev_s g_can2dev =
{
.cd_ops = &g_canops,
.cd_priv= &g_can2priv,
};
#endif
/****************************************************************************
* Private Functions
@ -117,21 +145,40 @@ static void can_reset(FAR struct can_dev_s *dev)
{
irqstate_t flags;
uint32_t regval;
struct up_dev_s *priv=dev->cd_priv;
int baud = priv->baud;
int port = priv->port;
baud = 0x25c003;
flags = irqsave();
if(port==1)
{
putreg32(0x01,LPC17_CAN1_MOD);
putreg32(0x00,LPC17_CAN1_IER);
putreg32(0x00,LPC17_CAN1_GSR);
putreg32(0x02,LPC17_CAN1_CMR);
putreg32(baud,LPC17_CAN1_BTR);
putreg32(0x00,LPC17_CAN1_MOD);
putreg32(0x01,LPC17_CAN1_IER);
putreg32(0x02,LPC17_CANAF_AFMR);
}
else if(port==2)
{
putreg32(0x01,LPC17_CAN2_MOD);
putreg32(0x00,LPC17_CAN2_IER);
putreg32(0x00,LPC17_CAN2_GSR);
putreg32(0x02,LPC17_CAN2_CMR);
putreg32(0x25c003,LPC17_CAN2_BTR);
putreg32(baud,LPC17_CAN2_BTR);
putreg32(0x00,LPC17_CAN2_MOD);
putreg32(0x01,LPC17_CAN2_IER);
putreg32(0x02,LPC17_CANAF_AFMR);
}
else
{
dbg("Unsupport port %d\n",port);
}
irqrestore(flags);
regval = getreg32(LPC17_CAN2_BTR);
//dbg("BTR=%x\n",regval);
}
/* Configure the CAN. This method is called the first time that the CAN
@ -141,8 +188,7 @@ static void can_reset(FAR struct can_dev_s *dev)
*/
static int can_setup(FAR struct can_dev_s *dev)
{
int ret=0;
ret = irq_attach(LPC17_IRQ_CAN, can_interrupt);
int ret = irq_attach(LPC17_IRQ_CAN, can_interrupt);
if (ret == OK)
{
up_enable_irq(LPC17_IRQ_CAN);
@ -163,11 +209,21 @@ static void can_shutdown(FAR struct can_dev_s *dev)
static void can_rxint(FAR struct can_dev_s *dev, bool enable)
{
uint32_t regval;
int port = ((struct up_dev_s *)(dev->cd_priv))->port;
if(port == 1)
regval = getreg32(LPC17_CAN1_IER);
else
regval = getreg32(LPC17_CAN2_IER);
if(enable)
if (enable)
regval |= CAN_IER_RIE;
else
regval &= ~CAN_IER_RIE;
if(port == 1)
putreg32(regval, LPC17_CAN1_IER);
else
putreg32(regval, LPC17_CAN2_IER);
}
@ -175,11 +231,21 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
static void can_txint(FAR struct can_dev_s *dev, bool enable)
{
uint32_t regval;
int port = ((struct up_dev_s *)(dev->cd_priv))->port;
if(port == 1)
regval = getreg32(LPC17_CAN1_IER);
else
regval = getreg32(LPC17_CAN2_IER);
if(enable)
if (enable)
regval |= CAN_IER_TIE1;
else
regval &= ~CAN_IER_TIE1;
if(port == 1)
putreg32(regval, LPC17_CAN1_IER);
else
putreg32(regval, LPC17_CAN2_IER);
}
@ -199,24 +265,39 @@ static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
{
int port = ((struct up_dev_s *)(dev->cd_priv))->port;
uint32_t tid=CAN_ID(msg->cm_hdr);
uint32_t tfi=CAN_DLC(msg->cm_hdr)<<16;
if(CAN_RTR(msg->cm_hdr))
if (CAN_RTR(msg->cm_hdr))
tfi|=CAN_TFI_RTR;
//dbg("header=%04x\n",msg->cm_hdr);
if( port == 1)
{
putreg32(tfi,LPC17_CAN1_TFI1);
putreg32(tid,LPC17_CAN1_TID1);
putreg32(*(uint32_t *)&msg->cm_data[0],LPC17_CAN1_TDA1);
putreg32(*(uint32_t *)&msg->cm_data[4],LPC17_CAN1_TDB1);
putreg32(0x21,LPC17_CAN1_CMR);
}
else
{
putreg32(tfi,LPC17_CAN2_TFI1);
putreg32(tid,LPC17_CAN2_TID1);
putreg32(*(uint32_t *)&msg->cm_data[0],LPC17_CAN2_TDA1);
putreg32(*(uint32_t *)&msg->cm_data[4],LPC17_CAN2_TDB1);
putreg32(0x21,LPC17_CAN2_CMR);
}
return 0;
}
static bool can_txempty(FAR struct can_dev_s *dev)
{
uint32_t regval;
int port = ((struct up_dev_s *)(dev->cd_priv))->port;
if( port == 1)
regval = getreg32(LPC17_CAN1_GSR);
else
regval = getreg32(LPC17_CAN2_GSR);
if( regval & CAN_GSR_TBS)
if ( regval & CAN_GSR_TBS)
return true;
else
return false;
@ -225,6 +306,28 @@ static bool can_txempty(FAR struct can_dev_s *dev)
static int can_interrupt(int irq, void *context)
{
uint32_t regval;
#ifdef CONFIG_LPC17_CAN1
regval=getreg32(LPC17_CAN1_ICR);
if (regval & CAN_ICR_RI ) //Receive interrupt
{
uint16_t hdr;
uint32_t data[2];
uint32_t rfs=getreg32(LPC17_CAN1_RFS);
uint32_t rid=getreg32(LPC17_CAN1_RID);
data[0]=getreg32(LPC17_CAN1_RDA);
data[1]=getreg32(LPC17_CAN1_RDB);
putreg32(0x04,LPC17_CAN1_CMR); //release recieve buffer
hdr=((rid<<5)&~0x1f)|((rfs>>16)&0x0f);
if (rfs&CAN_RFS_RTR)
hdr|=0x10;
can_receive(&g_can1dev,hdr,(uint8_t *)data);
}
if ( regval & CAN_ICR_TI1) //Transmit interrupt 1
can_txdone(&g_can1dev);
#endif
#ifdef CONFIG_LPC17_CAN2
regval=getreg32(LPC17_CAN2_ICR);
if (regval & CAN_ICR_RI ) //Receive interrupt
{
@ -236,12 +339,13 @@ static int can_interrupt(int irq, void *context)
data[1]=getreg32(LPC17_CAN2_RDB);
putreg32(0x04,LPC17_CAN2_CMR); //release recieve buffer
hdr=((rid<<5)&~0x1f)|((rfs>>16)&0x0f);
if(rfs&CAN_RFS_RTR)
if (rfs&CAN_RFS_RTR)
hdr|=0x10;
can_receive(&g_candev,hdr,data);
can_receive(&g_can2dev,hdr,data);
}
if ( regval & CAN_ICR_TI1) //Transmit interrupt 1
can_txdone(&g_candev);
can_txdone(&g_can2dev);
#endif
return OK;
}
@ -253,13 +357,13 @@ static int can_interrupt(int irq, void *context)
* Name: up_caninitialize
*
* Description:
* Initialize the selected SPI port
* Initialize the selected can port
*
* Input Parameter:
* Port number (for hardware that has mutiple SPI interfaces)
* Port number (for hardware that has mutiple can interfaces)
*
* Returned Value:
* Valid SPI device structure reference on succcess; a NULL on failure
* Valid can device structure reference on succcess; a NULL on failure
*
****************************************************************************/
@ -268,23 +372,50 @@ FAR struct can_dev_s *up_caninitialize(int port)
uint32_t regval;
irqstate_t flags;
flags = irqsave();
struct can_dev_s *candev=NULL;
/* Step 1: Enable power on */
#ifdef CONFIG_LPC17_CAN1
if( port == 1 )
{
regval = getreg32(LPC17_SYSCON_PCONP);
regval |= SYSCON_PCONP_PCCAN1;
putreg32(regval, LPC17_SYSCON_PCONP);
regval = getreg32(LPC17_SYSCON_PCLKSEL0);
regval &= ~SYSCON_PCLKSEL0_CAN1_MASK;
regval |= (SYSCON_PCLKSEL_CCLK4 << SYSCON_PCLKSEL0_CAN1_SHIFT);
putreg32(regval, LPC17_SYSCON_PCLKSEL0);
lpc17_configgpio(GPIO_CAN1_RD);
lpc17_configgpio(GPIO_CAN1_TD);
putreg32(0x01,LPC17_CAN1_MOD);
putreg32(0x00,LPC17_CAN1_IER);
putreg32(0x00,LPC17_CAN1_GSR);
putreg32(0x02,LPC17_CAN1_CMR);
putreg32(0x49c009,LPC17_CAN1_BTR);
putreg32(0x00,LPC17_CAN1_MOD);
putreg32(0x01,LPC17_CAN1_IER);
putreg32(0x02,LPC17_CANAF_AFMR);
candev = &g_can1dev;
}
#endif
#ifdef CONFIG_LPC17_CAN2
if ( port ==2 )
{
regval = getreg32(LPC17_SYSCON_PCONP);
regval |= SYSCON_PCONP_PCCAN2;
putreg32(regval, LPC17_SYSCON_PCONP);
/* Step 2: Enable clocking */
regval = getreg32(LPC17_SYSCON_PCLKSEL0);
regval &= ~SYSCON_PCLKSEL0_CAN2_MASK;
regval |= (SYSCON_PCLKSEL_CCLK4 << SYSCON_PCLKSEL0_CAN2_SHIFT);
putreg32(regval, LPC17_SYSCON_PCLKSEL0);
/* Step 3: Configure I/O pins */
lpc17_configgpio(GPIO_CAN2_RD_2);
lpc17_configgpio(GPIO_CAN2_TD_2);
lpc17_configgpio(GPIO_CAN2_RD);
lpc17_configgpio(GPIO_CAN2_TD);
/* Step 4: Setup */
putreg32(0x01,LPC17_CAN2_MOD);
putreg32(0x00,LPC17_CAN2_IER);
putreg32(0x00,LPC17_CAN2_GSR);
@ -294,8 +425,11 @@ FAR struct can_dev_s *up_caninitialize(int port)
putreg32(0x01,LPC17_CAN2_IER);
putreg32(0x02,LPC17_CANAF_AFMR);
candev = &g_can2dev;
}
#endif
irqrestore(flags);
return &g_candev;
return candev;
}
#endif