dm: core: Create a new header file for 'compat' features

[oweals/u-boot.git] / test / dm / video.c

diff --git a/test/dm/video.c b/test/dm/video.c
index 2f7df4e61150b1766261ced8c5313993d789366c..f72979fac4ee895598acac4fc4917673ca85bc59 100644 (file)
--- a/test/dm/video.c
+++ b/test/dm/video.c
@@ -1,13 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2014 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <bzlib.h>
 #include <dm.h>
+#include <malloc.h>
 #include <mapmem.h>
 #include <os.h>
 #include <video.h>
@@ -98,14 +98,6 @@ static int select_vidconsole(struct unit_test_state *uts, const char *drv_name)
        return 0;
 }
 
-static void vidconsole_put_string(struct udevice *dev, const char *str)
-{
-       const char *s;
-
-       for (s = str; *s; s++)
-               vidconsole_put_char(dev, *s);
-}
-
 /* Test text output works on the video console */
 static int dm_test_video_text(struct unit_test_state *uts)
 {
@@ -170,7 +162,7 @@ static int dm_test_video_ansi(struct unit_test_state *uts)
 
        /* reference clear: */
        video_clear(con->parent);
-       video_sync(con->parent);
+       video_sync(con->parent, false);
        ut_asserteq(46, compress_frame_buffer(dev));
 
        /* test clear escape sequence: [2J */
@@ -179,12 +171,12 @@ static int dm_test_video_ansi(struct unit_test_state *uts)
 
        /* test set-cursor: [%d;%df */
        vidconsole_put_string(con, "abc"ANSI_ESC"[2;2fab"ANSI_ESC"[4;4fcd");
-       ut_asserteq(142, compress_frame_buffer(dev));
+       ut_asserteq(143, compress_frame_buffer(dev));
 
        /* test colors (30-37 fg color, 40-47 bg color) */
        vidconsole_put_string(con, ANSI_ESC"[30;41mfoo"); /* black on red */
        vidconsole_put_string(con, ANSI_ESC"[33;44mbar"); /* yellow on blue */
-       ut_asserteq(265, compress_frame_buffer(dev));
+       ut_asserteq(272, compress_frame_buffer(dev));
 
        return 0;
 }
@@ -336,7 +328,7 @@ static int dm_test_video_truetype(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev));
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_put_string(con, test_string);
-       ut_asserteq(12619, compress_frame_buffer(dev));
+       ut_asserteq(12237, compress_frame_buffer(dev));
 
        return 0;
 }
@@ -357,7 +349,7 @@ static int dm_test_video_truetype_scroll(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev));
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_put_string(con, test_string);
-       ut_asserteq(33849, compress_frame_buffer(dev));
+       ut_asserteq(35030, compress_frame_buffer(dev));
 
        return 0;
 }
@@ -378,7 +370,7 @@ static int dm_test_video_truetype_bs(struct unit_test_state *uts)
        ut_assertok(uclass_get_device(UCLASS_VIDEO, 0, &dev));
        ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con));
        vidconsole_put_string(con, test_string);
-       ut_asserteq(34871, compress_frame_buffer(dev));
+       ut_asserteq(29018, compress_frame_buffer(dev));
 
        return 0;
 }