[Commit-gnuradio] r7468 - in usrp2/trunk/firmware: apps lib

[eb]

Author: eb
Date: 2008-01-18 15:23:20 -0700 (Fri, 18 Jan 2008)
New Revision: 7468

Modified:
   usrp2/trunk/firmware/apps/test1.c
   usrp2/trunk/firmware/apps/timer_test.c
   usrp2/trunk/firmware/lib/u2_init.c
   usrp2/trunk/firmware/lib/u2_init.h
Log:
removed cruft

Modified: usrp2/trunk/firmware/apps/test1.c
===================================================================
--- usrp2/trunk/firmware/apps/test1.c   2008-01-18 22:21:31 UTC (rev 7467)
+++ usrp2/trunk/firmware/apps/test1.c   2008-01-18 22:23:20 UTC (rev 7468)
@@ -80,7 +80,8 @@
   // register interrupt handler
   pic_register_handler(IRQ_BUFFER, buffer_irq_handler);
 
-  u2_infinite_loop();
+  while (1)
+    ;
 
   hal_finish();
   return 1;

Modified: usrp2/trunk/firmware/apps/timer_test.c
===================================================================
--- usrp2/trunk/firmware/apps/timer_test.c      2008-01-18 22:21:31 UTC (rev 
7467)
+++ usrp2/trunk/firmware/apps/timer_test.c      2008-01-18 22:23:20 UTC (rev 
7468)
@@ -49,7 +49,8 @@
   int t = timer_regs->time;
   timer_regs->time = t + DELTA_T;
 
-  u2_infinite_loop();
+  while (1)
+    ;
 
   putstr("Done Testing\n");
   

Modified: usrp2/trunk/firmware/lib/u2_init.c
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.c  2008-01-18 22:21:31 UTC (rev 7467)
+++ usrp2/trunk/firmware/lib/u2_init.c  2008-01-18 22:23:20 UTC (rev 7468)
@@ -184,18 +184,3 @@
   
   return true;
 }
-
-
-// work around for microblaze CPU bug
-
-static int _not_done_ = 1;
-
-void
-u2_infinite_loop(void)
-{
-  while(_not_done_){
-  }
-  asm volatile ("or r0, r0, r0");      // FIXME CPU bug workaround
-  asm volatile ("or r0, r0, r0");
-}
-

Modified: usrp2/trunk/firmware/lib/u2_init.h
===================================================================
--- usrp2/trunk/firmware/lib/u2_init.h  2008-01-18 22:21:31 UTC (rev 7467)
+++ usrp2/trunk/firmware/lib/u2_init.h  2008-01-18 22:23:20 UTC (rev 7468)
@@ -1,3 +1,23 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef INCLUDED_U2_INIT_H
+#define INCLUDED_U2_INIT_H
+
 /*!
  * one-time init
  */
@@ -3,6 +23,3 @@
 int u2_init(void);
 
-/*!
- * infinte loop that works around CPU bug and allows interrupts to occur ;)
- */
-void u2_infinite_loop(void);
+#endif /* INCLUDED_U2_INIT_H */