From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD0ABC678DB for ; Tue, 7 Mar 2023 10:23:22 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E767C857DF; Tue, 7 Mar 2023 11:22:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NHA8ZCWJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B9AE85C0F; Tue, 7 Mar 2023 11:22:08 +0100 (CET) Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B2DEF85B54 for ; Tue, 7 Mar 2023 11:21:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=dsankouski@gmail.com Received: by mail-wm1-x32e.google.com with SMTP id c18so7408758wmr.3 for ; Tue, 07 Mar 2023 02:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678184516; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5fIrtd4IDlM2zv88Zt7/qGxOJj8fqH9sNVcJ76lLEW4=; b=NHA8ZCWJpBEl1HPfAah/CanwuCeV64HiCdM9free76mdmy1WvP4bNKPrvDUUGeC/Eu 0myAEsGNbcEAXgVkGoKlE2E0rm4P634QG9meYVvA4zktINWFgTd80r+8hZUfc4bWs71h pgDzUjpWYy3XssA6ZVuvkr5lWKcE8JwZD+ghQS3OumloQbnrrCQkYFeAwO68pROnk3fw SHaqTPQVSi3dIKKm1NmuAlOkml5u0y94wvv9dTQ0kcLjTQGf18Hn9Rd13qnEx7HjkUR7 /3lDIVYxYV78AfafL0GTHUuBnKFSrd14NiSc5J5U9oQutZksIh8SjYQx54wqLv3jmDYh cCaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678184516; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5fIrtd4IDlM2zv88Zt7/qGxOJj8fqH9sNVcJ76lLEW4=; b=c5yjzUyLjuOhLxWiHQVoodnZmDUoRVmST6Wy+sBKFOKUvKU9OPC+STzNKHdRK5Jj9j ulzQHJHq3PLTlLDgcGaopDJlEsmjrvFdHZgD+isl6w6lHC+3f7CyUuqRgGlRgcAczWpA CQI42V9XxjpyjhLUL23lEDD7146XohOD8Ku91Eto9iO2g5op5RxygmRyBr52zVcg08Pb 4BFAhJCrF3+nUmS61gnO3kbYpleclKUFNo8ZaHBOvHiDBuUH6luWKeEYYpNjai2+MilI ZjW1qy0Quw5c/YgwkU6gp+ENQBsFoMGnLsMs7UQh04mRv5PiW0VIzwDReQOVO/LWlGbw Mu6Q== X-Gm-Message-State: AO0yUKVJUlFSGfknr6tJOO0YlHJ1rZrKyG1hCg7kBV5KAs9JAsG1gpyM g6mD7y5dvYuszkADEMtJ2cVEDM5nTmY= X-Google-Smtp-Source: AK7set8uzrbV8t9b+Fyre0oBytJOtRzVuTwNoLLucizFpYzhj2CPXdUNmguusN8zH5iLZ/mqUui4XQ== X-Received: by 2002:a05:600c:45d2:b0:3ea:e4f8:be09 with SMTP id s18-20020a05600c45d200b003eae4f8be09mr11728399wmo.30.1678184515957; Tue, 07 Mar 2023 02:21:55 -0800 (PST) Received: from debian.localdomain ([37.45.231.77]) by smtp.googlemail.com with ESMTPSA id d42-20020a05600c4c2a00b003e6efc0f91csm12306258wmp.42.2023.03.07.02.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 02:21:55 -0800 (PST) From: Dzmitry Sankouski To: U-Boot Mailing List Cc: Dzmitry Sankouski , Simon Glass Subject: [PATCH v8 10/10] video console: add 12x22 console simple font test Date: Tue, 7 Mar 2023 13:21:20 +0300 Message-Id: <20230307102121.1925581-11-dsankouski@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230307102121.1925581-1-dsankouski@gmail.com> References: <20230307102121.1925581-1-dsankouski@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Tests fonts wider than a byte. Signed-off-by: Dzmitry Sankouski Reviewed-by: Simon Glass --- Changes in v8: none Changes in v7: none Changes in v6: - rebase - move sandbox defconfig change to separate patch - run savedefconfig Changes in v5: N/A Changes in v4: N/A Changes in v2: N/A none test/dm/video.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/test/dm/video.c b/test/dm/video.c index 17a33cc7af..30778157d9 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -151,6 +151,8 @@ static int dm_test_video_text(struct unit_test_state *uts) ut_assertok(select_vidconsole(uts, "vidconsole0")); ut_assertok(video_get_nologo(uts, &dev)); + ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); + ut_assertok(vidconsole_select_font(con, "8x16", 0)); ut_asserteq(46, compress_frame_buffer(uts, dev)); ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); @@ -175,6 +177,42 @@ static int dm_test_video_text(struct unit_test_state *uts) } DM_TEST(dm_test_video_text, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); +static int dm_test_video_text_12x22(struct unit_test_state *uts) +{ + struct udevice *dev, *con; + int i; + +#define WHITE 0xffff +#define SCROLL_LINES 100 + + ut_assertok(select_vidconsole(uts, "vidconsole0")); + ut_assertok(video_get_nologo(uts, &dev)); + ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); + ut_assertok(vidconsole_select_font(con, "12x22", 0)); + ut_asserteq(46, compress_frame_buffer(uts, dev)); + + ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); + vidconsole_putc_xy(con, 0, 0, 'a'); + ut_asserteq(89, compress_frame_buffer(uts, dev)); + + vidconsole_putc_xy(con, 0, 0, ' '); + ut_asserteq(46, compress_frame_buffer(uts, dev)); + + for (i = 0; i < 20; i++) + vidconsole_putc_xy(con, VID_TO_POS(i * 8), 0, ' ' + i); + ut_asserteq(363, compress_frame_buffer(uts, dev)); + + vidconsole_set_row(con, 0, WHITE); + ut_asserteq(46, compress_frame_buffer(uts, dev)); + + for (i = 0; i < 20; i++) + vidconsole_putc_xy(con, VID_TO_POS(i * 8), 0, ' ' + i); + ut_asserteq(363, compress_frame_buffer(uts, dev)); + + return 0; +} +DM_TEST(dm_test_video_text_12x22, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); + /* Test handling of special characters in the console */ static int dm_test_video_chars(struct unit_test_state *uts) { @@ -184,6 +222,7 @@ static int dm_test_video_chars(struct unit_test_state *uts) ut_assertok(select_vidconsole(uts, "vidconsole0")); ut_assertok(video_get_nologo(uts, &dev)); ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); + ut_assertok(vidconsole_select_font(con, "8x16", 0)); vidconsole_put_string(con, test_string); ut_asserteq(466, compress_frame_buffer(uts, dev)); @@ -201,6 +240,7 @@ static int dm_test_video_ansi(struct unit_test_state *uts) ut_assertok(select_vidconsole(uts, "vidconsole0")); ut_assertok(video_get_nologo(uts, &dev)); ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); + ut_assertok(vidconsole_select_font(con, "8x16", 0)); /* reference clear: */ video_clear(con->parent); @@ -249,6 +289,7 @@ static int check_vidconsole_output(struct unit_test_state *uts, int rot, ut_assertok(video_get_nologo(uts, &dev)); ut_assertok(uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &con)); + ut_assertok(vidconsole_select_font(con, "8x16", 0)); ut_asserteq(46, compress_frame_buffer(uts, dev)); /* Check display wrap */ -- 2.30.2