upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-21 22:27:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

loader: move all gfx_fb.c stubs to common/gfx_fb_stub.c

Browse source 
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
This commit is contained in:
Warner Losh 2021-12-14 14:39:12 -07:00
parent aaaa5a2e68
commit 91d462192d
8 changed files with 9 additions and 246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stand/uboot/lib/gfx_fb.c → stand/common/gfx_fb_stub.c
View file

@ -28,7 +28,7 @@
__FBSDID("$FreeBSD$");
/*
* U-Boot-specific gfx stubs.
* Generic gfx stubs.
*/
#include <sys/types.h>

5
stand/powerpc/kboot/Makefile
View file

@ -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"

78
stand/powerpc/kboot/gfx_fb.c
View file

@ -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);
}

5
stand/powerpc/ofw/Makefile
View file

@ -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"

78
stand/powerpc/ofw/gfx_fb.c
View file

@ -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);
}

5
stand/uboot/lib/Makefile
View file

@ -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"

4
stand/userboot/userboot/Makefile
View file

@ -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

78
stand/userboot/userboot/gfx_fb.c
View file

@ -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);
}