--- Frodo4/Src/C64.h	2003/07/02 14:46:24	1.3
+++ Frodo4/Src/C64.h	2004/01/10 15:07:14	1.5
@@ -23,7 +23,6 @@
 
 #ifdef __BEOS__
 #include <KernelKit.h>
-#include <device/Joystick.h>
 #endif
 
 #ifdef AMIGA
@@ -119,7 +118,7 @@ private:
 	void c64_ctor1(void);
 	void c64_ctor2(void);
 	void c64_dtor(void);
-	void open_close_joysticks(bool oldjoy1, bool oldjoy2, bool newjoy1, bool newjoy2);
+	void open_close_joysticks(int oldjoy1, int oldjoy2, int newjoy1, int newjoy2);
 	uint8 poll_joystick(int port);
 	void thread_func(void);
 
@@ -127,7 +126,7 @@ private:
 	bool quit_thyself;		// Emulation thread shall quit
 	bool have_a_break;		// Emulation thread shall pause
 
-	int joy_minx, joy_maxx, joy_miny, joy_maxy; // For dynamic joystick calibration
+	int joy_minx[2], joy_maxx[2], joy_miny[2], joy_maxy[2]; // For dynamic joystick calibration
 	uint8 joykey;			// Joystick keyboard emulation mask value
 
 	uint8 orig_kernal_1d84,	// Original contents of kernal locations $1d84 and $1d85
@@ -139,12 +138,14 @@ public:
 
 private:
 	static long thread_invoc(void *obj);
+	void open_close_joystick(int port, int oldjoy, int newjoy);
 
-	BJoystick *joy[2];		// Joystick objects
+	void *joy[2];			// Joystick objects (BJoystick or BDigitalPort)
+	bool joy_geek_port[2];	// Flag: joystick on GeekPort?
 	thread_id the_thread;
 	sem_id pause_sem;
 	sem_id sound_sync_sem;
-	double start_time;
+	bigtime_t start_time;
 #endif
 
 #ifdef AMIGA
@@ -160,7 +161,7 @@ private:
 #endif
 
 #ifdef __unix
-	int joyfd[2];			// File descriptors for joysticks
+	void open_close_joystick(int port, int oldjoy, int newjoy);
 	double speed_index;
 public:
 	CmdPipe *gui;