mirror of
https://github.com/RetroPie/RetroPie-Setup.git
synced 2025-04-02 10:51:41 -04:00
94 lines
3.6 KiB
Diff
94 lines
3.6 KiB
Diff
diff --git a/Makefile.libretro b/Makefile.libretro
|
|
index 58e33e4..eb654c6 100755
|
|
--- a/Makefile.libretro
|
|
+++ b/Makefile.libretro
|
|
@@ -225,7 +225,7 @@ $(TARGET): $(OBJECTS)
|
|
ifeq ($(STATIC_LINKING_LINK),1)
|
|
$(AR) rcs $@ $(OBJECTS)
|
|
else
|
|
- $(CC) $(CFLAGS) $(INCFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ -lm $(ZLIB) $(SHARED)
|
|
+ $(CC) $(CFLAGS) $(INCFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ -lm $(ZLIB) $(SHARED) $(CAPSIMG_LDFLAGS)
|
|
endif
|
|
|
|
%.o: %.c
|
|
diff --git a/src/floppy_ipf.c b/src/floppy_ipf.c
|
|
index c615b75..3626c19 100644
|
|
--- a/src/floppy_ipf.c
|
|
+++ b/src/floppy_ipf.c
|
|
@@ -24,6 +24,7 @@ const char floppy_ipf_fileid[] = "Hatari floppy_ipf.c : " __DATE__ " " __TIME__;
|
|
#include "screen.h"
|
|
#include "video.h"
|
|
#include "cycles.h"
|
|
+#include "inttypes.h"
|
|
|
|
#ifdef HAVE_CAPSIMAGE
|
|
#if CAPSIMAGE_VERSION == 5
|
|
@@ -46,7 +47,7 @@ typedef struct
|
|
|
|
struct CapsFdc Fdc; /* Fdc state */
|
|
struct CapsDrive Drive[ MAX_FLOPPYDRIVES ]; /* Physical drives */
|
|
- CapsLong CapsImage[ MAX_FLOPPYDRIVES ]; /* For the IPF disk images */
|
|
+ Sint32 CapsImage[ MAX_FLOPPYDRIVES ]; /* For the IPF disk images */
|
|
|
|
int Rev_Track[ MAX_FLOPPYDRIVES ]; /* Needed to handle CAPSSetRevolution for type II/III commands */
|
|
int Rev_Side[ MAX_FLOPPYDRIVES ];
|
|
@@ -63,9 +64,9 @@ static IPF_STRUCT IPF_State; /* All variables related to the IPF support */
|
|
|
|
|
|
#ifdef HAVE_CAPSIMAGE
|
|
-static void IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State );
|
|
-static void IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State );
|
|
-static void IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State );
|
|
+static void IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State );
|
|
+static void IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State );
|
|
+static void IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State );
|
|
static void IPF_Drive_Update_Enable_Side ( void );
|
|
#endif
|
|
|
|
@@ -317,8 +318,8 @@ bool IPF_Insert ( int Drive , Uint8 *pImageBuffer , long ImageSize )
|
|
return false;
|
|
|
|
#else
|
|
- CapsLong ImageId;
|
|
- CapsLong ImageType;
|
|
+ Sint32 ImageId;
|
|
+ Sint32 ImageType;
|
|
|
|
ImageId = CAPSAddImage();
|
|
if ( ImageId < 0 )
|
|
@@ -351,7 +352,7 @@ bool IPF_Insert ( int Drive , Uint8 *pImageBuffer , long ImageSize )
|
|
}
|
|
#endif
|
|
|
|
- if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (CapsULong)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
|
|
+ if ( CAPSLockImageMemory ( ImageId , pImageBuffer , (Uint32)ImageSize , DI_LOCK_MEMREF ) == imgeOk )
|
|
{
|
|
struct CapsImageInfo cii;
|
|
int i;
|
|
@@ -467,7 +468,7 @@ void IPF_Reset ( void )
|
|
* We need to update the track data by calling CAPSLockTrack
|
|
*/
|
|
#ifdef HAVE_CAPSIMAGE
|
|
-static void IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State )
|
|
+static void IPF_CallBack_Trk ( struct CapsFdc *pc , Uint32 State )
|
|
{
|
|
int Drive = State; /* State is the drive number in that case */
|
|
struct CapsDrive *pd = pc->drive+Drive; /* Current drive where the track change occurred */
|
|
@@ -496,7 +497,7 @@ static void IPF_CallBack_Trk ( struct CapsFdc *pc , CapsULong State )
|
|
* Callback function used when the FDC change the IRQ signal
|
|
*/
|
|
#ifdef HAVE_CAPSIMAGE
|
|
-static void IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State )
|
|
+static void IPF_CallBack_Irq ( struct CapsFdc *pc , Uint32 State )
|
|
{
|
|
LOG_TRACE(TRACE_FDC, "fdc ipf callback irq state=0x%x VBL=%d HBL=%d\n" , (int)State , nVBLs , nHBL );
|
|
|
|
@@ -515,7 +516,7 @@ static void IPF_CallBack_Irq ( struct CapsFdc *pc , CapsULong State )
|
|
* -> copy the byte to/from the DMA's FIFO if it's a read or a write to the disk
|
|
*/
|
|
#ifdef HAVE_CAPSIMAGE
|
|
-static void IPF_CallBack_Drq ( struct CapsFdc *pc , CapsULong State )
|
|
+static void IPF_CallBack_Drq ( struct CapsFdc *pc , Uint32 State )
|
|
{
|
|
Uint8 Byte;
|
|
|