From 5514d168ab7fb6fb8d11238f4a381029b043c124 Mon Sep 17 00:00:00 2001
From: Nick Foster <nick@nerdnetworks.org>
Date: Tue, 10 Aug 2010 14:16:48 -0700
Subject: Interrupt-driven I2C. txrx_uhd uses async i2c for comms.

---
 firmware/microblaze/lib/u2_init.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'firmware/microblaze/lib/u2_init.c')

diff --git a/firmware/microblaze/lib/u2_init.c b/firmware/microblaze/lib/u2_init.c
index 75bc40859..8d666b76b 100644
--- a/firmware/microblaze/lib/u2_init.c
+++ b/firmware/microblaze/lib/u2_init.c
@@ -45,22 +45,26 @@ get_hw_rev(void)
 bool
 u2_init(void)
 {
+  hal_disable_ints();
   hal_io_init();
 
   // init spi, so that we can switch over to the high-speed clock
   spi_init();
 
-  // init i2c so we can read our rev
-  i2c_init();
-  get_hw_rev();
-
   // set up the default clocks
   clocks_init();
 
+  hal_uart_init();
+
+  // init i2c so we can read our rev
   pic_init();	// progammable interrupt controller
+  i2c_init();
+  hal_enable_ints();
+  get_hw_rev();
+
   bp_init();	// buffer pool
   
-  hal_enable_ints();
+
 
   // flash all leds to let us know board is alive
   hal_set_leds(0x0, 0x1f);
-- 
cgit v1.2.3