ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/Frodo4/Src/C64.h
(Generate patch)

Comparing Frodo4/Src/C64.h (file contents):
Revision 1.3 by cebix, 2003-07-02T14:46:24Z vs.
Revision 1.6 by cebix, 2004-01-12T15:13:20Z

# Line 1 | Line 1
1   /*
2   *  C64.h - Put the pieces together
3   *
4 < *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
4 > *  Frodo (C) 1994-1997,2002-2004 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 23 | Line 23
23  
24   #ifdef __BEOS__
25   #include <KernelKit.h>
26 – #include <device/Joystick.h>
26   #endif
27  
28   #ifdef AMIGA
# Line 119 | Line 118 | private:
118          void c64_ctor1(void);
119          void c64_ctor2(void);
120          void c64_dtor(void);
121 <        void open_close_joysticks(bool oldjoy1, bool oldjoy2, bool newjoy1, bool newjoy2);
121 >        void open_close_joysticks(int oldjoy1, int oldjoy2, int newjoy1, int newjoy2);
122          uint8 poll_joystick(int port);
123          void thread_func(void);
124  
# Line 127 | Line 126 | private:
126          bool quit_thyself;              // Emulation thread shall quit
127          bool have_a_break;              // Emulation thread shall pause
128  
129 <        int joy_minx, joy_maxx, joy_miny, joy_maxy; // For dynamic joystick calibration
129 >        int joy_minx[2], joy_maxx[2], joy_miny[2], joy_maxy[2]; // For dynamic joystick calibration
130          uint8 joykey;                   // Joystick keyboard emulation mask value
131  
132          uint8 orig_kernal_1d84, // Original contents of kernal locations $1d84 and $1d85
# Line 139 | Line 138 | public:
138  
139   private:
140          static long thread_invoc(void *obj);
141 +        void open_close_joystick(int port, int oldjoy, int newjoy);
142  
143 <        BJoystick *joy[2];              // Joystick objects
143 >        void *joy[2];                   // Joystick objects (BJoystick or BDigitalPort)
144 >        bool joy_geek_port[2];  // Flag: joystick on GeekPort?
145          thread_id the_thread;
146          sem_id pause_sem;
147          sem_id sound_sync_sem;
148 <        double start_time;
148 >        bigtime_t start_time;
149   #endif
150  
151   #ifdef AMIGA
# Line 160 | Line 161 | private:
161   #endif
162  
163   #ifdef __unix
164 <        int joyfd[2];                   // File descriptors for joysticks
164 >        void open_close_joystick(int port, int oldjoy, int newjoy);
165          double speed_index;
166   public:
167          CmdPipe *gui;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines