From cf67c2a1a9c11b75d83b79eb8b54084fd8d04285 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Fri, 15 Dec 2017 04:59:55 +0100
Subject: [PATCH] Removed fdi_init() and fixed joystick_process().

---
 src/floppy/floppy.c      | 1 -
 src/floppy/floppy_fdi.c  | 7 +------
 src/floppy/floppy_fdi.h  | 2 +-
 src/win/win_joystick.cpp | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/floppy/floppy.c b/src/floppy/floppy.c
index a57bdd929..0d9d55479 100644
--- a/src/floppy/floppy.c
+++ b/src/floppy/floppy.c
@@ -417,7 +417,6 @@ void floppy_stop(int drive)
 void floppy_general_init(void)
 {
     floppy_init();
-    fdi_init();
     img_init();
     d86f_init();
     td0_init();
diff --git a/src/floppy/floppy_fdi.c b/src/floppy/floppy_fdi.c
index 914339b25..58819ec39 100644
--- a/src/floppy/floppy_fdi.c
+++ b/src/floppy/floppy_fdi.c
@@ -9,7 +9,7 @@
  *		Implementation of the FDI floppy stream image format
  *		interface to the FDI2RAW module.
  *
- * Version:	@(#)floppy_fdi.c	1.0.5	2017/11/04
+ * Version:	@(#)floppy_fdi.c	1.0.6	2017/12/15
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -334,8 +334,3 @@ void fdi_seek(int drive, int track)
 
 	fdi_read_revolution(drive);
 }
-
-void fdi_init()
-{
-	return;
-}
diff --git a/src/floppy/floppy_fdi.h b/src/floppy/floppy_fdi.h
index 1c9b02224..75b3b4936 100644
--- a/src/floppy/floppy_fdi.h
+++ b/src/floppy/floppy_fdi.h
@@ -9,7 +9,7 @@
  *		Implementation of the FDI floppy stream image format
  *		interface to the FDI2RAW module.
  *
- * Version:	@(#)floppy_fdi.h	1.0.2	2017/09/03
+ * Version:	@(#)floppy_fdi.h	1.0.3	2017/12/15
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
diff --git a/src/win/win_joystick.cpp b/src/win/win_joystick.cpp
index 74cb1bdce..2f14c8169 100644
--- a/src/win/win_joystick.cpp
+++ b/src/win/win_joystick.cpp
@@ -8,7 +8,7 @@
  *
  *		Joystick interface to host device.
  *
- * Version:	@(#)win_joystick.cpp	1.0.6	2017/11/25
+ * Version:	@(#)win_joystick.cpp	1.0.7	2017/12/15
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -216,7 +216,7 @@ void joystick_process(void)
 {
         int c, d;
 
-	if (joystick_type != 7) return;
+	if (joystick_type == 7) return;
 
         for (c = 0; c < joysticks_present; c++)
         {