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,6 +154,7 @@ int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
     
     rtems_interrupt_enable(level);
@@ -216,6 +217,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
     
     rtems_interrupt_enable(level);
@@ -308,6 +310,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
+	if (irq->off)
     	irq->off(irq);
 
     /*
@@ -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,6 +556,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+  if (irq->on)
   	irq->on(irq);
 
   rtems_interrupt_enable(level);
@@ -632,6 +633,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
   /*
    * Disable interrupt on device
    */
+  if (irq->off)
   	irq->off(irq);
 
   /*
@@ -677,12 +679,14 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
       {
 
 	  BSP_irq_enable_at_siu(i);
+	  if (rtems_hdl_tbl[i].on)
 	  	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 
       }
     else
       {
 
+	  if (rtems_hdl_tbl[i].off)
 	  	rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	  BSP_irq_disable_at_siu(i);
 
@@ -699,12 +703,14 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
     if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl)
       {
 
+	  if (rtems_hdl_tbl[i].on)
 	  	rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 
       }
     else
       {
 
+	  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,6 +243,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
 
     rtems_interrupt_enable(level);
@@ -299,6 +300,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
+	if (irq->off)
     	irq->off(irq);
 
     /*
@@ -334,9 +336,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);
+	if (rtems_hdl_tbl[i].on)
 		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
+	if (rtems_hdl_tbl[i].off)
 		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	BSP_irq_disable_at_cpm (i);
       }
@@ -353,9 +357,11 @@ 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);
+	if (rtems_hdl_tbl[i].on)
 		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
+	if (rtems_hdl_tbl[i].off)
 		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	BSP_irq_disable_at_siu (i);
        }
@@ -371,9 +377,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) {
+	if (rtems_hdl_tbl[i].on)
 		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
+	if (rtems_hdl_tbl[i].off)
 		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
       }
     }

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

@@ -289,6 +289,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 	/*
 	 * Enable interrupt on device
 	 */
+	if (irq->on)
 		irq->on(irq);
 
 	rtems_interrupt_enable(level);
@@ -343,6 +344,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
 	/*
 	 * Disable interrupt on device
 	 */
+	if (irq->off)
 		irq->off(irq);
 
 	/*
@@ -381,8 +383,10 @@ 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);
+			if (rtems_hdl_tbl[i].on)
 				rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 		} else {
+			if (rtems_hdl_tbl[i].off)
 				rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 			BSP_irq_disable_at_cpm (i);
 		}
@@ -393,8 +397,10 @@ 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) {
+			if (rtems_hdl_tbl[i].on)
 				rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
 		} else {
+			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,9 +400,11 @@ 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);
+	if (rtems_hdl_tbl[i].on)
 		rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
       }
       else {
+	if (rtems_hdl_tbl[i].off)
 		rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
 	BSP_disable_pic_irq(i);
       }
@@ -477,6 +479,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
     
     rtems_interrupt_enable(level);
@@ -529,6 +532,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
+	if (irq->off)
     	irq->off(irq);
 
     /*

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

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

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

@@ -129,6 +129,7 @@ int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
 
     rtems_interrupt_enable(level);
@@ -183,6 +184,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
 
     rtems_interrupt_enable(level);
@@ -268,6 +270,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
+	if (irq->off)
     	irq->off(irq);
 
     /*
@@ -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 )
             {
+			  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,6 +110,7 @@ int BSP_install_rtems_shared_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
 
     rtems_interrupt_enable(level);
@@ -172,6 +160,7 @@ int BSP_install_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Enable interrupt on device
      */
+	if (irq->on)
     	irq->on(irq);
 
     rtems_interrupt_enable(level);
@@ -253,6 +242,7 @@ int BSP_remove_rtems_irq_handler  (const rtems_irq_connect_data* irq)
     /*
      * Disable interrupt on device
      */
+	if (irq->off)
     	irq->off(irq);
 
     /*
@@ -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");
     }