Update vm4.h

Author: baileytye

vm4.h

@@ -92,7 +92,7 @@
 #define P9 16
 #define P10 20
 #define P11 21
-#define CLKPIN 17
+#define CLKPIN 5
 
 
 //Main loop modes
@@ -105,112 +105,119 @@ typedef struct _nibble{
 	uint8_t data : 4;
 } nibble;
 
-	// Global Variables
+// Global Variables
 
-	extern uint16_t regPC;
-	extern nibble   regA;
-	extern uint16_t regMEM;
-	extern nibble	regSTAT;
+extern uint16_t regPC;
+extern nibble   regA;
+extern uint16_t regMEM;
+extern nibble	regSTAT;
 
-	extern nibble*	MAINMEM;
+extern nibble*	MAINMEM;
 
-        extern int  mem_fd;
-        extern void *gpio_map;
-        // I/O access
-        extern volatile unsigned *gpio;
+extern int  mem_fd;
+extern void *gpio_map;
+// I/O access
+extern volatile unsigned *gpio;
 
 
-	//--------------------Prototypes----------------------//
+//--------------------Prototypes----------------------//
 
 
-	// inst.c Prototypes
-	// ------------------------------------------------//
+// inst.c Prototypes
+// ------------------------------------------------//
 
 
-	//Decodes the OP code and Calls the appropriate instruction
-	int decode(const char* op_code, uint16_t address);
+//Decodes the OP code and Calls the appropriate instruction
+int decode(const char* op_code, uint16_t address);
 
-	//Halt Instruction
-	void hlt(void);
+//Halt Instruction
+void hlt(void);
 
-	//Load Instruction
-	void lod(uint16_t);
+//Load Instruction
+void lod(uint16_t);
 
-	//Store Instruction
-	void str(uint16_t);
+//Store Instruction
+void str(uint16_t);
 
-	//Add Instruction
-	void add(uint16_t);
+//Add Instruction
+void add(uint16_t);
 
-	//No Operation Instruction
-	void nop(void);
+//No Operation Instruction
+void nop(void);
 
-	//NAND Instruction
-	void nnd(uint16_t);
+//NAND Instruction
+void nnd(uint16_t);
 
-	//Carry XOR into Accumulator
-	void cxa(void);
+//Carry XOR into Accumulator
+void cxa(void);
 
-	//Jump Instruction
-	void jmp(uint16_t);
+//Jump Instruction
+void jmp(uint16_t);
 
-	//Prints registers to screen
-	void printReg(void);
+//Prints registers to screen
+void printReg(void);
 
+//Sets the IO fields in MEM to the GPIOs
+void setIOMem(int mode);
 
-	// mem.c Prototypes
-	// ------------------------------------------------//
+//Inits all GPIOs to outputs
+void initGPIOs(void);
 
-	//Initialize Memory
-	int initMem(void);
 
 
-	nibble readMem(uint16_t);
+// mem.c Prototypes
+// ------------------------------------------------//
 
-	//Stores data into memory
-	void writeMem(nibble data, uint16_t address);
+//Initialize Memory
+int initMem(void);
 
-	//Prints all of Memory
-	void printMem(uint16_t, uint16_t);
 
-	//Frees Memory allocation
-	void freeMem(void);
+nibble readMem(uint16_t);
 
-	//Sets data table values for 1 to 15
-	void setBoot(void);
+//Stores data into memory
+void writeMem(nibble data, uint16_t address);
 
+//Prints all of Memory
+void printMem(uint16_t, uint16_t);
 
+//Frees Memory allocation
+void freeMem(void);
 
-	//main.c Prototypes
-	// ------------------------------------------------//
+//Sets data table values for 1 to 15
+void setBoot(void);
 
-	//Superloop
-	int mainloop(void);
 
-	//Shuts down the virtual machine
-	int shutdown(int);
 
+//main.c Prototypes
+// ------------------------------------------------//
 
-	void waitForPeriod(long firstTime,struct timespec gettime_now,long period );
+//Superloop
+int mainloop(void);
 
-	//util.c Prototypes
-	//-------------------------------------------------//
+//Shuts down the virtual machine
+int shutdown(int);
 
 
-	char *tobitstr(size_t,uint64_t,char);
+void waitForPeriod(long firstTime,struct timespec gettime_now,long period );
 
+//util.c Prototypes
+//-------------------------------------------------//
 
-	//fileIO.c Prototypes
-	//------------------------------------------------//
 
-	//Reads file into memory
-	int readBin(const char*, uint16_t);
+char *tobitstr(size_t,uint64_t,char);
 
 
-	//GPIO.c Prototypes
-	//-----------------------------------------------//
+//fileIO.c Prototypes
+//------------------------------------------------//
 
-	void setup_io(void);
+//Reads file into memory
+int readBin(const char*, uint16_t);
+
+
+//GPIO.c Prototypes
+//-----------------------------------------------//
+
+void setup_io(void);
 
 
 #endif