From 78a2465af4394a734edc453254896e1d32fb132c Mon Sep 17 00:00:00 2001 From: OrbitalFox Date: Fri, 10 Jun 2016 09:56:35 -0600 Subject: [PATCH] SAM4E: Fix some errors in AFEC header file. --- Documentation/NuttXCCodingStandard.html | 2 +- arch/arm/src/sam34/chip/sam_afec.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/NuttXCCodingStandard.html b/Documentation/NuttXCCodingStandard.html index 581c6f60c4..e3b3103297 100644 --- a/Documentation/NuttXCCodingStandard.html +++ b/Documentation/NuttXCCodingStandard.html @@ -248,7 +248,7 @@

Deoxygen Information. - NuttX does not use Deoxygen for documentation and no file should contain Doxygen tags. + NuttX does not use Deoxygen for documentation and no file should contain Doxygen tags or Doxygen style comments.

diff --git a/arch/arm/src/sam34/chip/sam_afec.h b/arch/arm/src/sam34/chip/sam_afec.h index 9e779a1e4c..6dbf515f87 100644 --- a/arch/arm/src/sam34/chip/sam_afec.h +++ b/arch/arm/src/sam34/chip/sam_afec.h @@ -211,8 +211,8 @@ # define AFEC_EMR_CMPMODE_HIGH (1 << AFEC_EMR_CMPMODE_SHIFT) /* Event when higher than high window threshold */ # define AFEC_EMR_CMPMODE_IN (2 << AFEC_EMR_CMPMODE_SHIFT) /* Event when in comparison window */ # define AFEC_EMR_CMPMODE_OUT (3 << AFEC_EMR_CMPMODE_SHIFT) /* Event when out of comparison window */ -#define AFEC_EMR_CMPSEL_SHIFT (4) /* Bit 4-7: Comparison Selected Channel */ -#define AFEC_EMR_CMPSEL_MASK (15 << AFEC_EMR_CMPSEL_SHIFT) +#define AFEC_EMR_CMPSEL_SHIFT (3) /* Bit 3-7: Comparison Selected Channel */ +#define AFEC_EMR_CMPSEL_MASK (31 << AFEC_EMR_CMPSEL_SHIFT) # define AFEC_EMR_CMPSEL(n) ((uint32_t)(n) << AFEC_EMR_CMPSEL_SHIFT) #define AFEC_EMR_CMPALL (1 << 9) /* Bit 9: Compare All Channels */ #define AFEC_EMR_CMPFILTER_SHIFT (12) /* Bits 12-13: Compare Event Filtering */ @@ -375,7 +375,7 @@ # define AFEC_CWR_LOWTHRES(n) ((uint32_t)(n) << AFEC_CWR_LOWTHRES_SHIFT) #define AFEC_CWR_HIGHTHRES_SHIFT (16) /* Bits 16-27: High Threshold */ #define AFEC_CWR_HIGHTHRES_MASK (0xfff << AFEC_CWR_LOWTHRES_SHIFT) -# define AFEC_CWR_HIGHTHRES(n)K ((uint32_t)(n) << AFEC_CWR_LOWTHRES_SHIFT) +# define AFEC_CWR_HIGHTHRES(n) ((uint32_t)(n) << AFEC_CWR_LOWTHRES_SHIFT) /* Channel Gain Register */