X-Git-Url: http://git.rot13.org/?p=fx2fw-sdcc;a=blobdiff_plain;f=fx2%2Fisr.c;fp=fx2%2Fisr.c;h=cb1e0b8642a1472aba0442d2fa24cff6a71e5ce8;hp=f92a0641b2877b8c53a1a40da1ef1a0efa713321;hb=bfdb50c8dfa96ad8a804b152c92c5a5880c8bdb7;hpb=750d9b37905b7a1cf9e8708c4688f3342c8be133

diff --git a/fx2/isr.c b/fx2/isr.c
index f92a064..cb1e0b8 100644
--- a/fx2/isr.c
+++ b/fx2/isr.c
@@ -1,336 +1,168 @@
 /* -*- c++ -*- */
-
 /*-----------------------------------------------------------------------------
-
  * Interrupt handling for FX2
-
  *-----------------------------------------------------------------------------
-
  * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2,
-
  * Copyright 2003 Free Software Foundation, Inc.
-
  *-----------------------------------------------------------------------------
-
  * This code is part of usbjtag. usbjtag 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 2 of the License,
-
  * or (at your option) any later version. usbjtag 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 in the file
-
  * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin
-
  * St, Fifth Floor, Boston, MA  02110-1301  USA
-
  *-----------------------------------------------------------------------------
-
  */
 
-
-
 #include "isr.h"
-
 #include "fx2regs.h"
-
 #include "syncdelay.h"
 
-
-
 extern xdata unsigned char _standard_interrupt_vector[];
-
 extern xdata unsigned char _usb_autovector[];
-
 extern xdata unsigned char _fifo_gpif_autovector[];
 
-
-
 #define LJMP_OPCODE	0x02
 
-
-
 /*
-
  * Hook standard interrupt vector.
-
  *
-
  * vector_number is from the SV_<foo> list.
-
  * addr is the address of the interrupt service routine.
-
  */
-
 void 
-
 hook_sv (unsigned char vector_number, unsigned short addr)
-
 {
-
   bit	t;
-
   
-
   // sanity checks
 
-
-
   if (vector_number < SV_MIN || vector_number > SV_MAX)
-
     return;
 
-
-
   if ((vector_number & 0x0f) != 0x03 && (vector_number & 0x0f) != 0x0b)
-
     return;
 
-
-
   t = EA;
-
   EA = 0;
-
   _standard_interrupt_vector[vector_number] = LJMP_OPCODE;
-
   _standard_interrupt_vector[vector_number + 1] = addr >> 8;
-
   _standard_interrupt_vector[vector_number + 2] = addr & 0xff;
-
   EA = t;
-
 }
 
-
-
 /*
-
  * Hook usb interrupt vector.
-
  *
-
  * vector_number is from the UV_<foo> list.
-
  * addr is the address of the interrupt service routine.
-
  */
-
 void 
-
 hook_uv (unsigned char vector_number, unsigned short addr)
-
 {
-
   bit	t;
-
   
-
   // sanity checks
 
-
-
 #if UV_MIN>0
-
   if (vector_number < UV_MIN) return;
-
 #endif
-
   if (vector_number > UV_MAX)
-
     return;
 
-
-
   if ((vector_number & 0x3) != 0)
-
     return;
 
-
-
   t = EA;
-
   EA = 0;
-
   _usb_autovector[vector_number] = LJMP_OPCODE;
-
   _usb_autovector[vector_number + 1] = addr >> 8;
-
   _usb_autovector[vector_number + 2] = addr & 0xff;
-
   EA = t;
-
 }
 
-
-
 /*
-
  * Hook fifo/gpif interrupt vector.
-
  *
-
  * vector_number is from the FGV_<foo> list.
-
  * addr is the address of the interrupt service routine.
-
  */
-
 void 
-
 hook_fgv (unsigned char vector_number, unsigned short addr)
-
 {
-
   bit	t;
-
   
-
   // sanity checks
 
-
-
   if (vector_number < FGV_MIN || vector_number > FGV_MAX)
-
     return;
 
-
-
   if ((vector_number & 0x3) != 0)
-
     return;
 
-
-
   t = EA;
-
   EA = 0;
-
   _fifo_gpif_autovector[vector_number] = LJMP_OPCODE;
-
   _fifo_gpif_autovector[vector_number + 1] = addr >> 8;
-
   _fifo_gpif_autovector[vector_number + 2] = addr & 0xff;
-
   EA = t;
-
 }
 
-
-
 /*
-
  * One time call to enable autovectoring for both USB and FIFO/GPIF.
-
  *
-
  * This disables all USB and FIFO/GPIF interrupts and clears
-
  * any pending interrupts too.  It leaves the master USB and FIFO/GPIF
-
  * interrupts enabled.
-
  */
-
 void
-
 setup_autovectors (void)
-
 {
-
   // disable master usb and fifo/gpif interrupt enables
-
   EIUSB = 0;
-
   EIEX4 = 0;
 
-
-
   hook_sv (SV_INT_2, (unsigned short) _usb_autovector);
-
   hook_sv (SV_INT_4, (unsigned short) _fifo_gpif_autovector);
 
-
-
   // disable all fifo interrupt enables
-
   SYNCDELAY;
-
   EP2FIFOIE = 0;	SYNCDELAY;
-
   EP4FIFOIE = 0;	SYNCDELAY;
-
   EP6FIFOIE = 0;	SYNCDELAY;
-
   EP8FIFOIE = 0;	SYNCDELAY;
 
-
-
   // clear all pending fifo irqs	
-
   EP2FIFOIRQ = 0xff;	SYNCDELAY;
-
   EP4FIFOIRQ = 0xff;	SYNCDELAY;
-
   EP6FIFOIRQ = 0xff;	SYNCDELAY;
-
   EP8FIFOIRQ = 0xff;	SYNCDELAY;
 
-
-
   IBNIE  = 0;
-
   IBNIRQ = 0xff;
-
   NAKIE  = 0;
-
   NAKIRQ = 0xff;
-
   USBIE  = 0;
-
   USBIRQ = 0xff;
-
   EPIE   = 0;
-
   EPIRQ  = 0xff;
-
   SYNCDELAY;	GPIFIE = 0;		
-
   SYNCDELAY;	GPIFIRQ = 0xff;
-
   USBERRIE = 0;
-
   USBERRIRQ = 0xff;
-
   CLRERRCNT = 0;
-
   
-
   INTSETUP = bmAV2EN | bmAV4EN | bmINT4IN;
 
-
-
   // clear master irq's for usb and fifo/gpif
-
   EXIF &= ~bmEXIF_USBINT;
-
   EXIF &= ~bmEXIF_IE4;
-
   
-
   // enable master usb and fifo/gpif interrrupts
-
   EIUSB = 1;
-
   EIEX4 = 1;
-
 }
-