riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14295 from benpicco/core/include/macros/units_convenience

Browse Source 
core/include: don't use 64 bit for MHZ & MiB macros
This commit is contained in:
benpicco 2020-06-17 15:01:44 +02:00 committed by GitHub
commit 7ea26cb118
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/include/macros/units.h
View File

@ -26,7 +26,7 @@
/** /**
* @brief A macro to return the bytes in x KiB * @brief A macro to return the bytes in x KiB
*/ */
#define KiB(x) ((unsigned long long)(x) << 10) #define KiB(x) ((unsigned long)(x) << 10)
/** /**
* @brief A macro to return the bytes in x MiB * @brief A macro to return the bytes in x MiB
@ -36,17 +36,22 @@
/** /**
* @brief A macro to return the bytes in x GiB * @brief A macro to return the bytes in x GiB
*/ */
#define GiB(x) (MiB(x) << 10) #define GiB(x) ((unsigned long long)MiB(x) << 10)
/** /**
* @brief A macro to return the Hz in x kHz * @brief A macro to return the Hz in x kHz
*/ */
#define KHZ(x) ((x) * 1000ULL) #define KHZ(x) ((x) * 1000UL)
/** /**
* @brief A macro to return the Hz in x MHz * @brief A macro to return the Hz in x MHz
*/ */
#define MHZ(x) (KHZ(x) * 1000ULL) #define MHZ(x) (KHZ(x) * 1000UL)
/**
* @brief A macro to return the Hz in x GHz
*/
#define GHZ(x) (MHZ(x) * 1000ULL)
#ifdef __cplusplus #ifdef __cplusplus
} }