samr35: dac: Rename EMPTY bit-fields to avoid name collision.

EMPTY collides with Zephyr's utility macro. Signed-off-by: Thomas Schranz <[email protected]>
zephyrproject-rtos · Feb 7, 2025 · da76744 · da76744
1 parent ee2f87e
commit da76744
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/asf/sam0/include/samr35/README b/asf/sam0/include/samr35/README
@@ -37,3 +37,4 @@ License Link:
 
 Patch List:
    * Fix anonymous bit-fields with qualifiers.
+   * Rename DAC EMPTY bit-fields to DBEMPTY to avoid collision with Zephyr macros.
diff --git a/asf/sam0/include/samr35/component/dac.h b/asf/sam0/include/samr35/component/dac.h
@@ -150,7 +150,7 @@ typedef union {
   } bit;                       /*!< Structure used for bit  access                  */
   struct {
     uint8_t  UNDERRUN:2;       /*!< bit:  0.. 1  Underrun Interrupt Enable for DAC x */
-    uint8_t  EMPTY:2;          /*!< bit:  2.. 3  Data Buffer x Empty Interrupt Enable */
+    uint8_t  DBEMPTY:2;        /*!< bit:  2.. 3  Data Buffer x Empty Interrupt Enable */
     uint8_t  :4;               /*!< bit:  4.. 7  Reserved                           */
   } vec;                       /*!< Structure used for vec  access                  */
   uint8_t reg;                 /*!< Type      used for register access              */
@@ -188,7 +188,7 @@ typedef union {
   } bit;                       /*!< Structure used for bit  access                  */
   struct {
     uint8_t  UNDERRUN:2;       /*!< bit:  0.. 1  Underrun Interrupt Enable for DAC x */
-    uint8_t  EMPTY:2;          /*!< bit:  2.. 3  Data Buffer x Empty Interrupt Enable */
+    uint8_t  DBEMPTY:2;        /*!< bit:  2.. 3  Data Buffer x Empty Interrupt Enable */
     uint8_t  :4;               /*!< bit:  4.. 7  Reserved                           */
   } vec;                       /*!< Structure used for vec  access                  */
   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
   } bit;                       /*!< Structure used for bit  access                  */
   struct {
     __I uint8_t  UNDERRUN:2;       /*!< bit:  0.. 1  DAC x Underrun                     */
-    __I uint8_t  EMPTY:2;          /*!< bit:  2.. 3  Data Buffer x Empty                */
+    __I uint8_t  DBEMPTY:2;        /*!< bit:  2.. 3  Data Buffer x Empty                */
     __I uint8_t  Reserved1:4;      /*!< bit:  4.. 7  Reserved                           */
   } vec;                       /*!< Structure used for vec  access                  */
   uint8_t reg;                 /*!< Type      used for register access              */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,3 +37,4 @@ License Link:

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