mirror of
https://github.com/jfdelnero/HxCFloppyEmulator.git
synced 2026-10-27 06:20:50 +00:00
fix new default clang warnings.
This commit is contained in:
Jean-François DEL NERO committed
1 parent
d296b3af77
commit
406db9f516
3 files changed
+204
-198
No files matched your search
@@ -47,7 +47,7 @@
|
||||
|
||||
typedef struct _sdu_header
|
||||
{
|
||||
const uint8_t signature[21]; // SAB Diskette Utility\0
|
||||
uint8_t signature[21]; // SAB Diskette Utility\0
|
||||
uint8_t version[5]; // X.XX\0
|
||||
uint16_t flags;
|
||||
uint16_t type;
|
||||
|
||||
@@ -108,7 +108,7 @@ int SDU_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,cha
|
||||
|
||||
hxc_fread(&sduh,sizeof(sduh),f_img);
|
||||
|
||||
if( strncmp((const char*)&sduh.signature,"SAB ",4))
|
||||
if( strncmp((char*)&sduh.signature,"SAB ",4))
|
||||
{
|
||||
imgldr_ctx->hxcfe->hxc_printf(MSG_ERROR,"SDU_libLoad_DiskFile : Bad file !");
|
||||
return HXCFE_BADFILE;
|
||||
|
||||
@@ -42,10 +42,10 @@
|
||||
|
||||
extern struct Env adfEnv;
|
||||
|
||||
uint32_t bitMask[32] = {
|
||||
0x1, 0x2, 0x4, 0x8,
|
||||
uint32_t bitMask[32] = {
|
||||
0x1, 0x2, 0x4, 0x8,
|
||||
0x10, 0x20, 0x40, 0x80,
|
||||
0x100, 0x200, 0x400, 0x800,
|
||||
0x100, 0x200, 0x400, 0x800,
|
||||
0x1000, 0x2000, 0x4000, 0x8000,
|
||||
0x10000, 0x20000, 0x40000, 0x80000,
|
||||
0x100000, 0x200000, 0x400000, 0x800000,
|
||||
@@ -55,25 +55,25 @@ uint32_t bitMask[32] = {
|
||||
|
||||
RETCODE adfInstallBootBlock(struct Volume *vol, unsigned char* code)
|
||||
{
|
||||
int i;
|
||||
struct bBootBlock boot;
|
||||
int i;
|
||||
struct bBootBlock boot;
|
||||
|
||||
if (vol->dev->devType!=DEVTYPE_FLOPDD && vol->dev->devType!=DEVTYPE_FLOPHD)
|
||||
return RC_ERROR;
|
||||
if (vol->dev->devType!=DEVTYPE_FLOPDD && vol->dev->devType!=DEVTYPE_FLOPHD)
|
||||
return RC_ERROR;
|
||||
|
||||
if (adfReadBootBlock(vol, &boot)!=RC_OK)
|
||||
return RC_ERROR;
|
||||
if (adfReadBootBlock(vol, &boot)!=RC_OK)
|
||||
return RC_ERROR;
|
||||
|
||||
boot.rootBlock = 880;
|
||||
for(i=0; i<1024-12; i++) /* bootcode */
|
||||
boot.data[i] = code[i+12];
|
||||
boot.rootBlock = 880;
|
||||
for(i=0; i<1024-12; i++) /* bootcode */
|
||||
boot.data[i] = code[i+12];
|
||||
|
||||
if (adfWriteBootBlock(vol, &boot)!=RC_OK)
|
||||
if (adfWriteBootBlock(vol, &boot)!=RC_OK)
|
||||
return RC_ERROR;
|
||||
|
||||
vol->bootCode = TRUE;
|
||||
|
||||
return RC_OK;
|
||||
return RC_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -83,9 +83,9 @@ RETCODE adfInstallBootBlock(struct Volume *vol, unsigned char* code)
|
||||
*/
|
||||
BOOL isSectNumValid(struct Volume *vol, SECTNUM nSect)
|
||||
{
|
||||
return( 0<=nSect && nSect<=(vol->lastBlock - vol->firstBlock) );
|
||||
}
|
||||
|
||||
return( 0<=nSect && nSect<=(vol->lastBlock - vol->firstBlock) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
@@ -97,13 +97,13 @@ void adfVolumeInfo(struct Volume *vol)
|
||||
struct bRootBlock root;
|
||||
char diskName[35];
|
||||
int days,month,year;
|
||||
|
||||
|
||||
if (adfReadRootBlock(vol, vol->rootBlock, &root)!=RC_OK)
|
||||
return;
|
||||
|
||||
|
||||
memset(diskName, 0, 35);
|
||||
memcpy(diskName, root.diskName, root.nameLen);
|
||||
|
||||
|
||||
printf ("Name : %-30s\n",vol->volName);
|
||||
printf ("Type : ");
|
||||
switch(vol->dev->devType) {
|
||||
@@ -114,40 +114,48 @@ void adfVolumeInfo(struct Volume *vol)
|
||||
printf ("Floppy High Density : 1760 KBytes\n");
|
||||
break;
|
||||
case DEVTYPE_HARDDISK:
|
||||
printf ("Hard Disk partition : %3.1f KBytes\n",
|
||||
printf ("Hard Disk partition : %3.1f KBytes\n",
|
||||
(vol->lastBlock - vol->firstBlock +1) * 512.0/1024.0);
|
||||
break;
|
||||
case DEVTYPE_HARDFILE:
|
||||
printf ("HardFile : %3.1f KBytes\n",
|
||||
printf ("HardFile : %3.1f KBytes\n",
|
||||
(vol->lastBlock - vol->firstBlock +1) * 512.0/1024.0);
|
||||
break;
|
||||
default:
|
||||
printf ("Unknown devType!\n");
|
||||
}
|
||||
|
||||
printf ("Filesystem : ");
|
||||
printf("%s ",isFFS(vol->dosType) ? "FFS" : "OFS");
|
||||
|
||||
if (isINTL(vol->dosType))
|
||||
printf ("INTL ");
|
||||
if (isDIRCACHE(vol->dosType))
|
||||
printf ("DIRCACHE ");
|
||||
|
||||
putchar('\n');
|
||||
|
||||
printf("Free blocks = %d\n", adfCountFreeBlocks(vol));
|
||||
if (vol->readOnly)
|
||||
printf("Read only\n");
|
||||
else
|
||||
printf("Read/Write\n");
|
||||
|
||||
/* created */
|
||||
printf("Free blocks = %d\n", adfCountFreeBlocks(vol));
|
||||
|
||||
if (vol->readOnly)
|
||||
printf("Read only\n");
|
||||
else
|
||||
printf("Read/Write\n");
|
||||
|
||||
/* created */
|
||||
adfDays2Date(root.coDays, &year, &month, &days);
|
||||
printf ("created %d/%02d/%02d %d:%02d:%02d\n",days,month,year,
|
||||
root.coMins/60,root.coMins%60,root.coTicks/50);
|
||||
printf ("created %d/%02d/%02d %d:%02d:%02d\n",days,month,year,
|
||||
root.coMins/60,root.coMins%60,root.coTicks/50);
|
||||
|
||||
adfDays2Date(root.days, &year, &month, &days);
|
||||
printf ("last access %d/%02d/%02d %d:%02d:%02d, ",days,month,year,
|
||||
root.mins/60,root.mins%60,root.ticks/50);
|
||||
|
||||
printf ("last access %d/%02d/%02d %d:%02d:%02d, ",days,month,year,
|
||||
root.mins/60,root.mins%60,root.ticks/50);
|
||||
|
||||
adfDays2Date(root.cDays, &year, &month, &days);
|
||||
printf ("%d/%02d/%02d %d:%02d:%02d\n",days,month,year,
|
||||
root.cMins/60,root.cMins%60,root.cTicks/50);
|
||||
|
||||
printf ("%d/%02d/%02d %d:%02d:%02d\n",days,month,year,
|
||||
root.cMins/60,root.cMins%60,root.cTicks/50);
|
||||
}
|
||||
|
||||
|
||||
@@ -155,56 +163,56 @@ void adfVolumeInfo(struct Volume *vol)
|
||||
/*
|
||||
* adfMount
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
struct Volume* adfMount( struct Device *dev, int nPart, BOOL readOnly )
|
||||
{
|
||||
int32_t nBlock;
|
||||
struct bRootBlock root;
|
||||
int32_t nBlock;
|
||||
struct bRootBlock root;
|
||||
struct bBootBlock boot;
|
||||
struct Volume* vol;
|
||||
|
||||
if (dev==NULL || nPart >= dev->nVol) {
|
||||
(*adfEnv.eFct)("adfMount : invalid parameter(s)");
|
||||
return NULL;
|
||||
}
|
||||
if (dev==NULL || nPart >= dev->nVol) {
|
||||
(*adfEnv.eFct)("adfMount : invalid parameter(s)");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
vol = dev->volList[nPart];
|
||||
vol = dev->volList[nPart];
|
||||
vol->dev = dev;
|
||||
vol->mounted = TRUE;
|
||||
vol->mounted = TRUE;
|
||||
|
||||
/*printf("first=%ld last=%ld root=%ld\n",vol->firstBlock,
|
||||
vol->lastBlock, vol->rootBlock);
|
||||
*/
|
||||
if (adfReadBootBlock(vol, &boot)!=RC_OK) {
|
||||
(*adfEnv.wFct)("adfMount : BootBlock invalid");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (adfReadBootBlock(vol, &boot)!=RC_OK) {
|
||||
(*adfEnv.wFct)("adfMount : BootBlock invalid");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
vol->dosType = boot.dosType[3];
|
||||
if (isFFS(vol->dosType))
|
||||
vol->datablockSize=512;
|
||||
else
|
||||
vol->datablockSize=488;
|
||||
|
||||
if (dev->readOnly /*|| isDIRCACHE(vol->dosType)*/)
|
||||
vol->readOnly = TRUE;
|
||||
else
|
||||
vol->readOnly = readOnly;
|
||||
|
||||
if (adfReadRootBlock(vol, vol->rootBlock, &root)!=RC_OK) {
|
||||
(*adfEnv.wFct)("adfMount : RootBlock invalid");
|
||||
return NULL;
|
||||
}
|
||||
if (dev->readOnly /*|| isDIRCACHE(vol->dosType)*/)
|
||||
vol->readOnly = TRUE;
|
||||
else
|
||||
vol->readOnly = readOnly;
|
||||
|
||||
nBlock = vol->lastBlock - vol->firstBlock +1 - 2;
|
||||
if (adfReadRootBlock(vol, vol->rootBlock, &root)!=RC_OK) {
|
||||
(*adfEnv.wFct)("adfMount : RootBlock invalid");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
nBlock = vol->lastBlock - vol->firstBlock +1 - 2;
|
||||
|
||||
adfReadBitmap( vol, nBlock, &root );
|
||||
vol->curDirPtr = vol->rootBlock;
|
||||
vol->curDirPtr = vol->rootBlock;
|
||||
|
||||
/*printf("blockSize=%d\n",vol->blockSize);*/
|
||||
|
||||
return( vol );
|
||||
return( vol );
|
||||
}
|
||||
|
||||
|
||||
@@ -219,13 +227,13 @@ void adfUnMount(struct Volume *vol)
|
||||
{
|
||||
if (!vol) {
|
||||
(*adfEnv.eFct)("adfUnMount : vol is null");
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
adfFreeBitmap(vol);
|
||||
adfFreeBitmap(vol);
|
||||
|
||||
vol->mounted = FALSE;
|
||||
|
||||
vol->mounted = FALSE;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -233,91 +241,91 @@ void adfUnMount(struct Volume *vol)
|
||||
/*
|
||||
* adfCreateVol
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
struct Volume* adfCreateVol( struct Device* dev, int32_t start, int32_t len,
|
||||
char* volName, int volType,struct DateTime * voldate )
|
||||
struct Volume* adfCreateVol( struct Device* dev, int32_t start, int32_t len,
|
||||
char* volName, int volType,struct DateTime * voldate )
|
||||
{
|
||||
struct bBootBlock boot;
|
||||
struct bRootBlock root;
|
||||
struct bBootBlock boot;
|
||||
struct bRootBlock root;
|
||||
/* struct bDirCacheBlock dirc;*/
|
||||
SECTNUM blkList[2];
|
||||
struct Volume* vol;
|
||||
int nlen;
|
||||
SECTNUM blkList[2];
|
||||
struct Volume* vol;
|
||||
int nlen;
|
||||
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(0);
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(0);
|
||||
|
||||
vol=(struct Volume*)calloc(1,sizeof(struct Volume));
|
||||
if (!vol) {
|
||||
vol=(struct Volume*)calloc(1,sizeof(struct Volume));
|
||||
if (!vol) {
|
||||
(*adfEnv.eFct)("adfCreateVol : malloc vol");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
vol->dev = dev;
|
||||
vol->firstBlock = (dev->heads * dev->sectors)*start;
|
||||
vol->lastBlock = (vol->firstBlock + (dev->heads * dev->sectors)*len)-1;
|
||||
vol->rootBlock = (vol->lastBlock - vol->firstBlock+1)/2;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
vol->dev = dev;
|
||||
vol->firstBlock = (dev->heads * dev->sectors)*start;
|
||||
vol->lastBlock = (vol->firstBlock + (dev->heads * dev->sectors)*len)-1;
|
||||
vol->rootBlock = (vol->lastBlock - vol->firstBlock+1)/2;
|
||||
/*printf("first=%ld last=%ld root=%ld\n",vol->firstBlock,
|
||||
vol->lastBlock, vol->rootBlock);
|
||||
*/
|
||||
vol->curDirPtr = vol->rootBlock;
|
||||
vol->curDirPtr = vol->rootBlock;
|
||||
|
||||
vol->readOnly = dev->readOnly;
|
||||
vol->readOnly = dev->readOnly;
|
||||
|
||||
vol->mounted = TRUE;
|
||||
vol->mounted = TRUE;
|
||||
|
||||
nlen = min( MAXNAMELEN, strlen(volName) );
|
||||
vol->volName = (char*)calloc(1,nlen+1);
|
||||
if (!vol->volName) {
|
||||
nlen = min( MAXNAMELEN, strlen(volName) );
|
||||
vol->volName = (char*)calloc(1,nlen+1);
|
||||
if (!vol->volName) {
|
||||
(*adfEnv.eFct)("adfCreateVol : malloc");
|
||||
free(vol); return NULL;
|
||||
}
|
||||
memcpy(vol->volName, volName, nlen);
|
||||
vol->volName[nlen]='\0';
|
||||
}
|
||||
memcpy(vol->volName, volName, nlen);
|
||||
vol->volName[nlen]='\0';
|
||||
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(25);
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(25);
|
||||
|
||||
memset(&boot, 0, 1024);
|
||||
boot.dosType[3] = volType;
|
||||
memset(&boot, 0, 1024);
|
||||
boot.dosType[3] = volType;
|
||||
/*printf("first=%d last=%d\n", vol->firstBlock, vol->lastBlock);
|
||||
printf("name=%s root=%d\n", vol->volName, vol->rootBlock);
|
||||
*/
|
||||
if (adfWriteBootBlock(vol, &boot)!=RC_OK) {
|
||||
free(vol->volName); free(vol);
|
||||
return NULL;
|
||||
}
|
||||
if (adfWriteBootBlock(vol, &boot)!=RC_OK) {
|
||||
free(vol->volName); free(vol);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(20);
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(20);
|
||||
|
||||
if (adfCreateBitmap( vol )!=RC_OK) {
|
||||
free(vol->volName); free(vol);
|
||||
return NULL;
|
||||
}
|
||||
if (adfCreateBitmap( vol )!=RC_OK) {
|
||||
free(vol->volName); free(vol);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(40);
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(40);
|
||||
|
||||
|
||||
/*for(i=0; i<127; i++)
|
||||
printf("%3d %x, ",i,vol->bitmapTable[0]->map[i]);
|
||||
*/
|
||||
if ( isDIRCACHE(volType) )
|
||||
adfGetFreeBlocks( vol, 2, blkList );
|
||||
else
|
||||
adfGetFreeBlocks( vol, 1, blkList );
|
||||
if ( isDIRCACHE(volType) )
|
||||
adfGetFreeBlocks( vol, 2, blkList );
|
||||
else
|
||||
adfGetFreeBlocks( vol, 1, blkList );
|
||||
|
||||
|
||||
/*printf("[0]=%d [1]=%d\n",blkList[0],blkList[1]);*/
|
||||
|
||||
memset(&root, 0, LOGICAL_BLOCK_SIZE);
|
||||
memset(&root, 0, LOGICAL_BLOCK_SIZE);
|
||||
|
||||
if (strlen(volName)>MAXNAMELEN)
|
||||
volName[MAXNAMELEN]='\0';
|
||||
root.nameLen = (char)strlen(volName);
|
||||
memcpy(root.diskName,volName,root.nameLen);
|
||||
if (strlen(volName)>MAXNAMELEN)
|
||||
volName[MAXNAMELEN]='\0';
|
||||
root.nameLen = (char)strlen(volName);
|
||||
memcpy(root.diskName,volName,root.nameLen);
|
||||
|
||||
if(voldate)
|
||||
{
|
||||
@@ -329,41 +337,41 @@ printf("%3d %x, ",i,vol->bitmapTable[0]->map[i]);
|
||||
adfTime2AmigaTime(adfGiveCurrentTime(),&(root.coDays),&(root.coMins),&(root.coTicks));
|
||||
}
|
||||
|
||||
/* dircache block */
|
||||
if ( isDIRCACHE(volType) ) {
|
||||
root.extension = 0L;
|
||||
root.secType = ST_ROOT; /* needed by adfCreateEmptyCache() */
|
||||
adfCreateEmptyCache(vol, (struct bEntryBlock*)&root, blkList[1]);
|
||||
}
|
||||
/* dircache block */
|
||||
if ( isDIRCACHE(volType) ) {
|
||||
root.extension = 0L;
|
||||
root.secType = ST_ROOT; /* needed by adfCreateEmptyCache() */
|
||||
adfCreateEmptyCache(vol, (struct bEntryBlock*)&root, blkList[1]);
|
||||
}
|
||||
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(60);
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(60);
|
||||
|
||||
if (adfWriteRootBlock(vol, blkList[0], &root)!=RC_OK) {
|
||||
free(vol->volName); free(vol);
|
||||
return NULL;
|
||||
}
|
||||
if (adfWriteRootBlock(vol, blkList[0], &root)!=RC_OK) {
|
||||
free(vol->volName); free(vol);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* fills root->bmPages[] and writes filled bitmapExtBlocks */
|
||||
if (adfWriteNewBitmap(vol)!=RC_OK)
|
||||
if (adfWriteNewBitmap(vol)!=RC_OK)
|
||||
return NULL;
|
||||
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(80);
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(80);
|
||||
|
||||
if (adfUpdateBitmap(vol)!=RC_OK)
|
||||
if (adfUpdateBitmap(vol)!=RC_OK)
|
||||
return NULL;
|
||||
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(100);
|
||||
if (adfEnv.useProgressBar)
|
||||
(*adfEnv.progressBar)(100);
|
||||
/*printf("free blocks %ld\n",adfCountFreeBlocks(vol));*/
|
||||
|
||||
/* will be managed by adfMount() later */
|
||||
adfFreeBitmap(vol);
|
||||
/* will be managed by adfMount() later */
|
||||
adfFreeBitmap(vol);
|
||||
|
||||
vol->mounted = FALSE;
|
||||
vol->mounted = FALSE;
|
||||
|
||||
return(vol);
|
||||
return(vol);
|
||||
}
|
||||
|
||||
|
||||
@@ -378,40 +386,40 @@ RETCODE
|
||||
adfReadBlock(struct Volume* vol, int32_t nSect, unsigned char* buf)
|
||||
{
|
||||
/* char strBuf[80];*/
|
||||
int32_t pSect;
|
||||
struct nativeFunctions *nFct;
|
||||
RETCODE rc;
|
||||
int32_t pSect;
|
||||
struct nativeFunctions *nFct;
|
||||
RETCODE rc;
|
||||
|
||||
if (!vol->mounted) {
|
||||
(*adfEnv.eFct)("the volume isn't mounted, adfReadBlock not possible");
|
||||
return RC_ERROR;
|
||||
}
|
||||
if (!vol->mounted) {
|
||||
(*adfEnv.eFct)("the volume isn't mounted, adfReadBlock not possible");
|
||||
return RC_ERROR;
|
||||
}
|
||||
|
||||
/* translate logical sect to physical sect */
|
||||
pSect = nSect+vol->firstBlock;
|
||||
/* translate logical sect to physical sect */
|
||||
pSect = nSect+vol->firstBlock;
|
||||
|
||||
if (adfEnv.useRWAccess)
|
||||
(*adfEnv.rwhAccess)(pSect,nSect,FALSE);
|
||||
if (adfEnv.useRWAccess)
|
||||
(*adfEnv.rwhAccess)(pSect,nSect,FALSE);
|
||||
|
||||
/*printf("psect=%ld nsect=%ld\n",pSect,nSect);*/
|
||||
/* sprintf(strBuf,"ReadBlock : accessing logical block #%ld", nSect);
|
||||
(*adfEnv.vFct)(strBuf);
|
||||
/* sprintf(strBuf,"ReadBlock : accessing logical block #%ld", nSect);
|
||||
(*adfEnv.vFct)(strBuf);
|
||||
*/
|
||||
if (pSect<vol->firstBlock || pSect>vol->lastBlock) {
|
||||
(*adfEnv.wFct)("adfReadBlock : nSect out of range");
|
||||
|
||||
}
|
||||
if (pSect<vol->firstBlock || pSect>vol->lastBlock) {
|
||||
(*adfEnv.wFct)("adfReadBlock : nSect out of range");
|
||||
|
||||
}
|
||||
/*printf("pSect R =%ld\n",pSect);*/
|
||||
nFct = adfEnv.nativeFct;
|
||||
if (vol->dev->isNativeDev)
|
||||
rc = (*nFct->adfNativeReadSector)(vol->dev, pSect, 512, buf);
|
||||
else
|
||||
rc = adfReadDumpSector(vol->dev, pSect, 512, buf);
|
||||
nFct = adfEnv.nativeFct;
|
||||
if (vol->dev->isNativeDev)
|
||||
rc = (*nFct->adfNativeReadSector)(vol->dev, pSect, 512, buf);
|
||||
else
|
||||
rc = adfReadDumpSector(vol->dev, pSect, 512, buf);
|
||||
/*printf("rc=%ld\n",rc);*/
|
||||
if (rc!=RC_OK)
|
||||
return RC_ERROR;
|
||||
else
|
||||
return RC_OK;
|
||||
if (rc!=RC_OK)
|
||||
return RC_ERROR;
|
||||
else
|
||||
return RC_OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -421,43 +429,41 @@ adfReadBlock(struct Volume* vol, int32_t nSect, unsigned char* buf)
|
||||
*/
|
||||
RETCODE adfWriteBlock(struct Volume* vol, int32_t nSect, unsigned char *buf)
|
||||
{
|
||||
int32_t pSect;
|
||||
struct nativeFunctions *nFct;
|
||||
RETCODE rc;
|
||||
int32_t pSect;
|
||||
struct nativeFunctions *nFct;
|
||||
RETCODE rc;
|
||||
|
||||
if (!vol->mounted) {
|
||||
(*adfEnv.eFct)("the volume isn't mounted, adfWriteBlock not possible");
|
||||
return RC_ERROR;
|
||||
}
|
||||
if (!vol->mounted) {
|
||||
(*adfEnv.eFct)("the volume isn't mounted, adfWriteBlock not possible");
|
||||
return RC_ERROR;
|
||||
}
|
||||
|
||||
if (vol->readOnly) {
|
||||
(*adfEnv.wFct)("adfWriteBlock : can't write block, read only volume");
|
||||
return RC_ERROR;
|
||||
}
|
||||
if (vol->readOnly) {
|
||||
(*adfEnv.wFct)("adfWriteBlock : can't write block, read only volume");
|
||||
return RC_ERROR;
|
||||
}
|
||||
|
||||
pSect = nSect+vol->firstBlock;
|
||||
pSect = nSect+vol->firstBlock;
|
||||
/*printf("write nsect=%ld psect=%ld\n",nSect,pSect);*/
|
||||
|
||||
if (adfEnv.useRWAccess)
|
||||
(*adfEnv.rwhAccess)(pSect,nSect,TRUE);
|
||||
|
||||
if (pSect<vol->firstBlock || pSect>vol->lastBlock) {
|
||||
(*adfEnv.wFct)("adfWriteBlock : nSect out of range");
|
||||
}
|
||||
if (adfEnv.useRWAccess)
|
||||
(*adfEnv.rwhAccess)(pSect,nSect,TRUE);
|
||||
|
||||
nFct = adfEnv.nativeFct;
|
||||
if (pSect<vol->firstBlock || pSect>vol->lastBlock) {
|
||||
(*adfEnv.wFct)("adfWriteBlock : nSect out of range");
|
||||
}
|
||||
|
||||
nFct = adfEnv.nativeFct;
|
||||
/*printf("nativ=%d\n",vol->dev->isNativeDev);*/
|
||||
if (vol->dev->isNativeDev)
|
||||
rc = (*nFct->adfNativeWriteSector)(vol->dev, pSect, 512, buf);
|
||||
else
|
||||
rc = adfWriteDumpSector(vol->dev, pSect, 512, buf);
|
||||
if (vol->dev->isNativeDev)
|
||||
rc = (*nFct->adfNativeWriteSector)(vol->dev, pSect, 512, buf);
|
||||
else
|
||||
rc = adfWriteDumpSector(vol->dev, pSect, 512, buf);
|
||||
|
||||
if (rc!=RC_OK)
|
||||
return RC_ERROR;
|
||||
else
|
||||
return RC_OK;
|
||||
if (rc!=RC_OK)
|
||||
return RC_ERROR;
|
||||
else
|
||||
return RC_OK;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*#######################################################################################*/
|
||||
Reference in new issue
Block a user