tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-21 21:04:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

This change was missed, as the changelog mentioned it was in 2035a already:

Browse Source 
r_si/r_di contents added as documented in PC-DOS Technical Update.
I also moved the CharReqHdr filling in to just before execrh, and
made the command table a static const so it is outside the SDA (OW places
it in CONST2).


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1427 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2009-06-09 12:23:14 +00:00
parent 598ca4276a
commit d519f3db40
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
kernel/ioctl.c
View File

@ -54,47 +54,33 @@ static BYTE *RcsId =
*/ */
/* this is a file scope static because with Turbo C 2.01 "static const" does
* not work correctly inside the function */
STATIC const UBYTE cmd [] = {
0, 0,
/* 0x02 */ C_IOCTLIN,
/* 0x03 */ C_IOCTLOUT,
/* 0x04 */ C_IOCTLIN,
/* 0x05 */ C_IOCTLOUT,
/* 0x06 */ C_ISTAT,
/* 0x07 */ C_OSTAT,
/* 0x08 */ C_REMMEDIA,
0, 0, 0,
/* 0x0c */ C_GENIOCTL,
/* 0x0d */ C_GENIOCTL,
/* 0x0e */ C_GETLDEV,
/* 0x0f */ C_SETLDEV,
/* 0x10 */ C_IOCTLQRY,
/* 0x11 */ C_IOCTLQRY,
};
int DosDevIOctl(lregs * r) int DosDevIOctl(lregs * r)
{ {
static UBYTE cmd [] = {
0, 0,
/* 0x02 */ C_IOCTLIN,
/* 0x03 */ C_IOCTLOUT,
/* 0x04 */ C_IOCTLIN,
/* 0x05 */ C_IOCTLOUT,
/* 0x06 */ C_ISTAT,
/* 0x07 */ C_OSTAT,
/* 0x08 */ C_REMMEDIA,
0, 0, 0,
/* 0x0c */ C_GENIOCTL,
/* 0x0d */ C_GENIOCTL,
/* 0x0e */ C_GETLDEV,
/* 0x0f */ C_SETLDEV,
/* 0x10 */ C_IOCTLQRY,
/* 0x11 */ C_IOCTLQRY,
};
struct dhdr FAR *dev; struct dhdr FAR *dev;
if (r->AL > 0x11) if (r->AL > 0x11)
return DE_INVLDFUNC; return DE_INVLDFUNC;
/* commonly used, shouldn't harm to do front up */
CharReqHdr.r_command = cmd[r->AL];
if (r->AL == 0x0C || r->AL == 0x0D || r->AL >= 0x10) /* generic or query */
{
CharReqHdr.r_cat = r->CH; /* category (major) code */
CharReqHdr.r_fun = r->CL; /* function (minor) code */
CharReqHdr.r_io = MK_FP(r->DS, r->DX); /* parameter block */
}
else
{
CharReqHdr.r_count = r->CX;
CharReqHdr.r_trans = MK_FP(r->DS, r->DX);
}
CharReqHdr.r_length = sizeof(request);
CharReqHdr.r_status = 0;
switch (r->AL) switch (r->AL)
{ {
case 0x0b: case 0x0b:
@ -249,6 +235,23 @@ int DosDevIOctl(lregs * r)
return DE_INVLDFUNC; return DE_INVLDFUNC;
} }
CharReqHdr.r_command = cmd[r->AL];
if (r->AL == 0x0C || r->AL == 0x0D || r->AL >= 0x10) /* generic or query */
{
CharReqHdr.r_cat = r->CH; /* category (major) code */
CharReqHdr.r_fun = r->CL; /* function (minor) code */
CharReqHdr.r_si = r->SI; /* contents of SI and DI */
CharReqHdr.r_di = r->DI;
CharReqHdr.r_io = MK_FP(r->DS, r->DX); /* parameter block */
}
else
{
CharReqHdr.r_count = r->CX;
CharReqHdr.r_trans = MK_FP(r->DS, r->DX);
}
CharReqHdr.r_length = sizeof(request);
CharReqHdr.r_status = 0;
execrh(&CharReqHdr, dev); execrh(&CharReqHdr, dev);
if (CharReqHdr.r_status & S_ERROR) if (CharReqHdr.r_status & S_ERROR)