repo-copy the source files from modules/syscons to the normal tree - src

diff options


context:
space:
mode:

author	Peter Wemm <peter@FreeBSD.org>	2001-08-09 00:02:30 +0000
committer	Peter Wemm <peter@FreeBSD.org>	2001-08-09 00:02:30 +0000
commit	20d6258defd680c8215331b88adee84abdf42f83 (patch)
tree	41e7ba73abde4357fbab83bd3bee81283530e6bc /sys/dev/syscons
parent	4f06748fd6951c6d381d29e0fda78103ebabec70 (diff)

Notes

Diffstat (limited to 'sys/dev/syscons')

-rw-r--r--

sys/dev/syscons/logo/logo.c

-rw-r--r--

sys/dev/syscons/logo/logo_saver.c

2 files changed, 13 insertions, 5 deletions

diff --git a/sys/dev/syscons/logo/logo.c b/sys/dev/syscons/logo/logo.c
index 0c122ad9012f..ea3f46e5c3a7 100644
--- a/sys/dev/syscons/logo/logo.c
+++ b/sys/dev/syscons/logo/logo.c

@@ -1,7 +1,10 @@

/* $FreeBSD$ */

-#define logo_w 88

-#define logo_h 88

+#define logo_width 88

+#define logo_height 88

+unsigned int logo_w = logo_width;

+unsigned int logo_h = logo_height;

unsigned char logo_pal[768] = {

0x00, 0x00, 0x00,

@@ -262,7 +265,7 @@ unsigned char logo_pal[768] = {

0x00, 0x00, 0x00,

};

-unsigned char logo_img[logo_w*logo_h] = {

+unsigned char logo_img[logo_width*logo_height] = {

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

@@ -352,3 +355,4 @@ unsigned char logo_img[logo_w*logo_h] = {

};

+unsigned int logo_img_size = sizeof(logo_img);

diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 2d2c660847ac..0961cb61bc01 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c

@@ -44,7 +44,11 @@ static u_char *vid;

static int banksize, scrmode, bpsl, scrw, scrh;

static int blanked;

-#include "logo.c"

+extern unsigned int logo_w;

+extern unsigned int logo_h;

+extern unsigned char logo_pal[];

+extern unsigned char logo_img[];

+extern unsigned int logo_img_size;

static void

logo_blit(video_adapter_t *adp, int x, int y)

@@ -55,7 +59,7 @@ logo_blit(video_adapter_t *adp, int x, int y)

o += banksize;

set_origin(adp, o);

- for (d = 0; d < sizeof logo_img; d += logo_w) {

+ for (d = 0; d < logo_img_size; d += logo_w) {

if (p + logo_w < banksize) {

bcopy(logo_img + d, vid + p, logo_w);

p += bpsl;