From ef3e38de7b01b06b1ec695050c8cba625fee2bee Mon Sep 17 00:00:00 2001 From: Bart Oldeman Date: Tue, 2 Dec 2003 23:34:43 +0000 Subject: [PATCH] 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 --- kernel/fatfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/fatfs.c b/kernel/fatfs.c index 4244f91..ee691c7 100644 --- a/kernel/fatfs.c +++ b/kernel/fatfs.c @@ -2064,7 +2064,7 @@ ckok:; #endif } -STATIC int blockio(unsigned char command, struct dpb FAR * dpbp) +STATIC int rqblockio(unsigned char command, struct dpb FAR * dpbp) { retry: MediaReqHdr.r_length = sizeof(request); @@ -2101,7 +2101,7 @@ COUNT media_check(REG struct dpb FAR * dpbp) return DE_INVLDDRV; /* First test if anyone has changed the removable media */ - ret = blockio(C_MEDIACHK, dpbp); + ret = rqblockio(C_MEDIACHK, dpbp); if (ret < SUCCESS) return ret; @@ -2122,7 +2122,7 @@ COUNT media_check(REG struct dpb FAR * dpbp) case M_CHANGED: default: setinvld(dpbp->dpb_unit); - ret = blockio(C_BLDBPB, dpbp); + ret = rqblockio(C_BLDBPB, dpbp); if (ret < SUCCESS) return ret; #ifdef WITHFAT32