Changed global DOS_LOL into function DOSMEM_LOL() in order to operate
on the correct address space. Added DOSMEM_MovePointers() that relocates selectors when the DOS address space changes (i.e. when dosmod is spawned, particularly from Win16 apps that uses DPMI to execute real-mode code). More complete DOS device implementation.
This commit is contained in:
parent
e54d4d15c4
commit
59c827325c
|
@ -86,8 +86,8 @@ extern DWORD DOSMEM_CollateTable;
|
||||||
extern DWORD DOSMEM_ErrorCall;
|
extern DWORD DOSMEM_ErrorCall;
|
||||||
extern DWORD DOSMEM_ErrorBuffer;
|
extern DWORD DOSMEM_ErrorBuffer;
|
||||||
|
|
||||||
extern struct _DOS_LISTOFLISTS * DOS_LOL;
|
|
||||||
extern DWORD DOS_LOLSeg;
|
extern DWORD DOS_LOLSeg;
|
||||||
|
extern struct _DOS_LISTOFLISTS * DOSMEM_LOL();
|
||||||
|
|
||||||
extern BOOL DOSMEM_Init(HMODULE16 hModule);
|
extern BOOL DOSMEM_Init(HMODULE16 hModule);
|
||||||
extern void DOSMEM_Tick(WORD timer);
|
extern void DOSMEM_Tick(WORD timer);
|
||||||
|
|
485
msdos/devices.c
485
msdos/devices.c
|
@ -9,6 +9,7 @@
|
||||||
#include "wine/winbase16.h"
|
#include "wine/winbase16.h"
|
||||||
#include "msdos.h"
|
#include "msdos.h"
|
||||||
#include "miscemu.h"
|
#include "miscemu.h"
|
||||||
|
#include "dosexe.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
#include "pshpack1.h"
|
#include "pshpack1.h"
|
||||||
|
@ -21,9 +22,35 @@ typedef struct {
|
||||||
RMCBPROC interrupt;
|
RMCBPROC interrupt;
|
||||||
} WINEDEV;
|
} WINEDEV;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
BYTE size; /* length of header + data */
|
||||||
|
BYTE unit; /* unit (block devices only) */
|
||||||
|
BYTE command;
|
||||||
|
WORD status;
|
||||||
|
BYTE reserved[8];
|
||||||
|
} REQUEST_HEADER;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
REQUEST_HEADER hdr;
|
||||||
|
BYTE media; /* media descriptor from BPB */
|
||||||
|
SEGPTR buffer;
|
||||||
|
WORD count; /* byte/sector count */
|
||||||
|
WORD sector; /* starting sector (block devices) */
|
||||||
|
DWORD volume; /* volume ID (block devices) */
|
||||||
|
} REQ_IO;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
REQUEST_HEADER hdr;
|
||||||
|
BYTE data;
|
||||||
|
} REQ_SAFEINPUT;
|
||||||
|
|
||||||
#include "poppack.h"
|
#include "poppack.h"
|
||||||
|
|
||||||
DOS_LISTOFLISTS * DOS_LOL;
|
#define REQ_SCRATCH sizeof(REQ_IO)
|
||||||
|
|
||||||
|
#define SYSTEM_STRATEGY_NUL 0x0100
|
||||||
|
#define SYSTEM_STRATEGY_CON 0x0101
|
||||||
|
|
||||||
DWORD DOS_LOLSeg;
|
DWORD DOS_LOLSeg;
|
||||||
|
|
||||||
#define NONEXT ((DWORD)-1)
|
#define NONEXT ((DWORD)-1)
|
||||||
|
@ -33,51 +60,326 @@ DWORD DOS_LOLSeg;
|
||||||
#define ATTR_NUL 0x0004
|
#define ATTR_NUL 0x0004
|
||||||
#define ATTR_CLOCK 0x0008
|
#define ATTR_CLOCK 0x0008
|
||||||
#define ATTR_FASTCON 0x0010
|
#define ATTR_FASTCON 0x0010
|
||||||
|
#define ATTR_RAW 0x0020
|
||||||
|
#define ATTR_NOTEOF 0x0040
|
||||||
|
#define ATTR_DEVICE 0x0080
|
||||||
#define ATTR_REMOVABLE 0x0800
|
#define ATTR_REMOVABLE 0x0800
|
||||||
#define ATTR_NONIBM 0x2000 /* block devices */
|
#define ATTR_NONIBM 0x2000 /* block devices */
|
||||||
#define ATTR_UNTILBUSY 0x2000 /* char devices */
|
#define ATTR_UNTILBUSY 0x2000 /* char devices */
|
||||||
#define ATTR_IOCTL 0x4000
|
#define ATTR_IOCTL 0x4000
|
||||||
#define ATTR_CHAR 0x8000
|
#define ATTR_CHAR 0x8000
|
||||||
|
|
||||||
#define LJMP 0x9a
|
#define CMD_INIT 0
|
||||||
|
#define CMD_MEDIACHECK 1 /* block devices */
|
||||||
|
#define CMD_BUILDBPB 2 /* block devices */
|
||||||
|
#define CMD_INIOCTL 3
|
||||||
|
#define CMD_INPUT 4 /* read data */
|
||||||
|
#define CMD_SAFEINPUT 5 /* "non-destructive input no wait", char devices */
|
||||||
|
#define CMD_INSTATUS 6 /* char devices */
|
||||||
|
#define CMD_INFLUSH 7 /* char devices */
|
||||||
|
#define CMD_OUTPUT 8 /* write data */
|
||||||
|
#define CMD_SAFEOUTPUT 9 /* write data with verify */
|
||||||
|
#define CMD_OUTSTATUS 10 /* char devices */
|
||||||
|
#define CMD_OUTFLUSH 11 /* char devices */
|
||||||
|
#define CMD_OUTIOCTL 12
|
||||||
|
#define CMD_DEVOPEN 13
|
||||||
|
#define CMD_DEVCLOSE 14
|
||||||
|
#define CMD_REMOVABLE 15 /* block devices */
|
||||||
|
#define CMD_UNTILBUSY 16 /* output until busy */
|
||||||
|
|
||||||
static void WINAPI nul_strategy(CONTEXT*ctx)
|
#define STAT_MASK 0x00FF
|
||||||
{
|
#define STAT_DONE 0x0100
|
||||||
}
|
#define STAT_BUSY 0x0200
|
||||||
|
#define STAT_ERROR 0x8000
|
||||||
|
|
||||||
static void WINAPI nul_interrupt(CONTEXT*ctx)
|
#define LJMP 0xea
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void WINAPI con_strategy(CONTEXT*ctx)
|
#define DEV0_OFS (sizeof(DOS_LISTOFLISTS) - sizeof(DOS_DEVICE_HEADER))
|
||||||
{
|
#define DEV1_OFS (DEV0_OFS + sizeof(WINEDEV))
|
||||||
}
|
#define ALLDEV_OFS (DEV1_OFS + sizeof(devs))
|
||||||
|
#define ALL_OFS (ALLDEV_OFS + REQ_SCRATCH)
|
||||||
|
|
||||||
static void WINAPI con_interrupt(CONTEXT*ctx)
|
/* prototypes */
|
||||||
{
|
static void WINAPI nul_strategy(CONTEXT*ctx);
|
||||||
}
|
static void WINAPI nul_interrupt(CONTEXT*ctx);
|
||||||
|
static void WINAPI con_strategy(CONTEXT*ctx);
|
||||||
|
static void WINAPI con_interrupt(CONTEXT*ctx);
|
||||||
|
|
||||||
|
/* the device headers */
|
||||||
#define STRATEGY_OFS sizeof(DOS_DEVICE_HEADER)
|
#define STRATEGY_OFS sizeof(DOS_DEVICE_HEADER)
|
||||||
#define INTERRUPT_OFS STRATEGY_OFS+5
|
#define INTERRUPT_OFS STRATEGY_OFS+5
|
||||||
|
|
||||||
static DOS_DEVICE_HEADER dev_nul_hdr={
|
static DOS_DEVICE_HEADER dev_nul_hdr={
|
||||||
NONEXT,
|
NONEXT,
|
||||||
ATTR_CHAR|ATTR_NUL,
|
ATTR_CHAR|ATTR_NUL|ATTR_DEVICE,
|
||||||
STRATEGY_OFS,INTERRUPT_OFS,
|
STRATEGY_OFS,INTERRUPT_OFS,
|
||||||
"NUL "
|
"NUL "
|
||||||
};
|
};
|
||||||
|
|
||||||
static WINEDEV devs={
|
static WINEDEV devs[]={
|
||||||
|
{
|
||||||
{NONEXT,
|
{NONEXT,
|
||||||
ATTR_CHAR|ATTR_STDIN|ATTR_STDOUT|ATTR_FASTCON,
|
ATTR_CHAR|ATTR_STDIN|ATTR_STDOUT|ATTR_FASTCON|ATTR_NOTEOF|ATTR_DEVICE,
|
||||||
STRATEGY_OFS,INTERRUPT_OFS,
|
STRATEGY_OFS,INTERRUPT_OFS,
|
||||||
"CON "},
|
"CON "},
|
||||||
LJMP,con_strategy,
|
LJMP,con_strategy,
|
||||||
LJMP,con_interrupt
|
LJMP,con_interrupt}
|
||||||
};
|
};
|
||||||
#define nr_devs (sizeof(devs)/sizeof(WINEDEV))
|
#define nr_devs (sizeof(devs)/sizeof(WINEDEV))
|
||||||
|
|
||||||
static void InitListOfLists()
|
/* the device implementations */
|
||||||
|
static void do_lret(CONTEXT*ctx)
|
||||||
|
{
|
||||||
|
WORD *stack = CTX_SEG_OFF_TO_LIN(ctx, SS_reg(ctx), ESP_reg(ctx));
|
||||||
|
|
||||||
|
IP_reg(ctx) = *(stack++);
|
||||||
|
CS_reg(ctx) = *(stack++);
|
||||||
|
SP_reg(ctx) += 2*sizeof(WORD);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void do_strategy(CONTEXT*ctx, int id, int extra)
|
||||||
|
{
|
||||||
|
REQUEST_HEADER *hdr = CTX_SEG_OFF_TO_LIN(ctx, ES_reg(ctx), EBX_reg(ctx));
|
||||||
|
void **hdr_ptr = DOSVM_GetSystemData(id);
|
||||||
|
|
||||||
|
if (!hdr_ptr) {
|
||||||
|
hdr_ptr = calloc(1,sizeof(void *)+extra);
|
||||||
|
DOSVM_SetSystemData(id, hdr_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
*hdr_ptr = hdr;
|
||||||
|
do_lret(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
static REQUEST_HEADER * get_hdr(int id, void**extra)
|
||||||
|
{
|
||||||
|
void **hdr_ptr = DOSVM_GetSystemData(id);
|
||||||
|
if (extra)
|
||||||
|
*extra = hdr_ptr ? (void*)(hdr_ptr+1) : (void *)NULL;
|
||||||
|
return hdr_ptr ? *hdr_ptr : (void *)NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void WINAPI nul_strategy(CONTEXT*ctx)
|
||||||
|
{
|
||||||
|
do_strategy(ctx, SYSTEM_STRATEGY_NUL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void WINAPI nul_interrupt(CONTEXT*ctx)
|
||||||
|
{
|
||||||
|
REQUEST_HEADER *hdr = get_hdr(SYSTEM_STRATEGY_NUL, NULL);
|
||||||
|
/* eat everything and recycle nothing */
|
||||||
|
switch (hdr->command) {
|
||||||
|
case CMD_INPUT:
|
||||||
|
((REQ_IO*)hdr)->count = 0;
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
break;
|
||||||
|
case CMD_SAFEINPUT:
|
||||||
|
hdr->status = STAT_DONE|STAT_BUSY;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
}
|
||||||
|
do_lret(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
#define CON_BUFFER 128
|
||||||
|
|
||||||
|
static void WINAPI con_strategy(CONTEXT*ctx)
|
||||||
|
{
|
||||||
|
do_strategy(ctx, SYSTEM_STRATEGY_CON, sizeof(int));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void WINAPI con_interrupt(CONTEXT*ctx)
|
||||||
|
{
|
||||||
|
int *scan;
|
||||||
|
REQUEST_HEADER *hdr = get_hdr(SYSTEM_STRATEGY_CON,(void **)&scan);
|
||||||
|
BIOSDATA *bios = DOSMEM_BiosData();
|
||||||
|
WORD CurOfs = bios->NextKbdCharPtr;
|
||||||
|
DOS_LISTOFLISTS *lol = DOSMEM_LOL();
|
||||||
|
BYTE *linebuffer = ((BYTE*)lol) + ALL_OFS;
|
||||||
|
BYTE *curbuffer = (lol->offs_unread_CON) ?
|
||||||
|
(((BYTE*)lol) + lol->offs_unread_CON) : (BYTE*)NULL;
|
||||||
|
DOS_DEVICE_HEADER *con = (DOS_DEVICE_HEADER*)(((BYTE*)lol) + DEV1_OFS);
|
||||||
|
LPDOSTASK lpDosTask = MZ_Current();
|
||||||
|
|
||||||
|
switch (hdr->command) {
|
||||||
|
case CMD_INPUT:
|
||||||
|
{
|
||||||
|
REQ_IO *io = (REQ_IO *)hdr;
|
||||||
|
WORD count = io->count, len = 0;
|
||||||
|
BYTE *buffer = CTX_SEG_OFF_TO_LIN(ctx,
|
||||||
|
SELECTOROF(io->buffer),
|
||||||
|
(DWORD)OFFSETOF(io->buffer));
|
||||||
|
|
||||||
|
hdr->status = STAT_BUSY;
|
||||||
|
/* first, check whether we already have data in line buffer */
|
||||||
|
if (curbuffer) {
|
||||||
|
/* yep, copy as much as we can */
|
||||||
|
BYTE data = 0;
|
||||||
|
while ((len<count) && (data != '\r')) {
|
||||||
|
data = *curbuffer++;
|
||||||
|
buffer[len++] = data;
|
||||||
|
}
|
||||||
|
if (data == '\r') {
|
||||||
|
/* line buffer emptied */
|
||||||
|
lol->offs_unread_CON = 0;
|
||||||
|
curbuffer = NULL;
|
||||||
|
/* if we're not in raw mode, call it a day*/
|
||||||
|
if (!(con->attr & ATTR_RAW)) {
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
io->count = len;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* still some data left */
|
||||||
|
lol->offs_unread_CON = curbuffer - (BYTE*)lol;
|
||||||
|
/* but buffer was filled, we're done */
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
io->count = len;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if we're in raw mode, we just need to fill the buffer */
|
||||||
|
if (con->attr & ATTR_RAW) {
|
||||||
|
while (len<count) {
|
||||||
|
WORD data;
|
||||||
|
|
||||||
|
/* do we have a waiting scancode? */
|
||||||
|
if (*scan) {
|
||||||
|
/* yes, store scancode in buffer */
|
||||||
|
buffer[len++] = *scan;
|
||||||
|
*scan = 0;
|
||||||
|
if (len==count) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* check for new keyboard input */
|
||||||
|
while (CurOfs == bios->FirstKbdCharPtr) {
|
||||||
|
/* no input available yet, so wait... */
|
||||||
|
DOSVM_Wait( -1, 0 );
|
||||||
|
}
|
||||||
|
/* read from keyboard queue (call int16?) */
|
||||||
|
data = ((WORD*)bios)[CurOfs];
|
||||||
|
CurOfs += 2;
|
||||||
|
if (CurOfs >= bios->KbdBufferEnd) CurOfs = bios->KbdBufferStart;
|
||||||
|
bios->NextKbdCharPtr = CurOfs;
|
||||||
|
/* if it's an extended key, save scancode */
|
||||||
|
if (LOBYTE(data) == 0) *scan = HIBYTE(data);
|
||||||
|
/* store ASCII char in buffer */
|
||||||
|
buffer[len++] = LOBYTE(data);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* we're not in raw mode, so we need to do line input... */
|
||||||
|
while (TRUE) {
|
||||||
|
WORD data;
|
||||||
|
/* check for new keyboard input */
|
||||||
|
while (CurOfs == bios->FirstKbdCharPtr) {
|
||||||
|
/* no input available yet, so wait... */
|
||||||
|
DOSVM_Wait( -1, 0 );
|
||||||
|
}
|
||||||
|
/* read from keyboard queue (call int16?) */
|
||||||
|
data = ((WORD*)bios)[CurOfs];
|
||||||
|
CurOfs += 2;
|
||||||
|
if (CurOfs >= bios->KbdBufferEnd) CurOfs = bios->KbdBufferStart;
|
||||||
|
bios->NextKbdCharPtr = CurOfs;
|
||||||
|
|
||||||
|
if (LOBYTE(data) == '\r') {
|
||||||
|
/* it's the return key, we're done */
|
||||||
|
linebuffer[len++] = LOBYTE(data);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else if (LOBYTE(data) >= ' ') {
|
||||||
|
/* a character */
|
||||||
|
if ((len+1)<CON_BUFFER) {
|
||||||
|
linebuffer[len] = LOBYTE(data);
|
||||||
|
WriteFile(lpDosTask->hConOutput, &linebuffer[len++], 1, NULL, NULL);
|
||||||
|
}
|
||||||
|
/* else beep, but I don't like noise */
|
||||||
|
}
|
||||||
|
else switch (LOBYTE(data)) {
|
||||||
|
case '\b':
|
||||||
|
if (len>0) {
|
||||||
|
len--;
|
||||||
|
WriteFile(lpDosTask->hConOutput, "\b \b", 3, NULL, NULL);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (len > count) {
|
||||||
|
/* save rest of line for later */
|
||||||
|
lol->offs_unread_CON = linebuffer - (BYTE*)lol + count;
|
||||||
|
len = count;
|
||||||
|
}
|
||||||
|
memcpy(buffer, linebuffer, len);
|
||||||
|
}
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
io->count = len;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case CMD_SAFEINPUT:
|
||||||
|
if (curbuffer) {
|
||||||
|
/* some line input waiting */
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
((REQ_SAFEINPUT*)hdr)->data = *curbuffer;
|
||||||
|
}
|
||||||
|
else if (con->attr & ATTR_RAW) {
|
||||||
|
if (CurOfs == bios->FirstKbdCharPtr) {
|
||||||
|
/* no input */
|
||||||
|
hdr->status = STAT_DONE|STAT_BUSY;
|
||||||
|
} else {
|
||||||
|
/* some keyboard input waiting */
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
((REQ_SAFEINPUT*)hdr)->data = ((BYTE*)bios)[CurOfs];
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* no line input */
|
||||||
|
hdr->status = STAT_DONE|STAT_BUSY;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case CMD_INSTATUS:
|
||||||
|
if (curbuffer) {
|
||||||
|
/* we have data */
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
}
|
||||||
|
else if (con->attr & ATTR_RAW) {
|
||||||
|
if (CurOfs == bios->FirstKbdCharPtr) {
|
||||||
|
/* no input */
|
||||||
|
hdr->status = STAT_DONE|STAT_BUSY;
|
||||||
|
} else {
|
||||||
|
/* some keyboard input waiting */
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* no line input */
|
||||||
|
hdr->status = STAT_DONE|STAT_BUSY;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
case CMD_INFLUSH:
|
||||||
|
/* flush line and keyboard queue */
|
||||||
|
lol->offs_unread_CON = 0;
|
||||||
|
bios->NextKbdCharPtr = bios->FirstKbdCharPtr;
|
||||||
|
break;
|
||||||
|
case CMD_OUTPUT:
|
||||||
|
case CMD_SAFEOUTPUT:
|
||||||
|
{
|
||||||
|
REQ_IO *io = (REQ_IO *)hdr;
|
||||||
|
BYTE *buffer = CTX_SEG_OFF_TO_LIN(ctx,
|
||||||
|
SELECTOROF(io->buffer),
|
||||||
|
(DWORD)OFFSETOF(io->buffer));
|
||||||
|
DWORD result = 0;
|
||||||
|
WriteFile(lpDosTask->hConOutput, buffer, io->count, &result, NULL);
|
||||||
|
io->count = result;
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
hdr->status = STAT_DONE;
|
||||||
|
}
|
||||||
|
do_lret(ctx);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void InitListOfLists(DOS_LISTOFLISTS *DOS_LOL)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
Output of DOS 6.22:
|
Output of DOS 6.22:
|
||||||
|
@ -131,14 +433,16 @@ void DOSDEV_InstallDOSDevices(void)
|
||||||
DOS_DEVICE_HEADER *pdev;
|
DOS_DEVICE_HEADER *pdev;
|
||||||
UINT16 seg;
|
UINT16 seg;
|
||||||
int n;
|
int n;
|
||||||
WORD ofs = sizeof(DOS_LISTOFLISTS)-sizeof(DOS_DEVICE_HEADER);
|
WORD ofs = DEV0_OFS;
|
||||||
|
DOS_LISTOFLISTS *DOS_LOL;
|
||||||
|
|
||||||
/* allocate DOS data segment or something */
|
/* allocate DOS data segment or something */
|
||||||
DOS_LOLSeg = GlobalDOSAlloc16(ofs+sizeof(WINEDEV)+sizeof(devs));
|
DOS_LOLSeg = GlobalDOSAlloc16(ALL_OFS+CON_BUFFER);
|
||||||
seg = HIWORD(DOS_LOLSeg);
|
seg = HIWORD(DOS_LOLSeg);
|
||||||
DOS_LOL = PTR_SEG_OFF_TO_LIN(LOWORD(DOS_LOLSeg), 0);
|
DOS_LOL = PTR_SEG_OFF_TO_LIN(LOWORD(DOS_LOLSeg), 0);
|
||||||
|
|
||||||
InitListOfLists();
|
/* initialize the magnificent List Of Lists */
|
||||||
|
InitListOfLists(DOS_LOL);
|
||||||
|
|
||||||
/* copy first device (NUL) */
|
/* copy first device (NUL) */
|
||||||
pdev = &(DOS_LOL->NUL_dev);
|
pdev = &(DOS_LOL->NUL_dev);
|
||||||
|
@ -155,6 +459,10 @@ void DOSDEV_InstallDOSDevices(void)
|
||||||
dev++;
|
dev++;
|
||||||
ofs += sizeof(WINEDEV);
|
ofs += sizeof(WINEDEV);
|
||||||
|
|
||||||
|
/* first of remaining devices is CON */
|
||||||
|
DOS_LOL->ptr_CON_dev_hdr = PTR_SEG_OFF_TO_SEGPTR(seg, ofs);
|
||||||
|
|
||||||
|
/* copy remaining devices */
|
||||||
memcpy(dev,&devs,sizeof(devs));
|
memcpy(dev,&devs,sizeof(devs));
|
||||||
for (n=0; n<nr_devs; n++) {
|
for (n=0; n<nr_devs; n++) {
|
||||||
pdev->next_dev = PTR_SEG_OFF_TO_SEGPTR(seg, ofs);
|
pdev->next_dev = PTR_SEG_OFF_TO_SEGPTR(seg, ofs);
|
||||||
|
@ -166,3 +474,136 @@ void DOSDEV_InstallDOSDevices(void)
|
||||||
pdev = &(dev[n].hdr);
|
pdev = &(dev[n].hdr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DWORD DOSDEV_Console(void)
|
||||||
|
{
|
||||||
|
return DOSMEM_LOL()->ptr_CON_dev_hdr;
|
||||||
|
}
|
||||||
|
|
||||||
|
DWORD DOSDEV_FindCharDevice(char*name)
|
||||||
|
{
|
||||||
|
SEGPTR cur_ptr = PTR_SEG_OFF_TO_SEGPTR(HIWORD(DOS_LOLSeg),
|
||||||
|
FIELD_OFFSET(DOS_LISTOFLISTS,NUL_dev));
|
||||||
|
DOS_DEVICE_HEADER *cur = DOSMEM_MapRealToLinear(cur_ptr);
|
||||||
|
char dname[8];
|
||||||
|
int cnt;
|
||||||
|
|
||||||
|
/* get first 8 characters */
|
||||||
|
strncpy(dname,name,8);
|
||||||
|
/* if less than 8 characters, pad with spaces */
|
||||||
|
for (cnt=0; cnt<8; cnt++)
|
||||||
|
if (!dname[cnt]) dname[cnt]=' ';
|
||||||
|
|
||||||
|
/* search for char devices with the right name */
|
||||||
|
while (cur &&
|
||||||
|
((!(cur->attr & ATTR_CHAR)) ||
|
||||||
|
memcmp(cur->name,dname,8))) {
|
||||||
|
cur_ptr = cur->next_dev;
|
||||||
|
if (cur_ptr == NONEXT) cur=NULL;
|
||||||
|
else cur = DOSMEM_MapRealToLinear(cur_ptr);
|
||||||
|
}
|
||||||
|
return cur_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void DOSDEV_DoReq(void*req, DWORD dev)
|
||||||
|
{
|
||||||
|
REQUEST_HEADER *hdr = (REQUEST_HEADER *)req;
|
||||||
|
DOS_DEVICE_HEADER *dhdr;
|
||||||
|
CONTEXT ctx;
|
||||||
|
char *phdr;
|
||||||
|
|
||||||
|
dhdr = DOSMEM_MapRealToLinear(dev);
|
||||||
|
phdr = ((char*)DOSMEM_LOL()) + ALLDEV_OFS;
|
||||||
|
|
||||||
|
/* copy request to request scratch area */
|
||||||
|
memcpy(phdr, req, hdr->size);
|
||||||
|
|
||||||
|
/* prepare to call device driver */
|
||||||
|
memset(&ctx, 0, sizeof(ctx));
|
||||||
|
|
||||||
|
/* ES:BX points to request for strategy routine */
|
||||||
|
ES_reg(&ctx) = HIWORD(DOS_LOLSeg);
|
||||||
|
BX_reg(&ctx) = ALLDEV_OFS;
|
||||||
|
|
||||||
|
/* call strategy routine */
|
||||||
|
CS_reg(&ctx) = SELECTOROF(dev);
|
||||||
|
IP_reg(&ctx) = dhdr->strategy;
|
||||||
|
DPMI_CallRMProc(&ctx, 0, 0, 0);
|
||||||
|
|
||||||
|
/* call interrupt routine */
|
||||||
|
CS_reg(&ctx) = SELECTOROF(dev);
|
||||||
|
IP_reg(&ctx) = dhdr->interrupt;
|
||||||
|
DPMI_CallRMProc(&ctx, 0, 0, 0);
|
||||||
|
|
||||||
|
/* completed, copy request back */
|
||||||
|
memcpy(req, phdr, hdr->size);
|
||||||
|
|
||||||
|
if (hdr->status & STAT_ERROR) {
|
||||||
|
switch (hdr->status & STAT_MASK) {
|
||||||
|
case 0x0F: /* invalid disk change */
|
||||||
|
/* this error seems to fit the bill */
|
||||||
|
SetLastError(ER_NotSameDevice);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
SetLastError((hdr->status & STAT_MASK) + 0x13);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int DOSDEV_IO(unsigned cmd, DWORD dev, DWORD buf, int buflen)
|
||||||
|
{
|
||||||
|
REQ_IO req;
|
||||||
|
|
||||||
|
req.hdr.size=sizeof(req);
|
||||||
|
req.hdr.unit=0; /* not dealing with block devices yet */
|
||||||
|
req.hdr.command=cmd;
|
||||||
|
req.hdr.status=STAT_BUSY;
|
||||||
|
req.media=0; /* not dealing with block devices yet */
|
||||||
|
req.buffer=buf;
|
||||||
|
req.count=buflen;
|
||||||
|
req.sector=0; /* block devices */
|
||||||
|
req.volume=0; /* block devices */
|
||||||
|
|
||||||
|
DOSDEV_DoReq(&req, dev);
|
||||||
|
|
||||||
|
return req.count;
|
||||||
|
}
|
||||||
|
|
||||||
|
int DOSDEV_Peek(DWORD dev, BYTE*data)
|
||||||
|
{
|
||||||
|
REQ_SAFEINPUT req;
|
||||||
|
|
||||||
|
req.hdr.size=sizeof(req);
|
||||||
|
req.hdr.unit=0; /* not dealing with block devices yet */
|
||||||
|
req.hdr.command=CMD_SAFEINPUT;
|
||||||
|
req.hdr.status=STAT_BUSY;
|
||||||
|
req.data=0;
|
||||||
|
|
||||||
|
DOSDEV_DoReq(&req, dev);
|
||||||
|
|
||||||
|
if (req.hdr.status & STAT_BUSY) return 0;
|
||||||
|
|
||||||
|
*data = req.data;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int DOSDEV_Read(DWORD dev, DWORD buf, int buflen)
|
||||||
|
{
|
||||||
|
return DOSDEV_IO(CMD_INPUT, dev, buf, buflen);
|
||||||
|
}
|
||||||
|
|
||||||
|
int DOSDEV_Write(DWORD dev, DWORD buf, int buflen, int verify)
|
||||||
|
{
|
||||||
|
return DOSDEV_IO(verify?CMD_SAFEOUTPUT:CMD_OUTPUT, dev, buf, buflen);
|
||||||
|
}
|
||||||
|
|
||||||
|
int DOSDEV_IoctlRead(DWORD dev, DWORD buf, int buflen)
|
||||||
|
{
|
||||||
|
return DOSDEV_IO(CMD_INIOCTL, dev, buf, buflen);
|
||||||
|
}
|
||||||
|
|
||||||
|
int DOSDEV_IoctlWrite(DWORD dev, DWORD buf, int buflen)
|
||||||
|
{
|
||||||
|
return DOSDEV_IO(CMD_OUTIOCTL, dev, buf, buflen);
|
||||||
|
}
|
||||||
|
|
|
@ -156,6 +156,12 @@ BYTE * DOSMEM_BiosSys()
|
||||||
return DOSMEM_MemoryBase(0)+0xf0000;
|
return DOSMEM_MemoryBase(0)+0xf0000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct _DOS_LISTOFLISTS * DOSMEM_LOL()
|
||||||
|
{
|
||||||
|
return (struct _DOS_LISTOFLISTS *)DOSMEM_MapRealToLinear
|
||||||
|
(PTR_SEG_OFF_TO_SEGPTR(HIWORD(DOS_LOLSeg),0));
|
||||||
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DOSMEM_FillBiosSegments
|
* DOSMEM_FillBiosSegments
|
||||||
*
|
*
|
||||||
|
@ -376,6 +382,28 @@ static void DOSMEM_InitMemory(HMODULE16 hModule)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* DOSMEM_MovePointers
|
||||||
|
*
|
||||||
|
* Relocates any pointers into DOS memory to a new address space.
|
||||||
|
*/
|
||||||
|
static void DOSMEM_MovePointers(LPVOID dest, LPVOID src, DWORD size)
|
||||||
|
{
|
||||||
|
unsigned long delta = dest-src;
|
||||||
|
unsigned cnt;
|
||||||
|
ldt_entry ent;
|
||||||
|
|
||||||
|
/* relocate base addresses of any selectors pointing into memory */
|
||||||
|
for (cnt=FIRST_LDT_ENTRY_TO_ALLOC; cnt<LDT_SIZE; cnt++) {
|
||||||
|
LDT_GetEntry(cnt, &ent);
|
||||||
|
if ((ent.base >= (unsigned long)src) && \
|
||||||
|
(ent.base < ((unsigned long)src + size))) {
|
||||||
|
ent.base += delta;
|
||||||
|
LDT_SetEntry(cnt, &ent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DOSMEM_Init
|
* DOSMEM_Init
|
||||||
*
|
*
|
||||||
|
@ -415,8 +443,12 @@ BOOL DOSMEM_Init(HMODULE16 hModule)
|
||||||
DOSMEM_FillIsrTable(hModule);
|
DOSMEM_FillIsrTable(hModule);
|
||||||
DOSMEM_InitMemory(hModule);
|
DOSMEM_InitMemory(hModule);
|
||||||
#else
|
#else
|
||||||
|
LPVOID base = DOSMEM_MemoryBase(hModule);
|
||||||
|
|
||||||
/* bootstrap the new V86 task with a copy of the "system" memory */
|
/* bootstrap the new V86 task with a copy of the "system" memory */
|
||||||
memcpy(DOSMEM_MemoryBase(hModule), DOSMEM_dosmem, 0x100000);
|
memcpy(base, DOSMEM_dosmem, 0x100000);
|
||||||
|
/* then move existing selectors to it */
|
||||||
|
DOSMEM_MovePointers(base, DOSMEM_dosmem, 0x100000);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -1662,9 +1662,9 @@ void WINAPI DOS3Call( CONTEXT *context )
|
||||||
SET_CFLAG(context);
|
SET_CFLAG(context);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
DOS_LOL->sharing_retry_delay = CX_reg(context);
|
DOSMEM_LOL()->sharing_retry_delay = CX_reg(context);
|
||||||
if (!DX_reg(context))
|
if (!DX_reg(context))
|
||||||
DOS_LOL->sharing_retry_count = DX_reg(context);
|
DOSMEM_LOL()->sharing_retry_count = DX_reg(context);
|
||||||
RESET_CFLAG(context);
|
RESET_CFLAG(context);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue