From nobody Tue Dec 14 22:28:03 2021
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 86A5A18F591E;
Tue, 14 Dec 2021 22:28:04 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4JDCgl4gQtz4cdp;
Tue, 14 Dec 2021 22:28:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A9DD10E62;
Tue, 14 Dec 2021 22:28:03 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BEMS35H051192;
Tue, 14 Dec 2021 22:28:03 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEMS30n051191;
Tue, 14 Dec 2021 22:28:03 GMT
(envelope-from git)
Date: Tue, 14 Dec 2021 22:28:03 GMT
Message-Id: <202112142228.1BEMS30n051191@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 91d462192db0 - main - loader: move all gfx_fb.c stubs to common/gfx_fb_stub.c
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 91d462192db0dc33dbc4ca38f2b24d74c5ea2987
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1639520883;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=fjSyj4VsEAGtzeMDhAz8z1tfcCO9bVxA+3JIBIH8zUQ=;
b=Qf1hVWvfOZVBZvKIIkurLIwEBtSGmXLwQoSnlR/LwxHgyCHAP9ABY9Hk5NavPEmLcpsjYX
zXQPK3NdbT94wkGb1JCv5yQPCoIwbon+OA5lP2NHJO/Ul50Dra+1aMmNDL64C29eISBMU6
DbGljM0yu0B3WqqVuFQ6DCu4T6a8UOnVsC8jXEJjdeETD/8QuJob+8WzvfzBmW59nf/2pJ
fFY3JGsWJ6dw7CWjY4sGZvtvWdKxx0lml2Z3aQd1tTszY4+igTu9v3LUVdHREOlCVFhxBv
C+Fm5d0qNhkSUJm0pPkAqBT3YI7E7TakkRmphir3VcGeGNKxDf9G5sTqFg3RCQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639520883; a=rsa-sha256; cv=none;
b=uSn2Xd++DuatjxY4UYj0HIwdgWwbHP8M/tYd07EjmmNju3S4wPlHkpv8kTtmnUnXnlHBF+
Xa7eX9+d/s10LbCAc47j/w7gpAB3ejaTKcXNrX6x2cMTdVOa6wpjnVS3UyAWRpN0r3pKbR
3DMy/Ukfz1+VXPjGXbcnjitEAaT3+DzifYwBc+P1RZtDrafhkkPmU68IEYgtI8xDOf7In6
+8d74KRKF4qwvv+vuzb+bTmyogneWDSv/ofIbZeER7RW2K8ERCvs1uRLsxKUiam4gC8rql
7BcPPg1226tDwSz274b65zROCwSykUsV8T5Q5WkqZhXQFmDZY2EZV1fbBn89lQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=91d462192db0dc33dbc4ca38f2b24d74c5ea2987
commit 91d462192db0dc33dbc4ca38f2b24d74c5ea2987
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-12-14 21:39:12 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-12-14 22:27:47 +0000
loader: move all gfx_fb.c stubs to common/gfx_fb_stub.c
All these files are the same, modulo one comment. Move them all into
common/gfx_fb_stub.c and adjust Makefiles accordingly.
Sponsored by: Netflix
Reviewed by: manu
Differential Revision: https://reviews.freebsd.org/D33428
---
stand/{uboot/lib/gfx_fb.c => common/gfx_fb_stub.c} | 2 +-
stand/powerpc/kboot/Makefile | 5 +-
stand/powerpc/kboot/gfx_fb.c | 78 ----------------------
stand/powerpc/ofw/Makefile | 5 +-
stand/powerpc/ofw/gfx_fb.c | 78 ----------------------
stand/uboot/lib/Makefile | 5 +-
stand/userboot/userboot/Makefile | 4 +-
stand/userboot/userboot/gfx_fb.c | 78 ----------------------
8 files changed, 9 insertions(+), 246 deletions(-)
diff --git a/stand/uboot/lib/gfx_fb.c b/stand/common/gfx_fb_stub.c
similarity index 98%
rename from stand/uboot/lib/gfx_fb.c
rename to stand/common/gfx_fb_stub.c
index e2d3204da7b9..e212bd2daa12 100644
--- a/stand/uboot/lib/gfx_fb.c
+++ b/stand/common/gfx_fb_stub.c
@@ -28,7 +28,7 @@
__FBSDID("$FreeBSD$");
/*
- * U-Boot-specific gfx stubs.
+ * Generic gfx stubs.
*/
#include <sys/types.h>
diff --git a/stand/powerpc/kboot/Makefile b/stand/powerpc/kboot/Makefile
index a5e43ab6fdaa..46bcc3d0e63a 100644
--- a/stand/powerpc/kboot/Makefile
+++ b/stand/powerpc/kboot/Makefile
@@ -19,10 +19,9 @@ INSTALLFLAGS= -b
# Architecture-specific loader code
SRCS= conf.c vers.c main.c ppc64_elf_freebsd.c
SRCS+= host_syscall.S hostcons.c hostdisk.c kerneltramp.S kbootfdt.c
-SRCS+= ucmpdi2.c gfx_fb.c
+SRCS+= ucmpdi2.c gfx_fb_stub.c
-CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite
-CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/teken
+CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
.include "${BOOTSRC}/fdt.mk"
diff --git a/stand/powerpc/kboot/gfx_fb.c b/stand/powerpc/kboot/gfx_fb.c
deleted file mode 100644
index 318e45225e06..000000000000
--- a/stand/powerpc/kboot/gfx_fb.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright 2021 Toomas Soome <tsoome@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * powerpc specific gfx stubs.
- */
-
-#include <sys/types.h>
-#include <pnglite.h>
-#include "bootstrap.h"
-#include "gfx_fb.h"
-
-font_list_t fonts = STAILQ_HEAD_INITIALIZER(fonts);
-teken_gfx_t gfx_state = { 0 };
-
-void
-gfx_fb_setpixel(uint32_t x __unused, uint32_t y __unused)
-{
-}
-
-void
-gfx_fb_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
- uint32_t x2 __unused, uint32_t y2 __unused, uint32_t fill __unused)
-{
-}
-
-void
-gfx_term_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
- uint32_t x2 __unused, uint32_t y2 __unused)
-{
-}
-
-void
-gfx_fb_line(uint32_t x0 __unused, uint32_t y0 __unused,
- uint32_t x1 __unused, uint32_t y1 __unused, uint32_t w __unused)
-{
-}
-
-void
-gfx_fb_bezier(uint32_t x0 __unused, uint32_t y0 __unused,
- uint32_t x1 __unused, uint32_t y1 __unused, uint32_t x2 __unused,
- uint32_t y2 __unused, uint32_t w __unused)
-{
-}
-
-int
-gfx_fb_putimage(png_t *png __unused, uint32_t ux1 __unused,
- uint32_t uy1 __unused, uint32_t ux2 __unused, uint32_t uy2 __unused,
- uint32_t flags __unused)
-{
- return (1);
-}
diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
index 03844301f094..28eb8ee91fad 100644
--- a/stand/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
@@ -18,10 +18,9 @@ INSTALLFLAGS= -b
# Architecture-specific loader code
SRCS= conf.c vers.c main.c elf_freebsd.c ppc64_elf_freebsd.c start.c
-SRCS+= ucmpdi2.c gfx_fb.c
+SRCS+= ucmpdi2.c gfx_fb_stub.c
-CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite
-CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/teken
+CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
.include "${BOOTSRC}/fdt.mk"
.if ${MK_FDT} == "yes"
diff --git a/stand/powerpc/ofw/gfx_fb.c b/stand/powerpc/ofw/gfx_fb.c
deleted file mode 100644
index 318e45225e06..000000000000
--- a/stand/powerpc/ofw/gfx_fb.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright 2021 Toomas Soome <tsoome@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * powerpc specific gfx stubs.
- */
-
-#include <sys/types.h>
-#include <pnglite.h>
-#include "bootstrap.h"
-#include "gfx_fb.h"
-
-font_list_t fonts = STAILQ_HEAD_INITIALIZER(fonts);
-teken_gfx_t gfx_state = { 0 };
-
-void
-gfx_fb_setpixel(uint32_t x __unused, uint32_t y __unused)
-{
-}
-
-void
-gfx_fb_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
- uint32_t x2 __unused, uint32_t y2 __unused, uint32_t fill __unused)
-{
-}
-
-void
-gfx_term_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
- uint32_t x2 __unused, uint32_t y2 __unused)
-{
-}
-
-void
-gfx_fb_line(uint32_t x0 __unused, uint32_t y0 __unused,
- uint32_t x1 __unused, uint32_t y1 __unused, uint32_t w __unused)
-{
-}
-
-void
-gfx_fb_bezier(uint32_t x0 __unused, uint32_t y0 __unused,
- uint32_t x1 __unused, uint32_t y1 __unused, uint32_t x2 __unused,
- uint32_t y2 __unused, uint32_t w __unused)
-{
-}
-
-int
-gfx_fb_putimage(png_t *png __unused, uint32_t ux1 __unused,
- uint32_t uy1 __unused, uint32_t ux2 __unused, uint32_t uy2 __unused,
- uint32_t flags __unused)
-{
- return (1);
-}
diff --git a/stand/uboot/lib/Makefile b/stand/uboot/lib/Makefile
index 448188c93058..e5d35de59ffd 100644
--- a/stand/uboot/lib/Makefile
+++ b/stand/uboot/lib/Makefile
@@ -8,10 +8,9 @@ LIB= uboot
WARNS?= 2
SRCS= console.c copy.c devicename.c elf_freebsd.c glue.c
-SRCS+= module.c net.c reboot.c time.c gfx_fb.c
+SRCS+= module.c net.c reboot.c time.c gfx_fb_stub.c
-CFLAGS.gfx_fb.c += -I${SRCTOP}/contrib/pnglite
-CFLAGS.gfx_fb.c += -I${SRCTOP}/sys/teken
+CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
CFLAGS.glue.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib
.if ${LOADER_DISK_SUPPORT:Uyes} == "yes"
diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
index 60fcf57d9697..c5e2e6fe7c7c 100644
--- a/stand/userboot/userboot/Makefile
+++ b/stand/userboot/userboot/Makefile
@@ -32,15 +32,15 @@ SRCS+= main.c
SRCS+= userboot_cons.c
SRCS+= userboot_disk.c
SRCS+= vers.c
-SRCS+= gfx_fb.c
+SRCS+= gfx_fb_stub.c
CFLAGS+= -Wall
CFLAGS+= -I${BOOTSRC}/userboot
CFLAGS.main.c+= -I${BOOTSRC}/libsa/zfs
CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include
CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
-CFLAGS.gfx_fb.c+= -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite
CWARNFLAGS.main.c += -Wno-implicit-function-declaration
+CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken
NEWVERSWHAT= "User boot ${LOADER_INTERP}" ${MACHINE_CPUARCH}
VERSION_FILE= ${.CURDIR}/../userboot/version
diff --git a/stand/userboot/userboot/gfx_fb.c b/stand/userboot/userboot/gfx_fb.c
deleted file mode 100644
index aef61814569a..000000000000
--- a/stand/userboot/userboot/gfx_fb.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright 2021 Toomas Soome <tsoome@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * userboot-specific gfx stubs.
- */
-
-#include <sys/types.h>
-#include <pnglite.h>
-#include "bootstrap.h"
-#include "gfx_fb.h"
-
-font_list_t fonts = STAILQ_HEAD_INITIALIZER(fonts);
-teken_gfx_t gfx_state = { 0 };
-
-void
-gfx_fb_setpixel(uint32_t x __unused, uint32_t y __unused)
-{
-}
-
-void
-gfx_fb_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
- uint32_t x2 __unused, uint32_t y2 __unused, uint32_t fill __unused)
-{
-}
-
-void
-gfx_term_drawrect(uint32_t x1 __unused, uint32_t y1 __unused,
- uint32_t x2 __unused, uint32_t y2 __unused)
-{
-}
-
-void
-gfx_fb_line(uint32_t x0 __unused, uint32_t y0 __unused,
- uint32_t x1 __unused, uint32_t y1 __unused, uint32_t w __unused)
-{
-}
-
-void
-gfx_fb_bezier(uint32_t x0 __unused, uint32_t y0 __unused,
- uint32_t x1 __unused, uint32_t y1 __unused, uint32_t x2 __unused,
- uint32_t y2 __unused, uint32_t w __unused)
-{
-}
-
-int
-gfx_fb_putimage(png_t *png __unused, uint32_t ux1 __unused,
- uint32_t uy1 __unused, uint32_t ux2 __unused, uint32_t uy2 __unused,
- uint32_t flags __unused)
-{
- return (1);
-}