General cleanup:

- clean up kernel section of minix/com.h somewhat
- remove ALLOCMEM and VM_ALLOCMEM calls
- remove non-safecopy and minix-vmd support from Inet
- remove SYS_VIRVCOPY and SYS_PHYSVCOPY calls
- remove obsolete segment encoding in SYS_SAFECOPY*
- remove DEVCTL call, svrctl(FSDEVUNMAP), map_driverX
- remove declarations of unimplemented svrctl requests
- remove everything related to swapping to disk
- remove floppysetup.sh
- remove traces of rescue device
- update DESCRIBE.sh with new devices
- some other small changes
This commit is contained in:
David van Moolenbroek
2010-01-05 19:39:27 +00:00
parent be992434e7
commit ac9ab099c8
75 changed files with 388 additions and 2178 deletions

View File

@@ -38,7 +38,6 @@ OBJECTS = \
$(SYSTEM)(do_devio.o) \
$(SYSTEM)(do_vdevio.o) \
$(SYSTEM)(do_copy.o) \
$(SYSTEM)(do_vcopy.o) \
$(SYSTEM)(do_umap.o) \
$(SYSTEM)(do_memset.o) \
$(SYSTEM)(do_setgrant.o) \
@@ -120,9 +119,6 @@ $(SYSTEM)(do_vdevio.o): do_vdevio.c
$(SYSTEM)(do_copy.o): do_copy.c
$(CC) do_copy.c
$(SYSTEM)(do_vcopy.o): do_vcopy.c
$(CC) do_vcopy.c
$(SYSTEM)(do_umap.o): do_umap.c
$(CC) do_umap.c

View File

@@ -3,7 +3,7 @@
*
* The parameters for this kernel call are:
* SCP_FROM_TO other endpoint
* SCP_INFO encoded: caller's own src/dst segment
* SCP_SEG segment in own address space
* SCP_GID grant id
* SCP_OFFSET offset within granted space
* SCP_ADDRESS address in own address space
@@ -288,15 +288,13 @@ register message *m_ptr; /* pointer to request message */
{
static int access, src_seg, dst_seg;
/* Set src and dst parameters.
* The caller's seg is encoded in the SCP_INFO field.
*/
/* Set src and dst parameters. */
if(sys_call_code == SYS_SAFECOPYFROM) {
src_seg = D;
dst_seg = SCP_INFO2SEG(m_ptr->SCP_INFO);
dst_seg = m_ptr->SCP_SEG;
access = CPF_READ;
} else if(sys_call_code == SYS_SAFECOPYTO) {
src_seg = SCP_INFO2SEG(m_ptr->SCP_INFO);
src_seg = m_ptr->SCP_SEG;
dst_seg = D;
access = CPF_WRITE;
} else minix_panic("Impossible system call nr. ", sys_call_code);

View File

@@ -1,79 +0,0 @@
/* The kernel call implemented in this file:
* m_type: SYS_VIRVCOPY, SYS_PHYSVCOPY
*
* The parameters for this kernel call are:
* m1_i3: VCP_VEC_SIZE size of copy request vector
* m1_p1: VCP_VEC_ADDR address of vector at caller
* m1_i2: VCP_NR_OK number of successfull copies
*/
#include "../system.h"
#include <minix/type.h>
#if (USE_VIRVCOPY || USE_PHYSVCOPY)
/* Buffer to hold copy request vector from user. */
PRIVATE struct vir_cp_req vir_cp_req[VCOPY_VEC_SIZE];
/*===========================================================================*
* do_vcopy *
*===========================================================================*/
PUBLIC int do_vcopy(m_ptr)
register message *m_ptr; /* pointer to request message */
{
/* Handle sys_virvcopy() and sys_physvcopy() that pass a vector with copy
* requests. Although a single handler function is used, there are two
* different kernel calls so that permissions can be checked.
*/
int nr_req, r;
vir_bytes caller_vir;
phys_bytes bytes;
int i,s;
struct vir_cp_req *req;
struct vir_addr src, dst;
struct proc *pr;
{ static int first=1;
if (first)
{
first= 0;
kprintf("do_vcopy: got request from %d\n", m_ptr->m_source);
}
}
if(!(pr = endpoint_lookup(who_e)))
minix_panic("do_vcopy: caller doesn't exist", who_e);
/* Check if request vector size is ok. */
nr_req = (unsigned) m_ptr->VCP_VEC_SIZE;
if (nr_req > VCOPY_VEC_SIZE) return(EINVAL);
bytes = nr_req * sizeof(struct vir_cp_req);
/* Calculate physical addresses and copy (port,value)-pairs from user. */
src.segment = dst.segment = D;
src.proc_nr_e = who_e;
dst.proc_nr_e = SYSTEM;
dst.offset = (vir_bytes) vir_cp_req;
src.offset = (vir_bytes) m_ptr->VCP_VEC_ADDR;
if((r=virtual_copy_vmcheck(&src, &dst, bytes)) != OK)
return r;
/* Assume vector with requests is correct. Try to copy everything. */
m_ptr->VCP_NR_OK = 0;
for (i=0; i<nr_req; i++) {
req = &vir_cp_req[i];
/* Check if physical addressing is used without SYS_PHYSVCOPY. */
if (((req->src.segment | req->dst.segment) & PHYS_SEG) &&
m_ptr->m_type != SYS_PHYSVCOPY) return(EPERM);
if ((s=virtual_copy_vmcheck(&req->src, &req->dst, req->count)) != OK)
return(s);
m_ptr->VCP_NR_OK ++;
}
return(OK);
}
#endif /* (USE_VIRVCOPY || USE_PHYSVCOPY) */