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

works towards better SS!=DS support, centralized debug macros, some comments

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/branches/UNSTABLE@1151 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Kenneth J Davis 2005-11-20 16:20:44 +00:00
parent 23006698f1
commit db9a0fa419
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/dsk.c
View File

@ -27,17 +27,13 @@
#include "portab.h" #include "portab.h"
#include "globals.h" #include "globals.h"
#include "dyndata.h" #include "dyndata.h"
#include "debug.h"
#ifdef VERSION_STRINGS #ifdef VERSION_STRINGS
static BYTE *dskRcsId = static BYTE *dskRcsId =
"$Id$"; "$Id$";
#endif #endif
#if defined(DEBUG)
#define DebugPrintf(x) printf x
#else
#define DebugPrintf(x)
#endif
void ASMPASCAL fl_readkey(void); void ASMPASCAL fl_readkey(void);
int ASMPASCAL fl_reset(UBYTE drive); int ASMPASCAL fl_reset(UBYTE drive);
@ -64,7 +60,7 @@ int ASMPASCAL fl_lba_ReadWrite(UBYTE drive, WORD mode,
#endif #endif
STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer, STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer,
ULONG LBA_address, unsigned total, UWORD * transferred); ULONG LBA_address, unsigned total, UWORD FAR * transferred);
#define LBA_READ 0x4200 #define LBA_READ 0x4200
#define LBA_WRITE 0x4300 #define LBA_WRITE 0x4300
@ -223,10 +219,14 @@ STATIC WORD diskchange(ddt * pddt)
{ {
int ret = fl_diskchanged(pddt->ddt_driveno); int ret = fl_diskchanged(pddt->ddt_driveno);
if (ret == 1) if (ret == 1)
{
/* check if it has changed... */ /* check if it has changed... */
return M_CHANGED; return M_CHANGED;
}
if (ret == 0) if (ret == 0)
{
return M_NOT_CHANGED; return M_NOT_CHANGED;
}
} }
/* can not detect or error... */ /* can not detect or error... */
@ -246,7 +246,7 @@ STATIC WORD mediachk(rqptr rp, ddt * pddt)
else if (pddt->ddt_descflags & DF_DISKCHANGE) else if (pddt->ddt_descflags & DF_DISKCHANGE)
{ {
pddt->ddt_descflags &= ~DF_DISKCHANGE; pddt->ddt_descflags &= ~DF_DISKCHANGE;
rp->r_mcretcode = M_DONT_KNOW; rp->r_mcretcode = M_DONT_KNOW; /* media_check() treats as M_CHANGED but tries flushing buffers 1st */
} }
else if ((rp->r_mcretcode = diskchange(pddt)) == M_DONT_KNOW) else if ((rp->r_mcretcode = diskchange(pddt)) == M_DONT_KNOW)
{ {
@ -813,7 +813,7 @@ STATIC WORD dskerr(COUNT code)
translate LBA sectors into CHS addressing translate LBA sectors into CHS addressing
*/ */
STATIC void LBA_to_CHS(ULONG LBA_address, struct CHS *chs, const ddt * pddt) STATIC void LBA_to_CHS(ULONG LBA_address, struct CHS FAR *chs, const ddt * pddt)
{ {
/* we need the defbpb values since those are taken from the /* we need the defbpb values since those are taken from the
BIOS, not from some random boot sector, except when BIOS, not from some random boot sector, except when
@ -866,7 +866,7 @@ STATIC unsigned DMA_max_transfer(void FAR * buffer, unsigned count)
STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer, STATIC int LBA_Transfer(ddt * pddt, UWORD mode, VOID FAR * buffer,
ULONG LBA_address, unsigned totaltodo, ULONG LBA_address, unsigned totaltodo,
UWORD * transferred) UWORD FAR * transferred)
{ {
*transferred = 0; *transferred = 0;