Skip to content

Commit ee2f87e

Browse files
Thomas Schranznandojve
authored andcommitted
samr34: dac: Rename EMPTY bit-fields to avoid name collision.
EMPTY collides with Zephyr's utility macro. Signed-off-by: Thomas Schranz <[email protected]>
1 parent 712243e commit ee2f87e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

asf/sam0/include/samr34/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ License Link:
3737

3838
Patch List:
3939
* Fix anonymous bit-fields with qualifiers.
40+
* Rename DAC EMPTY bit-fields to DBEMPTY to avoid collision with Zephyr macros.

asf/sam0/include/samr34/component/dac.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ typedef union {
150150
} bit; /*!< Structure used for bit access */
151151
struct {
152152
uint8_t UNDERRUN:2; /*!< bit: 0.. 1 Underrun Interrupt Enable for DAC x */
153-
uint8_t EMPTY:2; /*!< bit: 2.. 3 Data Buffer x Empty Interrupt Enable */
153+
uint8_t DBEMPTY:2; /*!< bit: 2.. 3 Data Buffer x Empty Interrupt Enable */
154154
uint8_t :4; /*!< bit: 4.. 7 Reserved */
155155
} vec; /*!< Structure used for vec access */
156156
uint8_t reg; /*!< Type used for register access */
@@ -188,7 +188,7 @@ typedef union {
188188
} bit; /*!< Structure used for bit access */
189189
struct {
190190
uint8_t UNDERRUN:2; /*!< bit: 0.. 1 Underrun Interrupt Enable for DAC x */
191-
uint8_t EMPTY:2; /*!< bit: 2.. 3 Data Buffer x Empty Interrupt Enable */
191+
uint8_t DBEMPTY:2; /*!< bit: 2.. 3 Data Buffer x Empty Interrupt Enable */
192192
uint8_t :4; /*!< bit: 4.. 7 Reserved */
193193
} vec; /*!< Structure used for vec access */
194194
uint8_t reg; /*!< Type used for register access */
@@ -226,7 +226,7 @@ typedef union { // __I to avoid read-modify-write on write-to-clear register
226226
} bit; /*!< Structure used for bit access */
227227
struct {
228228
__I uint8_t UNDERRUN:2; /*!< bit: 0.. 1 DAC x Underrun */
229-
__I uint8_t EMPTY:2; /*!< bit: 2.. 3 Data Buffer x Empty */
229+
__I uint8_t DBEMPTY:2; /*!< bit: 2.. 3 Data Buffer x Empty */
230230
__I uint8_t Reserved1:4; /*!< bit: 4.. 7 Reserved */
231231
} vec; /*!< Structure used for vec access */
232232
uint8_t reg; /*!< Type used for register access */

0 commit comments

Comments
 (0)