From nobody Wed Feb 5 13:00:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=koconnor.net Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1711986936714185.4601073309151; Mon, 1 Apr 2024 08:55:36 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 55B3E22944; Mon, 1 Apr 2024 15:55:31 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 94D6621C45 for ; Mon, 1 Apr 2024 15:54:27 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) for ; Mon, 01 Apr 2024 08:54:27 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by smtp.gmail.com with ESMTPSA id a2-20020a056214062200b006967ba7f1adsm4616915qvx.96.2024.04.01.08.54.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 08:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=koconnor.net; s=google; t=1711986866; x=1712591666; darn=seabios.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ck8cJbn+o3SJsuCnl5T4bzWz/DOT6jjVVvfjF1ZdKKo=; b=V/vgf6WwG5AmP56ieliEchI5yewx5Ub39+IXt7Fxcfnm8sy/9jbj+c4QPCtRhLFaiq nXw8mDMJIx7UQHwjxXVkTfUwORRQCHMmySSv0MJ7FIUOVR6dvhXs/OtfO9OyY4qgmZXi FcjwUnoOdK/iYuC2y2JxH52ySgQvKnWMa2VGQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711986866; x=1712591666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ck8cJbn+o3SJsuCnl5T4bzWz/DOT6jjVVvfjF1ZdKKo=; b=d7qu7UvnB9qTIG7P4hIQ9GWVFZVluYrfcfpgGz+ci5GcdkK9Bt4OFVm6wFy2U2XSAI g3GGNyuaD/4gyZVlpS8godcCNgg05mHKxobmS8iGCLGj+9TBUs3jR3ryrJbFtbOnmEzG 4+xUZMT2eqbv93vSwWG1Kddiv/3BotxBa4/E2p8L9wQcPSewt00BIfAnKhxlvxJ8UVoD 6ipPVcOgZJ2yVFTasMKOD1kxockp5iWOjUsCgBofffOaI4UU1I0dyJadmA1OAG/w18eE piL9T5WC/zTKJGxwnUE5lQqWGK1tE7F6/S+55vk9BY+fwQq+zyMh77BouaZtZ8MNUQdl ecEg== X-Gm-Message-State: AOJu0YwV2FvxG84PVcwVFEnvkdUbOfBW4rb4U2XmRVUO+iVx/yuYWHlD Sk2vPLeONm397htsGL2H26Ms6TbvkMpOPR5klVVRhsANQcqpHOsd2Kk6fOIHcIaID/FJbfhMgUC S X-Google-Smtp-Source: AGHT+IERy2CEjPvwouXL+1esSkBzBHI36MzMz/ZwyHAtsZ/oE/2jsYTdUSNrRaPIkA83ACT/IaLWHA== X-Received: by 2002:a05:6214:247:b0:696:7565:b058 with SMTP id k7-20020a056214024700b006967565b058mr8819259qvt.0.1711986866377; Mon, 01 Apr 2024 08:54:26 -0700 (PDT) From: Kevin O'Connor To: seabios@seabios.org Date: Mon, 1 Apr 2024 11:51:25 -0400 Message-ID: <20240401155420.880666-4-kevin@koconnor.net> In-Reply-To: <20240401155420.880666-1-kevin@koconnor.net> References: <20240401155420.880666-1-kevin@koconnor.net> MIME-Version: 1.0 X-Spam-Level: ** Message-ID-Hash: JSKUBAISUNPXWZQM6FZ2KKDLMGVSXXHH X-Message-ID-Hash: JSKUBAISUNPXWZQM6FZ2KKDLMGVSXXHH X-MailFrom: kevin@koconnor.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.6b1 Precedence: list Subject: [SeaBIOS] [PATCH 3/9] stdvga: Rename CGA palette functions List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: --- X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1711986937937100001 Content-Type: text/plain; charset="utf-8" Rename stdvga_set_border_color() to stdvga_set_cga_background_color() and stdvga_set_palette() to stdvga_set_cga_palette(). These functions implement compatibility for old CGA cards - rename them so they are not confused with the functions that manipulte the VGA palette. Signed-off-by: Kevin O'Connor Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- vgasrc/stdvga.c | 23 ++++++++++++++--------- vgasrc/stdvga.h | 4 ++-- vgasrc/vgabios.c | 4 ++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c index da67af4..eac0357 100644 --- a/vgasrc/stdvga.c +++ b/vgasrc/stdvga.c @@ -18,19 +18,32 @@ * Attribute control ****************************************************************/ =20 +// Emulate CGA background setting via VGA palette index registers void -stdvga_set_border_color(u8 color) +stdvga_set_cga_background_color(u8 color) { + // Set the background color (via palette index 0) u8 v1 =3D color & 0x0f; if (v1 & 0x08) v1 +=3D 0x08; stdvga_attr_write(0x00, v1); =20 + // Dim/brighten foreground (see pal_cga[] in stdvgamodes.c) int i; for (i =3D 1; i < 4; i++) stdvga_attr_mask(i, 0x10, color & 0x10); } =20 +// Emulate CGA palette setting by altering VGA palette index registers +void +stdvga_set_cga_palette(u8 palid) +{ + // Switch foreground colors (see pal_cga[] in stdvgamodes.c) + int i; + for (i =3D 1; i < 4; i++) + stdvga_attr_mask(i, 0x01, palid & 0x01); +} + void stdvga_set_overscan_border_color(u8 color) { @@ -43,14 +56,6 @@ stdvga_get_overscan_border_color(void) return stdvga_attr_read(0x11); } =20 -void -stdvga_set_palette(u8 palid) -{ - int i; - for (i =3D 1; i < 4; i++) - stdvga_attr_mask(i, 0x01, palid & 0x01); -} - void stdvga_set_all_palette_reg(u16 seg, u8 *data_far) { diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h index ce79783..a2375c7 100644 --- a/vgasrc/stdvga.h +++ b/vgasrc/stdvga.h @@ -45,10 +45,10 @@ #define SEG_MTEXT 0xB000 =20 // stdvga.c -void stdvga_set_border_color(u8 color); +void stdvga_set_cga_background_color(u8 color); +void stdvga_set_cga_palette(u8 palid); void stdvga_set_overscan_border_color(u8 color); u8 stdvga_get_overscan_border_color(void); -void stdvga_set_palette(u8 palid); void stdvga_set_all_palette_reg(u16 seg, u8 *data_far); void stdvga_get_all_palette_reg(u16 seg, u8 *data_far); void stdvga_toggle_intensity(u8 flag); diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 2ca8c3d..d522f83 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -457,13 +457,13 @@ handle_100a(struct bregs *regs) static void handle_100b00(struct bregs *regs) { - stdvga_set_border_color(regs->bl); + stdvga_set_cga_background_color(regs->bl); } =20 static void handle_100b01(struct bregs *regs) { - stdvga_set_palette(regs->bl); + stdvga_set_cga_palette(regs->bl); } =20 static void --=20 2.44.0 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org