diff --git a/src/drv/drvFp.c b/src/drv/drvFp.c
index f017495b1..259492bea 100644
--- a/src/drv/drvFp.c
+++ b/src/drv/drvFp.c
@@ -45,6 +45,9 @@
  *			so that driver diagnostics will show up in
  *			the log
  * .08 joh 071092	now fetches base addr from module_types.h
+ * .09 joh 071092	added io_report routine
+ * .10 joh 071092	added scan task wakeup from ISR	 
+ * .11 joh 071092	moved ivec allocation to module_types.h
  */
 
 
@@ -74,6 +77,8 @@
  *		-1	No card present
  *		-2	Interrupt connection error
  *		-3	Semaphore creation error
+ *		-4	addressing error
+ *		-5	no memory
  *		0-8	successfull completion, or # of cards found
  *
  */
@@ -90,8 +95,6 @@
 #include "module_types.h"
 
 /* general constants */
-#define FP_MAX_CARDS	8		/* max number of cards per system */
-#define FP_IVEC0	0xe0		/* interrupt vector for card 0 */
 #define FP_INTLEV	5		/* interrupt level 5 (HKV2F BCL) */
 #define FP_BUFSIZ	8		/* input buffer size */
 
@@ -154,9 +157,9 @@ struct fp_rec
 	};
 
 LOCAL
-struct fp_rec fp[FP_MAX_CARDS];		/* fast protect control structure */
+struct fp_rec *fp;			/* fast protect control structure */
 LOCAL
-int fp_num;				/* # of fast protect cards found */
+int fp_num;				/* # of fast protect cards found -1 */
 LOCAL
 SEM_ID fp_semid;			/* semaphore for monitor task */
 
@@ -166,9 +169,10 @@ SEM_ID fp_semid;			/* semaphore for monitor task */
  * interrupt service routine
  *
  */
-fp_int(ptr)
- register struct fp_rec *ptr;
+fp_int(card)
+unsigned card;
 {
+ register struct fp_rec *ptr = &fp[card];
  register struct fp1 *regptr;
  unsigned short temp0, temp1, temp2;
 
@@ -193,6 +197,11 @@ fp_int(ptr)
    ptr->drvstat |= (temp0 & 0xff00)<<16;	/* csr status bits */
    if ((temp1 ^ (temp2>>8)) || (temp0 & CSR_CHNG)) /* fault or enable change */
     semGive(fp_semid);				/* wake up monitor */
+
+   /*
+    * wakeup the interrupt driven scanner
+    */
+   io_scanner_wakeup(IO_BI, AT8_FP10S_BI, card);
    break;
  }
  ptr->int_num++;				/* log interrupt */
@@ -213,10 +222,15 @@ fp_init(addr)
 {
  int i;
  short junk;
- short intvec = FP_IVEC0;
+ short intvec = AT8FP_IVEC_BASE;
  struct fp1 *ptr;
  int status;
 
+ fp = (struct fp_rec *) calloc(bi_num_cards[AT8_FP10S_BI], sizeof(*fp));
+ if(!fp){
+   return -5;
+ }
+
  if(!addr){
 	addr = bi_addrs[AT8_FP10S_BI];
  }	
@@ -227,10 +241,10 @@ fp_init(addr)
 			&ptr);
  if(status<0){
 	logMsg("VME shrt IO addr err in the slave fast protect driver\n");
-	return ERROR;
+	return -4;
  }
 
