summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2019-12-19 07:47:52 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-12-20 17:49:29 +0000
commitba9b504ec5d8bc42f56cb085749c1296b1291ba9 (patch)
treee8a52663d7b6add1437fe474986e88e5f90d53d4 /src/lib
parent361a935332489c635192b39204c7ec7af1667c8f (diff)
src: Replace min/max() with MIN/MAX()
Change-Id: I63b95144f2022685c60a1bd6de5af3c1f059992e Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37828 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/edid.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/edid.c b/src/lib/edid.c
index fd7f5ba252..4a2f07ae3e 100644
--- a/src/lib/edid.c
+++ b/src/lib/edid.c
@@ -29,12 +29,12 @@
*/
#include <assert.h>
+#include <commonlib/helpers.h>
#include <stddef.h>
#include <console/console.h>
#include <ctype.h>
#include <stdint.h>
#include <string.h>
-#include <stdlib.h>
#include <edid.h>
#include <vbe.h>
@@ -178,7 +178,7 @@ extract_string(unsigned char *x, int *valid_termination, int len)
memset(ret, 0, sizeof(ret));
- for (i = 0; i < min(len, EDID_ASCII_STRING_LENGTH); i++) {
+ for (i = 0; i < MIN(len, EDID_ASCII_STRING_LENGTH); i++) {
if (seen_newline) {
if (x[i] != 0x20) {
*valid_termination = 0;
@@ -1691,7 +1691,7 @@ void edid_set_framebuffer_bits_per_pixel(struct edid *edid, int fb_bpp,
{
/* Caller should pass a supported value, everything else is BUG(). */
assert(fb_bpp == 32 || fb_bpp == 24 || fb_bpp == 16);
- row_byte_alignment = max(row_byte_alignment, 1);
+ row_byte_alignment = MAX(row_byte_alignment, 1);
edid->framebuffer_bits_per_pixel = fb_bpp;
edid->bytes_per_line = ALIGN_UP(edid->mode.ha *