d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add option for compiling in a 8x16 font.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1997-07-25 11:53:30 +00:00
parent 5d08f31126
commit 38d8a113a9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=27674
13 changed files with 76 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/Makefile.i386
View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.99 1997/05/31 17:59:56 peter Exp $
# $Id: Makefile.i386,v 1.100 1997/06/29 16:39:09 bde Exp $
#
# Makefile for FreeBSD
#
@ -20,6 +20,8 @@ BINFORMAT?= aout
#BINFORMAT?= aoutkld
#BINFORMAT?= elf
STD8X16FONT?= iso
.if exists(./@/.)
S= ./@
.else

4
sys/conf/Makefile.powerpc
View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.99 1997/05/31 17:59:56 peter Exp $
# $Id: Makefile.i386,v 1.100 1997/06/29 16:39:09 bde Exp $
#
# Makefile for FreeBSD
#
@ -20,6 +20,8 @@ BINFORMAT?= aout
#BINFORMAT?= aoutkld
#BINFORMAT?= elf
STD8X16FONT?= iso
.if exists(./@/.)
S= ./@
.else

4
sys/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.351 1997/07/17 06:01:10 dyson Exp $
# $Id: LINT,v 1.352 1997/07/20 05:27:59 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -636,6 +636,8 @@ options PCVT_SCANSET=2 # IBM keyboards are non-std
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
options MAXCONS=16 # number of virtual consoles
options SLOW_VGA # do byte-wide i/o's to TS and GDC regs
options "STD8X16FONT" # Compile font in
makeoptions "STD8X16FONT"="cp850"
#
# `flags' for sc0:

7
sys/conf/files.i386
View File

@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
# $Id: files.i386,v 1.1 1997/07/24 19:05:09 smp Exp smp $
# $Id: files.i386,v 1.167 1997/07/24 23:45:17 fsmp Exp $
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/*.[chyl]" \
@ -31,6 +31,11 @@ linux_assym.h optional compat_linux \
no-obj no-implicit-rule before-depend \
clean "linux_assym.h"
#
font8x16.o optional std8x16font \
compile-with "uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
no-implicit-rule before-depend \
clean "${STD8X16FONT}-8x16 font8x16.c"
#
i386/scsi/93cx6.c optional ahc device-driver
i386/apm/apm.c optional apm device-driver
i386/apm/apm_setup.s optional apm

3
sys/conf/options.i386
View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.49 1997/06/30 14:37:43 yokota Exp $
# $Id: options.i386,v 1.50 1997/07/13 15:26:54 bde Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
@ -72,6 +72,7 @@ I686_CPU opt_cpu.h
SC_SPLASH_SCREEN opt_syscons.h
MAXCONS opt_syscons.h
SLOW_VGA opt_syscons.h
STD8X16FONT opt_syscons.h
PSM_ACCEL opt_psm.h
PSM_EMULATION opt_psm.h

19
sys/dev/syscons/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $
* $Id: syscons.c,v 1.226 1997/07/20 14:10:13 bde Exp $
*/
#include "sc.h"
@ -119,10 +119,15 @@ static long scrn_time_stamp;
u_char scr_map[256];
u_char scr_rmap[256];
char *video_mode_ptr = NULL;
int fonts_loaded = 0;
int fonts_loaded = 0
#ifdef STD8X16FONT
| FONT_16
#endif
;
char font_8[256*8];
char font_14[256*14];
char font_16[256*16];
extern unsigned char font_16[256*16];
char palette[256*3];
static char vgaregs[64];
static char *cut_buffer;
@ -2696,8 +2701,12 @@ scinit(void)
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
if (fonts_loaded & FONT_16) {
copy_font(LOAD, FONT_16, font_16);
} else {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
}
save_palette();
set_destructive_cursor(console[0]);
}

4
sys/i386/conf/LINT
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.351 1997/07/17 06:01:10 dyson Exp $
# $Id: LINT,v 1.352 1997/07/20 05:27:59 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -636,6 +636,8 @@ options PCVT_SCANSET=2 # IBM keyboards are non-std
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
options MAXCONS=16 # number of virtual consoles
options SLOW_VGA # do byte-wide i/o's to TS and GDC regs
options "STD8X16FONT" # Compile font in
makeoptions "STD8X16FONT"="cp850"
#
# `flags' for sc0:

