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

core/include: Don't use 64 bit for MHZ & MiB macros

Browse Source 
Those macros are all about convenience. However, always using 64 bit makes casts
nececcary that goes against the idea of having a convenience macro.

E.g. when printing a frequency in KHZ one might want to do

	printf("freq: %lu kHz\n", freq / KHZ(1));

leads to an error

> error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'long long unsigned int'

Now we would have to cast - `%llu` is not available with newlib-nano and wholly
uneccecary.

Only use 64 bit artithmetic where necessary (GHZ, GiB), not for smaller units.
This commit is contained in:
Benjamin Valentin 2020-06-16 13:33:40 +02:00 committed by Benjamin Valentin
parent 52fd00dc22
commit 0862a3c512
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
*/
#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
@ -36,17 +36,22 @@
/**
* @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
*/
#define KHZ(x) ((x) * 1000ULL)
#define KHZ(x) ((x) * 1000UL)
/**
* @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
}