summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-06-06 03:20:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-06-06 03:20:59 +0000
commit034e75d22e9fec0a70df06f1255b6448c8021d6b (patch)
tree28888057d8f330d5ebc8f742e9d051acf7b1a0ef /sys/arch
parentcaeb2c7cc4eec6ee9431d8bda5f2b44ed059af3e (diff)
option X86EMU is how this subsystem is brought into a kernel
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/files.amd644
-rw-r--r--sys/arch/amd64/pci/vga_post.c20
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/files.i3864
-rw-r--r--sys/arch/i386/pci/vga_post.c20
6 files changed, 28 insertions, 28 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 10ffde59e04..b31b2f3e497 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.268 2009/06/06 00:35:00 pirofti Exp $
+# $OpenBSD: GENERIC,v 1.269 2009/06/06 03:20:57 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -275,7 +275,7 @@ pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
vga0 at isa?
-option VGA_POST # we can repost video cards
+option X86EMU # to POST video cards
vga* at pci?
wsdisplay* at vga?
wskbd* at pckbd? mux 1
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index ef617ff155b..f772602558c 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.amd64,v 1.50 2009/06/06 00:35:00 pirofti Exp $
+# $OpenBSD: files.amd64,v 1.51 2009/06/06 03:20:57 deraadt Exp $
maxpartitions 16
maxusers 2 16 128
@@ -109,7 +109,7 @@ include "dev/pci/files.pci"
file arch/amd64/pci/pci_machdep.c pci
file arch/amd64/pci/iommu.c pci
file arch/amd64/pci/pciide_machdep.c pciide
-file arch/amd64/pci/vga_post.c vga_pci & vga_post
+file arch/amd64/pci/vga_post.c vga_pci & x86emu
include "dev/puc/files.puc"
diff --git a/sys/arch/amd64/pci/vga_post.c b/sys/arch/amd64/pci/vga_post.c
index 1cf51cf541b..bf2ddb861a2 100644
--- a/sys/arch/amd64/pci/vga_post.c
+++ b/sys/arch/amd64/pci/vga_post.c
@@ -1,5 +1,5 @@
+/* $OpenBSD: vga_post.c,v 1.3 2009/06/06 03:20:57 deraadt Exp $ */
/* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */
-/* $OpenBSD: vga_post.c,v 1.2 2009/06/06 00:49:08 deraadt Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -48,7 +48,7 @@
#define BASE_MEMORY 65536 /* How much memory to allocate in Real Mode */
struct vga_post {
- struct X86EMU emu;
+ struct x86emu emu;
vaddr_t sys_image;
uint32_t initial_eax;
uint8_t bios_data[PAGE_SIZE];
@@ -61,7 +61,7 @@ void ddb_vgapost(void);
#endif
static uint8_t
-vm86_emu_inb(struct X86EMU *emu, uint16_t port)
+vm86_emu_inb(struct x86emu *emu, uint16_t port)
{
if (port == 0xb2) /* APM scratch register */
return 0;
@@ -73,7 +73,7 @@ vm86_emu_inb(struct X86EMU *emu, uint16_t port)
}
static uint16_t
-vm86_emu_inw(struct X86EMU *emu, uint16_t port)
+vm86_emu_inw(struct x86emu *emu, uint16_t port)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return 0;
@@ -82,7 +82,7 @@ vm86_emu_inw(struct X86EMU *emu, uint16_t port)
}
static uint32_t
-vm86_emu_inl(struct X86EMU *emu, uint16_t port)
+vm86_emu_inl(struct x86emu *emu, uint16_t port)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return 0;
@@ -91,7 +91,7 @@ vm86_emu_inl(struct X86EMU *emu, uint16_t port)
}
static void
-vm86_emu_outb(struct X86EMU *emu, uint16_t port, uint8_t val)
+vm86_emu_outb(struct x86emu *emu, uint16_t port, uint8_t val)
{
if (port == 0xb2) /* APM scratch register */
return;
@@ -103,7 +103,7 @@ vm86_emu_outb(struct X86EMU *emu, uint16_t port, uint8_t val)
}
static void
-vm86_emu_outw(struct X86EMU *emu, uint16_t port, uint16_t val)
+vm86_emu_outw(struct x86emu *emu, uint16_t port, uint16_t val)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return;
@@ -112,7 +112,7 @@ vm86_emu_outw(struct X86EMU *emu, uint16_t port, uint16_t val)
}
static void
-vm86_emu_outl(struct X86EMU *emu, uint16_t port, uint32_t val)
+vm86_emu_outl(struct x86emu *emu, uint16_t port, uint32_t val)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return;
@@ -171,7 +171,7 @@ vga_post_init(int bus, int device, int function)
pmap_update(pmap_kernel());
memset(&sc->emu, 0, sizeof(sc->emu));
- X86EMU_init_default(&sc->emu);
+ x86emu_init_default(&sc->emu);
sc->emu.emu_inb = vm86_emu_inb;
sc->emu.emu_inw = vm86_emu_inw;
sc->emu.emu_inl = vm86_emu_inl;
@@ -204,7 +204,7 @@ vga_post_call(struct vga_post *sc)
sc->emu.x86.R_ESP = 0;
/* Jump straight into the VGA BIOS POST code */
- X86EMU_exec_call(&sc->emu, 0xc000, 0x0003);
+ x86emu_exec_call(&sc->emu, 0xc000, 0x0003);
}
void
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 8d2c87edc0b..d293a9dcf05 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.663 2009/06/06 00:35:00 pirofti Exp $
+# $OpenBSD: GENERIC,v 1.664 2009/06/06 03:20:57 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -340,7 +340,7 @@ pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
vga0 at isa?
-option VGA_POST # we can re-POST video cards
+option X86EMU # to POST video cards
vga* at pci?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga?
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index ffe4ccef9e1..ad1befb9562 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.191 2009/06/06 00:35:00 pirofti Exp $
+# $OpenBSD: files.i386,v 1.192 2009/06/06 03:20:58 deraadt Exp $
#
# new style config file for i386 architecture
#
@@ -103,7 +103,7 @@ include "../../../dev/pci/files.pci"
file arch/i386/pci/pci_machdep.c pci
file arch/i386/pci/pciide_machdep.c pciide
file arch/i386/pci/pcic_pci_machdep.c pcic_pci
-file arch/i386/pci/vga_post.c vga_pci & vga_post
+file arch/i386/pci/vga_post.c vga_pci & x86emu
# PCI-Host bridge chipsets
device pchb: pcibus, agpbus
diff --git a/sys/arch/i386/pci/vga_post.c b/sys/arch/i386/pci/vga_post.c
index a5304b4b4f1..0d42900c431 100644
--- a/sys/arch/i386/pci/vga_post.c
+++ b/sys/arch/i386/pci/vga_post.c
@@ -1,5 +1,5 @@
+/* $OpenBSD: vga_post.c,v 1.3 2009/06/06 03:20:58 deraadt Exp $ */
/* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */
-/* $OpenBSD: vga_post.c,v 1.2 2009/06/06 00:49:08 deraadt Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -48,7 +48,7 @@
#define BASE_MEMORY 65536 /* How much memory to allocate in Real Mode */
struct vga_post {
- struct X86EMU emu;
+ struct x86emu emu;
vaddr_t sys_image;
uint32_t initial_eax;
uint8_t bios_data[PAGE_SIZE];
@@ -61,7 +61,7 @@ void ddb_vgapost(void);
#endif
static uint8_t
-vm86_emu_inb(struct X86EMU *emu, uint16_t port)
+vm86_emu_inb(struct x86emu *emu, uint16_t port)
{
if (port == 0xb2) /* APM scratch register */
return 0;
@@ -73,7 +73,7 @@ vm86_emu_inb(struct X86EMU *emu, uint16_t port)
}
static uint16_t
-vm86_emu_inw(struct X86EMU *emu, uint16_t port)
+vm86_emu_inw(struct x86emu *emu, uint16_t port)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return 0;
@@ -82,7 +82,7 @@ vm86_emu_inw(struct X86EMU *emu, uint16_t port)
}
static uint32_t
-vm86_emu_inl(struct X86EMU *emu, uint16_t port)
+vm86_emu_inl(struct x86emu *emu, uint16_t port)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return 0;
@@ -91,7 +91,7 @@ vm86_emu_inl(struct X86EMU *emu, uint16_t port)
}
static void
-vm86_emu_outb(struct X86EMU *emu, uint16_t port, uint8_t val)
+vm86_emu_outb(struct x86emu *emu, uint16_t port, uint8_t val)
{
if (port == 0xb2) /* APM scratch register */
return;
@@ -103,7 +103,7 @@ vm86_emu_outb(struct X86EMU *emu, uint16_t port, uint8_t val)
}
static void
-vm86_emu_outw(struct X86EMU *emu, uint16_t port, uint16_t val)
+vm86_emu_outw(struct x86emu *emu, uint16_t port, uint16_t val)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return;
@@ -112,7 +112,7 @@ vm86_emu_outw(struct X86EMU *emu, uint16_t port, uint16_t val)
}
static void
-vm86_emu_outl(struct X86EMU *emu, uint16_t port, uint32_t val)
+vm86_emu_outl(struct x86emu *emu, uint16_t port, uint32_t val)
{
if (port >= 0x80 && port < 0x88) /* POST status register */
return;
@@ -171,7 +171,7 @@ vga_post_init(int bus, int device, int function)
pmap_update(pmap_kernel());
memset(&sc->emu, 0, sizeof(sc->emu));
- X86EMU_init_default(&sc->emu);
+ x86emu_init_default(&sc->emu);
sc->emu.emu_inb = vm86_emu_inb;
sc->emu.emu_inw = vm86_emu_inw;
sc->emu.emu_inl = vm86_emu_inl;
@@ -204,7 +204,7 @@ vga_post_call(struct vga_post *sc)
sc->emu.x86.R_ESP = 0;
/* Jump straight into the VGA BIOS POST code */
- X86EMU_exec_call(&sc->emu, 0xc000, 0x0003);
+ x86emu_exec_call(&sc->emu, 0xc000, 0x0003);
}
void
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 10:09:56 +0000