Changeset 907af7dc in rtems

Timestamp:

May 24, 2001, 8:14:58 PM (20 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

133ddf2e

Parents:

ffb4ccf

Message:

2001-05-24 Eric Valette <valette@…>

• mpc8xx/console-generic/console-generic.c: Bug found by Yacine <elkolli@…> where the initialization or irq data structure was incomplete in case a SMC channel was used first and later a SCC one.

Location:

c/src/lib/libcpu/powerpc

Files:

• ChangeLog (modified) (1 diff)
• mpc8xx/console-generic/console-generic.c (modified) (2 diffs)

c/src/lib/libcpu/powerpc/ChangeLog

@@ +1 @@
+2001-05-24      Eric Valette <valette@crf.canon.fr>
+
+        * mpc8xx/console-generic/console-generic.c: Bug found by Yacine
+        <elkolli@crf.canon.fr> where the initialization or irq data structure
+        was incomplete in case a SMC channel was used first and later a SCC one.
+
 2001-03-30      Eric Valette <valette@crf.canon.fr>
 

c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c

@@ -640 +640 @@
 }
 
-static rtems_irq_connect_data consoleIrqData =
-{
-  BSP_CPM_IRQ_SCC2,
-  (rtems_irq_hdl)m8xx_scc2_interrupt_handler,
-  (rtems_irq_enable) m8xx_scc_enable,
-  (rtems_irq_disable) m8xx_scc_disable,
-  (rtems_irq_is_enabled) m8xx_scc_isOn
-};
+static rtems_irq_connect_data consoleIrqData;
         
 void
@@ -827 +820 @@
   }
   if ( (mbx8xx_console_get_configuration() & 0x06) == 0x02 ) {
+    consoleIrqData.on = m8xx_scc_enable;
+    consoleIrqData.off = m8xx_scc_disable;
+    consoleIrqData.isOn = m8xx_scc_isOn;
+    
     switch (minor) {
-      case SCC2_MINOR:
-        break;
+    case SCC2_MINOR:
+      consoleIrqData.name = BSP_CPM_IRQ_SCC2;
+      consoleIrqData.hdl = m8xx_scc2_interrupt_handler;
+      break;
 
 #ifdef mpc860