From c4fe49e84a5632eeae9d6102cba41d8b83ca2a99 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 14 Dec 2010 13:21:11 -0800
Subject: usrp2: replaced hal interrupt with NOPS, removes warnings

---
 firmware/microblaze/lib/hal_io.h | 24 +++---------------------
 firmware/microblaze/lib/pic.c    |  3 ++-
 2 files changed, 5 insertions(+), 22 deletions(-)

(limited to 'firmware/microblaze')

diff --git a/firmware/microblaze/lib/hal_io.h b/firmware/microblaze/lib/hal_io.h
index ff87a3494..574df7d3e 100644
--- a/firmware/microblaze/lib/hal_io.h
+++ b/firmware/microblaze/lib/hal_io.h
@@ -70,13 +70,7 @@ hal_set_timeout(int delta_ticks)
 static inline int
 hal_disable_ints(void)
 {
-  int result, t0;
-
-  //asm volatile("mfs   %0, rmsr       \n\
-//		andni %1, %0, 0x2    \n\
-//		mts   rmsr, %1"
-//	       : "=r" (result), "=r" (t0));
-  return result;
+  return 0; /* NOP */
 }
 
 /*!
@@ -86,13 +80,7 @@ hal_disable_ints(void)
 static inline int
 hal_enable_ints(void)
 {
-  int result, t0;
-
-//  asm volatile("mfs  %0, rmsr	      \n\
-//		ori  %1, %0, 0x2      \n\
-//		mts  rmsr, %1"
-//	       : "=r" (result), "=r" (t0));
-  return result;
+  return 0; /* NOP */
 }
 
 /*!
@@ -102,13 +90,7 @@ hal_enable_ints(void)
 static inline void
 hal_restore_ints(int prev_state)
 {
-  int t0, t1;
-//  asm volatile("andi  %0, %2, 0x2	\n\
-//		mfs   %1, rmsr          \n\
-//		andni %1, %1, 0x2	\n\
-//		or    %1, %1, %0	\n\
-//		mts   rmsr, %1"
-//	       : "=r" (t0), "=r"(t1) : "r" (prev_state));
+    /* NOP */
 }
 
 #endif /* INCLUDED_HAL_IO_H */
diff --git a/firmware/microblaze/lib/pic.c b/firmware/microblaze/lib/pic.c
index 226da5f85..b8beda311 100644
--- a/firmware/microblaze/lib/pic.c
+++ b/firmware/microblaze/lib/pic.c
@@ -54,7 +54,8 @@ pic_init(void)
  * system interrupt handler with the appropriate prologue and
  * epilogue.
  */
-void pic_interrupt_handler() __attribute__ ((interrupt_handler));
+//FIXME zpu-gcc does not install interrupt_handler like this
+//void pic_interrupt_handler() __attribute__ ((interrupt_handler));
 
 void pic_interrupt_handler()
 {
-- 
cgit v1.2.3