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.2 by cebix, 2003-07-01T17:51:17Z vs.
Revision 1.8 by cebix, 2010-04-21T21:59:11Z

# Line 1 | Line 1
1   /*
2   *  C64.h - Put the pieces together
3   *
4 < *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
4 > *  Frodo Copyright (C) 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 37 | Line 36
36   #endif
37  
38  
39 + // Sizes of memory areas
40 + const int C64_RAM_SIZE = 0x10000;
41 + const int COLOR_RAM_SIZE = 0x400;
42 + const int BASIC_ROM_SIZE = 0x2000;
43 + const int KERNAL_ROM_SIZE = 0x2000;
44 + const int CHAR_ROM_SIZE = 0x1000;
45 + const int DRIVE_RAM_SIZE = 0x800;
46 + const int DRIVE_ROM_SIZE = 0x4000;
47 +
48 +
49   // false: Frodo, true: FrodoSC
50   extern bool IsFrodoSC;
51  
# Line 101 | Line 110 | public:
110          MOS6502_1541 *TheCPU1541;       // 1541
111          Job1541 *TheJob1541;
112  
113 < #ifdef FRODO_SC
105 <        uint32 CycleCounter;
106 < #endif
113 >        uint32 CycleCounter;  // Cycle counter for Frodo SC
114  
115   private:
116          void c64_ctor1(void);
117          void c64_ctor2(void);
118          void c64_dtor(void);
119 <        void open_close_joysticks(bool oldjoy1, bool oldjoy2, bool newjoy1, bool newjoy2);
119 >        void open_close_joysticks(int oldjoy1, int oldjoy2, int newjoy1, int newjoy2);
120          uint8 poll_joystick(int port);
121          void thread_func(void);
122  
# Line 117 | Line 124 | private:
124          bool quit_thyself;              // Emulation thread shall quit
125          bool have_a_break;              // Emulation thread shall pause
126  
127 <        int joy_minx, joy_maxx, joy_miny, joy_maxy; // For dynamic joystick calibration
127 >        int joy_minx[2], joy_maxx[2], joy_miny[2], joy_maxy[2]; // For dynamic joystick calibration
128          uint8 joykey;                   // Joystick keyboard emulation mask value
129  
130          uint8 orig_kernal_1d84, // Original contents of kernal locations $1d84 and $1d85
# Line 129 | Line 136 | public:
136  
137   private:
138          static long thread_invoc(void *obj);
139 +        void open_close_joystick(int port, int oldjoy, int newjoy);
140  
141 <        BJoystick *joy[2];              // Joystick objects
141 >        void *joy[2];                   // Joystick objects (BJoystick or BDigitalPort)
142 >        bool joy_geek_port[2];  // Flag: joystick on GeekPort?
143          thread_id the_thread;
144          sem_id pause_sem;
145          sem_id sound_sync_sem;
146 <        double start_time;
146 >        bigtime_t start_time;
147   #endif
148  
149   #ifdef AMIGA
# Line 150 | Line 159 | private:
159   #endif
160  
161   #ifdef __unix
162 <        int joyfd[2];                   // File descriptors for joysticks
162 >        void open_close_joystick(int port, int oldjoy, int newjoy);
163          double speed_index;
155 – public:
156 –        CmdPipe *gui;
164   #endif
165  
166   #ifdef WIN32

Diff Legend

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