cosmetic changes

acia.h

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

cpu.h

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

hardware.h

@@ -2,8 +2,8 @@
  * The hardware configuration of the machine. 
  * (This should be the same for all emulated devices.)
  */
-#ifndef __HARDWARE_H
-#define __HARDWARE_H
+#ifndef __HARDWARE_H__
+#define __HARDWARE_H__
 
 // TFT 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_restore(class Stream &);
 
+#ifdef __PS2DRV_H__
 extern class PS2Driver ps2;
+#endif
+#ifdef __SPIRAM_H__
 extern class spiram sram;
+#endif
+#ifdef UTFT_h
 extern class UTFT utft;
+#endif
+#ifdef __MEMORY_H__
 extern class Memory memory;
+#endif
 
 #endif

keyboard.h

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

memory.h

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

prom.h

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

ps2drv.h

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

r6502.h

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

r65emu.h

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

ram.h

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

sdtape.h

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

utftdisplay.h

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