andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5872 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
acirillo87 2013-06-22 17:15:49 +00:00
parent 34d1df589e
commit 4854a3136a
4 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
os/hal/platforms/SPC5xx/FlexCAN_v1/can_lld.c
View File

@ -83,11 +83,47 @@ CANDriver CAND6;
static void can_lld_tx_handler(CANDriver *canp) { static void can_lld_tx_handler(CANDriver *canp) {
uint32_t iflag1, iflag2; uint32_t iflag1, iflag2;
iflag1 = canp->flexcan->IFRL.R;
iflag2 = canp->flexcan->IFRH.R;
/* No more events until a message is transmitted.*/ /* No more events until a message is transmitted.*/
iflag1 = canp->flexcan->IFRL.R;
canp->flexcan->IFRL.R = iflag1 & 0xFFFFFF00; canp->flexcan->IFRL.R = iflag1 & 0xFFFFFF00;
canp->flexcan->IFRH.R = canp->flexcan->IFRH.R & 0xFFFFFFFF;
#if SPC5_CAN_USE_FLEXCAN0 && (SPC5_FLEXCAN0_MB == 64)
if(&CAND1 == canp) {
iflag2 = canp->flexcan->IFRH.R;
canp->flexcan->IFRH.R = canp->flexcan->IFRH.R & 0xFFFFFFFF;
}
#endif
#if SPC5_CAN_USE_FLEXCAN1 && (SPC5_FLEXCAN1_MB == 64)
if(&CAND2 == canp) {
iflag2 = canp->flexcan->IFRH.R;
canp->flexcan->IFRH.R = canp->flexcan->IFRH.R & 0xFFFFFFFF;
}
#endif
#if SPC5_CAN_USE_FLEXCAN2 && (SPC5_FLEXCAN2_MB == 64)
if(&CAND3 == canp) {
iflag2 = canp->flexcan->IFRH.R;
canp->flexcan->IFRH.R = canp->flexcan->IFRH.R & 0xFFFFFFFF;
}
#endif
#if SPC5_CAN_USE_FLEXCAN3 && (SPC5_FLEXCAN3_MB == 64)
if(&CAND4 == canp) {
iflag2 = canp->flexcan->IFRH.R;
canp->flexcan->IFRH.R = canp->flexcan->IFRH.R & 0xFFFFFFFF;
}
#endif
#if SPC5_CAN_USE_FLEXCAN4 && (SPC5_FLEXCAN4_MB == 64)
if(&CAND5 == canp) {
iflag2 = canp->flexcan->IFRH.R;
canp->flexcan->IFRH.R = canp->flexcan->IFRH.R & 0xFFFFFFFF;
}
#endif
#if SPC5_CAN_USE_FLEXCAN5 && (SPC5_FLEXCAN5_MB == 64)
if(&CAND6 == canp) {
iflag2 = canp->flexcan->IFRH.R;
canp->flexcan->IFRH.R = canp->flexcan->IFRH.R & 0xFFFFFFFF;
}
#endif
chSysLockFromIsr(); chSysLockFromIsr();
while (chSemGetCounterI(&canp->txsem) < 0) while (chSemGetCounterI(&canp->txsem) < 0)
chSemSignalI(&canp->txsem); chSemSignalI(&canp->txsem);

12
testhal/SPC560BCxx/CAN/mcuconf.h
View File

@ -181,42 +181,42 @@
#define SPC5_CAN_USE_FILTERS TRUE #define SPC5_CAN_USE_FILTERS TRUE
#define SPC5_CAN_USE_FLEXCAN0 FALSE #define SPC5_CAN_USE_FLEXCAN0 FALSE
#define SPC5_CAN_FLEXCAN0_PRIORITY 11 #define SPC5_CAN_FLEXCAN0_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN0_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN0_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN0_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN0_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \
SPC5_ME_PCTL_LP(0)) SPC5_ME_PCTL_LP(0))
#define SPC5_CAN_USE_FLEXCAN1 FALSE #define SPC5_CAN_USE_FLEXCAN1 FALSE
#define SPC5_CAN_FLEXCAN1_PRIORITY 11 #define SPC5_CAN_FLEXCAN1_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN1_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN1_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN1_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN1_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \
SPC5_ME_PCTL_LP(0)) SPC5_ME_PCTL_LP(0))
#define SPC5_CAN_USE_FLEXCAN2 FALSE #define SPC5_CAN_USE_FLEXCAN2 FALSE
#define SPC5_CAN_FLEXCAN2_PRIORITY 11 #define SPC5_CAN_FLEXCAN2_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN2_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN2_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN2_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN2_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \
SPC5_ME_PCTL_LP(0)) SPC5_ME_PCTL_LP(0))
#define SPC5_CAN_USE_FLEXCAN3 FALSE #define SPC5_CAN_USE_FLEXCAN3 FALSE
#define SPC5_CAN_FLEXCAN3_PRIORITY 11 #define SPC5_CAN_FLEXCAN3_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN3_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN3_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN3_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN3_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \
SPC5_ME_PCTL_LP(0)) SPC5_ME_PCTL_LP(0))
#define SPC5_CAN_USE_FLEXCAN4 TRUE #define SPC5_CAN_USE_FLEXCAN4 TRUE
#define SPC5_CAN_FLEXCAN4_PRIORITY 11 #define SPC5_CAN_FLEXCAN4_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN4_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN4_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN4_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN4_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \
SPC5_ME_PCTL_LP(0)) SPC5_ME_PCTL_LP(0))
#define SPC5_CAN_USE_FLEXCAN5 FALSE #define SPC5_CAN_USE_FLEXCAN5 FALSE
#define SPC5_CAN_FLEXCAN5_PRIORITY 11 #define SPC5_CAN_FLEXCAN5_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN5_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN5_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN5_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN5_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \

