Michel2/HxCFloppyEmulator
1
0
Fork 0
mirror of https://github.com/jfdelnero/HxCFloppyEmulator.git synced 2026-07-28 04:06:36 +00:00
Code Issues Releases Activity

static analyzer warnings fixes.

Browse Source
This commit is contained in:
Jean-François DEL NERO
2023-12-03 22:08:22 +01:00
parent 452970aa43
commit 8d788282fb
2 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libhxcfe/sources/loaders/extadf_loader/extadf_loader.c
+23 -8
View File
@@ -38,7 +38,7 @@
// File : extadf_loader.c
// Contains: Extended ADF floppy image loader
//
// Written by: DEL NERO Jean Francois
// Written by: Jean-François DEL NERO
//
// Change History (most recent first):
///////////////////////////////////////////////////////////////////////////////////
@@ -101,7 +101,7 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
int gap3len,skew,trackformat,interleave;
int sectorsize;
tracktable = 0;
tracktable = NULL;
imgldr_ctx->hxcfe->hxc_printf(MSG_DEBUG,"EXTADF_libLoad_DiskFile %s",imgfile);
@@ -128,7 +128,10 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
if(!strncmp((char*)header,"UAE-1ADF",8))
{
numberoftrack=header[0xB]+(header[0xA]*256);
tracktable=malloc(12*numberoftrack);
tracktable = malloc(12*numberoftrack);
if( !tracktable )
goto alloc_error;
memset(tracktable,0,12*numberoftrack);
hxc_fread(tracktable,12*numberoftrack,f);
@@ -148,7 +151,10 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
floppydisk->floppyNumberOfSide=2;
floppydisk->floppyBitRate=DEFAULT_AMIGA_BITRATE;
floppydisk->floppyiftype=AMIGA_DD_FLOPPYMODE;
floppydisk->tracks=(HXCFE_CYLINDER**)malloc(sizeof(HXCFE_CYLINDER*)*floppydisk->floppyNumberOfTrack);
floppydisk->tracks = (HXCFE_CYLINDER**)malloc(sizeof(HXCFE_CYLINDER*)*floppydisk->floppyNumberOfTrack);
if(!floppydisk->tracks)
goto alloc_error;
tracklen=(DEFAULT_AMIGA_BITRATE/(DEFAULT_AMIGA_RPM/60))/4;
@@ -157,7 +163,7 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
for(j=0;j<floppydisk->floppyNumberOfTrack;j++)
{
floppydisk->tracks[j]=allocCylinderEntry(DEFAULT_AMIGA_RPM,floppydisk->floppyNumberOfSide);
floppydisk->tracks[j] = allocCylinderEntry(DEFAULT_AMIGA_RPM,floppydisk->floppyNumberOfSide);
currentcylinder=floppydisk->tracks[j];
for(i=0;i<floppydisk->floppyNumberOfSide;i++)
@@ -193,7 +199,7 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
if(tracksize)
{
trackdata=(unsigned char*)malloc(tracksize);
trackdata = (unsigned char*)malloc(tracksize);
if(trackdata)
{
imgldr_ctx->hxcfe->hxc_printf(MSG_DEBUG,"[%.3d:%.1X] Reading DOS track at 0x%.8x, Size : 0x%.8x",j,i,ftell(f),tracksize);
@@ -203,6 +209,7 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
currentcylinder->sides[i]=tg_generateTrack(trackdata,sectorsize,(unsigned short)(tracksize_bit/sectorsize),(unsigned char)j,(unsigned char)i,0,interleave,((j<<1)|(i&1))*skew,floppydisk->floppyBitRate,currentcylinder->floppyRPM,trackformat,gap3len,0,2500,-11150);
free(trackdata);
trackdata = NULL;
}
}
}
@@ -212,7 +219,6 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
imgldr_ctx->hxcfe->hxc_printf(MSG_DEBUG,"[%.3d:%.1X] Null Size track!",j,i);
currentcylinder->sides[i]=tg_alloctrack(DEFAULT_AMIGA_BITRATE,AMIGA_MFM_ENCODING,DEFAULT_AMIGA_RPM,(tracklen)*8,2500,-11360,0x00);
}
}
else
{
@@ -224,13 +230,22 @@ int EXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydisk,
}
}
if(tracktable) free(tracktable);
free(tracktable);
imgldr_ctx->hxcfe->hxc_printf(MSG_INFO_1,"track file successfully loaded and encoded!");
hxc_fclose(f);
hxcfe_sanityCheck(imgldr_ctx->hxcfe,floppydisk);
return HXCFE_NOERROR;
alloc_error:
free(tracktable);
hxc_fclose(f);
return HXCFE_INTERNALERROR;
}
int EXTADF_libGetPluginInfo(HXCFE_IMGLDR * imgldr_ctx,uint32_t infotype,void * returnvalue)
libhxcfe/sources/loaders/oldextadf_loader/oldextadf_loader.c
+26 -16
View File
@@ -38,7 +38,7 @@
// File : oldextadf_loader.c
// Contains: OLD Extended ADF floppy image loader
//
// Written by: DEL NERO Jean Francois
// Written by: Jean-François DEL NERO
//
// Change History (most recent first):
///////////////////////////////////////////////////////////////////////////////////
@@ -98,7 +98,7 @@ int OLDEXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydi
int gap3len,skew,trackformat,interleave;
int sectorsize;
tracktable = 0;
tracktable = NULL;
imgldr_ctx->hxcfe->hxc_printf(MSG_DEBUG,"OLDEXTADF_libLoad_DiskFile %s",imgfile);
@@ -125,7 +125,10 @@ int OLDEXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydi
if(!strncmp((char*)header,"UAE--ADF",8))
{
numberoftrack=160;
tracktable=malloc(4*numberoftrack);
tracktable = malloc(4*numberoftrack);
if( !tracktable )
goto alloc_error;
memset(tracktable,0,4*numberoftrack);
hxc_fread(tracktable,4*numberoftrack,f);
@@ -138,13 +141,16 @@ int OLDEXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydi
interleave=1;
gap3len=0;
skew=0;
trackformat=AMIGAFORMAT_DD;
trackformat = AMIGAFORMAT_DD;
floppydisk->floppySectorPerTrack=-1;
floppydisk->floppyNumberOfSide=2;
floppydisk->floppyBitRate=DEFAULT_AMIGA_BITRATE;
floppydisk->floppyiftype=AMIGA_DD_FLOPPYMODE;
floppydisk->tracks=(HXCFE_CYLINDER**)malloc(sizeof(HXCFE_CYLINDER*)*floppydisk->floppyNumberOfTrack);
floppydisk->tracks = (HXCFE_CYLINDER**)malloc(sizeof(HXCFE_CYLINDER*)*floppydisk->floppyNumberOfTrack);
if(!floppydisk->tracks)
goto alloc_error;
tracklen=(DEFAULT_AMIGA_BITRATE/(DEFAULT_AMIGA_RPM/60))/4;
@@ -152,7 +158,6 @@ int OLDEXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydi
for(j=0;j<floppydisk->floppyNumberOfTrack;j++)
{
floppydisk->tracks[j]=allocCylinderEntry(DEFAULT_AMIGA_RPM,floppydisk->floppyNumberOfSide);
currentcylinder=floppydisk->tracks[j];
@@ -171,8 +176,6 @@ int OLDEXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydi
if(tracktable[(4*trackindex)+0] || tracktable[(4*trackindex)+1] )
{
imgldr_ctx->hxcfe->hxc_printf(MSG_DEBUG,"[%.3d:%.1X] Reading Non-DOS track at 0x%.8x, Size : 0x%.8x",j,i,ftell(f),tracksize);
currentcylinder->sides[i]=tg_alloctrack(DEFAULT_AMIGA_BITRATE,AMIGA_MFM_ENCODING,DEFAULT_AMIGA_RPM,(tracksize+2)*8,2500,-100,0x00);
@@ -183,16 +186,15 @@ int OLDEXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydi
hxc_fread(&currentcylinder->sides[i]->databuffer[2],tracksize,f);
currentcylinder->sides[i]->number_of_sector=floppydisk->floppySectorPerTrack;
}
else
{
imgldr_ctx->hxcfe->hxc_printf(MSG_DEBUG,"[%.3d:%.1X] Reading DOS track at 0x%.8x, Size : 0x%.8x",j,i,ftell(f),tracksize);
trackdata=(unsigned char*)malloc(tracksize);
trackdata = (unsigned char*)malloc(tracksize);
if( !trackdata )
goto alloc_error;
hxc_fread(trackdata,tracksize,f);
@@ -213,19 +215,27 @@ int OLDEXTADF_libLoad_DiskFile(HXCFE_IMGLDR * imgldr_ctx,HXCFE_FLOPPY * floppydi
currentcylinder->sides[i]=tg_alloctrack(DEFAULT_AMIGA_BITRATE,AMIGA_MFM_ENCODING,DEFAULT_AMIGA_RPM,(tracklen)*8,2500,-11360,0x00);
}
trackindex++;
}
}
if(tracktable) free(tracktable);
free(tracktable);
imgldr_ctx->hxcfe->hxc_printf(MSG_INFO_1,"track file successfully loaded and encoded!");
hxc_fclose(f);
hxcfe_sanityCheck(imgldr_ctx->hxcfe,floppydisk);
return HXCFE_NOERROR;
alloc_error:
free(tracktable);
hxc_fclose(f);
return HXCFE_INTERNALERROR;
}
int OLDEXTADF_libGetPluginInfo(HXCFE_IMGLDR * imgldr_ctx,uint32_t infotype,void * returnvalue)