From 55a5a21b974e0dac09ead45939e6aea133ad62c2 Mon Sep 17 00:00:00 2001 From: Antoine Leca Date: Wed, 20 Jul 2016 17:43:35 +0200 Subject: [PATCH] Clean up traces from long-gone sys_int86 interface Change-Id: I773ab67342be852cc74f76b4fcbb338c9cb11f7e --- distrib/sets/lists/minix-comp/md.i386 | 2 +- minix/commands/service/parse.c | 1 - minix/include/arch/i386/include/Makefile | 2 +- minix/include/arch/i386/include/int86.h | 61 ------------------------ minix/include/minix/com.h | 2 +- minix/include/minix/syslib.h | 2 - minix/lib/libsys/arch/i386/Makefile.inc | 1 - minix/lib/libsys/arch/i386/sys_int86.c | 17 ------- 8 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 minix/include/arch/i386/include/int86.h delete mode 100644 minix/lib/libsys/arch/i386/sys_int86.c diff --git a/distrib/sets/lists/minix-comp/md.i386 b/distrib/sets/lists/minix-comp/md.i386 index 78d78305f..a7f9af776 100644 --- a/distrib/sets/lists/minix-comp/md.i386 +++ b/distrib/sets/lists/minix-comp/md.i386 @@ -134,7 +134,7 @@ ./usr/include/i386/ibcs2_machdep.h minix-comp ./usr/include/i386/ieee.h minix-comp ./usr/include/i386/ieeefp.h minix-comp -./usr/include/i386/int86.h minix-comp +./usr/include/i386/int86.h minix-comp obsolete ./usr/include/i386/int_const.h minix-comp ./usr/include/i386/int_fmtio.h minix-comp ./usr/include/i386/int_limits.h minix-comp diff --git a/minix/commands/service/parse.c b/minix/commands/service/parse.c index af2d349ef..dfae9e3c3 100644 --- a/minix/commands/service/parse.c +++ b/minix/commands/service/parse.c @@ -835,7 +835,6 @@ struct { "UMAP_REMOTE", SYS_UMAP_REMOTE }, { "VUMAP", SYS_VUMAP }, { "IRQCTL", SYS_IRQCTL }, - { "INT86", SYS_INT86 }, { "DEVIO", SYS_DEVIO }, { "SDEVIO", SYS_SDEVIO }, { "VDEVIO", SYS_VDEVIO }, diff --git a/minix/include/arch/i386/include/Makefile b/minix/include/arch/i386/include/Makefile index 1fa8a6df5..196c83a88 100644 --- a/minix/include/arch/i386/include/Makefile +++ b/minix/include/arch/i386/include/Makefile @@ -2,7 +2,7 @@ INCSDIR= /usr/include/i386 INCS= archconst.h archtypes.h bios.h cmos.h \ - diskparm.h elf.h fpu.h int86.h interrupt.h \ + diskparm.h elf.h fpu.h interrupt.h \ ipcconst.h memory.h partition.h \ pci_amd.h pci.h pci_intel.h pci_sis.h \ pci_via.h ports.h stackframe.h vm.h diff --git a/minix/include/arch/i386/include/int86.h b/minix/include/arch/i386/include/int86.h deleted file mode 100644 index 30d6fa67f..000000000 --- a/minix/include/arch/i386/include/int86.h +++ /dev/null @@ -1,61 +0,0 @@ -/* int86.h - 8086 interrupt types Author: Kees J. Bot - * 3 May 2000 - */ - -/* Registers used in an PC real mode call for BIOS or DOS services. A - * driver is called through the vector if the interrupt number is zero. - */ -union reg86 { - struct l { - u32_t ef; /* 32 bit flags (output only) */ - u32_t vec; /* Driver vector (input only) */ - u32_t _ds_es[1]; - u32_t eax; /* 32 bit general registers */ - u32_t ebx; - u32_t ecx; - u32_t edx; - u32_t esi; - u32_t edi; - u32_t ebp; - } l; - struct w { - u16_t f, _ef[1]; /* 16 bit flags (output only) */ - u16_t off, seg; /* Driver vector (input only) */ - u16_t ds, es; /* DS and ES real mode segment regs */ - u16_t ax, _eax[1]; /* 16 bit general registers */ - u16_t bx, _ebx[1]; - u16_t cx, _ecx[1]; - u16_t dx, _edx[1]; - u16_t si, _esi[1]; - u16_t di, _edi[1]; - u16_t bp, _ebp[1]; - } w; - struct b { - u8_t intno, _intno[3]; /* Interrupt number (input only) */ - u8_t _vec[4]; - u8_t _ds_es[4]; - u8_t al, ah, _eax[2]; /* 8 bit general registers */ - u8_t bl, bh, _ebx[2]; - u8_t cl, ch, _ecx[2]; - u8_t dl, dh, _edx[2]; - u8_t _esi[4]; - u8_t _edi[4]; - u8_t _ebp[4]; - } b; -}; - -struct reg86u { union reg86 u; }; /* Better for forward declarations */ - -/* Parameters passed on ioctls to the memory task. */ - -struct mio_int86 { /* MIOCINT86 */ - union reg86 reg86; /* x86 registers as above */ - u16_t off, seg; /* Address of kernel buffer */ - void *buf; /* User data buffer */ - size_t len; /* Size of user buffer */ -}; - -struct mio_ldt86 { /* MIOCGLDT86, MIOCSLDT86 */ - size_t idx; /* Index in process' LDT */ - u16_t entry[4]; /* One LDT entry to get or set. */ -}; diff --git a/minix/include/minix/com.h b/minix/include/minix/com.h index f6a728630..35367e9ea 100644 --- a/minix/include/minix/com.h +++ b/minix/include/minix/com.h @@ -224,7 +224,7 @@ # define SYS_VUMAP (KERNEL_CALL + 18) /* sys_vumap() */ # define SYS_IRQCTL (KERNEL_CALL + 19) /* sys_irqctl() */ -# define SYS_INT86 (KERNEL_CALL + 20) /* sys_int86() */ + # define SYS_DEVIO (KERNEL_CALL + 21) /* sys_devio() */ # define SYS_SDEVIO (KERNEL_CALL + 22) /* sys_sdevio() */ # define SYS_VDEVIO (KERNEL_CALL + 23) /* sys_vdevio() */ diff --git a/minix/include/minix/syslib.h b/minix/include/minix/syslib.h index 6f884508d..1b5ebf11a 100644 --- a/minix/include/minix/syslib.h +++ b/minix/include/minix/syslib.h @@ -15,7 +15,6 @@ #include /* Forward declaration */ -struct reg86u; struct rs_pci; struct rusage; @@ -55,7 +54,6 @@ int sys_privquery_mem(endpoint_t proc_ep, phys_bytes physstart, phys_bytes physlen); int sys_setgrant(cp_grant_t *grants, int ngrants); -int sys_int86(struct reg86u *reg86p); int sys_vm_setbuf(phys_bytes base, phys_bytes size, phys_bytes high); int sys_vm_map(endpoint_t proc_ep, int do_map, phys_bytes base, phys_bytes size, phys_bytes offset); diff --git a/minix/lib/libsys/arch/i386/Makefile.inc b/minix/lib/libsys/arch/i386/Makefile.inc index 9b9aa2d38..19f85b7e0 100644 --- a/minix/lib/libsys/arch/i386/Makefile.inc +++ b/minix/lib/libsys/arch/i386/Makefile.inc @@ -11,7 +11,6 @@ SRCS+= \ spin.c \ sys_eniop.c \ sys_in.c \ - sys_int86.c \ sys_out.c \ sys_readbios.c \ sys_sdevio.c \ diff --git a/minix/lib/libsys/arch/i386/sys_int86.c b/minix/lib/libsys/arch/i386/sys_int86.c deleted file mode 100644 index f697819cb..000000000 --- a/minix/lib/libsys/arch/i386/sys_int86.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "syslib.h" - -/*===========================================================================* - * sys_int86 * - *===========================================================================*/ -int sys_int86(reg86p) -struct reg86u *reg86p; -{ - message m; - int result; - - m.m1_p1= (char *)reg86p; - - result = _kernel_call(SYS_INT86, &m); - return(result); -} - -- 2.44.0