1
0
mirror of https://github.com/jscrane/r65emu.git synced 2024-06-12 20:08:04 +00:00

cosmetic changes

This commit is contained in:
Stephen Crane 2014-11-10 14:16:45 +00:00
parent 0c87474d58
commit 5e5116229b
12 changed files with 393 additions and 388 deletions

7
acia.h
View File

@ -1,6 +1,6 @@
/* #ifndef __ACIA_H__
* acia.h -- ACIA device #define __ACIA_H__
*/
struct acia { struct acia {
// status bits returned by operator byte // status bits returned by operator byte
@ -37,3 +37,4 @@ struct acia {
static const byte eri = 1 << 7; // enable receive interrupt static const byte eri = 1 << 7; // enable receive interrupt
}; };
#endif

7
cpu.h
View File

@ -1,8 +1,5 @@
/* #ifndef __CPU_H__
* cpu.h #define __CPU_H__
*/
#ifndef _CPU_H
#define _CPU_H
#ifndef _SETJMP_H #ifndef _SETJMP_H
#include <setjmp.h> #include <setjmp.h>

View File

@ -2,8 +2,8 @@
* The hardware configuration of the machine. * The hardware configuration of the machine.
* (This should be the same for all emulated devices.) * (This should be the same for all emulated devices.)
*/ */
#ifndef __HARDWARE_H #ifndef __HARDWARE_H__
#define __HARDWARE_H #define __HARDWARE_H__
// TFT display... // TFT display...
// NOTE: edit memorysaver.h to select the correct chip for your display! // NOTE: edit memorysaver.h to select the correct chip for your display!
@ -41,9 +41,17 @@ void hardware_init(class CPU &);
void hardware_checkpoint(class Stream &); void hardware_checkpoint(class Stream &);
void hardware_restore(class Stream &); void hardware_restore(class Stream &);
#ifdef __PS2DRV_H__
extern class PS2Driver ps2; extern class PS2Driver ps2;
#endif
#ifdef __SPIRAM_H__
extern class spiram sram; extern class spiram sram;
#endif
#ifdef UTFT_h
extern class UTFT utft; extern class UTFT utft;
#endif
#ifdef __MEMORY_H__
extern class Memory memory; extern class Memory memory;
#endif
#endif #endif

View File

@ -1,5 +1,5 @@
#ifndef _KEYBOARD_H #ifndef __KEYBOARD_H__
#define _KEYBOARD_H #define __KEYBOARD_H__
class Keyboard { class Keyboard {
public: public:

View File

@ -1,8 +1,5 @@
/* #ifndef __MEMORY_H__
* memory.h #define __MEMORY_H__
*/
#ifndef _MEMORY_H
#define _MEMORY_H
typedef unsigned char byte; typedef unsigned char byte;

5
prom.h
View File

@ -1,3 +1,6 @@
#ifndef __PROM_H__
#define __PROM_H__
class prom: public Memory::Device { class prom: public Memory::Device {
public: public:
virtual void operator= (byte) {} virtual void operator= (byte) {}
@ -8,3 +11,5 @@ public:
private: private:
const byte *_mem; const byte *_mem;
}; };
#endif

View File

@ -1,9 +1,9 @@
#ifndef __PS2DRV_H #ifndef __PS2DRV_H__
#define __PS2DRV_H #define __PS2DRV_H__
class PS2Driver class PS2Driver
{ {
public: public:
PS2Driver() {} PS2Driver() {}
/** /**

View File

@ -1,8 +1,5 @@
/* #ifndef __R6502_H__
* r6502.h #define __R6502_H__
*/
#ifndef _R6502_H
#define _R6502_H
#undef PC #undef PC
class Stream; class Stream;
@ -36,7 +33,7 @@ private:
byte value; byte value;
} P; } P;
byte _toBCD[256], _fromBCD[256]; // BCD maps byte _toBCD[256], _fromBCD[256]; // BCD maps
bool _irq; // interrupt pending bool _irq; // interrupt pending?
void irq(); void irq();
void nmi(); void nmi();

View File

@ -1,5 +1,5 @@
#ifndef _R65EMU_H #ifndef __R65EMU_H__
#define _R65EMU_H #define __R65EMU_H__
#include "memory.h" #include "memory.h"
#include "cpu.h" #include "cpu.h"

4
ram.h
View File

@ -1,5 +1,5 @@
#ifndef _RAM_H #ifndef __RAM_H__
#define _RAM_H #define __RAM_H__
class ram: public Memory::Device { class ram: public Memory::Device {
public: public:

View File

@ -1,5 +1,5 @@
#ifndef _SDTAPE_H #ifndef __SDTAPE_H__
#define _SDTAPE_H #define __SDTAPE_H__
class sdtape { class sdtape {
public: public:

View File

@ -1,5 +1,5 @@
#ifndef _UTFT_DISPLAY_H #ifndef __UTFT_DISPLAY_H__
#define _UTFT_DISPLAY_H #define __UTFT_DISPLAY_H__
class Stream; class Stream;