tyler.durden
/
kernel
mirror of https://github.com/FDOS/kernel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add optionally compiled in support to sys for PC/MS DOS versions (FAT16 only) 

git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/branches/UNSTABLE@1027 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Kenneth J Davis 2004-09-07 18:31:41 +00:00
parent a9c8174b5d
commit 6e7415e7a4
5 changed files with 141 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot/makefile
View File

@ -8,7 +8,7 @@
########################################################################
all: fat12.bin fat16.bin fat32chs.bin fat32lba.bin
all: fat12.bin fat16.bin fat32chs.bin fat32lba.bin oemfat12.bin oemfat16.bin
fat12.bin: boot.asm $(DEPENDS)
$(NASM) -DISFAT12 boot.asm -o$*.bin
@ -22,6 +22,12 @@ fat32chs.bin: boot32.asm $(DEPENDS)
fat32lba.bin: boot32lb.asm $(DEPENDS)
$(NASM) boot32lb.asm -o$*.bin
oemfat12.bin: oemboot.asm $(DEPENDS)
$(NASM) -DISFAT12 oemboot.asm -o$*.bin
oemfat16.bin: oemboot.asm $(DEPENDS)
$(NASM) -DISFAT16 oemboot.asm -o$*.bin
########################################################################
clean:

2
docs/config.txt
View File

@ -14,7 +14,7 @@ file named FDCONFIG.SYS, should it exist, it will will be used
instead of CONFIG.SYS; this allows the FreeDOS kernel to coexist
and be configured differently than another DOS kernel. There
are additional options available to adjust other aspects of the
kernels behaviour. Note: some options listed below are FreeDOS
kernel's behaviour. Note: some options listed below are FreeDOS
specific and will not work when using other/older DOS kernels.
Below is list of all documented FreeDOS config.sys supported
options; additional undocumented options may exist but are not

1
filelist
View File

