--- Frodo4/Src/C64.h	2003/07/09 13:51:13	1.4
+++ Frodo4/Src/C64.h	2010/04/21 21:59:11	1.8
@@ -1,7 +1,7 @@
 /*
  *  C64.h - Put the pieces together
  *
- *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
+ *  Frodo Copyright (C) Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -110,9 +110,7 @@ public:
 	MOS6502_1541 *TheCPU1541;	// 1541
 	Job1541 *TheJob1541;
 
-#ifdef FRODO_SC
-	uint32 CycleCounter;
-#endif
+	uint32 CycleCounter;  // Cycle counter for Frodo SC
 
 private:
 	void c64_ctor1(void);
@@ -126,7 +124,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
@@ -161,10 +159,8 @@ 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;
 #endif
 
 #ifdef WIN32