2 files changed, 7 insertions, 7 deletions
diff --git a/bus.c b/bus.c
index db24a2e..141c4ef 100644
--- a/bus.c
+++ b/bus.c
@@ -167,11 +167,11 @@ static void gpmc_printinfo()
 
 
 // multiply by 10 ns
-#define TOTAL_IO_CYCLE 20;  // 200 ns cycle
-#define CS_DELAY 0;         // CS low right away
-#define DELAY_TO_WR_RD 4;   // i.e., 40 ns after CS
-#define WR_RD_WIDTH 15;     // 40 ns delay + 150 ns pulse + 10 ns spare
-#define DATA_READY 15;      // data ready 150 ns after CS, 110 ns after RD/WR
+#define TOTAL_IO_CYCLE 25;  // 250 ns cycle
+#define CS_DELAY 2;         // CS low 20ns after address valid
+#define DELAY_TO_WR_RD 5;   // RD/WR lines low 50ns after address valid
+#define WR_RD_WIDTH 20;     // stay low for until 200 ns after address valid
+#define DATA_READY 15;      // data ready 150ns after address valid
 
 
 static void gpmc_setup(void)
diff --git a/instr-daemon.c b/instr-daemon.c
index 8d7f2dd..9ac77f4 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -195,6 +195,8 @@ int main(int argc, char **argv)
 
 	g_type_init ();
 
+	bus_init();
+
 	LCD_initialize();
 	LCD_write(0,0,"Starting...");
 
@@ -247,8 +249,6 @@ int main(int argc, char **argv)
 	}
 	LCD_write(3,27,"OK");
 
-	bus_init();
-
 	I2C_Setup_Monitor();
 
 	Main_Rst();