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

Add UMB code, patch, and code fixes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@32 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Jim Tabor 2000-06-21 18:16:46 +00:00
parent befddcad33
commit b8a19f9da0
20 changed files with 528 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hdr/fat.h
View File

@ -36,6 +36,9 @@ static BYTE *fat_hRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.4 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.3 2000/05/25 20:56:19 jimtabor * Revision 1.3 2000/05/25 20:56:19 jimtabor
* Fixed project history * Fixed project history
* *
@ -112,8 +115,11 @@ static BYTE *fat_hRcsId = "$Id$";
/* Test for 16 bit or 12 bit FAT */ /* Test for 16 bit or 12 bit FAT */
#define SIZEOF_CLST16 2 #define SIZEOF_CLST16 2
#define FAT_MAGIC 4086 #define FAT_MAGIC 4086
#define FAT_MAGIC16 65526
#define FAT_MAGIC32 268435456
#define ISFAT16(dpbp) (((dpbp)->dpb_size)>FAT_MAGIC) #define ISFAT32(dpbp) (((dpbp)->dpb_size)>FAT_MAGIC16 || ((dpbp)->dpb_size)<=FAT_MAGIC32 )
#define ISFAT16(dpbp) (((dpbp)->dpb_size)>FAT_MAGIC || ((dpbp)->dpb_size)<=FAT_MAGIC16 )
#define ISFAT12(dpbp) (((dpbp)->dpb_size)<=FAT_MAGIC) #define ISFAT12(dpbp) (((dpbp)->dpb_size)<=FAT_MAGIC)
/* FAT file system directory entry */ /* FAT file system directory entry */

9
hdr/mcb.h
View File

@ -36,6 +36,9 @@ static BYTE *mcb_hRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.4 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.3 2000/05/25 20:56:19 jimtabor * Revision 1.3 2000/05/25 20:56:19 jimtabor
* Fixed project history * Fixed project history
* *
@ -85,6 +88,12 @@ static BYTE *mcb_hRcsId = "$Id$";
#define FIRST_FIT 0 #define FIRST_FIT 0
#define BEST_FIT 1 #define BEST_FIT 1
#define LAST_FIT 2 #define LAST_FIT 2
#define FIRST_FIT_UO 0x40
#define BEST_FIT_UO 0x41
#define LAST_FIT_UO 0x42
#define FIRST_FIT_U 0x80
#define BEST_FIT_U 0x81
#define LAST_FIT_U 0x82
#define MCB_NORMAL 0x4d #define MCB_NORMAL 0x4d
#define MCB_LAST 0x5a #define MCB_LAST 0x5a

119
kernel/config.c
View File

@ -39,6 +39,9 @@ static BYTE *RcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.5 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.4 2000/05/26 19:25:19 jimtabor * Revision 1.4 2000/05/26 19:25:19 jimtabor
* Read History file for Change info * Read History file for Change info
* *
@ -140,7 +143,9 @@ void __int__(int); /* TC 2.01 requires this. :( -- ror4 */
#endif #endif
BYTE FAR *lpBase; BYTE FAR *lpBase;
BYTE FAR *upBase;
static BYTE FAR *lpOldLast; static BYTE FAR *lpOldLast;
static BYTE FAR *upOldLast;
static COUNT nCfgLine; static COUNT nCfgLine;
static COUNT nPass; static COUNT nPass;
static BYTE szLine[256]; static BYTE szLine[256];
@ -148,14 +153,19 @@ static BYTE szBuf[256];
int singleStep = 0; int singleStep = 0;
INIT VOID zumcb_init(mcb FAR * mcbp, UWORD size);
INIT VOID Buffers(BYTE * pLine); INIT VOID Buffers(BYTE * pLine);
INIT VOID sysScreenMode(BYTE * pLine); INIT VOID sysScreenMode(BYTE * pLine);
INIT VOID sysVersion(BYTE * pLine); INIT VOID sysVersion(BYTE * pLine);
INIT VOID Break(BYTE * pLine); INIT VOID Break(BYTE * pLine);
INIT VOID Device(BYTE * pLine); INIT VOID Device(BYTE * pLine);
INIT VOID DeviceHigh(BYTE * pLine);
INIT VOID Files(BYTE * pLine); INIT VOID Files(BYTE * pLine);
INIT VOID Fcbs(BYTE * pLine); INIT VOID Fcbs(BYTE * pLine);
INIT VOID Lastdrive(BYTE * pLine); INIT VOID Lastdrive(BYTE * pLine);
INIT VOID LoadDevice(BYTE * pLine, COUNT top, COUNT mode);
INIT VOID Dosmem(BYTE * pLine);
INIT VOID Country(BYTE * pLine); INIT VOID Country(BYTE * pLine);
INIT VOID InitPgm(BYTE * pLine); INIT VOID InitPgm(BYTE * pLine);
INIT VOID Switchar(BYTE * pLine); INIT VOID Switchar(BYTE * pLine);
@ -190,6 +200,8 @@ static struct table commands[] =
{"command", 1, InitPgm}, {"command", 1, InitPgm},
{"country", 1, Country}, {"country", 1, Country},
{"device", 2, Device}, {"device", 2, Device},
{"devicehigh", 2, DeviceHigh},
{"dos", 1, Dosmem},
{"fcbs", 1, Fcbs}, {"fcbs", 1, Fcbs},
{"files", 1, Files}, {"files", 1, Files},
{"lastdrive", 1, Lastdrive}, {"lastdrive", 1, Lastdrive},
@ -251,7 +263,7 @@ INIT void PreConfig(void)
+ Config.cfgFiles * sizeof(sft)); + Config.cfgFiles * sizeof(sft));
CDSp = (cdstbl FAR *) CDSp = (cdstbl FAR *)
KernelAlloc(0x58 * (lastdrive + 1)); KernelAlloc(0x58 * (lastdrive));
#ifdef DEBUG #ifdef DEBUG
@ -289,13 +301,15 @@ INIT void PreConfig(void)
/* Also, run config.sys to load drivers. */ /* Also, run config.sys to load drivers. */
INIT void PostConfig(void) INIT void PostConfig(void)
{ {
COUNT tmp = 0xc000;
/* Set pass number */ /* Set pass number */
nPass = 2; nPass = 2;
/* compute lastdrive ... */ /* compute lastdrive ... */
lastdrive = Config.cfgLastdrive; lastdrive = Config.cfgLastdrive;
if (lastdrive < nblkdev -1) if (lastdrive < nblkdev )
lastdrive = nblkdev -1; lastdrive = nblkdev ;
/* Initialize the base memory pointers from last time. */ /* Initialize the base memory pointers from last time. */
lpBase = AlignParagraph(lpOldLast); lpBase = AlignParagraph(lpOldLast);
@ -326,7 +340,7 @@ INIT void PostConfig(void)
+ Config.cfgFiles * sizeof(sft)); + Config.cfgFiles * sizeof(sft));
CDSp = (cdstbl FAR *) CDSp = (cdstbl FAR *)
KernelAlloc(0x58 * (lastdrive + 1)); KernelAlloc(0x58 * (lastdrive));
#ifdef DEBUG #ifdef DEBUG
@ -353,6 +367,21 @@ INIT void PostConfig(void)
printf("Allocation completed: top at 0x%04x:0x%04x\n", printf("Allocation completed: top at 0x%04x:0x%04x\n",
FP_SEG(lpBase), FP_OFF(lpBase)); FP_SEG(lpBase), FP_OFF(lpBase));
#endif #endif
if(uppermem_link)
{
upBase = MK_FP(tmp , 0);
uppermem_root = FP_SEG(upBase) + ((FP_OFF(upBase) + 0x0f) >> 4);
umcb_init((mcb FAR *) (MK_FP(uppermem_root, 0)), 0 );
upBase += 16;
#ifdef DEBUG
printf("UMB Allocation completed: top at 0x%04x:0x%04x\n",
FP_SEG(upBase), FP_OFF(upBase));
#endif
}
} }
/* This code must be executed after device drivers has been loaded */ /* This code must be executed after device drivers has been loaded */
@ -360,13 +389,13 @@ INIT VOID configDone(VOID)
{ {
COUNT i; COUNT i;
if (lastdrive < nblkdev -1) { if (lastdrive < nblkdev) {
#ifdef DEBUG #ifdef DEBUG
printf("lastdrive %c too small upping it to: %c\n", lastdrive + 'A', nblkdev + 'A' -1); printf("lastdrive %c too small upping it to: %c\n", lastdrive + 'A', nblkdev + 'A' -1);
#endif /* DEBUG */ #endif /* DEBUG */
lastdrive = nblkdev -1; lastdrive = nblkdev;
CDSp = (cdstbl FAR *) CDSp = (cdstbl FAR *)
KernelAlloc(0x58 * (lastdrive +1)); KernelAlloc(0x58 * (lastdrive ));
} }
first_mcb = FP_SEG(lpBase) + ((FP_OFF(lpBase) + 0x0f) >> 4); first_mcb = FP_SEG(lpBase) + ((FP_OFF(lpBase) + 0x0f) >> 4);
@ -374,6 +403,13 @@ INIT VOID configDone(VOID)
mcb_init((mcb FAR *) (MK_FP(first_mcb, 0)), mcb_init((mcb FAR *) (MK_FP(first_mcb, 0)),
(ram_top << 6) - first_mcb - 1); (ram_top << 6) - first_mcb - 1);
if(uppermem_link)
{
uppermem_root = FP_SEG(upBase) + ((FP_OFF(upBase) + 0x0f) >> 4);
zumcb_init((mcb FAR *) (MK_FP(uppermem_root, 0)),
(UMB_top << 6) - uppermem_root - 1);
}
/* The standard handles should be reopened here, because /* The standard handles should be reopened here, because
we may have loaded new console or printer drivers in CONFIG.SYS */ we may have loaded new console or printer drivers in CONFIG.SYS */
} }
@ -636,9 +672,29 @@ INIT static VOID Lastdrive(BYTE * pLine)
return; return;
} }
drv -= 'A'; drv -= 'A';
drv++; /* Make real number*/
Config.cfgLastdrive = max(Config.cfgLastdrive, drv); Config.cfgLastdrive = max(Config.cfgLastdrive, drv);
} }
INIT static VOID Dosmem(BYTE * pLine)
{
COUNT tmp;
COUNT FAR * u = MK_FP(0xc000, 0);
GetStringArg(pLine, szBuf);
uppermem_link = strcmp(szBuf, "UMB") ? 1 : 0;
if(uppermem_link)
{
tmp = *u;
*u = 0x1234;
if(*u == 0x1234)
*u = tmp;
else
uppermem_link = 0;
}
}
INIT static VOID Switchar(BYTE * pLine) INIT static VOID Switchar(BYTE * pLine)
{ {
/* Format: SWITCHAR = character */ /* Format: SWITCHAR = character */
@ -769,14 +825,37 @@ INIT static VOID Break(BYTE * pLine)
break_ena = strcmp(szBuf, "OFF") ? 1 : 0; break_ena = strcmp(szBuf, "OFF") ? 1 : 0;
} }
INIT static VOID DeviceHigh(BYTE * pLine)
{
if(uppermem_link)
{
LoadDevice(pLine, UMB_top, TRUE);
}
else
{
printf("UMB's unavalable!\n");
LoadDevice(pLine, ram_top, FALSE);
}
}
INIT static VOID Device(BYTE * pLine) INIT static VOID Device(BYTE * pLine)
{
LoadDevice(pLine, ram_top, FALSE);
}
INIT static VOID LoadDevice(BYTE * pLine, COUNT top, COUNT mode)
{ {
VOID FAR *driver_ptr; VOID FAR *driver_ptr;
BYTE *pTmp; BYTE *pTmp;
exec_blk eb; exec_blk eb;
struct dhdr FAR *dhp; struct dhdr FAR *dhp;
struct dhdr FAR *next_dhp; struct dhdr FAR *next_dhp;
UWORD dev_seg = (((ULONG) FP_SEG(lpBase) << 4) + FP_OFF(lpBase) + 0xf) >> 4; UWORD dev_seg;
if(mode)
dev_seg = (((ULONG) FP_SEG(upBase) << 4) + FP_OFF(upBase) + 0xf) >> 4;
else
dev_seg = (((ULONG) FP_SEG(lpBase) << 4) + FP_OFF(lpBase) + 0xf) >> 4;
/* Get the device driver name */ /* Get the device driver name */
GetStringArg(pLine, szBuf); GetStringArg(pLine, szBuf);
@ -797,7 +876,7 @@ INIT static VOID Device(BYTE * pLine)
next_dhp = dhp->dh_next = nul_dev.dh_next; next_dhp = dhp->dh_next = nul_dev.dh_next;
nul_dev.dh_next = dhp; nul_dev.dh_next = dhp;
if(init_device(dhp, pLine)){ if(init_device(dhp, pLine, mode, top)){
nul_dev.dh_next = next_dhp; /* return orig pointer if error */ nul_dev.dh_next = next_dhp; /* return orig pointer if error */
} }
} }
@ -962,6 +1041,26 @@ INIT VOID
mcbp->m_name[i] = '\0'; mcbp->m_name[i] = '\0';
mem_access_mode = FIRST_FIT; mem_access_mode = FIRST_FIT;
} }
INIT VOID
umcb_init(mcb FAR * mcbp, UWORD size)
{
COUNT i;
static char name[8] = "UMB ";
mcbp->m_type = 0x4d;
mcbp->m_psp = 0x08;
mcbp->m_size = size;
for (i = 0; i < 8; i++)
mcbp->m_name[i] = name[i];
}
INIT VOID
zumcb_init(mcb FAR * mcbp, UWORD size)
{
COUNT i;
mcbp->m_type = MCB_LAST;
mcbp->m_psp = FREE_PSP;
mcbp->m_size = size;
}
#endif #endif
INIT VOID INIT VOID

