OS_Develop/FreeDOS
OS_Develop/FreeDOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BOOTONLY support for SYS

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@603 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2003-06-15 22:01:45 +00:00
parent 5a5df81896
commit d56013c885
1 changed files with 122 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
sys/sys.c
View File

@ -28,7 +28,6 @@
/* /*
TE thinks, that the boot info storage should be done by FORMAT, noone else TE thinks, that the boot info storage should be done by FORMAT, noone else
unfortunately, that doesn't work ??? unfortunately, that doesn't work ???
*/ */
#define STORE_BOOT_INFO #define STORE_BOOT_INFO
@ -64,8 +63,11 @@ extern WORD CDECL sprintf(BYTE * buff, CONST BYTE * fmt, ...);
#endif #endif
#ifndef __WATCOMC__ #ifndef __WATCOMC__
#include <io.h> #include <io.h>
#else #else
int unlink(const char *pathname); int unlink(const char *pathname);
/* some non-conforming functions to make the executable smaller */ /* some non-conforming functions to make the executable smaller */
int open(const char *pathname, int flags, ...) int open(const char *pathname, int flags, ...)
@ -105,6 +107,26 @@ int stat(const char *file_name, struct stat *buf)
return _dos_findfirst(file_name, _A_NORMAL | _A_HIDDEN | _A_SYSTEM, &find_tbuf); return _dos_findfirst(file_name, _A_NORMAL | _A_HIDDEN | _A_SYSTEM, &find_tbuf);
} }
#endif #endif
char *getenv(const char *name)
{
char **envp, *ep;
const char *np;
char ec, nc;
for (envp = environ; (ep = *envp) != NULL; envp++) {
np = name;
do {
ec = *ep++;
nc = *np++;
if (nc == 0) {
if (ec == '=')
return ep;
break;
}
} while (ec == nc);
}
return NULL;
}
BYTE pgm[] = "SYS"; BYTE pgm[] = "SYS";
@ -238,15 +260,17 @@ int main(int argc, char **argv)
if (drivearg == 0) if (drivearg == 0)
{ {
printf("Usage: %s [source] drive: [bootsect [BOTH]]\n", pgm); printf("Usage: %s [source] drive: [bootsect [BOTH|BOOTONLY]]\n", pgm);
printf printf
(" source = A:,B:,C:\\KERNEL\\BIN\\,etc., or current directory if not given\n"); (" source = A:,B:,C:\\KERNEL\\BIN\\,etc., or current directory if not given\n");
printf(" drive = A,B,etc.\n"); printf(" drive = A,B,etc.\n");
printf printf
(" bootsect = name of 512-byte boot sector file image for drive:\n"); (" bootsect = name of 512-byte boot sector file image for drive:\n");
printf(" to write to instead of real boot sector\n"); printf(" to write to *instead* of real boot sector\n");
printf printf
(" BOTH : write to both the real boot sector and the image file\n"); (" BOTH : write to *both* the real boot sector and the image file\n");
printf
(" BOOTONLY : do *not* copy kernel / shell, only update boot sector or image\n");
printf("%s CONFIG /help\n", pgm); printf("%s CONFIG /help\n", pgm);
exit(1); exit(1);
} }
@ -280,43 +304,51 @@ int main(int argc, char **argv)
else else
sprintf(rootPath, "%c:\\", 'A' + srcDrive); sprintf(rootPath, "%c:\\", 'A' + srcDrive);
if (!check_space(drive, oldboot)) if ((argc <= drivearg + 2)
|| (memicmp(argv[drivearg + 2], "BOOTONLY", 8) != 0))
{ {
printf("%s: Not enough space to transfer system files\n", pgm); if (!check_space(drive, oldboot))
exit(1); {
} printf("%s: Not enough space to transfer system files\n", pgm);
exit(1);
}
printf("\nCopying KERNEL.SYS...\n"); printf("\nCopying KERNEL.SYS...\n");
if (!copy(drive, srcPath, rootPath, "kernel.sys")) if (!copy(drive, srcPath, rootPath, "kernel.sys"))
{ {
printf("\n%s: cannot copy \"KERNEL.SYS\"\n", pgm); printf("\n%s: cannot copy \"KERNEL.SYS\"\n", pgm);
exit(1); exit(1);
} }
} /* copy kernel */
if (argc > drivearg + 1) if (argc > drivearg + 1)
bsFile = argv[drivearg + 1]; bsFile = argv[drivearg + 1];
printf("\nWriting boot sector...\n"); printf("\nWriting boot sector...\n");
put_boot(drive, bsFile, put_boot(drive, bsFile,
(argc > drivearg + 2) (argc > drivearg + 2)
&& memicmp(argv[drivearg + 2], "BOTH", 4) == 0); && memicmp(argv[drivearg + 2], "BOTH", 4) == 0);
printf("\nCopying COMMAND.COM...\n"); if ((argc <= drivearg + 2)
if (!copy(drive, srcPath, rootPath, "COMMAND.COM")) || (memicmp(argv[drivearg + 2], "BOOTONLY", 8) != 0))
{ {
char *comspec = getenv("COMSPEC"); printf("\nCopying COMMAND.COM...\n");
if (comspec != NULL) if (!copy(drive, srcPath, rootPath, "COMMAND.COM"))
{ {
printf("%s: Trying \"%s\"\n", pgm, comspec); char *comspec = getenv("COMSPEC");
if (!copy(drive, comspec, NULL, "COMMAND.COM")) if (comspec != NULL)
comspec = NULL; {
printf("%s: Trying \"%s\"\n", pgm, comspec);
if (!copy(drive, comspec, NULL, "COMMAND.COM"))
comspec = NULL;
}
if (comspec == NULL)
{
printf("\n%s: cannot copy \"COMMAND.COM\"\n", pgm);
exit(1);
}
} }
if (comspec == NULL) } /* copy shell */
{
printf("\n%s: cannot copy \"COMMAND.COM\"\n", pgm);
exit(1);
}
}
printf("\nSystem transferred.\n"); printf("\nSystem transferred.\n");
return 0; return 0;
@ -351,37 +383,30 @@ VOID dump_sector(unsigned char far * sec)
#endif #endif
/*
TC absRead not functional on MSDOS 6.2, large disks
MSDOS requires int25, CX=ffff for drives > 32MB
*/
#ifdef __WATCOMC__ #ifdef __WATCOMC__
unsigned int2526readwrite(int DosDrive, void *diskReadPacket, unsigned intno);
#pragma aux int2526readwrite = \ int absread(int DosDrive, int nsects, int foo, void *diskReadPacket);
"mov cx, 0xffff" \ #pragma aux absread = \
"cmp si, 0x26" \
"je int26" \
"int 0x25" \ "int 0x25" \
"jmp short cfltest" \ "sbb ax, ax" \
"int26:" \ parm [ax] [cx] [dx] [bx] \
modify [si di bp] \
value [ax];
int abswrite(int DosDrive, int nsects, int foo, void *diskReadPacket);
#pragma aux abswrite = \
"int 0x26" \ "int 0x26" \
"cfltest:" \ "sbb ax, ax" \
"mov ax, 0" \ parm [ax] [cx] [dx] [bx] \
"adc ax, ax" \ modify [si di bp] \
parm [ax] [bx] [si] \
modify [cx] \
value [ax]; value [ax];
fat32readwrite(int DosDrive, void *diskReadPacket, unsigned intno); fat32readwrite(int DosDrive, void *diskReadPacket, unsigned intno);
#pragma aux fat32readwrite = \ #pragma aux fat32readwrite = \
"mov ax, 0x7305" \ "mov ax, 0x7305" \
"mov cx, 0xffff" \ "mov cx, 0xffff" \
"inc dx" \
"sub si, 0x25" \
"int 0x21" \ "int 0x21" \
"mov ax, 0" \ "sbb ax, ax" \
"adc ax, ax" \
parm [dx] [bx] [si] \ parm [dx] [bx] [si] \
modify [cx dx si] \ modify [cx dx si] \
value [ax]; value [ax];
@ -397,7 +422,11 @@ void reset_drive(int DosDrive);
"pop ds" \ "pop ds" \
parm [dx] \ parm [dx] \
modify [ax bx]; modify [ax bx];
#else #else
#ifndef __TURBOC__
int2526readwrite(int DosDrive, void *diskReadPacket, unsigned intno) int2526readwrite(int DosDrive, void *diskReadPacket, unsigned intno)
{ {
union REGS regs; union REGS regs;
@ -411,36 +440,43 @@ int2526readwrite(int DosDrive, void *diskReadPacket, unsigned intno)
return regs.x.cflag; return regs.x.cflag;
} }
#define absread(int DosDrive, int foo, int cx, void *diskReadPacket) \
int2526readwrite(DosDrive, diskReadPacket, 0x25)
#define abswrite(int DosDrive, int foo, int cx, void *diskReadPacket) \
int2526readwrite(DosDrive, diskReadPacket, 0x26)
#endif
fat32readwrite(int DosDrive, void *diskReadPacket, unsigned intno) fat32readwrite(int DosDrive, void *diskReadPacket, unsigned intno)
{ {
union REGS regs; union REGS regs;
regs.x.ax = 0x7305; regs.x.ax = 0x7305;
regs.h.dl = DosDrive + 1; regs.h.dl = DosDrive;
regs.x.bx = (short)diskReadPacket; regs.x.bx = (short)diskReadPacket;
regs.x.cx = 0xffff; regs.x.cx = 0xffff;
regs.x.si = intno - 0x25; regs.x.si = intno;
int86(0x21, &regs, &regs); intdos(&regs, &regs);
return regs.x.cflag; return regs.x.cflag;
} } /* fat32readwrite */
void reset_drive(int DosDrive) void reset_drive(int DosDrive)
{ {
union REGS regs; union REGS regs;
regs.h.ah = 0xd; regs.h.ah = 0xd;
int86(0x21, &regs, &regs); intdos(&regs, &regs);
regs.h.ah = 0x32; regs.h.ah = 0x32;
regs.h.dl = DosDrive + 1; regs.h.dl = DosDrive + 1;
int86(0x21, &regs, &regs); intdos(&regs, &regs);
} } /* reset_drive */
#endif #endif
int MyAbsReadWrite(int DosDrive, int count, ULONG sector, void *buffer, int MyAbsReadWrite(int DosDrive, int count, ULONG sector, void *buffer,
unsigned intno) int write)
{ {
struct { struct {
unsigned long sectorNumber; unsigned long sectorNumber;
@ -452,19 +488,17 @@ int MyAbsReadWrite(int DosDrive, int count, ULONG sector, void *buffer,
diskReadPacket.count = count; diskReadPacket.count = count;
diskReadPacket.address = buffer; diskReadPacket.address = buffer;
if (intno != 0x25 && intno != 0x26) if ((!write && absread(DosDrive, -1, -1, &diskReadPacket) == -1)
return 0xff; || (write && abswrite(DosDrive, -1, -1, &diskReadPacket) == -1))
if (int2526readwrite(DosDrive, &diskReadPacket, intno))
{ {
#ifdef WITHFAT32 #ifdef WITHFAT32
return fat32readwrite(DosDrive, &diskReadPacket, intno); return fat32readwrite(DosDrive + 1, &diskReadPacket, write);
#else #else
return 0xff; return 0xff;
#endif #endif
} }
return 0; return 0;
} } /* MyAbsReadWrite */
#ifdef __WATCOMC__ #ifdef __WATCOMC__
@ -478,17 +512,13 @@ unsigned getdrivespace(COUNT drive, unsigned *total_clusters);
modify [bx cx dx] \ modify [bx cx dx] \
value [ax]; value [ax];
unsigned getextdrivespace(void *drivename, void *buf, unsigned buf_size); unsigned getextdrivespace(void far *drivename, void *buf, unsigned buf_size);
#pragma aux getextdrivespace = \ #pragma aux getextdrivespace = \
"mov ax, 0x7303" \ "mov ax, 0x7303" \
"push ds" \
"pop es" \
"stc" \ "stc" \
"int 0x21" \ "int 0x21" \
"mov ax, 0" \ "sbb ax, ax" \
"adc ax, ax" \ parm [es dx] [di] [cx] \
parm [dx] [di] [cx] \
modify [es] \
value [ax]; value [ax];
#else #else
@ -499,10 +529,10 @@ unsigned getdrivespace(COUNT drive, unsigned *total_clusters)
regs.h.ah = 0x36; /* get drive free space */ regs.h.ah = 0x36; /* get drive free space */
regs.h.dl = drive + 1; /* 1 = 'A',... */ regs.h.dl = drive + 1; /* 1 = 'A',... */
int86(0x21, &regs, &regs); intdos(&regs, &regs);
*total_clusters = regs.x.dx; *total_clusters = regs.x.dx;
return regs.x.ax; return regs.x.ax;
} } /* getdrivespace */
unsigned getextdrivespace(void *drivename, void *buf, unsigned buf_size) unsigned getextdrivespace(void *drivename, void *buf, unsigned buf_size)
{ {
@ -518,9 +548,9 @@ unsigned getextdrivespace(void *drivename, void *buf, unsigned buf_size)
regs.x.cx = buf_size; regs.x.cx = buf_size;
int86x(0x21, &regs, &regs, &sregs); intdosx(&regs, &regs, &sregs);
return regs.x.ax == 0x7300 || regs.x.cflag; return regs.x.ax == 0x7300 || regs.x.cflag;
} } /* getextdrivespace */
#endif #endif
@ -532,7 +562,7 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
struct bootsectortype32 *bs32; struct bootsectortype32 *bs32;
#endif #endif
int fs; int fs;
char drivename[] = "A:\\"; char *drivename = "A:\\";
static unsigned char x[0x40]; /* we make this static to be 0 by default - static unsigned char x[0x40]; /* we make this static to be 0 by default -
this avoids FAT misdetections */ this avoids FAT misdetections */
unsigned total_clusters; unsigned total_clusters;
@ -542,7 +572,8 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
#endif #endif
reset_drive(drive); reset_drive(drive);
if (MyAbsReadWrite(drive, 1, 0, oldboot, 0x25) != 0) /* suggestion: allow reading from a boot sector or image file here */
if (MyAbsReadWrite(drive, 1, 0, oldboot, 0) != 0)
{ {
printf("can't read old boot sector for drive %c:\n", drive + 'A'); printf("can't read old boot sector for drive %c:\n", drive + 'A');
exit(1); exit(1);
@ -569,6 +600,7 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
this should work, as the disk was writeable, so GetFreeDiskSpace should work. this should work, as the disk was writeable, so GetFreeDiskSpace should work.
*/ */
/* would work different when reading from an image */
if (getdrivespace(drive, &total_clusters) == 0xffff) if (getdrivespace(drive, &total_clusters) == 0xffff)
{ {
printf("can't get free disk space for %c:\n", drive + 'A'); printf("can't get free disk space for %c:\n", drive + 'A');
@ -593,6 +625,7 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
*/ */
drivename[0] = 'A' + drive; drivename[0] = 'A' + drive;
/* would also work different when reading from an image */
if (getextdrivespace(drivename, x, sizeof(x))) if (getextdrivespace(drivename, x, sizeof(x)))
/* error --> no Win98 --> no FAT32 */ /* error --> no Win98 --> no FAT32 */
{ {
@ -696,7 +729,7 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
bs->bsDriveNumber = drive < 2 ? 0 : 0xff; bs->bsDriveNumber = drive < 2 ? 0 : 0xff;
} }
#ifdef DEBUG #ifdef DEBUG /* add an option to display this on user request? */
printf("Root dir entries = %u\n", bs->bsRootDirEnts); printf("Root dir entries = %u\n", bs->bsRootDirEnts);
printf("Root dir sectors = %u\n", bs->sysRootDirSecs); printf("Root dir sectors = %u\n", bs->sysRootDirSecs);
@ -721,12 +754,13 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
printf("writing new bootsector to drive %c:\n", drive + 'A'); printf("writing new bootsector to drive %c:\n", drive + 'A');
#endif #endif
if (MyAbsReadWrite(drive, 1, 0, newboot, 0x26) != 0) /* write newboot to a drive */
if (MyAbsReadWrite(drive, 1, 0, newboot, 1) != 0)
{ {
printf("Can't write new boot sector to drive %c:\n", drive + 'A'); printf("Can't write new boot sector to drive %c:\n", drive + 'A');
exit(1); exit(1);
} }
} } /* if write boot sector */
if (bsFile != NULL) if (bsFile != NULL)
{ {
@ -737,7 +771,7 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
#endif #endif
/* write newboot to bsFile */ /* write newboot to bsFile */
if ((fd = if ((fd = /* suggestion: do not trunc - allows to write to images */
open(bsFile, O_RDWR | O_TRUNC | O_CREAT | O_BINARY, open(bsFile, O_RDWR | O_TRUNC | O_CREAT | O_BINARY,
S_IREAD | S_IWRITE)) < 0) S_IREAD | S_IWRITE)) < 0)
{ {
@ -752,9 +786,10 @@ VOID put_boot(COUNT drive, BYTE * bsFile, BOOL both)
exit(1); exit(1);
} }
close(fd); close(fd);
} } /* if write boot sector file */
reset_drive(drive); reset_drive(drive);
} } /* put_boot */
BOOL check_space(COUNT drive, BYTE * BlkBuffer) BOOL check_space(COUNT drive, BYTE * BlkBuffer)
{ {
@ -765,7 +800,8 @@ BOOL check_space(COUNT drive, BYTE * BlkBuffer)
UNREFERENCED_PARAMETER(BlkBuffer); UNREFERENCED_PARAMETER(BlkBuffer);
return TRUE; return TRUE;
} } /* check_space */
BYTE copybuffer[COPY_SIZE]; BYTE copybuffer[COPY_SIZE];
@ -860,7 +896,8 @@ BOOL copy(COUNT drive, BYTE * srcPath, BYTE * rootPath, BYTE * file)
printf("%lu Bytes transferred", copied); printf("%lu Bytes transferred", copied);
return TRUE; return TRUE;
} } /* copy */
/* version 2.2 jeremyd 2001/9/20 /* version 2.2 jeremyd 2001/9/20
Changed so if no source given or only source drive (no path) Changed so if no source given or only source drive (no path)
@ -869,6 +906,7 @@ BOOL copy(COUNT drive, BYTE * srcPath, BYTE * rootPath, BYTE * file)
uses root (but only if source & destination drive are different). uses root (but only if source & destination drive are different).
Fix printf to include count(ret) if copy can't write all requested bytes Fix printf to include count(ret) if copy can't write all requested bytes
*/ */
/* version 2.1a jeremyd 2001/8/19 /* version 2.1a jeremyd 2001/8/19
modified so takes optional 2nd parameter (similar to PC DOS) modified so takes optional 2nd parameter (similar to PC DOS)
where if only 1 argument is given, assume to be destination drive, where if only 1 argument is given, assume to be destination drive,
@ -879,8 +917,6 @@ BOOL copy(COUNT drive, BYTE * srcPath, BYTE * rootPath, BYTE * file)
/* Revision 2.1 tomehlert 2001/4/26 /* Revision 2.1 tomehlert 2001/4/26
changed the file system detection code. changed the file system detection code.
*/ */
/* Revision 2.0 tomehlert 2001/4/26 /* Revision 2.0 tomehlert 2001/4/26
@ -900,5 +936,4 @@ BOOL copy(COUNT drive, BYTE * srcPath, BYTE * rootPath, BYTE * file)
included (slighly modified) PRF.c from kernel included (slighly modified) PRF.c from kernel
size is no ~7500 byte vs. ~13690 before size is no ~7500 byte vs. ~13690 before
*/ */