From 663427b303f3da2b738559a73896e18b3bc8dfd5 Mon Sep 17 00:00:00 2001 From: Petr Ledvina Date: Mon, 9 Dec 2024 15:52:30 +0100 Subject: [PATCH] OSD - fix macro arguments (#14074) --- src/main/osd/osd.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/osd/osd.h b/src/main/osd/osd.h index fd37957750..c7cfbc19d5 100644 --- a/src/main/osd/osd.h +++ b/src/main/osd/osd.h @@ -74,11 +74,13 @@ extern const char * const osdTimerSourceNames[OSD_NUM_TIMER_TYPES]; #define OSD_POSITION_XHD_MASK (1 << OSD_POSITION_BIT_XHD) #define OSD_POSITION_XY_MASK ((1 << OSD_POSITION_BITS) - 1) #define OSD_TYPE_MASK 0xC000 // bits 14-15 -#define OSD_POS(x,y) ((x & OSD_POSITION_XY_MASK) | ((x << (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS)) & OSD_POSITION_XHD_MASK) | \ - ((y & OSD_POSITION_XY_MASK) << OSD_POSITION_BITS)) -#define OSD_X(x) ((x & OSD_POSITION_XY_MASK) | ((x & OSD_POSITION_XHD_MASK) >> (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS))) -#define OSD_Y(x) ((x >> OSD_POSITION_BITS) & OSD_POSITION_XY_MASK) -#define OSD_TYPE(x) ((x & OSD_TYPE_MASK) >> 14) +#define OSD_POS(x, y) (((x) & OSD_POSITION_XY_MASK) \ + | (((x) << (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS)) & OSD_POSITION_XHD_MASK) \ + | (((y) & OSD_POSITION_XY_MASK) << OSD_POSITION_BITS)) \ + /**/ +#define OSD_X(x) (((x) & OSD_POSITION_XY_MASK) | (((x) & OSD_POSITION_XHD_MASK) >> (OSD_POSITION_BIT_XHD - OSD_POSITION_BITS))) +#define OSD_Y(x) (((x) >> OSD_POSITION_BITS) & OSD_POSITION_XY_MASK) +#define OSD_TYPE(x) (((x) & OSD_TYPE_MASK) >> 14) #define OSD_SD_COLS VIDEO_COLUMNS_SD #define OSD_SD_ROWS VIDEO_LINES_PAL