diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-14 13:21:11 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-14 13:21:11 -0800 |
| commit | c4fe49e84a5632eeae9d6102cba41d8b83ca2a99 (patch) | |
| tree | d5da3eda8c8343307ec1171fa699fe91edc61ff0 | |
| parent | 01d5209e103a590dbcdaa51b7fecd2a9e161f558 (diff) | |
| download | uhd-c4fe49e84a5632eeae9d6102cba41d8b83ca2a99.tar.gz uhd-c4fe49e84a5632eeae9d6102cba41d8b83ca2a99.tar.bz2 uhd-c4fe49e84a5632eeae9d6102cba41d8b83ca2a99.zip | |
usrp2: replaced hal interrupt with NOPS, removes warnings
| -rw-r--r-- | firmware/microblaze/lib/hal_io.h | 24 | ||||
| -rw-r--r-- | firmware/microblaze/lib/pic.c | 3 |
2 files changed, 5 insertions, 22 deletions
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() { |