4
sys/i386/conf/Makefile.i386
View File

@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.99 1997/05/31 17:59:56 peter Exp $
# $Id: Makefile.i386,v 1.100 1997/06/29 16:39:09 bde Exp $
#
# Makefile for FreeBSD
#
@ -20,6 +20,8 @@ BINFORMAT?= aout
#BINFORMAT?= aoutkld
#BINFORMAT?= elf
STD8X16FONT?= iso
.if exists(./@/.)
S= ./@
.else

4
sys/i386/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.351 1997/07/17 06:01:10 dyson Exp $
# $Id: LINT,v 1.352 1997/07/20 05:27:59 bde Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -636,6 +636,8 @@ options PCVT_SCANSET=2 # IBM keyboards are non-std
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
options MAXCONS=16 # number of virtual consoles
options SLOW_VGA # do byte-wide i/o's to TS and GDC regs
options "STD8X16FONT" # Compile font in
makeoptions "STD8X16FONT"="cp850"
#
# `flags' for sc0:

7
sys/i386/conf/files.i386
View File

@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
# $Id: files.i386,v 1.1 1997/07/24 19:05:09 smp Exp smp $
# $Id: files.i386,v 1.167 1997/07/24 23:45:17 fsmp Exp $
#
aic7xxx_asm optional ahc device-driver \
dependency "$S/dev/aic7xxx/*.[chyl]" \
@ -31,6 +31,11 @@ linux_assym.h optional compat_linux \
no-obj no-implicit-rule before-depend \
clean "linux_assym.h"
#
font8x16.o optional std8x16font \
compile-with "uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
no-implicit-rule before-depend \
clean "${STD8X16FONT}-8x16 font8x16.c"
#
i386/scsi/93cx6.c optional ahc device-driver
i386/apm/apm.c optional apm device-driver
i386/apm/apm_setup.s optional apm

3
sys/i386/conf/options.i386
View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.49 1997/06/30 14:37:43 yokota Exp $
# $Id: options.i386,v 1.50 1997/07/13 15:26:54 bde Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
@ -72,6 +72,7 @@ I686_CPU opt_cpu.h
SC_SPLASH_SCREEN opt_syscons.h
MAXCONS opt_syscons.h
SLOW_VGA opt_syscons.h
STD8X16FONT opt_syscons.h
PSM_ACCEL opt_psm.h
PSM_EMULATION opt_psm.h

19
sys/i386/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $
* $Id: syscons.c,v 1.226 1997/07/20 14:10:13 bde Exp $
*/
#include "sc.h"
@ -119,10 +119,15 @@ static long scrn_time_stamp;
u_char scr_map[256];
u_char scr_rmap[256];
char *video_mode_ptr = NULL;
int fonts_loaded = 0;
int fonts_loaded = 0
#ifdef STD8X16FONT
| FONT_16
#endif
;
char font_8[256*8];
char font_14[256*14];
char font_16[256*16];
extern unsigned char font_16[256*16];
char palette[256*3];
static char vgaregs[64];
static char *cut_buffer;
@ -2696,8 +2701,12 @@ scinit(void)
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
if (fonts_loaded & FONT_16) {
copy_font(LOAD, FONT_16, font_16);
} else {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
}
save_palette();
set_destructive_cursor(console[0]);
}

19
sys/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.225 1997/07/15 14:43:22 yokota Exp $
* $Id: syscons.c,v 1.226 1997/07/20 14:10:13 bde Exp $
*/
#include "sc.h"
@ -119,10 +119,15 @@ static long scrn_time_stamp;
u_char scr_map[256];
u_char scr_rmap[256];
char *video_mode_ptr = NULL;
int fonts_loaded = 0;
int fonts_loaded = 0
#ifdef STD8X16FONT
| FONT_16
#endif
;
char font_8[256*8];
char font_14[256*14];
char font_16[256*16];
extern unsigned char font_16[256*16];
char palette[256*3];
static char vgaregs[64];
static char *cut_buffer;
@ -2696,8 +2701,12 @@ scinit(void)
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
if (fonts_loaded & FONT_16) {
copy_font(LOAD, FONT_16, font_16);
} else {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
}
save_palette();
set_destructive_cursor(console[0]);
}