2007-11-06 Till Straumann <strauman@slac.stanford.edu>

* ep1a/irq/irq.c, gen5200/irq/irq.c, mbx8xx/irq/irq.c,
	mpc8260ads/irq/irq.c, mvme5500/irq/irq.c, psim/irq/irq.c,
	score603e/irq/irq.c, shared/irq/irq.c:
	test for non-NULL-ness before calling 'on'/'off'
	methods so that users don't have to provide
	no-ops if they don't want this feature.

c/src/lib/libbsp/powerpc/ChangeLog

@@ -1,3 +1,12 @@
+2007-11-06	Till Straumann <strauman@slac.stanford.edu>
+
+	* ep1a/irq/irq.c, gen5200/irq/irq.c, mbx8xx/irq/irq.c,
+	mpc8260ads/irq/irq.c, mvme5500/irq/irq.c, psim/irq/irq.c,
+	score603e/irq/irq.c, shared/irq/irq.c:
+	test for non-NULL-ness before calling 'on'/'off'
+	methods so that users don't have to provide
+	no-ops if they don't want this feature.
+
 2007-11-06	Till Straumann <strauman@slac.stanford.edu>
 
 	* shared/console/uart.c: removed #define UARTDEBUG

c/src/lib/libbsp/powerpc/ep1a/irq/irq.c

@@ -154,7 +154,8 @@ int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
     
     rtems_interrupt_enable(level);
 
@@ -216,7 +217,8 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
     
     rtems_interrupt_enable(level);
 
@@ -308,7 +310,8 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
-    irq->off(irq);
+	if (irq->off)
+    	irq->off(irq);
 
     /*
      * restore the default irq value
@@ -374,19 +377,21 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl); 
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
+			  if(vchain->on)
                vchain->on(vchain);
             }
          }
 
       }
       else {
-         /* rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); */
+         /* if (rtems_hdl_tbl[i].off) rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); */
          {
             rtems_irq_connect_data* vchain;
             for( vchain = &rtems_hdl_tbl[i];
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl); 
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
+			  if (vchain->off)
                vchain->off(vchain);
             }
          }
@@ -403,26 +408,28 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
      */
     for (i=BSP_PROCESSOR_IRQ_LOWEST_OFFSET; i < BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER; i++) {
       if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
-         /* rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); */
+         /* if (rtems_hdl_tbl[i].on) rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]); */
          {
             rtems_irq_connect_data* vchain;
             for( vchain = &rtems_hdl_tbl[i];
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl); 
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
+			  if (vchain->on)
                vchain->on(vchain);
             }
          }
 
       }
       else {
-         /* rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); */
+         /* if (rtems_hdl_tbl[i].off) rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); */
          {
             rtems_irq_connect_data* vchain;
             for( vchain = &rtems_hdl_tbl[i];
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl); 
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
+			  if (vchain->off)
                vchain->off(vchain);
             }
          }

c/src/lib/libbsp/powerpc/gen5200/irq/irq.c

@@ -556,7 +556,8 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-  irq->on(irq);
+  if (irq->on)
+  	irq->on(irq);
 
   rtems_interrupt_enable(level);
 
@@ -632,7 +633,8 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
   /*
    * Disable interrupt on device
    */
-  irq->off(irq);
+  if (irq->off)
+  	irq->off(irq);
 
   /*
    * restore the default irq value
@@ -677,13 +679,15 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
       {
 
 	  BSP_irq_enable_at_siu(i);
-	  rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+	  if (rtems_hdl_tbl[i].on)
+	  	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 
       }
     else
       {
 
-	  rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+	  if (rtems_hdl_tbl[i].off)
+	  	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	  BSP_irq_disable_at_siu(i);
 
       }
@@ -699,13 +703,15 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
     if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl)
       {
 
-	  rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+	  if (rtems_hdl_tbl[i].on)
+	  	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 
       }
     else
       {
 
-	  rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+	  if (rtems_hdl_tbl[i].off)
+	  	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 
       }
 

c/src/lib/libbsp/powerpc/mbx8xx/irq/irq.c

@@ -243,7 +243,8 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
 
     rtems_interrupt_enable(level);
 
@@ -299,7 +300,8 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
-    irq->off(irq);
+	if (irq->off)
+    	irq->off(irq);
 
     /*
      * restore the default irq value
@@ -334,10 +336,12 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
     for (i=BSP_CPM_IRQ_LOWEST_OFFSET; i < BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER ; i++) {
       if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
 	BSP_irq_enable_at_cpm (i);
-	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].on)
+		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
-	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].off)
+		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	BSP_irq_disable_at_cpm (i);
       }
     }
@@ -353,10 +357,12 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
     for (i=BSP_SIU_IRQ_LOWEST_OFFSET; i < BSP_SIU_IRQ_LOWEST_OFFSET + BSP_SIU_IRQ_NUMBER ; i++) {
       if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
 	BSP_irq_enable_at_siu (i);
-	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].on)
+		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
-	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].off)
+		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	BSP_irq_disable_at_siu (i);
        }
     }
@@ -371,10 +377,12 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
      */
     for (i=BSP_PROCESSOR_IRQ_LOWEST_OFFSET; i < BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER; i++) {
       if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
-	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].on)
+		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
-	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].off)
+		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
       }
     }
     rtems_interrupt_enable(level);

c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c

@@ -289,7 +289,8 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 	/*
 	 * Enable interrupt on device
 	 */