- for (i = 0; (i < FP_MAX_CARDS-1) && (vxMemProbe(ptr,READ,2,&junk) == OK);
+ for (i = 0; (i < bi_num_cards[AT8_FP10S_BI]) && (vxMemProbe(ptr,READ,2,&junk) == OK);
       i++,ptr++)
   {
   /*
@@ -254,7 +268,7 @@ fp_init(addr)
   set up interrupt handler
   */
   ptr->csr |= FP_INTLEV<<4;		/* set up board for level 5 interrupt */
-  if (intConnect(INUM_TO_IVEC(fp[i].fp_vector),fp_int,&fp[i]) != OK)
+  if (intConnect(INUM_TO_IVEC(fp[i].fp_vector),fp_int,i) != OK)
    return -2;				/* abort if can't connect */
   sysIntEnable(FP_INTLEV);
   ptr->csr |= 0x0001;
@@ -428,4 +442,13 @@ fp_monitor()
   return -1;
  return 0;
 }
-  
+ 
+fp_io_report(level)
+int level;
+{
+	int i;
+
+        for(i=0; i<=fp_num; i++){
+                printf("BI: AT8-FP-S:    card %d\n", i);
+        }
+} 
diff --git a/src/drv/drvFpm.c b/src/drv/drvFpm.c
index 27e62949e..7faad57c9 100644
--- a/src/drv/drvFpm.c
+++ b/src/drv/drvFpm.c
@@ -44,6 +44,11 @@
  * .06 joh 070992       FP_ILEV passed to call sysIntEnable() so that the
  *                      interrupt level can be easily changed
  * .07 joh 071092       now fetches base addr from module_types.h
+ * .08 joh 071092       added io report routine
+ * .09 joh 071092	allocate config structure at run time so that
+ *			the users can adjust the number of cards without
+ *			recompilation
+ * .10 joh 071092	moved ivec allocation to module_types.h
  *
  *
  * Routines:
@@ -65,6 +70,8 @@
  *
  *		-1		Nonexistent card
  *		-2		Interrupt connection error
+ *		-3		no memory
+ *		-4		VME short IO bus nonexistent
  *		0-2		Successfull completion, or # cards found
  *
  */
@@ -82,8 +89,6 @@
 
 /* general constants */
 #define FPM_ADD0	0xffdd00	/* card 0 base address */
-#define FPM_MAX_CARDS	2		/* max number of cards per system */
-#define FPM_IVEC0	0xe8		/* interrupt vector for card 0 */
 #define FPM_INTLEV	5		/* interrupt level */
 
 /* control register bit definitions */
@@ -133,9 +138,10 @@ struct fpm_rec
 	};
 
 LOCAL
-struct fpm_rec fpm[FPM_MAX_CARDS];		/* fast protect control structure */
+struct fpm_rec *fpm;		/* fast protect control structure */
+
 LOCAL
-int fpm_num;					/* # cards found */
+int fpm_num;				/* # cards found - 1 */
 
 /*
  * fpm_int
@@ -172,12 +178,19 @@ fpm_init(addr)
 {
  int i;
  short junk;
- short intvec = FPM_IVEC0;
+ short intvec = AT8FPM_IVEC_BASE;
  struct fp10m *ptr;
  int status;
 
+ fpm = (struct fpm_rec *) calloc(
+				bo_num_cards[AT8_FP10M_BO],
+				sizeof(*fpm));
+ if(!fpm){
+	return -3;
+ }
+
  if(!addr){
-        addr = bi_addrs[AT8_FP10M_BO];
+        addr = bo_addrs[AT8_FP10M_BO];
  }
 
  status = sysBusToLocalAdrs(
@@ -186,12 +199,10 @@ fpm_init(addr)
                         &ptr);
  if(status<0){
         logMsg("VME shrt IO addr err in the master fast protect driver\n");
-        return ERROR;
+        return -4;
  }
 
- if (addr)
-  ptr = (struct fp10m *)addr;	/* override if present */
- for (i = 0; (i < FPM_MAX_CARDS-1) && (vxMemProbe(ptr,READ,2,&junk) == OK);
+ for (i = 0; (i < bo_num_cards[AT8_FP10M_BO]) && (vxMemProbe(ptr,READ,2,&junk) == OK);
       i++,ptr++)
   {
   /*
@@ -346,3 +357,19 @@ if (card < 0 || (card > fpm_num))
 *pval = fpm[card].fmptr->cr & 0x000f;
 return 0;
 }
+
+
+
+/*
+ * fpm_io_report()
+ *
+ */
+fpm_io_report(level)
+int	level;
+{
+	int	i;
+
+	for(i=0; i<=fpm_num; i++){
+		printf("BO: AT8-FP-M:    card %d\n", i);
+	}
+}