mirror of
https://github.com/opnsense/src.git
synced 2026-06-08 16:22:46 -04:00
MFC: revision 201339 and 201340
- Add setting machine type support to the loader. - Don't use 15M-16M area on pc98. It's reserved for some devices.
This commit is contained in:
Yoshihiro Takahashi
parent
ad9bb0898d
commit
cf83985263
6 changed files with 132 additions and 2 deletions
|
|
@ -351,6 +351,9 @@ file_loadraw(char *type, char *name)
|
|||
char *cp;
|
||||
int fd, got;
|
||||
vm_offset_t laddr;
|
||||
#ifdef PC98
|
||||
struct stat st;
|
||||
#endif
|
||||
|
||||
/* We can't load first */
|
||||
if ((file_findfile(NULL, NULL)) == NULL) {
|
||||
|
|
@ -372,6 +375,14 @@ file_loadraw(char *type, char *name)
|
|||
return(CMD_ERROR);
|
||||
}
|
||||
|
||||
#ifdef PC98
|
||||
/* We cannot use 15M-16M area on pc98. */
|
||||
if (loadaddr < 0x1000000 &&
|
||||
fstat(fd, &st) == 0 &&
|
||||
(st.st_size == -1 || loadaddr + st.st_size > 0xf00000))
|
||||
loadaddr = 0x1000000;
|
||||
#endif
|
||||
|
||||
laddr = loadaddr;
|
||||
for (;;) {
|
||||
/* read in 4k chunks; size is not really important */
|
||||
|
|
@ -477,6 +488,14 @@ mod_loadkld(const char *kldname, int argc, char *argv[])
|
|||
;
|
||||
|
||||
do {
|
||||
#ifdef PC98
|
||||
/* We cannot use 15M-16M area on pc98. */
|
||||
struct stat st;
|
||||
if (loadaddr < 0x1000000 &&
|
||||
stat(filename, &st) == 0 &&
|
||||
(st.st_size == -1 || loadaddr + st.st_size > 0xf00000))
|
||||
loadaddr = 0x1000000;
|
||||
#endif
|
||||
err = file_load(filename, loadaddr, &fp);
|
||||
if (err)
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ BINDIR?= /boot
|
|||
LOADER_ADDRESS?=0x200000
|
||||
CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \
|
||||
-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
|
||||
-Os
|
||||
-Os -DPC98
|
||||
LDFLAGS+= -nostdlib
|
||||
|
||||
# BTX components
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ INTERNALLIB=
|
|||
SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c \
|
||||
biospci.c biossmap.c bootinfo.c bootinfo32.c \
|
||||
comconsole.c devicename.c elf32_freebsd.c \
|
||||
i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
|
||||
i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \
|
||||
time.c vidconsole.c
|
||||
|
||||
# Enable PXE TFTP or NFS support, not both.
|
||||
|
|
|
|||
29
sys/boot/pc98/libpc98/libpc98.h
Normal file
29
sys/boot/pc98/libpc98/libpc98.h
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/*-
|
||||
* Copyright (c) 2009 TAKAHASHI Yoshihiro <nyan@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.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
void set_machine_type(void);
|
||||
78
sys/boot/pc98/libpc98/pc98_sys.c
Normal file
78
sys/boot/pc98/libpc98/pc98_sys.c
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
/*-
|
||||
* Copyright (c) 2009 TAKAHASHI Yoshihiro <nyan@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$");
|
||||
|
||||
#include <btxv86.h>
|
||||
#include <machine/cpufunc.h>
|
||||
#define _KERNEL
|
||||
#include <pc98/pc98/pc98_machdep.h>
|
||||
|
||||
/*
|
||||
* Set machine type to PC98_SYSTEM_PARAMETER.
|
||||
*/
|
||||
void
|
||||
set_machine_type(void)
|
||||
{
|
||||
int i;
|
||||
u_long ret, data;
|
||||
|
||||
/* PC98_SYSTEM_PARAMETER (0x501) */
|
||||
ret = ((*(u_char *)PTOV(0xA1501)) & 0x08) >> 3;
|
||||
|
||||
/* Wait V-SYNC */
|
||||
while (inb(0x60) & 0x20) {}
|
||||
while (!(inb(0x60) & 0x20)) {}
|
||||
|
||||
/* ANK 'A' font */
|
||||
outb(0xa1, 0x00);
|
||||
outb(0xa3, 0x41);
|
||||
|
||||
/* M_NORMAL, use CG window (all NEC OK) */
|
||||
for (i = data = 0; i < 4; i++)
|
||||
data += *((u_long *)PTOV(0xA4000) + i); /* 0xa4000 */
|
||||
if (data == 0x6efc58fc) /* DA data */
|
||||
ret |= M_NEC_PC98;
|
||||
else
|
||||
ret |= M_EPSON_PC98;
|
||||
ret |= (inb(0x42) & 0x20) ? M_8M : 0;
|
||||
|
||||
/* PC98_SYSTEM_PARAMETER(0x400) */
|
||||
if ((*(u_char *)PTOV(0xA1400)) & 0x80)
|
||||
ret |= M_NOTE;
|
||||
if (ret & M_NEC_PC98) {
|
||||
/* PC98_SYSTEM_PARAMETER(0x458) */
|
||||
if ((*(u_char *)PTOV(0xA1458)) & 0x80)
|
||||
ret |= M_H98;
|
||||
else
|
||||
ret |= M_NOT_H98;
|
||||
} else
|
||||
ret |= M_NOT_H98;
|
||||
|
||||
(*(u_long *)PTOV(0xA1620)) = ret;
|
||||
}
|
||||
|
|
@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
|
|||
|
||||
#include "bootstrap.h"
|
||||
#include "libi386/libi386.h"
|
||||
#include "libpc98/libpc98.h"
|
||||
#include "btxv86.h"
|
||||
|
||||
#define KARGS_FLAGS_CD 0x1
|
||||
|
|
@ -81,6 +82,9 @@ main(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
/* Set machine type to PC98_SYSTEM_PARAMETER. */
|
||||
set_machine_type();
|
||||
|
||||
/* Pick up arguments */
|
||||
kargs = (void *)__args;
|
||||
initial_howto = kargs->howto;
|
||||
|
|
|
|||
Loading…
Reference in a new issue