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

Finally do the floppy determination type optimization for format --

Browse Source 
based on Arkady's suggestions a long time ago.
+ a few other small optimizations (~70 bytes total).


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@889 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2004-04-20 17:59:35 +00:00
parent c42277d259
commit 545b571c3e
1 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
kernel/dsk.c
View File

@ -296,13 +296,14 @@ STATIC WORD RWzero(ddt * pddt, UWORD mode)
STATIC WORD Getlogdev(rqptr rp, ddt * pddt) STATIC WORD Getlogdev(rqptr rp, ddt * pddt)
{ {
int i; int i;
ddt *pddt2 = getddt(0); ddt *pddt2;
if (!(pddt->ddt_descflags & DF_MULTLOG)) { if (!(pddt->ddt_descflags & DF_MULTLOG)) {
rp->r_unit = 0; rp->r_unit = 0;
return S_DONE; return S_DONE;
} }
pddt2 = getddt(0);
for (i = 0; i < blk_dev.dh_name[0]; i++, pddt2++) for (i = 0; i < blk_dev.dh_name[0]; i++, pddt2++)
{ {
if (pddt->ddt_driveno == pddt2->ddt_driveno && if (pddt->ddt_driveno == pddt2->ddt_driveno &&
@ -321,7 +322,7 @@ STATIC WORD Setlogdev(rqptr rp, ddt * pddt)
Getlogdev(rp, pddt); Getlogdev(rp, pddt);
if (rp->r_unit == 0) if (rp->r_unit == 0)
return S_DONE; return S_DONE;
(&(getddt(0))[rp->r_unit - 1])->ddt_descflags &= ~DF_CURLOG; getddt(rp->r_unit - 1)->ddt_descflags &= ~DF_CURLOG;
pddt->ddt_descflags |= DF_CURLOG; pddt->ddt_descflags |= DF_CURLOG;
rp->r_unit = unit + 1; rp->r_unit = unit + 1;
return S_DONE; return S_DONE;
@ -501,7 +502,7 @@ STATIC COUNT Genblockio(ddt * pddt, UWORD mode, WORD head, WORD track,
STATIC WORD Genblkdev(rqptr rp, ddt * pddt) STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
{ {
int ret; int ret;
bpb *pbpb; unsigned descflags = pddt->ddt_descflags;
#ifdef WITHFAT32 #ifdef WITHFAT32
int extended = 0; int extended = 0;
@ -517,10 +518,10 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
case 0x40: /* set device parameters */ case 0x40: /* set device parameters */
{ {
struct gblkio FAR *gblp = (struct gblkio FAR *)rp->r_trans; struct gblkio FAR *gblp = (struct gblkio FAR *)rp->r_trans;
bpb *pbpb;
pddt->ddt_type = gblp->gbio_devtype; pddt->ddt_type = gblp->gbio_devtype;
pddt->ddt_descflags &= ~3; pddt->ddt_descflags = (descflags & ~3) | (gblp->gbio_devattrib & 3)
pddt->ddt_descflags |= (gblp->gbio_devattrib & 3)
| (DF_DPCHANGED | DF_REFORMAT); | (DF_DPCHANGED | DF_REFORMAT);
pddt->ddt_ncyl = gblp->gbio_ncyl; pddt->ddt_ncyl = gblp->gbio_ncyl;
/* use default dpb or current bpb? */ /* use default dpb or current bpb? */
@ -528,11 +529,11 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
(gblp->gbio_spcfunbit & 0x01) == (gblp->gbio_spcfunbit & 0x01) ==
0 ? &pddt->ddt_defbpb : &pddt->ddt_bpb; 0 ? &pddt->ddt_defbpb : &pddt->ddt_bpb;
#ifdef WITHFAT32 #ifdef WITHFAT32
if (!extended) fmemcpy(pbpb, &gblp->gbio_bpb,
fmemcpy(pbpb, &gblp->gbio_bpb, BPB_SIZEOF); extended ? sizeof(gblp->gbio_bpb) : BPB_SIZEOF);
else #else
fmemcpy(pbpb, &gblp->gbio_bpb, sizeof(gblp->gbio_bpb));
#endif #endif
fmemcpy(pbpb, &gblp->gbio_bpb, sizeof(gblp->gbio_bpb));
/*pbpb->bpb_nsector = gblp->gbio_nsecs; */ /*pbpb->bpb_nsector = gblp->gbio_nsecs; */
break; break;
} }
@ -553,17 +554,15 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
UBYTE track, head, sector, type; UBYTE track, head, sector, type;
} *addrfield, afentry; } *addrfield, afentry;
if (hd(pddt->ddt_descflags)) pddt->ddt_descflags &= ~DF_DPCHANGED;
if (hd(descflags))
{ {
/* XXX no low-level formatting for hard disks implemented */ /* XXX no low-level formatting for hard disks implemented */
fv->gbfv_spcfunbit = 1; /* "not supported by bios" */ fv->gbfv_spcfunbit = 1; /* "not supported by bios" */
pddt->ddt_descflags &= ~DF_DPCHANGED;
return S_DONE; return S_DONE;
} }
if (pddt->ddt_descflags & DF_DPCHANGED) if (descflags & DF_DPCHANGED)
{ {
pddt->ddt_descflags &= ~DF_DPCHANGED;
/* first try newer setmediatype function */ /* first try newer setmediatype function */
ret = fl_setmediatype(pddt->ddt_driveno, pddt->ddt_ncyl, ret = fl_setmediatype(pddt->ddt_driveno, pddt->ddt_ncyl,
pddt->ddt_bpb.bpb_nsecs); pddt->ddt_bpb.bpb_nsecs);
@ -581,7 +580,8 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
else if (ret != 0) else if (ret != 0)
/* otherwise, setdisktype */ /* otherwise, setdisktype */
{ {
COUNT type = 0; unsigned char type;
unsigned tracks, secs;
if ((fv->gbfv_spcfunbit & 1) && if ((fv->gbfv_spcfunbit & 1) &&
(ret = (ret =
fl_read(pddt->ddt_driveno, 0, 0, 1, 1, fl_read(pddt->ddt_driveno, 0, 0, 1, 1,
@ -590,27 +590,25 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
fv->gbfv_spcfunbit = 3; /* no disk in drive */ fv->gbfv_spcfunbit = 3; /* no disk in drive */
return dskerr(ret); return dskerr(ret);
} }
if (pddt->ddt_ncyl == 40 && /* type 1: 320/360K disk in 360K drive */
(pddt->ddt_bpb.bpb_nsecs == 9 /* type 2: 320/360K disk in 1.2M drive */
|| pddt->ddt_bpb.bpb_nsecs == 8)) tracks = pddt->ddt_ncyl;
secs = pddt->ddt_bpb.bpb_nsecs;
type = pddt->ddt_type + 1;
if (!(tracks == 40 && (secs == 9 || secs == 8) && type < 3))
{ {
if (pddt->ddt_type == 0) /* type 3: 1.2M disk in 1.2M drive */
type = 1; /* 320/360K disk in 360K drive */ /* type 4: 720kb disk in 1.44M or 720kb drive */
else if (pddt->ddt_type == 1) type++;
type = 2; /* 320/360K disk in 1.2M drive */ if (type == 9) /* 1.44M drive */
} type = 4;
else if (pddt->ddt_type == 1 && pddt->ddt_ncyl == 80 && if (!(tracks == 80 && ((secs == 15 && type == 3) ||
pddt->ddt_bpb.bpb_nsecs == 15) (secs == 9 && type == 4))))
type = 3; /* 1.2M disk in 1.2M drive */ {
else if ((pddt->ddt_type == 2 || pddt->ddt_type == 7) && /* specified tracks, sectors/track not allowed for drive */
pddt->ddt_ncyl == 80 && pddt->ddt_bpb.bpb_nsecs == 15) fv->gbfv_spcfunbit = 2;
type = 4; /* 720kb disk in 1.44M or 720kb drive */ return dskerr(0xc);
}
if (type == 0)
{
/* specified tracks, sectors/track not allowed for drive */
fv->gbfv_spcfunbit = 2;
return dskerr(0xc);
} }
fl_setdisktype(pddt->ddt_driveno, type); fl_setdisktype(pddt->ddt_driveno, type);
} }
@ -685,16 +683,17 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
case 0x47: /* set access flag */ case 0x47: /* set access flag */
{ {
struct Access_info FAR *ai = (struct Access_info FAR *)rp->r_trans; struct Access_info FAR *ai = (struct Access_info FAR *)rp->r_trans;
pddt->ddt_descflags &= ~DF_NOACCESS; pddt->ddt_descflags = (descflags & ~DF_NOACCESS) |
pddt->ddt_descflags |= (ai->AI_Flag ? 0 : DF_NOACCESS); (ai->AI_Flag ? 0 : DF_NOACCESS);
} }
break; break;
case 0x60: /* get device parameters */ case 0x60: /* get device parameters */
{ {
struct gblkio FAR *gblp = (struct gblkio FAR *)rp->r_trans; struct gblkio FAR *gblp = (struct gblkio FAR *)rp->r_trans;
bpb *pbpb;
gblp->gbio_devtype = pddt->ddt_type; gblp->gbio_devtype = pddt->ddt_type;
gblp->gbio_devattrib = pddt->ddt_descflags & 3; gblp->gbio_devattrib = descflags & 3;
/* 360 kb disk in 1.2 MB drive */ /* 360 kb disk in 1.2 MB drive */
gblp->gbio_media = (pddt->ddt_type == 1) && (pddt->ddt_ncyl == 40); gblp->gbio_media = (pddt->ddt_type == 1) && (pddt->ddt_ncyl == 40);
gblp->gbio_ncyl = pddt->ddt_ncyl; gblp->gbio_ncyl = pddt->ddt_ncyl;
@ -703,11 +702,11 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
(gblp->gbio_spcfunbit & 0x01) == (gblp->gbio_spcfunbit & 0x01) ==
0 ? &pddt->ddt_defbpb : &pddt->ddt_bpb; 0 ? &pddt->ddt_defbpb : &pddt->ddt_bpb;
#ifdef WITHFAT32 #ifdef WITHFAT32
if (!extended) fmemcpy(&gblp->gbio_bpb, pbpb,
fmemcpy(&gblp->gbio_bpb, pbpb, BPB_SIZEOF); extended ? sizeof(gblp->gbio_bpb) : BPB_SIZEOF);
else #else
fmemcpy(&gblp->gbio_bpb, pbpb, sizeof(gblp->gbio_bpb));
#endif #endif
fmemcpy(&gblp->gbio_bpb, pbpb, sizeof(gblp->gbio_bpb));
/*gblp->gbio_nsecs = pbpb->bpb_nsector; */ /*gblp->gbio_nsecs = pbpb->bpb_nsector; */
break; break;
} }
@ -736,7 +735,7 @@ STATIC WORD Genblkdev(rqptr rp, ddt * pddt)
case 0x67: /* get access flag */ case 0x67: /* get access flag */
{ {
struct Access_info FAR *ai = (struct Access_info FAR *)rp->r_trans; struct Access_info FAR *ai = (struct Access_info FAR *)rp->r_trans;
ai->AI_Flag = pddt->ddt_descflags & DF_NOACCESS ? 0 : 1; /* bit 9 */ ai->AI_Flag = descflags & DF_NOACCESS ? 0 : 1; /* bit 9 */
} }
break; break;
default: default:
@ -929,6 +928,7 @@ STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer,
unsigned error_code = 0; unsigned error_code = 0;
struct CHS chs; struct CHS chs;
void FAR *transfer_address; void FAR *transfer_address;
unsigned char driveno = pddt->ddt_driveno;
int num_retries; int num_retries;
@ -944,11 +944,12 @@ STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer,
if (!hd(pddt->ddt_descflags)) if (!hd(pddt->ddt_descflags))
{ {
UBYTE FAR *int1e_ptr = (UBYTE FAR *)getvec(0x1e); UBYTE FAR *int1e_ptr = (UBYTE FAR *)getvec(0x1e);
unsigned char nsecs = (unsigned char)(pddt->ddt_bpb.bpb_nsecs);
if (int1e_ptr[4] != pddt->ddt_bpb.bpb_nsecs) if (int1e_ptr[4] != nsecs)
{ {
int1e_ptr[4] = pddt->ddt_bpb.bpb_nsecs; int1e_ptr[4] = nsecs;
fl_reset(pddt->ddt_driveno); fl_reset(driveno);
} }
} }
@ -996,18 +997,18 @@ STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer,
if ((pddt->ddt_descflags & DF_WRTVERIFY) || mode != LBA_WRITE_VERIFY) if ((pddt->ddt_descflags & DF_WRTVERIFY) || mode != LBA_WRITE_VERIFY)
{ {
error_code = fl_lba_ReadWrite(pddt->ddt_driveno, mode, &dap); error_code = fl_lba_ReadWrite(driveno, mode, &dap);
} }
else else
{ {
/* verify requested, but not supported */ /* verify requested, but not supported */
error_code = error_code =
fl_lba_ReadWrite(pddt->ddt_driveno, LBA_WRITE, &dap); fl_lba_ReadWrite(driveno, LBA_WRITE, &dap);
if (error_code == 0) if (error_code == 0)
{ {
error_code = error_code =
fl_lba_ReadWrite(pddt->ddt_driveno, LBA_VERIFY, &dap); fl_lba_ReadWrite(driveno, LBA_VERIFY, &dap);
} }
} }
} }
@ -1027,8 +1028,7 @@ STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer,
error_code = (mode == LBA_READ ? fl_read : error_code = (mode == LBA_READ ? fl_read :
mode == LBA_VERIFY ? fl_verify : mode == LBA_VERIFY ? fl_verify :
mode == mode ==
LBA_FORMAT ? fl_format : fl_write) (pddt-> LBA_FORMAT ? fl_format : fl_write) (driveno,
ddt_driveno,
chs.Head, chs.Head,
chs.Cylinder, chs.Cylinder,
chs.Sector, chs.Sector,
@ -1037,15 +1037,14 @@ STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer,
if (error_code == 0 && mode == LBA_WRITE_VERIFY) if (error_code == 0 && mode == LBA_WRITE_VERIFY)
{ {
error_code = fl_verify(pddt->ddt_driveno, error_code = fl_verify(driveno, chs.Head, chs.Cylinder,
chs.Head, chs.Cylinder,
chs.Sector, count, transfer_address); chs.Sector, count, transfer_address);
} }
} }
if (error_code == 0) if (error_code == 0)
break; break;
fl_reset(pddt->ddt_driveno); fl_reset(driveno);
} /* end of retries */ } /* end of retries */