Skip to content

Commit ca7e4c6

Browse files
everederonandojve
authored andcommitted
sam3x: spi: missing adc macro
Add missing ADC_MR_STARTUP and ADC_MR_SETTLING macros for sam3x variants Signed-off-by: Eve Redero <[email protected]>
1 parent cd0ddbb commit ca7e4c6

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

asf/sam/include/sam3x/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ Patch Lst:
4444
* Fix PWM registers macros
4545
* Fix SSC registers macros
4646
* Fix missing SPI_CSR_BITS macro
47+
* Fix missing ADC_MR_STARTUP and ADC_MR_SETTLING macros

asf/sam/include/sam3x/component/adc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ typedef struct {
104104
#define ADC_MR_PRESCAL(value) ((ADC_MR_PRESCAL_Msk & ((value) << ADC_MR_PRESCAL_Pos)))
105105
#define ADC_MR_STARTUP_Pos 16
106106
#define ADC_MR_STARTUP_Msk (0xfu << ADC_MR_STARTUP_Pos) /**< \brief (ADC_MR) Start Up Time */
107+
#define ADC_MR_STARTUP(value) ((ADC_MR_STARTUP_Msk & ((value) << ADC_MR_STARTUP_Pos)))
107108
#define ADC_MR_STARTUP_SUT0 (0x0u << 16) /**< \brief (ADC_MR) 0 periods of ADCClock */
108109
#define ADC_MR_STARTUP_SUT8 (0x1u << 16) /**< \brief (ADC_MR) 8 periods of ADCClock */
109110
#define ADC_MR_STARTUP_SUT16 (0x2u << 16) /**< \brief (ADC_MR) 16 periods of ADCClock */
@@ -122,6 +123,7 @@ typedef struct {
122123
#define ADC_MR_STARTUP_SUT960 (0xFu << 16) /**< \brief (ADC_MR) 960 periods of ADCClock */
123124
#define ADC_MR_SETTLING_Pos 20
124125
#define ADC_MR_SETTLING_Msk (0x3u << ADC_MR_SETTLING_Pos) /**< \brief (ADC_MR) Analog Settling Time */
126+
#define ADC_MR_SETTLING(value) ((ADC_MR_SETTLING_Msk & ((value) << ADC_MR_SETTLING_Pos)))
125127
#define ADC_MR_SETTLING_AST3 (0x0u << 20) /**< \brief (ADC_MR) 3 periods of ADCClock */
126128
#define ADC_MR_SETTLING_AST5 (0x1u << 20) /**< \brief (ADC_MR) 5 periods of ADCClock */
127129
#define ADC_MR_SETTLING_AST9 (0x2u << 20) /**< \brief (ADC_MR) 9 periods of ADCClock */

0 commit comments

Comments
 (0)