-	irq->on(irq);
+	if (irq->on)
+		irq->on(irq);
 
 	rtems_interrupt_enable(level);
 
@@ -343,7 +344,8 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 	/*
 	 * Disable interrupt on device
 	 */
-	irq->off(irq);
+	if (irq->off)
+		irq->off(irq);
 
 	/*
 	 * restore the default irq value
@@ -381,9 +383,11 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
 	for (i=BSP_CPM_IRQ_LOWEST_OFFSET; i < BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER ; i++) {
 		if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
 			BSP_irq_enable_at_cpm (i);
-			rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+			if (rtems_hdl_tbl[i].on)
+				rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 		} else {
-			rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+			if (rtems_hdl_tbl[i].off)
+				rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 			BSP_irq_disable_at_cpm (i);
 		}
 	}
@@ -393,9 +397,11 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
 	 */
 	for (i=BSP_PROCESSOR_IRQ_LOWEST_OFFSET; i < BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER; i++) {
 		if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
-			rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+			if (rtems_hdl_tbl[i].on)
+				rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 		} else {
-			rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+			if (rtems_hdl_tbl[i].off)
+				rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 		}
 	}
 

c/src/lib/libbsp/powerpc/mvme5500/irq/irq.c

@@ -400,10 +400,12 @@ int BSP_setup_the_pic()  /* adapt the same name as shared/irq */
     for (i=BSP_MICL_IRQ_LOWEST_OFFSET; i < BSP_PROCESSOR_IRQ_LOWEST_OFFSET ; i++) {
       if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
 	BSP_enable_pic_irq(i);
-	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].on)
+		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
-	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
+	if (rtems_hdl_tbl[i].off)
+		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	BSP_disable_pic_irq(i);
       }
     }
@@ -477,7 +479,8 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
     
     rtems_interrupt_enable(level);
 
@@ -529,7 +532,8 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
-    irq->off(irq);
+	if (irq->off)
+    	irq->off(irq);
 
     /*
      * restore the default irq value

c/src/lib/libbsp/powerpc/psim/irq/irq.c

@@ -152,7 +152,8 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
     
     rtems_interrupt_enable(level);
 
@@ -235,7 +236,8 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
-    irq->off(irq);
+	if (irq->off)
+    	irq->off(irq);
 
     /*
      * restore the default irq value

c/src/lib/libbsp/powerpc/score603e/irq/irq.c

@@ -129,7 +129,8 @@ int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
 
     rtems_interrupt_enable(level);
 
@@ -183,7 +184,8 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
 
     rtems_interrupt_enable(level);
 
@@ -268,7 +270,8 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
-    irq->off(irq);
+	if (irq->off)
+    	irq->off(irq);
 
     /*
      * restore the default irq value
@@ -332,19 +335,21 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl);
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
-               vchain->on(vchain);
+			  if (vchain->on)
+               	vchain->on(vchain);
             }
          }
 
       }
       else {
-         /* rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); */
+         /* if (rtems_hdl_tbl[i].off) rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); */
          {
             rtems_irq_connect_data* vchain;
             for( vchain = &rtems_hdl_tbl[i];
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl);
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
+			  if (vchain->off)
                vchain->off(vchain);
             }
          }
@@ -361,6 +366,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl);
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
+			  if (vchain->on)
                vchain->on(vchain);
             }
          }
@@ -373,6 +379,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
                  ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl);
                  vchain = (rtems_irq_connect_data*)vchain->next_handler )
             {
+			  if (vchain->off)
                vchain->off(vchain);
             }
          }

c/src/lib/libbsp/powerpc/shared/irq/irq.c

@@ -49,19 +49,6 @@ static inline int is_processor_irq(const rtems_irq_number irqLine)
 	 );
 }
 
-/*
- * default on/off function
- */
-static void nop_func(){}
-/*
- * default isOn function
-static int not_connected() {return 0;}
- */
-/*
- * default possible isOn function
- */
-static int connected() {return 1;}
-
 
 /*
  * ------------------------ RTEMS Irq helper functions ----------------
@@ -123,7 +110,8 @@ int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
 
     rtems_interrupt_enable(level);
 
@@ -172,7 +160,8 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
-    irq->on(irq);
+	if (irq->on)
+    	irq->on(irq);
 
     rtems_interrupt_enable(level);
 
@@ -253,7 +242,8 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
-    irq->off(irq);
+	if (irq->off)
+    	irq->off(irq);
 
     /*
      * restore the default irq value
@@ -316,6 +306,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
 		     ((int)vchain != -1 && vchain->hdl != default_rtems_entry.hdl); 
 		     vchain = (rtems_irq_connect_data*)vchain->next_handler )
 		{
+			if (vchain->on)
               vchain->on(vchain);
 		}
 	}
@@ -330,9 +321,9 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
     vectorDesc.hdl.vector	=	ASM_DEC_VECTOR;
     vectorDesc.hdl.raw_hdl	=	decrementer_exception_vector_prolog_code;
     vectorDesc.hdl.raw_hdl_size	=	(unsigned) decrementer_exception_vector_prolog_code_size;
-    vectorDesc.on		=	nop_func;
+    vectorDesc.on		=	0;
-    vectorDesc.off		=	nop_func;
+    vectorDesc.off		=	0;
-    vectorDesc.isOn		=	connected;
+    vectorDesc.isOn		=	0;
     if (!ppc_set_exception (&vectorDesc)) {
       BSP_panic("Unable to initialize RTEMS decrementer raw exception\n");
     }