@ -12,6 +12,7 @@
*/*/boot/boot.asm
*/*/boot/boot32.asm
*/*/boot/boot32lb.asm
*/*/boot/oemboot.asm
*/*/boot/makefile
*/*/docs/bugs.txt
*/*/docs/build.txt

8
sys/makefile
View File

@ -27,7 +27,13 @@ fat32chs.h: ..\boot\fat32chs.bin bin2c.com
fat32lba.h: ..\boot\fat32lba.bin bin2c.com
bin2c ..\boot\$*.bin $*.h $*
..\bin\sys.com: $(SYS_C) ..\hdr\*.h fat12com.h fat16com.h fat32chs.h fat32lba.h
oemfat12.h: ..\boot\oemfat12.bin bin2c.com
bin2c ..\boot\$*.bin $*.h $*
oemfat16.h: ..\boot\oemfat16.bin bin2c.com
bin2c ..\boot\$*.bin $*.h $*
..\bin\sys.com: $(SYS_C) ..\hdr\*.h fat12com.h fat16com.h fat32chs.h fat32lba.h oemfat12.h oemfat16.h
$(CL) $(CFLAGST) -DFORSYS -DWITHFAT32 $(SYS_C)
copy sys.com ..\bin
del sys.com

148
sys/sys.c
View File

@ -28,6 +28,7 @@
#define DEBUG
/* #define DDEBUG */
/* #define WITHOEMCOMPATBS */ /* uncomment for larger sys that support MS/PC DOS */
#define SYS_VERSION "v3.4"
@ -68,12 +69,38 @@ extern int VA_CDECL sprintf(char * buff, const char * fmt, ...);
#include "fat32chs.h"
#include "fat32lba.h"
#endif
#ifdef WITHOEMCOMPATBS
#include "oemfat12.h"
#include "oemfat16.h"
#endif
#ifndef __WATCOMC__
#include <io.h>
/* returns current DOS drive, A=0, B=1,C=2, ... */
#ifdef __TURBOC__
#define getcurdrive (unsigned)getdisk
#else
unsigned getcurdrive(void)
{
union REGS regs;
regs.h.ah = 0x19;
int86(0x21, &regs, &regs);
return regs.h.al;
}
#endif
#else
/* returns current DOS drive, A=0, B=1,C=2, ... */
unsigned getcurdrive(void);
#pragma aux getcurdrive = \
"mov ah, 0x19" \
"int 0x21" \
"xor ah, ah" \
value [ax];
long filelength(int __handle);
#pragma aux filelength = \
@ -159,7 +186,7 @@ char *getenv(const char *name)
BYTE pgm[] = "SYS";
void put_boot(int, char *, char *, int, int);
void put_boot(int, char *, char *, int, int, int);
BOOL check_space(COUNT, ULONG);
BOOL get_full_path(BYTE * srcPath, BYTE * rootPath, BYTE * filename, BYTE *source);
BOOL copy(BYTE *source, COUNT drive, BYTE * filename);
@ -251,9 +278,17 @@ int FDKrnConfigMain(int argc, char **argv);
#define FDKERNEL "KERNEL.SYS"
#define OEMKERNEL "IBMBIO.COM"
#define OEMDOS "IBMDOS.COM"
#define MSKERNEL "IO.SYS"
#define MSDOS "MSDOS.SYS"
#define FDLOADSEG 0x60
#define OEMLOADSEG 0x70
#define NO_OEMKERN 0 /* standard FreeDOS mode */
#define DR_OEMKERN 1 /* use FreeDOS boot sector, but OEM names */
#define PC_OEMKERN 2 /* use PC-DOS compatible boot sector and names */
#define MS_OEMKERN 3 /* use PC-DOS compatible BS with MS names */
int main(int argc, char **argv)
{
COUNT drive; /* destination drive */
@ -270,7 +305,7 @@ int main(int argc, char **argv)
int both = 0;
char *kernel_name = FDKERNEL;
int load_segment = FDLOADSEG;
int altkern = 0; /* use OEM kernel values instead of FD ones */
int altkern = NO_OEMKERN; /* use OEM kernel values instead of FD ones */
printf("FreeDOS System Installer " SYS_VERSION ", " __DATE__ "\n\n");
@ -300,9 +335,43 @@ int main(int argc, char **argv)
if (memicmp(argp, "OEM", 3) == 0)
{
altkern = 1; /* kernel is split into 2 files and update BS name */
kernel_name = OEMKERNEL;
load_segment = OEMLOADSEG;
#ifdef WITHOEMCOMPATBS
if (*(argp+3) == ':')
{
argp+=4; /* point to DR/PC/MS that follows */
if (memicmp(argp, "PC", 2) == 0)
{
altkern = PC_OEMKERN; /* kernel is split into 2 files and update BS name */
load_segment = OEMLOADSEG;
kernel_name = OEMKERNEL;
}
else if (memicmp(argp, "MS", 2) == 0)
{
altkern = MS_OEMKERN; /* kernel is split into 2 files and update BS name */
load_segment = OEMLOADSEG;
kernel_name = MSKERNEL;
}
else if (memicmp(argp, "DR", 2) == 0)
{
altkern = DR_OEMKERN; /* kernel is split into 2 files and update BS name */
load_segment = OEMLOADSEG;
kernel_name = OEMKERNEL;
}
else /* if (memicmp(argp, "FD", 2) == 0) */
{
altkern = NO_OEMKERN; /* restore defaults */
load_segment = FDLOADSEG;
kernel_name = FDKERNEL;
}
}
else /* generic support, just change names and load sector */
#endif
{
altkern = DR_OEMKERN; /* kernel is split into 2 files and update BS name */
load_segment = OEMLOADSEG;
if (kernel_name == FDKERNEL) /* preserve /K name if on cmd line 1st */
kernel_name = OEMKERNEL;
}
}
else if (memicmp(argp, "BOOTONLY", 8) == 0)
{
@ -347,6 +416,11 @@ int main(int argc, char **argv)
" BOTH : write to *both* the real boot sector and the image file\n"
" /BOOTONLY: do *not* copy kernel / shell, only update boot sector or image\n"
" /OEM : indicates kernel is IBMIO.SYS/IBMDOS.SYS loaded at 0x70\n"
#ifdef WITHOEMCOMPATBS
" /OEM:DR use IBMBIO.COM/IBMDOS.SYS and FD boot sector (default)\n"
" /OEM:PC use PC-DOS compatible boot sector\n"
" /OEM:MS use PC-DOS compatible boot sector with IO.SYS/MSDOS.SYS\n"
#endif
" /K name : name of kernel to use instead of KERNEL.SYS\n"
" /L segm : hex load segment to use instead of 60\n"
"%s CONFIG /help\n", pgm, pgm);
@ -382,14 +456,7 @@ int main(int argc, char **argv)
if ((strlen(srcPath) > 1) && (srcPath[1] == ':')) /* src specifies drive */
srcDrive = toupper(*srcPath) - 'A';
else /* src doesn't specify drive, so assume current drive */
{
#ifdef __TURBOC__
srcDrive = (unsigned) getdisk();
#else
_dos_getdrive(&srcDrive);
srcDrive--;
#endif
}
srcDrive = getcurdrive();
/* Don't try root if src==dst drive or source path given */
if ((drive == srcDrive)
@ -414,7 +481,7 @@ int main(int argc, char **argv)
}
else /* else OEM kernel found, so switch modes */
{
altkern = 1;
altkern = DR_OEMKERN;
kernel_name = OEMKERNEL;
load_segment = OEMLOADSEG;
}
@ -422,7 +489,7 @@ int main(int argc, char **argv)
}
printf("Processing boot sector...\n");
put_boot(drive, bsFile, kernel_name, load_segment, both);
put_boot(drive, bsFile, kernel_name, load_segment, both, altkern);
if (!bootonly)
{
@ -434,10 +501,15 @@ int main(int argc, char **argv)
if (altkern)
{
if ( (!get_full_path(srcPath, rootPath, OEMDOS, srcFile)) ||
(!copy(srcFile, drive, OEMDOS)) )
char *dosfn = OEMDOS;
#ifdef WITHOEMCOMPATBS
if (altkern == MS_OEMKERN) dosfn = MSDOS;
#endif
if ( (!get_full_path(srcPath, rootPath, dosfn, srcFile)) ||
(!copy(srcFile, drive, dosfn)) )
{
printf("\n%s: cannot copy \"%s\"\n", pgm, OEMDOS);
printf("\n%s: cannot copy \"%s\"\n", pgm, dosfn);
exit(1);
}
}
@ -452,7 +524,7 @@ int main(int argc, char **argv)
printf("\n%s: failed to find command interpreter (shell) file %s\n", pgm, "COMMAND.COM");
exit(1);
}
printf("%s: Using shell from %COMSPEC% \"%s\"\n", pgm, comspec);
printf("\n%s: Using shell from %COMSPEC% \"%s\"\n", pgm, comspec);
}
if (!copy(srcFile, drive, "COMMAND.COM"))
{
@ -494,6 +566,7 @@ VOID dump_sector(unsigned char far * sec)
#endif
#ifdef __WATCOMC__
int absread(int DosDrive, int nsects, int foo, void *diskReadPacket);
@ -741,7 +814,7 @@ void correct_bpb(struct bootsectortype *default_bpb,
oldboot->bsHiddenSecs = default_bpb->bsHiddenSecs;
}
void put_boot(int drive, char *bsFile, char *kernel_name, int load_seg, int both)
void put_boot(int drive, char *bsFile, char *kernel_name, int load_seg, int both, int altkern)
{
#ifdef WITHFAT32
struct bootsectortype32 *bs32;
@ -819,6 +892,15 @@ void put_boot(int drive, char *bsFile, char *kernel_name, int load_seg, int both
correct_bpb((struct bootsectortype *)(default_bpb + 7 - 11), bs);
#ifdef WITHFAT32 /* copy one of the FAT32 boot sectors */
#ifdef WITHOEMCOMPATBS
if (altkern >= 2) /* MS or PC compatible BS requested */
{
printf("%s: FAT32 versions of PC/MS DOS compatible boot sectors\n"
"are not supported [yet].\n");
exit(1);
}
#endif
memcpy(newboot, haveLBA() ? fat32lba : fat32chs, SEC_SIZE);
#else
printf("SYS hasn't been compiled with FAT32 support.\n"
@ -832,7 +914,21 @@ void put_boot(int drive, char *bsFile, char *kernel_name, int load_seg, int both
if (drive >= 2 &&
generic_block_ioctl(drive + 1, 0x860, default_bpb) == 0)
correct_bpb((struct bootsectortype *)(default_bpb + 7 - 11), bs);
memcpy(newboot, fs == FAT16 ? fat16com : fat12com, SEC_SIZE);
#ifdef WITHOEMCOMPATBS
{
unsigned char * bs;
if (altkern >= 2)
{
printf("Using PC-DOS compatible boot sector.\n");
bs = (fs == FAT16) ? oemfat16 : oemfat12;
}
else
bs = (fs == FAT16) ? fat16com : fat12com;
memcpy(newboot, bs, SEC_SIZE);
}
#else
memcpy(newboot, fs == FAT16 ? fat16com : fat12com, SEC_SIZE);
#endif
}
/* Copy disk parameter from old sector to new sector */
@ -859,7 +955,10 @@ void put_boot(int drive, char *bsFile, char *kernel_name, int load_seg, int both
This happens to be offset 0x78 (=0x3c * 2) for FAT32 and
offset 0x5c (=0x2e * 2) for FAT16 */
/* i.e. BE CAREFUL WHEN YOU CHANGE THE BOOT SECTORS !!! */
((int *)newboot)[0x3C] = load_seg;
#ifdef WITHOEMCOMPATBS
if (altkern < 2) /* PC-DOS compatible bs has fixed load sector */
#endif
((int *)newboot)[0x3C] = load_seg;
#ifdef DEBUG
printf(" FAT starts at sector %lx + %x\n",
bs32->bsHiddenSecs, bs32->bsResSectors);
@ -870,7 +969,10 @@ void put_boot(int drive, char *bsFile, char *kernel_name, int load_seg, int both
{
/* put 0 for A: or B: (force booting from A:), otherwise use DL */
bs->bsDriveNumber = drive < 2 ? 0 : 0xff;
((int *)newboot)[0x2E] = load_seg;
#ifdef WITHOEMCOMPATBS
if (altkern < 2) /* PC-DOS compatible bs has fixed load sector */
#endif
((int *)newboot)[0x2E] = load_seg;
}
#ifdef DEBUG /* add an option to display this on user request? */