flash: nor: use 'ULL' suffix for long constants

On 32 bit hosts, gcc should consider constants without suffix as
32 bits values. Adding a cast to convert it to 64 bits should not
be enough.

Use the suffix 'ULL' to guarantee it is a 64 bit.

Detected through 'sparse' tool.

Change-Id: If6be35bd3cbbc7c3a83e0da1407e611f07ff6e06
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/7593
Tested-by: jenkins

diff --git a/src/flash/nor/at91samd.c b/src/flash/nor/at91samd.c
index 416f077783453abd7625c22130c09d001e215946..36298f19d0ac54062467050ef76b4c20af2ed68d 100644 (file)
--- a/src/flash/nor/at91samd.c
+++ b/src/flash/nor/at91samd.c
@@ -78,7 +78,7 @@
 #define SAMD_GET_DEVSEL(id) (id & 0xFF)
 
 /* Bits to mask out lockbits in user row */
-#define NVMUSERROW_LOCKBIT_MASK ((uint64_t)0x0000FFFFFFFFFFFF)
+#define NVMUSERROW_LOCKBIT_MASK 0x0000FFFFFFFFFFFFULL
 
 struct samd_part {
        uint8_t id;
@@ -316,31 +316,31 @@ struct samd_family {
 static const struct samd_family samd_families[] = {
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_D, SAMD_SERIES_20,
                samd20_parts, ARRAY_SIZE(samd20_parts),
-               (uint64_t)0xFFFF01FFFE01FF77 },
+               0xFFFF01FFFE01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_D, SAMD_SERIES_21,
                samd21_parts, ARRAY_SIZE(samd21_parts),
-               (uint64_t)0xFFFF01FFFE01FF77 },
+               0xFFFF01FFFE01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_D, SAMD_SERIES_09,
                samd09_parts, ARRAY_SIZE(samd09_parts),
-               (uint64_t)0xFFFF01FFFE01FF77 },
+               0xFFFF01FFFE01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_D, SAMD_SERIES_10,
                samd10_parts, ARRAY_SIZE(samd10_parts),
-               (uint64_t)0xFFFF01FFFE01FF77 },
+               0xFFFF01FFFE01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_D, SAMD_SERIES_11,
                samd11_parts, ARRAY_SIZE(samd11_parts),
-               (uint64_t)0xFFFF01FFFE01FF77 },
+               0xFFFF01FFFE01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_L, SAMD_SERIES_21,
                saml21_parts, ARRAY_SIZE(saml21_parts),
-               (uint64_t)0xFFFF03FFFC01FF77 },
+               0xFFFF03FFFC01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_L, SAMD_SERIES_22,
                saml22_parts, ARRAY_SIZE(saml22_parts),
-               (uint64_t)0xFFFF03FFFC01FF77 },
+               0xFFFF03FFFC01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_C, SAMD_SERIES_20,
                samc20_parts, ARRAY_SIZE(samc20_parts),
-               (uint64_t)0xFFFF03FFFC01FF77 },
+               0xFFFF03FFFC01FF77ULL },
        { SAMD_PROCESSOR_M0, SAMD_FAMILY_C, SAMD_SERIES_21,
                samc21_parts, ARRAY_SIZE(samc21_parts),
-               (uint64_t)0xFFFF03FFFC01FF77 },
+               0xFFFF03FFFC01FF77ULL },
 };
 
 struct samd_info {

diff --git a/src/flash/nor/atsame5.c b/src/flash/nor/atsame5.c
index fdd610f5f38bcbeddd3131105f046c7b67f30381..c590081fcc7f575814f882cff9ada7e3a5158197 100644 (file)
--- a/src/flash/nor/atsame5.c
+++ b/src/flash/nor/atsame5.c
@@ -93,7 +93,7 @@
 #define SAMD_GET_DEVSEL(id) (id & 0xFF)
 
 /* Bits to mask user row */
-#define NVMUSERROW_SAM_E5_D5_MASK      ((uint64_t)0x7FFF00FF3C007FFF)
+#define NVMUSERROW_SAM_E5_D5_MASK      0x7FFF00FF3C007FFFULL
 
 struct samd_part {
        uint8_t id;