From 1cefa3fd390c80ea3af79d3336367d4f9c94d447 Mon Sep 17 00:00:00 2001 From: KATO Takenori Date: Fri, 30 Jul 1999 11:42:05 +0000 Subject: [PATCH] Sync with sys/i386/i386/machdep.c revision 1.357. --- sys/pc98/i386/machdep.c | 32 +++++++++++++++++++++++++------- sys/pc98/pc98/machdep.c | 32 +++++++++++++++++++++++++------- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index ebea886d0605..9c0728e5a9b7 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.126 1999/07/09 12:51:11 kato Exp $ + * $Id: machdep.c,v 1.127 1999/07/26 12:14:00 kato Exp $ */ #include "apm.h" @@ -1017,8 +1017,8 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 0, /* unused - default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, -/* GAPMCODE32_SEL 9 APM BIOS 32-bit interface (32bit Code) */ -{ 0, /* segment base address (overwritten by APM) */ +/* GBIOSCODE32_SEL 9 BIOS 32-bit interface (32bit Code) */ +{ 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ 0, /* segment descriptor priority level */ @@ -1026,8 +1026,8 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, -/* GAPMCODE16_SEL 10 APM BIOS 32-bit interface (16bit Code) */ -{ 0, /* segment base address (overwritten by APM) */ +/* GBIOSCODE16_SEL 10 BIOS 32-bit interface (16bit Code) */ +{ 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ 0, /* segment descriptor priority level */ @@ -1035,8 +1035,8 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 0, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, -/* GAPMDATA_SEL 11 APM BIOS 32-bit interface (Data) */ -{ 0, /* segment base address (overwritten by APM) */ +/* GBIOSDATA_SEL 11 BIOS 32-bit interface (Data) */ +{ 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ 0, /* segment descriptor priority level */ @@ -1044,6 +1044,24 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, +/* GBIOSUTIL_SEL 12 BIOS 16-bit interface (Utility) */ +{ 0, /* segment base address (overwritten) */ + 0xfffff, /* length */ + SDT_MEMRWA, /* segment type */ + 0, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 0, 0, + 0, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, +/* GBIOSARGS_SEL 13 BIOS 16-bit interface (Arguments) */ +{ 0, /* segment base address (overwritten) */ + 0xfffff, /* length */ + SDT_MEMRWA, /* segment type */ + 0, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 0, 0, + 0, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, }; static struct soft_segment_descriptor ldt_segs[] = { diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index ebea886d0605..9c0728e5a9b7 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.126 1999/07/09 12:51:11 kato Exp $ + * $Id: machdep.c,v 1.127 1999/07/26 12:14:00 kato Exp $ */ #include "apm.h" @@ -1017,8 +1017,8 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 0, /* unused - default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, -/* GAPMCODE32_SEL 9 APM BIOS 32-bit interface (32bit Code) */ -{ 0, /* segment base address (overwritten by APM) */ +/* GBIOSCODE32_SEL 9 BIOS 32-bit interface (32bit Code) */ +{ 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ 0, /* segment descriptor priority level */ @@ -1026,8 +1026,8 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, -/* GAPMCODE16_SEL 10 APM BIOS 32-bit interface (16bit Code) */ -{ 0, /* segment base address (overwritten by APM) */ +/* GBIOSCODE16_SEL 10 BIOS 32-bit interface (16bit Code) */ +{ 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMERA, /* segment type */ 0, /* segment descriptor priority level */ @@ -1035,8 +1035,8 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 0, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, -/* GAPMDATA_SEL 11 APM BIOS 32-bit interface (Data) */ -{ 0, /* segment base address (overwritten by APM) */ +/* GBIOSDATA_SEL 11 BIOS 32-bit interface (Data) */ +{ 0, /* segment base address (overwritten) */ 0xfffff, /* length */ SDT_MEMRWA, /* segment type */ 0, /* segment descriptor priority level */ @@ -1044,6 +1044,24 @@ struct soft_segment_descriptor gdt_segs[] = { 0, 0, 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, +/* GBIOSUTIL_SEL 12 BIOS 16-bit interface (Utility) */ +{ 0, /* segment base address (overwritten) */ + 0xfffff, /* length */ + SDT_MEMRWA, /* segment type */ + 0, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 0, 0, + 0, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, +/* GBIOSARGS_SEL 13 BIOS 16-bit interface (Arguments) */ +{ 0, /* segment base address (overwritten) */ + 0xfffff, /* length */ + SDT_MEMRWA, /* segment type */ + 0, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 0, 0, + 0, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, }; static struct soft_segment_descriptor ldt_segs[] = {