25
kernel/dosfns.c
View File

@ -34,6 +34,9 @@ static BYTE *dosfnsRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.7 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.6 2000/06/01 06:37:38 jimtabor * Revision 1.6 2000/06/01 06:37:38 jimtabor
* Read History for Changes * Read History for Changes
* *
@ -230,13 +233,7 @@ UCOUNT GenericRead(COUNT hndl, UCOUNT n, BYTE FAR * bp, COUNT FAR * err,
if (s->sft_flags & SFT_FSHARED) if (s->sft_flags & SFT_FSHARED)
{ {
ReadCount = Remote_RW(REM_READ, n, bp, s, err); ReadCount = Remote_RW(REM_READ, n, bp, s, err);
if (err) return *err == SUCCESS ? ReadCount : 0;
{
*err = SUCCESS;
return ReadCount;
}
else
return 0;
} }
/* Do a device read if device */ /* Do a device read if device */
if (s->sft_flags & SFT_FDEVICE) if (s->sft_flags & SFT_FDEVICE)
@ -346,12 +343,7 @@ UCOUNT DosWrite(COUNT hndl, UCOUNT n, BYTE FAR * bp, COUNT FAR * err)
if (s->sft_flags & SFT_FSHARED) if (s->sft_flags & SFT_FSHARED)
{ {
WriteCount = Remote_RW(REM_WRITE, n, bp, s, err); WriteCount = Remote_RW(REM_WRITE, n, bp, s, err);
if (err) return *err == SUCCESS ? WriteCount : 0;
{
return WriteCount;
}
else
return 0;
} }
/* Do a device write if device */ /* Do a device write if device */
@ -962,7 +954,7 @@ VOID DosGetFree(COUNT drive, COUNT FAR * spc, COUNT FAR * navc, COUNT FAR * bps,
drive = (drive == 0 ? default_drive : drive - 1); drive = (drive == 0 ? default_drive : drive - 1);
/* first check for valid drive */ /* first check for valid drive */
if (drive < 0 || drive > lastdrive) if (drive < 0 || drive > (lastdrive - 1))
{ {
*spc = -1; *spc = -1;
return; return;
@ -1011,7 +1003,7 @@ COUNT DosGetCuDir(COUNT drive, BYTE FAR * s)
drive = (drive == 0 ? default_drive : drive - 1); drive = (drive == 0 ? default_drive : drive - 1);
/* first check for valid drive */ /* first check for valid drive */
if (drive < 0 || drive > lastdrive) { if (drive < 0 || drive > (lastdrive - 1)) {
return DE_INVLDDRV; return DE_INVLDDRV;
} }
@ -1190,6 +1182,7 @@ COUNT DosGetFattr(BYTE FAR * name, UWORD FAR * attrp)
else { else {
result = dos_getfattr(name, attrp); result = dos_getfattr(name, attrp);
} }
return result;
} }
COUNT DosSetFattr(BYTE FAR * name, UWORD FAR * attrp) COUNT DosSetFattr(BYTE FAR * name, UWORD FAR * attrp)
@ -1228,7 +1221,7 @@ COUNT DosSetFattr(BYTE FAR * name, UWORD FAR * attrp)
BYTE DosSelectDrv(BYTE drv) BYTE DosSelectDrv(BYTE drv)
{ {
if ((drv <= lastdrive) && (CDSp->cds_table[drv].cdsFlags & 0xf000)) if ((drv <= (lastdrive -1 )) && (CDSp->cds_table[drv].cdsFlags & 0xf000))
{ {
current_ldt = &CDSp->cds_table[drv]; current_ldt = &CDSp->cds_table[drv];
default_drive = drv; default_drive = drv;

12
kernel/dosnames.c
View File

@ -36,6 +36,9 @@ static BYTE *dosnamesRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.6 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.5 2000/06/01 06:37:38 jimtabor * Revision 1.5 2000/06/01 06:37:38 jimtabor
* Read History for Changes * Read History for Changes
* *
@ -138,7 +141,13 @@ VOID SpacePad(BYTE * szString, COUNT nChars)
for (i = strlen(szString); i < nChars; i++) for (i = strlen(szString); i < nChars; i++)
szString[i] = ' '; szString[i] = ' ';
} }
/*
MSD durring an FindFirst search string looks like this;
(*), & (.) == Current directory *.*
(\) == Root directory *.*
(..) == Back one directory *.*
*/
COUNT ParseDosName(BYTE FAR * lpszFileName, COUNT ParseDosName(BYTE FAR * lpszFileName,
COUNT * pnDrive, COUNT * pnDrive,
BYTE * pszDir, BYTE * pszDir,
@ -254,10 +263,11 @@ COUNT ParseDosName(BYTE FAR * lpszFileName,
++nExtCnt; ++nExtCnt;
++lpszFileName; ++lpszFileName;
} }
else else{
return DE_FILENOTFND; return DE_FILENOTFND;
} }
} }
}
else if (*lpszFileName) else if (*lpszFileName)
return DE_FILENOTFND; return DE_FILENOTFND;

66
kernel/dsk.c
View File

@ -33,6 +33,9 @@ static BYTE *dskRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.8 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.7 2000/06/01 06:37:38 jimtabor * Revision 1.7 2000/06/01 06:37:38 jimtabor
* Read History for Changes * Read History for Changes
* *
@ -215,9 +218,13 @@ WORD init(rqptr),
blockio(rqptr), blockio(rqptr),
IoctlQueblk(rqptr), IoctlQueblk(rqptr),
Genblkdev(rqptr), Genblkdev(rqptr),
Getlogdev(rqptr),
Setlogdev(rqptr),
blk_Open(rqptr), blk_Open(rqptr),
blk_Close(rqptr), blk_Close(rqptr),
blk_Media(rqptr), blk_Media(rqptr),
blk_noerr(rqptr),
blk_nondr(rqptr),
blk_error(rqptr); blk_error(rqptr);
COUNT ltop(WORD *, WORD *, WORD *, COUNT, COUNT, LONG, byteptr); COUNT ltop(WORD *, WORD *, WORD *, COUNT, COUNT, LONG, byteptr);
WORD dskerr(COUNT); WORD dskerr(COUNT);
@ -229,9 +236,13 @@ WORD init(),
blockio(), blockio(),
IoctlQueblk(), IoctlQueblk(),
Genblkdev(), Genblkdev(),
Getlogdev(),
Setlogdev(),
blk_Open(), blk_Open(),
blk_Close(), blk_Close(),
blk_Media(), blk_Media(),
blk_noerr(),
blk_nondr(),
blk_error(); blk_error();
WORD dskerr(); WORD dskerr();
COUNT processtable(); COUNT processtable();
@ -252,26 +263,26 @@ static WORD(*dispatch[NENTRY]) () =
bldbpb, /* Build BPB */ bldbpb, /* Build BPB */
blk_error, /* Ioctl In */ blk_error, /* Ioctl In */
blockio, /* Input (Read) */ blockio, /* Input (Read) */
blk_error, /* Non-destructive Read */ blk_nondr, /* Non-destructive Read */
blk_error, /* Input Status */ blk_noerr, /* Input Status */
blk_error, /* Input Flush */ blk_noerr, /* Input Flush */
blockio, /* Output (Write) */ blockio, /* Output (Write) */
blockio, /* Output with verify */ blockio, /* Output with verify */
blk_error, /* Output Status */ blk_noerr, /* Output Status */
blk_error, /* Output Flush */ blk_noerr, /* Output Flush */
blk_error, /* Ioctl Out */ blk_error, /* Ioctl Out */
blk_Open, /* Device Open */ blk_Open, /* Device Open */
blk_Close, /* Device Close */ blk_Close, /* Device Close */
blk_Media, /* Removable Media */ blk_Media, /* Removable Media */
blk_error, /* Output till busy */ blk_noerr, /* Output till busy */
blk_error, /* undefined */ blk_error, /* undefined */
blk_error, /* undefined */ blk_error, /* undefined */
Genblkdev, /* Generic Ioctl Call */ Genblkdev, /* Generic Ioctl Call */
blk_error, /* undefined */ blk_error, /* undefined */
blk_error, /* undefined */ blk_error, /* undefined */
blk_error, /* undefined */ blk_error, /* undefined */
blk_error, /* Get Logical Device */ Getlogdev, /* Get Logical Device */
blk_error, /* Set Logical Device */ Setlogdev, /* Set Logical Device */
IoctlQueblk /* Ioctl Query */ IoctlQueblk /* Ioctl Query */
}; };
@ -535,6 +546,26 @@ static WORD RWzero(rqptr rp, WORD t)
return ret; return ret;
} }
/*
0 if not set, 1 = a, 2 = b, etc, assume set.
page 424 MS Programmer's Ref.
*/
static WORD Getlogdev(rqptr rp)
{
BYTE x = rp->r_unit;
x++;
if( x > nblk_rel )
return failure(E_UNIT);
rp->r_unit = x;
return S_DONE;
}
static WORD Setlogdev(rqptr rp)
{
return S_DONE;
}
static WORD blk_Open(rqptr rp) static WORD blk_Open(rqptr rp)
{ {
miarray[rp->r_unit].mi_FileOC++; miarray[rp->r_unit].mi_FileOC++;
@ -547,11 +578,14 @@ static WORD blk_Close(rqptr rp)
return S_DONE; return S_DONE;
} }
static WORD blk_nondr(rqptr rp)
{
return S_BUSY|S_DONE;
}
static WORD blk_Media(rqptr rp) static WORD blk_Media(rqptr rp)
{ {
COUNT drive = miarray[rp->r_unit].mi_drive; if (hd( miarray[rp->r_unit].mi_drive))
if (hd(drive))
return S_BUSY|S_DONE; /* Hard Drive */ return S_BUSY|S_DONE; /* Hard Drive */
else else
return S_DONE; /* Floppy */ return S_DONE; /* Floppy */
@ -652,7 +686,7 @@ static WORD IoctlQueblk(rqptr rp)
case 0x0867: case 0x0867:
break; break;
default: default:
return S_ERROR; return failure(E_CMD);
} }
return S_DONE; return S_DONE;
@ -738,7 +772,7 @@ static WORD Genblkdev(rqptr rp)
case 0x0847: /* set access flag, no real use*/ case 0x0847: /* set access flag, no real use*/
break; break;
default: default:
return S_ERROR; return failure(E_CMD);
} }
return S_DONE; return S_DONE;
} }
@ -818,6 +852,12 @@ static WORD blk_error(rqptr rp)
return failure(E_FAILURE); /* general failure */ return failure(E_FAILURE); /* general failure */
} }
static WORD blk_noerr(rqptr rp)
{
return S_DONE;
}
static WORD dskerr(COUNT code) static WORD dskerr(COUNT code)
{ {
/* printf("diskette error:\nhead = %d\ntrack = %d\nsector = %d\ncount = %d\n", /* printf("diskette error:\nhead = %d\ntrack = %d\nsector = %d\ncount = %d\n",

23
kernel/fatdir.c
View File

@ -36,6 +36,9 @@ static BYTE *fatdirRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.8 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.7 2000/06/01 06:46:57 jimtabor * Revision 1.7 2000/06/01 06:46:57 jimtabor
* Removed Debug printf * Removed Debug printf
* *
@ -190,7 +193,7 @@ struct f_node FAR *dir_open(BYTE FAR * dirname)
{ {
drive = default_drive; drive = default_drive;
} }
if (drive > lastdrive) { if (drive > (lastdrive-1)) {
release_f_node(fnp); release_f_node(fnp);
return NULL; return NULL;
} }
@ -580,7 +583,7 @@ COUNT dos_findfirst(UCOUNT attr, BYTE FAR * name)
fscopy(name, (BYTE FAR *)&Tname); fscopy(name, (BYTE FAR *)&Tname);
/* /*
printf("ff %s", Tname); printf("ff %s", Tname);
*/ */
/* The findfirst/findnext calls are probably the worst of the */ /* The findfirst/findnext calls are probably the worst of the */
/* DOS calls. They must work somewhat on the fly (i.e. - open */ /* DOS calls. They must work somewhat on the fly (i.e. - open */
/* but never close). Since we don't want to lose fnodes every */ /* but never close). Since we don't want to lose fnodes every */
@ -611,7 +614,7 @@ COUNT dos_findfirst(UCOUNT attr, BYTE FAR * name)
else else
nDrive = default_drive; nDrive = default_drive;
if (nDrive > lastdrive) { if (nDrive > (lastdrive -1)) {
return DE_INVLDDRV; return DE_INVLDDRV;
} }
current_ldt = &CDSp->cds_table[nDrive]; current_ldt = &CDSp->cds_table[nDrive];
@ -658,7 +661,7 @@ COUNT dos_findfirst(UCOUNT attr, BYTE FAR * name)
if (current_ldt->cdsFlags & CDSNETWDRV) if (current_ldt->cdsFlags & CDSNETWDRV)
{ {
if (Remote_find(REM_FINDFIRST, attr, name, dmp) != 0) if (Remote_find(REM_FINDFIRST, name, dmp) != 0)
return DE_FILENOTFND; return DE_FILENOTFND;
return SUCCESS; return SUCCESS;
} }
@ -751,7 +754,7 @@ COUNT dos_findnext(void)
*/ */
nDrive = dmp->dm_drive & 0x1f; nDrive = dmp->dm_drive & 0x1f;
if (nDrive > lastdrive) { if (nDrive > (lastdrive -1)) {
return DE_INVLDDRV; return DE_INVLDDRV;
} }
current_ldt = &CDSp->cds_table[nDrive]; current_ldt = &CDSp->cds_table[nDrive];
@ -763,7 +766,7 @@ COUNT dos_findnext(void)
if (current_ldt->cdsFlags & CDSNETWDRV) if (current_ldt->cdsFlags & CDSNETWDRV)
{ {
if (Remote_find(REM_FINDNEXT, 0, 0, dmp) != 0) if (Remote_find(REM_FINDNEXT, 0, dmp) != 0)
return DE_FILENOTFND; return DE_FILENOTFND;
return SUCCESS; return SUCCESS;
} }
@ -777,7 +780,7 @@ COUNT dos_findnext(void)
/* Force the fnode into read-write mode */ /* Force the fnode into read-write mode */
fnp->f_mode = RDWR; fnp->f_mode = RDWR;
if (dmp->dm_drive > lastdrive) { if (dmp->dm_drive > (lastdrive -1)) {
return DE_INVLDDRV; return DE_INVLDDRV;
} }
/* Select the default to help non-drive specified path */ /* Select the default to help non-drive specified path */
@ -815,6 +818,12 @@ COUNT dos_findnext(void)
{ {
if (fcmp_wild((BYTE FAR *) (dmp->dm_name_pat), (BYTE FAR *) fnp->f_dir.dir_name, FNAME_SIZE + FEXT_SIZE)) if (fcmp_wild((BYTE FAR *) (dmp->dm_name_pat), (BYTE FAR *) fnp->f_dir.dir_name, FNAME_SIZE + FEXT_SIZE))
{ {
/*
MSD Command.com uses FCB FN 11 & 12 with attrib set to 0x16.
Bits 0x21 seem to get set some where in MSD so Rd and Arc
files are returned. FD assumes the user knows what they need
to see.
*/
/* Test the attribute as the final step */ /* Test the attribute as the final step */
if (!(~dmp->dm_attr_srch & fnp->f_dir.dir_attrib)) if (!(~dmp->dm_attr_srch & fnp->f_dir.dir_attrib))
{ {

5
kernel/fatfs.c
View File

@ -36,6 +36,9 @@ BYTE *RcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.5 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.4 2000/05/25 20:56:21 jimtabor * Revision 1.4 2000/05/25 20:56:21 jimtabor
* Fixed project history * Fixed project history
* *
@ -329,7 +332,7 @@ static struct f_node FAR *
SpacePad(fname, FNAME_SIZE); SpacePad(fname, FNAME_SIZE);
SpacePad(fext, FEXT_SIZE); SpacePad(fext, FEXT_SIZE);
if (nDrive > lastdrive) { if (nDrive > (lastdrive -1)) {
return (struct f_node FAR *)0; return (struct f_node FAR *)0;
} }
cdsp = &CDSp->cds_table[nDrive]; cdsp = &CDSp->cds_table[nDrive];

33
kernel/fcbfns.c
View File

@ -35,6 +35,9 @@ static BYTE *RcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.5 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.4 2000/05/26 19:25:19 jimtabor * Revision 1.4 2000/05/26 19:25:19 jimtabor
* Read History file for Change info * Read History file for Change info
* *
@ -143,7 +146,7 @@ VOID FatGetDrvData(COUNT drive, COUNT FAR * spc, COUNT FAR * bps,
printf("FGDD\n"); printf("FGDD\n");
/* first check for valid drive */ /* first check for valid drive */
if ((drive < 0) || (drive > lastdrive) || (drive > NDEVS)) if ((drive < 0) || (drive > (lastdrive -1)) || (drive > NDEVS))
{ {
*spc = -1; *spc = -1;
return; return;
@ -226,7 +229,7 @@ WORD FcbParseFname(int wTestMode, BYTE FAR ** lpFileName, fcb FAR * lpFcb)
if (Drive < 'A' || Drive > 'Z') if (Drive < 'A' || Drive > 'Z')
return PARSE_RET_BADDRIVE; return PARSE_RET_BADDRIVE;
Drive -= ('A' - 1); Drive -= ('A' - 1);
if (Drive > lastdrive) if (Drive > (lastdrive -1))
return PARSE_RET_BADDRIVE; return PARSE_RET_BADDRIVE;
else else
lpFcb->fcb_drive = Drive; lpFcb->fcb_drive = Drive;
@ -650,7 +653,7 @@ BOOL FcbCreate(xfcb FAR * lpXfcb)
sftp->sft_mode = O_RDWR; sftp->sft_mode = O_RDWR;
sftp->sft_attrib = 0; sftp->sft_attrib = 0;
sftp->sft_flags = sftp->sft_flags =
(dhp->dh_attr & ~SFT_MASK) | SFT_FDEVICE | SFT_FEOF; ((dhp->dh_attr & ~SFT_MASK) & ~SFT_FSHARED) | SFT_FDEVICE | SFT_FEOF;
sftp->sft_psp = cu_psp; sftp->sft_psp = cu_psp;
fbcopy(lpFcb->fcb_fname, sftp->sft_name, FNAME_SIZE + FEXT_SIZE); fbcopy(lpFcb->fcb_fname, sftp->sft_name, FNAME_SIZE + FEXT_SIZE);
sftp->sft_dev = dhp; sftp->sft_dev = dhp;
@ -786,7 +789,7 @@ BOOL FcbOpen(xfcb FAR * lpXfcb)
sftp->sft_mode = O_RDWR; sftp->sft_mode = O_RDWR;
sftp->sft_attrib = 0; sftp->sft_attrib = 0;
sftp->sft_flags = sftp->sft_flags =
(dhp->dh_attr & ~SFT_MASK) | SFT_FDEVICE | SFT_FEOF; ((dhp->dh_attr & ~SFT_MASK) & ~SFT_FSHARED) | SFT_FDEVICE | SFT_FEOF;
sftp->sft_psp = cu_psp; sftp->sft_psp = cu_psp;
fbcopy(lpFcb->fcb_fname, sftp->sft_name, FNAME_SIZE + FEXT_SIZE); fbcopy(lpFcb->fcb_fname, sftp->sft_name, FNAME_SIZE + FEXT_SIZE);
sftp->sft_dev = dhp; sftp->sft_dev = dhp;
@ -800,7 +803,7 @@ BOOL FcbOpen(xfcb FAR * lpXfcb)
return TRUE; return TRUE;
} }
fbcopy((BYTE FAR *) & lpFcb->fcb_fname, (BYTE FAR *) & sftp->sft_name, FNAME_SIZE + FEXT_SIZE); fbcopy((BYTE FAR *) & lpFcb->fcb_fname, (BYTE FAR *) & sftp->sft_name, FNAME_SIZE + FEXT_SIZE);
if ((FcbDrive < 0) || (FcbDrive > lastdrive)) { if ((FcbDrive < 0) || (FcbDrive > (lastdrive -1))) {
return DE_INVLDDRV; return DE_INVLDDRV;
} }
if (CDSp->cds_table[FcbDrive].cdsFlags & CDSNETWDRV) { if (CDSp->cds_table[FcbDrive].cdsFlags & CDSNETWDRV) {
@ -846,7 +849,7 @@ BOOL FcbDelete(xfcb FAR * lpXfcb)
/* Build a traditional DOS file name */ /* Build a traditional DOS file name */
CommonFcbInit(lpXfcb, PriPathName, &FcbDrive); CommonFcbInit(lpXfcb, PriPathName, &FcbDrive);
if ((FcbDrive < 0) || (FcbDrive > lastdrive)) { if ((FcbDrive < 0) || (FcbDrive > (lastdrive -1))) {
return DE_INVLDDRV; return DE_INVLDDRV;
} }
current_ldt = &CDSp->cds_table[FcbDrive]; current_ldt = &CDSp->cds_table[FcbDrive];
@ -1123,8 +1126,19 @@ BOOL FcbFindFirst(xfcb FAR * lpXfcb)
} }
MoveDirInfo((dmatch FAR *) & Dmatch, (struct dirent FAR *)lpDir); MoveDirInfo((dmatch FAR *) & Dmatch, (struct dirent FAR *)lpDir);
lpFcb->fcb_dirclst = Dmatch.dm_cluster; lpFcb->fcb_dirclst = Dmatch.dm_cluster;
lpFcb->fcb_diroff = Dmatch.dm_entry; lpFcb->fcb_diroff = Dmatch.dm_entry;
/*
This is undocumented and seen using Pcwatch.
The First byte is the current directory count and the second seems
to be the attribute byte.
*/
#if 0
lpFcb->fcb_cublock = Dmatch.dm_entry;
lpFcb->fcb_cublock *= 0x100;
lpFcb->fcb_cublock += wAttr;
#endif
dta = lpPsp->ps_dta; dta = lpPsp->ps_dta;
return TRUE; return TRUE;
} }
@ -1159,6 +1173,7 @@ BOOL FcbFindNext(xfcb FAR * lpXfcb)
fbcopy(lpFcb->fcb_fname, (BYTE FAR *) Dmatch.dm_name_pat, FNAME_SIZE + FEXT_SIZE); fbcopy(lpFcb->fcb_fname, (BYTE FAR *) Dmatch.dm_name_pat, FNAME_SIZE + FEXT_SIZE);
upFMem((BYTE FAR *) Dmatch.dm_name_pat, FNAME_SIZE + FEXT_SIZE); upFMem((BYTE FAR *) Dmatch.dm_name_pat, FNAME_SIZE + FEXT_SIZE);
Dmatch.dm_attr_srch = wAttr; Dmatch.dm_attr_srch = wAttr;
Dmatch.dm_entry = lpFcb->fcb_diroff; Dmatch.dm_entry = lpFcb->fcb_diroff;
Dmatch.dm_cluster = lpFcb->fcb_dirclst; Dmatch.dm_cluster = lpFcb->fcb_dirclst;
@ -1166,6 +1181,7 @@ BOOL FcbFindNext(xfcb FAR * lpXfcb)
if (dos_findnext() != SUCCESS) if (dos_findnext() != SUCCESS)
{ {
dta = lpPsp->ps_dta; dta = lpPsp->ps_dta;
CritErrCode = 0x12;
return FALSE; return FALSE;
} }
@ -1173,6 +1189,11 @@ BOOL FcbFindNext(xfcb FAR * lpXfcb)
lpFcb->fcb_dirclst = Dmatch.dm_cluster; lpFcb->fcb_dirclst = Dmatch.dm_cluster;
lpFcb->fcb_diroff = Dmatch.dm_entry; lpFcb->fcb_diroff = Dmatch.dm_entry;
dta = lpPsp->ps_dta; dta = lpPsp->ps_dta;
#if 0
lpFcb->fcb_cublock = Dmatch.dm_entry;
lpFcb->fcb_cublock *= 0x100;
lpFcb->fcb_cublock += wAttr;
#endif
return TRUE; return TRUE;
} }
#endif #endif

22
kernel/globals.h
View File

@ -36,6 +36,9 @@ static BYTE *Globals_hRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.4 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.3 2000/05/25 20:56:21 jimtabor * Revision 1.3 2000/05/25 20:56:21 jimtabor
* Fixed project history * Fixed project history
* *
@ -419,7 +422,9 @@ extern BYTE NetDelay,
NetRetry; NetRetry;
extern UWORD extern UWORD
first_mcb; /* Start of user memory */ first_mcb, /* Start of user memory */
UMB_top,
uppermem_root; /* Start of umb chain ? */
extern struct dpb extern struct dpb
FAR *DPBp; /* First drive Parameter Block */ FAR *DPBp; /* First drive Parameter Block */
extern sfttbl extern sfttbl
@ -441,7 +446,8 @@ extern WORD
nprotfcb; /* number of protected fcbs */ nprotfcb; /* number of protected fcbs */
extern BYTE extern BYTE
nblkdev, /* number of block devices */ nblkdev, /* number of block devices */
lastdrive; /* value of last drive */ lastdrive, /* value of last drive */
uppermem_link; /* UMB Link flag */
extern struct dhdr extern struct dhdr
nul_dev; nul_dev;
extern BYTE extern BYTE
@ -452,9 +458,15 @@ extern BYTE
OpenMode, /* File Open Attributes */ OpenMode, /* File Open Attributes */
SAttr, /* Attrib Mask for Dir Search */ SAttr, /* Attrib Mask for Dir Search */
dosidle_flag, dosidle_flag,
Server_Call,
CritErrLocus,
CritErrAction,
CritErrClass,
njoined; /* number of joined devices */ njoined; /* number of joined devices */
extern UWORD Int21AX; extern UWORD Int21AX;
extern COUNT CritErrCode;
extern BYTE FAR * CritErrDev;
extern struct dirent extern struct dirent
SearchDir; SearchDir;
@ -545,9 +557,9 @@ extern BYTE
return_code; /* " " " */ return_code; /* " " " */
extern BYTE extern BYTE
BootDrive, /* Drive we came up from */
scr_pos; /* screen position for bs, ht, etc */ scr_pos; /* screen position for bs, ht, etc */
extern WORD extern WORD
BootDrive, /* Drive we came up from */
NumFloppies; /* How many floppies we have */ NumFloppies; /* How many floppies we have */
extern keyboard extern keyboard
@ -639,7 +651,7 @@ VOID FAR CharMapSrvc(VOID);
VOID FAR set_stack(VOID); VOID FAR set_stack(VOID);
VOID FAR restore_stack(VOID); VOID FAR restore_stack(VOID);
#ifndef IN_INIT_MOD #ifndef IN_INIT_MOD
VOID execrh(request FAR *, struct dhdr FAR *); WORD execrh(request FAR *, struct dhdr FAR *);
#endif #endif
VOID FAR init_call_execrh(request FAR *, struct dhdr FAR *); VOID FAR init_call_execrh(request FAR *, struct dhdr FAR *);
VOID exit(COUNT); VOID exit(COUNT);
@ -659,7 +671,7 @@ VOID putdirent(struct dirent FAR *, BYTE FAR *);
VOID FAR CharMapSrvc(); VOID FAR CharMapSrvc();
VOID FAR set_stack(); VOID FAR set_stack();
VOID FAR restore_stack(); VOID FAR restore_stack();
VOID execrh(); WORD execrh();
VOID exit(); VOID exit();
/*VOID INRPT FAR handle_break(); */ /*VOID INRPT FAR handle_break(); */
VOID tmark(); VOID tmark();

27
kernel/int2f.asm
View File

@ -30,6 +30,9 @@
; $Id$ ; $Id$
; ;
; $Log$ ; $Log$
; Revision 1.5 2000/06/21 18:16:46 jimtabor
; Add UMB code, patch, and code fixes
;
; Revision 1.4 2000/05/25 20:56:21 jimtabor ; Revision 1.4 2000/05/25 20:56:21 jimtabor
; Fixed project history ; Fixed project history
; ;
@ -108,9 +111,27 @@ Int2f3:
iret ; Default, interrupt return iret ; Default, interrupt return
; ;
;return dos data seg.
IntDosCal:
cmp al,03
jne IntDosCal_1
push ax
mov ax, seg _nul_dev
mov ds,ax
pop ax
clc
jmp FarTabRetn
;
;Set FastOpen but does nothing.
IntDosCal_1:
cmp al,02ah
jne IntDosCal_2
clc
jmp FarTabRetn
;
; added by James Tabor For Zip Drives ; added by James Tabor For Zip Drives
;Return Null Device Pointer ;Return Null Device Pointer
IntDosCal: IntDosCal_2:
cmp al,02ch cmp al,02ch
jne Int2f2 jne Int2f2
mov ax,_nul_dev mov ax,_nul_dev
@ -157,6 +178,7 @@ int2f_r_1:
jnc short int2f_skip1 jnc short int2f_skip1
jmp int2f_rfner jmp int2f_rfner
int2f_skip1: int2f_skip1:
xor ax,ax
les di,[bp+18] ; do return data stuff les di,[bp+18] ; do return data stuff
mov [es:di],cx mov [es:di],cx
jmp short int2f_rfner jmp short int2f_rfner
@ -170,6 +192,7 @@ int2f_r_2:
mov [es:di+2],bx mov [es:di+2],bx
mov [es:di+4],cx mov [es:di+4],cx
mov [es:di+6],dx mov [es:di+6],dx
xor ax,ax
jmp short int2f_rfner jmp short int2f_rfner
int2f_r_3: int2f_r_3:
cmp al,0fh ; Get Remote File Attrib cmp al,0fh ; Get Remote File Attrib
@ -183,7 +206,7 @@ int2f_r_3:
mov [es:di+4],bx ; high mov [es:di+4],bx ; high
mov [es:di+6],cx mov [es:di+6],cx
mov [es:di+8],dx mov [es:di+8],dx
mov ax,0000h xor ax,ax
jmp short int2f_rfner jmp short int2f_rfner
int2f_r_4: int2f_r_4:
cmp al,01eh cmp al,01eh

118
kernel/inthndlr.c
View File

@ -36,6 +36,9 @@ BYTE *RcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.8 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.7 2000/05/25 20:56:21 jimtabor * Revision 1.7 2000/05/25 20:56:21 jimtabor
* Fixed project history * Fixed project history
* *
@ -335,6 +338,7 @@ dispatch:
error_exit: error_exit:
r->AX = -rc; r->AX = -rc;
error_out: error_out:
CritErrCode = r->AX; /* Maybe set */
r->FLAGS |= FLG_CARRY; r->FLAGS |= FLG_CARRY;
break; break;
@ -504,23 +508,19 @@ dispatch:
case 0x14: case 0x14:
{ {
COUNT nErrorCode; if (FcbRead(MK_FP(r->DS, r->DX), &CritErrCode))
if (FcbRead(MK_FP(r->DS, r->DX), &nErrorCode))
r->AL = 0; r->AL = 0;
else else
r->AL = nErrorCode; r->AL = CritErrCode;
break; break;
} }
case 0x15: case 0x15:
{ {
COUNT nErrorCode; if (FcbWrite(MK_FP(r->DS, r->DX), &CritErrCode))
if (FcbWrite(MK_FP(r->DS, r->DX), &nErrorCode))
r->AL = 0; r->AL = 0;
else else
r->AL = nErrorCode; r->AL = CritErrCode;
break; break;
} }
@ -596,12 +596,13 @@ dispatch:
/* Get default DPB */ /* Get default DPB */
case 0x1f: case 0x1f:
if (default_drive <= lastdrive) if (default_drive <= (lastdrive -1))
{ {
struct dpb FAR *dpb = (struct dpb FAR *)CDSp->cds_table[default_drive].cdsDpb; struct dpb FAR *dpb = (struct dpb FAR *)CDSp->cds_table[default_drive].cdsDpb;
if (dpb == 0) if (dpb == 0)
{ {
r->AL = 0xff; r->AL = 0xff;
CritErrCode = 0x0f;
break; break;
} }
@ -609,31 +610,29 @@ dispatch:
r->BX = FP_OFF(dpb); r->BX = FP_OFF(dpb);
r->AL = 0; r->AL = 0;
} }
else else{
r->AL = 0xff; r->AL = 0xff;
CritErrCode = 0x0f;
}
break; break;
/* Random read using FCB */ /* Random read using FCB */
case 0x21: case 0x21:
{ {
COUNT nErrorCode; if (FcbRandomRead(MK_FP(r->DS, r->DX), &CritErrCode))
if (FcbRandomRead(MK_FP(r->DS, r->DX), &nErrorCode))
r->AL = 0; r->AL = 0;
else else
r->AL = nErrorCode; r->AL = CritErrCode;
break; break;
} }
/* Random write using FCB */ /* Random write using FCB */
case 0x22: case 0x22:
{ {
COUNT nErrorCode; if (FcbRandomWrite(MK_FP(r->DS, r->DX), &CritErrCode))
if (FcbRandomWrite(MK_FP(r->DS, r->DX), &nErrorCode))
r->AL = 0; r->AL = 0;
else else
r->AL = nErrorCode; r->AL = CritErrCode;
break; break;
} }
@ -671,24 +670,20 @@ dispatch:
/* Read random record(s) using FCB */ /* Read random record(s) using FCB */
case 0x27: case 0x27:
{ {
COUNT nErrorCode; if (FcbRandomBlockRead(MK_FP(r->DS, r->DX), r->CX, &CritErrCode))
if (FcbRandomBlockRead(MK_FP(r->DS, r->DX), r->CX, &nErrorCode))
r->AL = 0; r->AL = 0;
else else
r->AL = nErrorCode; r->AL = CritErrCode;
break; break;
} }
/* Write random record(s) using FCB */ /* Write random record(s) using FCB */
case 0x28: case 0x28:
{ {
COUNT nErrorCode; if (FcbRandomBlockWrite(MK_FP(r->DS, r->DX), r->CX, &CritErrCode))
if (FcbRandomBlockWrite(MK_FP(r->DS, r->DX), r->CX, &nErrorCode))
r->AL = 0; r->AL = 0;
else else
r->AL = nErrorCode; r->AL = CritErrCode;
break; break;
} }
@ -782,20 +777,24 @@ dispatch:
/* Get DPB */ /* Get DPB */
case 0x32: case 0x32:
r->DL = ( r->DL == 0 ? default_drive : r->DL - 1); r->DL = ( r->DL == 0 ? default_drive : r->DL - 1);
if (r->DL <= lastdrive) if (r->DL <= (lastdrive - 1))
{ {
struct dpb FAR *dpb = CDSp->cds_table[r->DL].cdsDpb; struct dpb FAR *dpb = CDSp->cds_table[r->DL].cdsDpb;
if (dpb == 0) if (dpb == 0)
{ {
r->AL = 0xff; r->AL = 0xff;
CritErrCode = 0x0f;
break; break;
} }
r->DS = FP_SEG(dpb); r->DS = FP_SEG(dpb);
r->BX = FP_OFF(dpb); r->BX = FP_OFF(dpb);
r->AL = 0; r->AL = 0;
} }
else else {
r->AL = 0xFF; r->AL = 0xFF;
CritErrCode = 0x0f;
}
break; break;
/* Get InDOS flag */ /* Get InDOS flag */
@ -943,8 +942,8 @@ dispatch:
if (rc1 != SUCCESS) if (rc1 != SUCCESS)
{ {
r->FLAGS |= FLG_CARRY;
r->AX = -rc1; r->AX = -rc1;
goto error_out;
} }
else else
{ {
@ -958,8 +957,8 @@ dispatch:
rc = DosWrite(r->BX, r->CX, MK_FP(r->DS, r->DX), (COUNT FAR *) & rc1); rc = DosWrite(r->BX, r->CX, MK_FP(r->DS, r->DX), (COUNT FAR *) & rc1);
if (rc1 != SUCCESS) if (rc1 != SUCCESS)
{ {
r->FLAGS |= FLG_CARRY;
r->AX = -rc1; r->AX = -rc1;
goto error_out;
} }
else else
{ {
@ -973,8 +972,8 @@ dispatch:
rc = DosDelete((BYTE FAR *) MK_FP(r->DS, r->DX)); rc = DosDelete((BYTE FAR *) MK_FP(r->DS, r->DX));
if (rc < 0) if (rc < 0)
{ {
r->FLAGS |= FLG_CARRY;
r->AX = -rc; r->AX = -rc;
goto error_out;
} }
else else
r->FLAGS &= ~FLG_CARRY; r->FLAGS &= ~FLG_CARRY;
@ -1026,13 +1025,10 @@ dispatch:
if (rc1 != SUCCESS) if (rc1 != SUCCESS)
{ {
r->FLAGS |= FLG_CARRY;
r->AX = -rc1; r->AX = -rc1;
goto error_out;
} }
else else{
{
if((r->AL == 0x02) || (r->AL == 0x03) || (r->AL == 0x04) || (r->AL == 0x05))
r->AX = r->CX;
r->FLAGS &= ~FLG_CARRY; r->FLAGS &= ~FLG_CARRY;
} }
} }
@ -1198,8 +1194,7 @@ dispatch:
if (r->AX == 2) if (r->AX == 2)
r->AX = 18; r->AX = 18;
goto error_out;
r->FLAGS |= FLG_CARRY;
} }
else else
{ {
@ -1282,13 +1277,23 @@ dispatch:
break; break;
case 0x01: case 0x01:
if (((COUNT) r->BX) < 0 || r->BX > 2) /* if (((COUNT) r->BX) < 0 || r->BX > 2)
goto error_invalid; goto error_invalid;
else else
{ { */
mem_access_mode = r->BX; mem_access_mode = r->BX;
r->FLAGS &= ~FLG_CARRY; r->FLAGS &= ~FLG_CARRY;
}
/* }*/
break;
case 0x02:
r->AL = uppermem_link;
break;
case 0x03:
uppermem_link = r->BL;
break; break;
default: default:
@ -1301,6 +1306,17 @@ dispatch:
} }
break; break;
/* Get Extended Error */
case 0x59:
r->AX = CritErrCode;
r->ES = FP_SEG(CritErrDev);
r->DI = FP_OFF(CritErrDev);
r->CH = CritErrLocus;
r->BH = CritErrClass;
r->BL = CritErrAction;
r->FLAGS &= ~FLG_CARRY;
break;
/* Create Temporary File */ /* Create Temporary File */
case 0x5a: case 0x5a:
if ((rc = DosMkTmp(MK_FP(r->DS, r->DX), r->CX)) < 0) if ((rc = DosMkTmp(MK_FP(r->DS, r->DX), r->CX)) < 0)
@ -1318,7 +1334,7 @@ dispatch:
{ {
DosClose(rc); DosClose(rc);
r->AX = 80; r->AX = 80;
r->FLAGS |= FLG_CARRY; goto error_out;
} }
else else
{ {
@ -1367,7 +1383,7 @@ dispatch:
result = int2f_Remote_call(REM_PRINTREDIR, 0, 0, r->DX, 0, 0, (MK_FP(0, Int21AX))); result = int2f_Remote_call(REM_PRINTREDIR, 0, 0, r->DX, 0, 0, (MK_FP(0, Int21AX)));
r->AX = result; r->AX = result;
if (result != SUCCESS) { if (result != SUCCESS) {
r->FLAGS |= FLG_CARRY; goto error_out;
} else { } else {
r->FLAGS &= ~FLG_CARRY; r->FLAGS &= ~FLG_CARRY;
} }
@ -1395,7 +1411,7 @@ dispatch:
result = int2f_Remote_call(REM_PRINTSET, r->BX, r->CX, r->DX, (MK_FP(r->ES, r->DI)), r->SI, (MK_FP(r->DS, Int21AX))); result = int2f_Remote_call(REM_PRINTSET, r->BX, r->CX, r->DX, (MK_FP(r->ES, r->DI)), r->SI, (MK_FP(r->DS, Int21AX)));
r->AX = result; r->AX = result;
if (result != SUCCESS) { if (result != SUCCESS) {
r->FLAGS |= FLG_CARRY; goto error_out;
} else { } else {
r->FLAGS &= ~FLG_CARRY; r->FLAGS &= ~FLG_CARRY;
} }
@ -1408,13 +1424,13 @@ dispatch:
switch (r->AL) switch (r->AL)
{ {
case 0x07: case 0x07:
if (r->DL <= lastdrive) { if (r->DL <= (lastdrive -1)) {
CDSp->cds_table[r->DL].cdsFlags |= 0x100; CDSp->cds_table[r->DL].cdsFlags |= 0x100;
} }
break; break;
case 0x08: case 0x08:
if (r->DL <= lastdrive) { if (r->DL <= (lastdrive -1)) {
CDSp->cds_table[r->DL].cdsFlags &= ~0x100; CDSp->cds_table[r->DL].cdsFlags &= ~0x100;
} }
break; break;
@ -1425,7 +1441,7 @@ dispatch:
result = int2f_Remote_call(REM_DOREDIRECT, r->BX, r->CX, r->DX, (MK_FP(r->ES, r->DI)), r->SI, (MK_FP(r->DS, Int21AX))); result = int2f_Remote_call(REM_DOREDIRECT, r->BX, r->CX, r->DX, (MK_FP(r->ES, r->DI)), r->SI, (MK_FP(r->DS, Int21AX)));
r->AX = result; r->AX = result;
if (result != SUCCESS) { if (result != SUCCESS) {
r->FLAGS |= FLG_CARRY; goto error_out;
} else { } else {
r->FLAGS &= ~FLG_CARRY; r->FLAGS &= ~FLG_CARRY;
} }
@ -1563,7 +1579,7 @@ dispatch:
/* Get/Set Serial Number */ /* Get/Set Serial Number */
case 0x69: case 0x69:
rc = ( r->BL == 0 ? default_drive : r->BL - 1); rc = ( r->BL == 0 ? default_drive : r->BL - 1);
if (rc <= lastdrive) if (rc <= (lastdrive -1))
{ {
if (CDSp->cds_table[rc].cdsFlags & CDSNETWDRV) { if (CDSp->cds_table[rc].cdsFlags & CDSNETWDRV) {
goto error_invalid; goto error_invalid;
@ -1583,8 +1599,8 @@ dispatch:
} }
if (rc1 != SUCCESS) if (rc1 != SUCCESS)
{ {
r->FLAGS |= FLG_CARRY;
r->AX = -rc1; r->AX = -rc1;
goto error_out;
} }
else else
{ {
@ -1771,7 +1787,7 @@ VOID int25_handler(struct int25regs FAR * r)
buf = MK_FP(r->ds, r->bx); buf = MK_FP(r->ds, r->bx);
} }
if (drv >= nblkdev) if (drv >= (lastdrive - 1))
{ {
r->ax = 0x202; r->ax = 0x202;
r->flags |= FLG_CARRY; r->flags |= FLG_CARRY;
@ -1814,7 +1830,7 @@ VOID int26_handler(struct int25regs FAR * r)
buf = MK_FP(r->ds, r->bx); buf = MK_FP(r->ds, r->bx);
} }
if (drv >= nblkdev) if (drv >= (lastdrive -1))
{ {
r->ax = 0x202; r->ax = 0x202;
r->flags |= FLG_CARRY; r->flags |= FLG_CARRY;

3
kernel/io.asm
View File

@ -28,6 +28,9 @@
; $Header$ ; $Header$
; ;
; $Log$ ; $Log$
; Revision 1.6 2000/06/21 18:16:46 jimtabor
; Add UMB code, patch, and code fixes
;
; Revision 1.5 2000/06/01 06:37:38 jimtabor ; Revision 1.5 2000/06/01 06:37:38 jimtabor
; Read History for Changes ; Read History for Changes
; ;

107
kernel/ioctl.c
View File

@ -35,6 +35,9 @@ static BYTE *RcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.6 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.5 2000/05/25 20:56:21 jimtabor * Revision 1.5 2000/05/25 20:56:21 jimtabor
* Fixed project history * Fixed project history
* *
@ -117,7 +120,7 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
struct dpb FAR *dpbp; struct dpb FAR *dpbp;
struct cds FAR *cdsp; struct cds FAR *cdsp;
BYTE FAR *pBuffer = MK_FP(r->DS, r->DX); BYTE FAR *pBuffer = MK_FP(r->DS, r->DX);
COUNT nMode; COUNT nMode , dev;
/* Test that the handle is valid */ /* Test that the handle is valid */
switch (r->AL) switch (r->AL)
@ -159,17 +162,16 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
/* JPP - changed to use default drive if drive=0 */ /* JPP - changed to use default drive if drive=0 */
/* JT Fixed it */ /* JT Fixed it */
r->BL = ( r->BL == 0 ? default_drive : r->BL - 1); dev = ( r->BL == 0 ? default_drive : r->BL - 1);
if (dev > (lastdrive -1))
if (r->BL > lastdrive)
{ {
*err = DE_INVLDDRV; *err = DE_INVLDDRV;
return 0; return 0;
} }
else else
{ {
cdsp = &CDSp->cds_table[r->BL]; cdsp = &CDSp->cds_table[dev];
dpbp = cdsp->cdsDpb; dpbp = cdsp->cdsDpb;
} }
break; break;
@ -191,10 +193,10 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
{ {
case 0x00: case 0x00:
/* Get the flags from the SFT */ /* Get the flags from the SFT */
r->DX = r->AX = s->sft_flags; r->AX = s->sft_dev->dh_attr;
r->DH = r->AH;
/* r->DX = r->AX = s->sft_dev->dh_attr;*/ /* Undocumented result, Ax = Dx seen using Pcwatch */
r->DL = r->AL = s->sft_flags;
break; break;
case 0x01: case 0x01:
@ -238,12 +240,23 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
execrh((request FAR *) & CharReqHdr, s->sft_dev); execrh((request FAR *) & CharReqHdr, s->sft_dev);
if (CharReqHdr.r_status & S_ERROR) if (CharReqHdr.r_status & S_ERROR)
return char_error(&CharReqHdr, s->sft_dev); {
*err = DE_DEVICE;
return 0;
}
if (r->AL == 0x07) if (r->AL == 0x07)
{ {
r->AL = r->AL = CharReqHdr.r_status & S_BUSY ? 00 : 0xff;
CharReqHdr.r_status & S_BUSY ?
00 : 0xff; }
if (r->AL == 0x02 || r->AL == 0x03)
{
r->AX = CharReqHdr.r_count;
}
if (r->AL == 0x0c || r->AL == 0x10)
{
r->AX = CharReqHdr.r_status;
} }
break; break;
} }
@ -262,6 +275,11 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
case 0x05: case 0x05:
nMode = C_IOCTLOUT; nMode = C_IOCTLOUT;
IoBlockCommon: IoBlockCommon:
if(!dpbp)
{
*err = DE_INVLDDRV;
return 0;
}
if ( ((r->AL == 0x04 ) && !(dpbp->dpb_device->dh_attr & ATTR_IOCTL)) if ( ((r->AL == 0x04 ) && !(dpbp->dpb_device->dh_attr & ATTR_IOCTL))
|| ((r->AL == 0x05 ) && !(dpbp->dpb_device->dh_attr & ATTR_IOCTL)) || ((r->AL == 0x05 ) && !(dpbp->dpb_device->dh_attr & ATTR_IOCTL))
|| ((r->AL == 0x11) && !(dpbp->dpb_device->dh_attr & ATTR_QRYIOCTL)) || ((r->AL == 0x11) && !(dpbp->dpb_device->dh_attr & ATTR_QRYIOCTL))
@ -271,7 +289,8 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
return 0; return 0;
} }
CharReqHdr.r_unit = r->BL;
CharReqHdr.r_unit = dev;
CharReqHdr.r_length = sizeof(request); CharReqHdr.r_length = sizeof(request);
CharReqHdr.r_command = nMode; CharReqHdr.r_command = nMode;
CharReqHdr.r_count = r->CX; CharReqHdr.r_count = r->CX;
@ -279,22 +298,26 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
CharReqHdr.r_status = 0; CharReqHdr.r_status = 0;
execrh((request FAR *) & CharReqHdr, execrh((request FAR *) & CharReqHdr,
dpbp->dpb_device); dpbp->dpb_device);
if (CharReqHdr.r_status & S_ERROR)
{
*err = DE_DEVICE;
return 0;
}
if (r->AL == 0x08) if (r->AL == 0x08)
{ {
if (CharReqHdr.r_status & S_ERROR)
{
*err = DE_DEVICE;
return 0;
}
r->AX = (CharReqHdr.r_status & S_BUSY) ? 1 : 0; r->AX = (CharReqHdr.r_status & S_BUSY) ? 1 : 0;
} }
else
if (r->AL == 0x04 || r->AL == 0x05)
{ {
if (CharReqHdr.r_status & S_ERROR) r->AX = CharReqHdr.r_count;
{
*err = DE_DEVICE;
return 0;
} }
if (r->AL == 0x0d || r->AL == 0x11)
{
r->AX = CharReqHdr.r_status;
} }
break; break;
@ -310,12 +333,18 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
case 0x07: case 0x07:
if (s->sft_flags & SFT_FDEVICE) if (s->sft_flags & SFT_FDEVICE)
{ {
nMode = C_OSTAT;
goto IoCharCommon; goto IoCharCommon;
} }
r->AL = 0; r->AL = 0;
break; break;
case 0x08: case 0x08:
if(!dpbp)
{
*err = DE_INVLDDRV;
return 0;
}
if (dpbp->dpb_device->dh_attr & ATTR_EXCALLS) if (dpbp->dpb_device->dh_attr & ATTR_EXCALLS)
{ {
nMode = C_REMMEDIA; nMode = C_REMMEDIA;
@ -326,13 +355,26 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
case 0x09: case 0x09:
if(cdsp->cdsFlags & CDSNETWDRV) if(cdsp->cdsFlags & CDSNETWDRV)
r->DX = ATTR_REMOTE; {
r->DX = ATTR_REMOTE ;
r->AX = S_DONE|S_BUSY;
}
else else
{
if(!dpbp)
{
*err = DE_INVLDDRV;
return 0;
}
/* Need to add subst bit 15 */
r->DX = dpbp->dpb_device->dh_attr; r->DX = dpbp->dpb_device->dh_attr;
r->AX = S_DONE|S_BUSY;
}
break; break;
case 0x0a: case 0x0a:
r->DX = s->sft_flags & SFT_FSHARED; r->DX = s->sft_flags;
r->AX = 0;
break; break;
case 0x0e: case 0x0e:
@ -341,12 +383,16 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
case 0x0f: case 0x0f:
nMode = C_SETLDEV; nMode = C_SETLDEV;
IoLogCommon: IoLogCommon:
if(!dpbp)
{
*err = DE_INVLDDRV;
return 0;
}
if ((dpbp->dpb_device->dh_attr & ATTR_GENIOCTL)) if ((dpbp->dpb_device->dh_attr & ATTR_GENIOCTL))
{ {
if (r->BL == 0)
r->BL = default_drive;
CharReqHdr.r_unit = r->BL;
CharReqHdr.r_unit = dev;
CharReqHdr.r_length = sizeof(request); CharReqHdr.r_length = sizeof(request);
CharReqHdr.r_command = nMode; CharReqHdr.r_command = nMode;
CharReqHdr.r_count = r->CX; CharReqHdr.r_count = r->CX;
@ -358,7 +404,10 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err)
if (CharReqHdr.r_status & S_ERROR) if (CharReqHdr.r_status & S_ERROR)
*err = DE_ACCESS; *err = DE_ACCESS;
else else
{
r->AL = CharReqHdr.r_unit;
*err = SUCCESS; *err = SUCCESS;
}
return 0; return 0;
} }
*err = DE_INVLDFUNC; *err = DE_INVLDFUNC;

27
kernel/kernel.asm
View File

@ -28,6 +28,9 @@
; $Id$ ; $Id$
; ;
; $Log$ ; $Log$
; Revision 1.4 2000/06/21 18:16:46 jimtabor
; Add UMB code, patch, and code fixes
;
; Revision 1.3 2000/05/25 20:56:21 jimtabor ; Revision 1.3 2000/05/25 20:56:21 jimtabor
; Fixed project history ; Fixed project history
; ;
@ -291,7 +294,7 @@ setverPtr dw 0,0 ; 0037 setver list
dw 1 ; 003F number of buffers dw 1 ; 003F number of buffers
dw 1 ; 0041 size of pre-read buffer dw 1 ; 0041 size of pre-read buffer
global _BootDrive global _BootDrive
_BootDrive dw 0 ; 0043 drive we booted from _BootDrive db 0 ; 0043 drive we booted from
db 0 ; 0044 cpu type (1 if >=386) db 0 ; 0044 cpu type (1 if >=386)
dw 0 ; 0045 Extended memory in KBytes dw 0 ; 0045 Extended memory in KBytes
buf_info dd 0 ; 0047 disk buffer chain buf_info dd 0 ; 0047 disk buffer chain
@ -306,9 +309,12 @@ deblock_seg dw 0 ; 0056 (offset always zero)
db 0, 0FFh, 0 ; 005D unknown db 0, 0FFh, 0 ; 005D unknown
db 0 ; 0060 unknown db 0 ; 0060 unknown
dw 0 ; 0061 unknown dw 0 ; 0061 unknown
dmd_upper_link db 0 ; 0063 upper memory link flag global _uppermem_link
dw 0 ; 0064 unknown _uppermem_link db 0 ; 0063 upper memory link flag
dmd_upper_root dw 0FFFFh ; 0066 dmd_upper_root global _UMB_top
_UMB_top dw 0 ; 0064 unknown UMB_top will do for now
global _uppermem_root
_uppermem_root dw 0FFFFh ; 0066 dmd_upper_root
dw 0 ; 0068 para of last mem search dw 0 ; 0068 para of last mem search
SysVarEnd: SysVarEnd:
@ -471,15 +477,12 @@ _SAttr db 0 ;24D - Attribute Mask for Dir Search
global _OpenMode global _OpenMode
_OpenMode db 0 ;24E - File Open Attribute _OpenMode db 0 ;24E - File Open Attribute
; times 3 db 0 times 3 db 0
; global _Server_Call global _Server_Call
;_Server_Call db 0 ;252 - Server call Func 5D sub 0 _Server_Call db 0 ;252 - Server call Func 5D sub 0
db 0
; Pad to 0570h
times (250h - ($ - _internal_data)) db 0
global _lpUserStack global _lpUserStack
_lpUserStack dd 0 ;250 - pointer to user stack frame _lpUserStack dd 0 ;254 - pointer to user stack frame
; Pad to 057Ch ; Pad to 057Ch
times (25ch - ($ - _internal_data)) db 0 times (25ch - ($ - _internal_data)) db 0

30
kernel/main.c
View File

@ -39,6 +39,9 @@ static BYTE *mainRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.6 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.5 2000/05/26 19:25:19 jimtabor * Revision 1.5 2000/05/26 19:25:19 jimtabor
* Read History file for Change info * Read History file for Change info
* *
@ -147,6 +150,8 @@ static BYTE *mainRcsId = "$Id$";
extern UWORD DaysSinceEpoch; extern UWORD DaysSinceEpoch;
extern WORD days[2][13]; extern WORD days[2][13];
extern BYTE FAR * lpBase;
extern BYTE FAR * upBase;
INIT BOOL ReadATClock(BYTE *, BYTE *, BYTE *, BYTE *); INIT BOOL ReadATClock(BYTE *, BYTE *, BYTE *, BYTE *);
VOID FAR init_call_WritePCClock(ULONG); VOID FAR init_call_WritePCClock(ULONG);
@ -189,6 +194,8 @@ INIT static VOID init_kernel(void)
/* Init oem hook - returns memory size in KB */ /* Init oem hook - returns memory size in KB */
ram_top = init_oem(); ram_top = init_oem();
UMB_top = 3; /* testing for now*
/* Fake int 21h stack frame */ /* Fake int 21h stack frame */
user_r = (iregs FAR *) DOS_PSP + 0xD0; user_r = (iregs FAR *) DOS_PSP + 0xD0;
@ -359,7 +366,7 @@ INIT VOID FsConfig(VOID)
default_drive = BootDrive - 1; default_drive = BootDrive - 1;
/* Initialzie the current directory structures */ /* Initialzie the current directory structures */
for (i = 0; i < lastdrive + 1; i++) for (i = 0; i < lastdrive ; i++)
{ {
fbcopy((VOID FAR *) "A:\\\0", fbcopy((VOID FAR *) "A:\\\0",
@ -427,14 +434,13 @@ INIT static VOID kernel()
p_0(); p_0();
} }
extern BYTE FAR *lpBase;
/* If cmdLine is NULL, this is an internal driver */ /* If cmdLine is NULL, this is an internal driver */
BOOL init_device(struct dhdr FAR * dhp, BYTE FAR * cmdLine) BOOL init_device(struct dhdr FAR * dhp, BYTE FAR * cmdLine, COUNT mode, COUNT r_top)
{ {
request rq; request rq;
ULONG memtop = ((ULONG) ram_top) << 10;
ULONG memtop = ((ULONG) r_top) << 10;
ULONG maxmem = memtop - ((ULONG) FP_SEG(dhp) << 4); ULONG maxmem = memtop - ((ULONG) FP_SEG(dhp) << 4);
if (maxmem >= 0x10000) if (maxmem >= 0x10000)
@ -455,10 +461,14 @@ BOOL init_device(struct dhdr FAR * dhp, BYTE FAR * cmdLine)
if (rq.r_status & S_ERROR) if (rq.r_status & S_ERROR)
return TRUE; return TRUE;
if (cmdLine) if(cmdLine){
if (mode)
upBase = rq.r_endaddr;
else
lpBase = rq.r_endaddr; lpBase = rq.r_endaddr;
}
/* check for a block device and update device control block */ /* check for a block device and update device control block */
if (!(dhp->dh_attr & ATTR_CHAR) && (rq.r_nunits != 0)) if (!(dhp->dh_attr & ATTR_CHAR) && (rq.r_nunits != 0))
{ {
REG COUNT Index; REG COUNT Index;
@ -497,9 +507,9 @@ INIT static void InitIO(void)
/* Initialize driver chain */ /* Initialize driver chain */
nul_dev.dh_next = (struct dhdr FAR *)&con_dev; nul_dev.dh_next = (struct dhdr FAR *)&con_dev;
setvec(0x29, int29_handler); /* Requires Fast Con Driver */ setvec(0x29, int29_handler); /* Requires Fast Con Driver */
init_device((struct dhdr FAR *)&con_dev, NULL); init_device((struct dhdr FAR *)&con_dev, NULL, NULL, ram_top);
init_device((struct dhdr FAR *)&clk_dev, NULL); init_device((struct dhdr FAR *)&clk_dev, NULL, NULL, ram_top);
init_device((struct dhdr FAR *)&blk_dev, NULL); init_device((struct dhdr FAR *)&blk_dev, NULL, NULL, ram_top);
/* If AT clock exists, copy AT clock time to system clock */ /* If AT clock exists, copy AT clock time to system clock */
if (!ReadATClock(bcd_days, &bcd_hours, &bcd_minutes, &bcd_seconds)) if (!ReadATClock(bcd_days, &bcd_hours, &bcd_minutes, &bcd_seconds))
{ {

3
kernel/memmgr.c
View File

@ -35,6 +35,9 @@ static BYTE *memmgrRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.4 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.3 2000/05/25 20:56:21 jimtabor * Revision 1.3 2000/05/25 20:56:21 jimtabor
* Fixed project history * Fixed project history
* *

7
kernel/network.c
View File

@ -36,6 +36,9 @@ static BYTE *RcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.6 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.5 2000/05/26 19:25:19 jimtabor * Revision 1.5 2000/05/26 19:25:19 jimtabor
* Read History file for Change info * Read History file for Change info
* *
@ -112,7 +115,7 @@ UCOUNT Remote_RW(UWORD func, UCOUNT n, BYTE FAR * bp, sft FAR * s, COUNT FAR * e
/* /*
*/ */
COUNT Remote_find(UWORD func, UWORD attrib, BYTE FAR * name, REG dmatch FAR * dmp ) COUNT Remote_find(UWORD func, BYTE FAR * name, REG dmatch FAR * dmp )
{ {
COUNT i, x; COUNT i, x;
char FAR *p, *q; char FAR *p, *q;
@ -142,7 +145,7 @@ COUNT Remote_find(UWORD func, UWORD attrib, BYTE FAR * name, REG dmatch FAR * dm
dta = (BYTE FAR *) &TempBuffer; dta = (BYTE FAR *) &TempBuffer;
i = int2f_Remote_call(func, 0, 0, 0, test, 0, 0); i = int2f_Remote_call(func, 0, 0, 0, test, 0, 0);
dta = p; dta = p;
fsncopy((BYTE FAR *) &TempBuffer[0], &dta[0], 21); fsncopy((BYTE FAR *) &TempBuffer, dta, 21);
if (i != 0) if (i != 0)
return i; return i;

7
kernel/newstuff.c
View File

@ -31,6 +31,9 @@ static BYTE *mainRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.7 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.6 2000/06/01 06:37:38 jimtabor * Revision 1.6 2000/06/01 06:37:38 jimtabor
* Read History for Changes * Read History for Changes
* *
@ -214,7 +217,7 @@ COUNT get_verify_drive(char FAR *src)
} }
else else
drive = default_drive; drive = default_drive;
if ((drive < 0) || (drive > lastdrive)) { if ((drive < 0) || (drive > (lastdrive - 1))) {
drive = DE_INVLDDRV; drive = DE_INVLDDRV;
} }
return drive; return drive;
@ -248,7 +251,7 @@ COUNT truename(char FAR * src, char FAR * dest, COUNT t)
{ {
buf[0] = (src[0] | 0x20) + 'A' - 'a'; buf[0] = (src[0] | 0x20) + 'A' - 'a';
if (buf[0] > lastdrive + 'A') if (buf[0] > (lastdrive - 1) + 'A')
return DE_PATHNOTFND; return DE_PATHNOTFND;
src += 2; src += 2;

8
kernel/proto.h
View File

@ -34,6 +34,9 @@ static BYTE *Proto_hRcsId = "$Id$";
/* /*
* $Log$ * $Log$
* Revision 1.5 2000/06/21 18:16:46 jimtabor
* Add UMB code, patch, and code fixes
*
* Revision 1.4 2000/05/26 19:25:19 jimtabor * Revision 1.4 2000/05/26 19:25:19 jimtabor
* Read History file for Change info * Read History file for Change info
* *
@ -186,6 +189,7 @@ INIT BYTE *GetNumber(REG BYTE * pszString, REG COUNT * pnNum);
INIT COUNT tolower(COUNT c); INIT COUNT tolower(COUNT c);
INIT COUNT toupper(COUNT c); INIT COUNT toupper(COUNT c);
INIT VOID mcb_init(mcb FAR * mcbp, UWORD size); INIT VOID mcb_init(mcb FAR * mcbp, UWORD size);
INIT VOID umcb_init(mcb FAR * mcbp, UWORD size);
INIT VOID strcat(REG BYTE * d, REG BYTE * s); INIT VOID strcat(REG BYTE * d, REG BYTE * s);
/* dosfns.c */ /* dosfns.c */
@ -354,7 +358,7 @@ COUNT DosDevIOctl(iregs FAR * r, COUNT FAR * err);
/* main.c */ /* main.c */
INIT VOID main(void); INIT VOID main(void);
INIT BOOL init_device(struct dhdr FAR * dhp, BYTE FAR * cmdLine); INIT BOOL init_device(struct dhdr FAR * dhp, BYTE FAR * cmdLine, COUNT mode, COUNT top);
/* memmgr.c */ /* memmgr.c */
seg far2para(VOID FAR * p); seg far2para(VOID FAR * p);
@ -459,7 +463,7 @@ COUNT QRemote_Fn(char FAR * s, char FAR * d);
UWORD get_machine_name(BYTE FAR * netname); UWORD get_machine_name(BYTE FAR * netname);
VOID set_machine_name(BYTE FAR * netname, UWORD name_num); VOID set_machine_name(BYTE FAR * netname, UWORD name_num);
UCOUNT Remote_RW(UWORD func, UCOUNT n, BYTE FAR * bp, sft FAR * s, COUNT FAR * err); UCOUNT Remote_RW(UWORD func, UCOUNT n, BYTE FAR * bp, sft FAR * s, COUNT FAR * err);
COUNT Remote_find(UWORD func, UWORD attrib, BYTE FAR * name, REG dmatch FAR * dmp); COUNT Remote_find(UWORD func, BYTE FAR * name, REG dmatch FAR * dmp);
/* procsupt.asm */ /* procsupt.asm */
VOID INRPT FAR exec_user(iregs FAR * irp); VOID INRPT FAR exec_user(iregs FAR * irp);