2
testhal/SPC560Pxx/CAN/mcuconf.h
View File

@ -183,7 +183,7 @@
#define SPC5_CAN_USE_FILTERS TRUE #define SPC5_CAN_USE_FILTERS TRUE
#define SPC5_CAN_USE_FLEXCAN0 TRUE #define SPC5_CAN_USE_FLEXCAN0 TRUE
#define SPC5_CAN_FLEXCAN0_PRIORITY 11 #define SPC5_CAN_FLEXCAN0_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN0_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN0_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN0_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN0_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \

4
testhal/SPC56ELxx/CAN/mcuconf.h
View File

@ -222,14 +222,14 @@
#define SPC5_CAN_USE_FILTERS TRUE #define SPC5_CAN_USE_FILTERS TRUE
#define SPC5_CAN_USE_FLEXCAN0 TRUE #define SPC5_CAN_USE_FLEXCAN0 TRUE
#define SPC5_CAN_FLEXCAN0_PRIORITY 11 #define SPC5_CAN_FLEXCAN0_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN0_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN0_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN0_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN0_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \
SPC5_ME_PCTL_LP(0)) SPC5_ME_PCTL_LP(0))
#define SPC5_CAN_USE_FLEXCAN1 FALSE #define SPC5_CAN_USE_FLEXCAN1 FALSE
#define SPC5_CAN_FLEXCAN1_PRIORITY 11 #define SPC5_CAN_FLEXCAN1_IRQ_PRIORITY 11
#define SPC5_CAN_FLEXCAN1_START_PCTL (SPC5_ME_PCTL_RUN(1) | \ #define SPC5_CAN_FLEXCAN1_START_PCTL (SPC5_ME_PCTL_RUN(1) | \
SPC5_ME_PCTL_LP(2)) SPC5_ME_PCTL_LP(2))
#define SPC5_CAN_FLEXCAN1_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \ #define SPC5_CAN_FLEXCAN1_STOP_PCTL (SPC5_ME_PCTL_RUN(0) | \