Rename blockio by rqblockio (namespace conflict with dsk.c)
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@734 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
parent
76cb6edf6e
commit
ef3e38de7b
@ -2064,7 +2064,7 @@ ckok:;
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
STATIC int blockio(unsigned char command, struct dpb FAR * dpbp)
|
STATIC int rqblockio(unsigned char command, struct dpb FAR * dpbp)
|
||||||
{
|
{
|
||||||
retry:
|
retry:
|
||||||
MediaReqHdr.r_length = sizeof(request);
|
MediaReqHdr.r_length = sizeof(request);
|
||||||
@ -2101,7 +2101,7 @@ COUNT media_check(REG struct dpb FAR * dpbp)
|
|||||||
return DE_INVLDDRV;
|
return DE_INVLDDRV;
|
||||||
|
|
||||||
/* First test if anyone has changed the removable media */
|
/* First test if anyone has changed the removable media */
|
||||||
ret = blockio(C_MEDIACHK, dpbp);
|
ret = rqblockio(C_MEDIACHK, dpbp);
|
||||||
if (ret < SUCCESS)
|
if (ret < SUCCESS)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@ -2122,7 +2122,7 @@ COUNT media_check(REG struct dpb FAR * dpbp)
|
|||||||
case M_CHANGED:
|
case M_CHANGED:
|
||||||
default:
|
default:
|
||||||
setinvld(dpbp->dpb_unit);
|
setinvld(dpbp->dpb_unit);
|
||||||
ret = blockio(C_BLDBPB, dpbp);
|
ret = rqblockio(C_BLDBPB, dpbp);
|
||||||
if (ret < SUCCESS)
|
if (ret < SUCCESS)
|
||||||
return ret;
|
return ret;
|
||||||
#ifdef WITHFAT32
|
#ifdef WITHFAT32
|
||||||
|
Loading…
Reference in New Issue
Block a user