RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-05-24 Eric Valette <valette@crf.canon.fr>

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2001-05-24 20:14:58 +00:00
parent ffb4ccf791
commit 907af7dc2e
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libcpu/powerpc/ChangeLog
View File

@@ -1,3 +1,9 @@
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> 2001-03-30 Eric Valette <valette@crf.canon.fr>
* mpc8xx/vectors/.cvsignore, mpc8xx/vectors/Makefile.am, * mpc8xx/vectors/.cvsignore, mpc8xx/vectors/Makefile.am,

19
c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
View File

@@ -639,14 +639,7 @@ int m8xx_scc_isOn(const rtems_irq_connect_data* ptr)
return BSP_irq_enabled_at_cpm (ptr->name); return BSP_irq_enabled_at_cpm (ptr->name);
} }
static rtems_irq_connect_data consoleIrqData = 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
};
void void
m8xx_uart_scc_initialize (int minor) m8xx_uart_scc_initialize (int minor)
@@ -826,9 +819,15 @@ m8xx_uart_scc_initialize (int minor)
#endif #endif
} }
if ( (mbx8xx_console_get_configuration() & 0x06) == 0x02 ) { if ( (mbx8xx_console_get_configuration() & 0x06) == 0x02 ) {
consoleIrqData.on = m8xx_scc_enable;
consoleIrqData.off = m8xx_scc_disable;
consoleIrqData.isOn = m8xx_scc_isOn;
switch (minor) { switch (minor) {
case SCC2_MINOR: case SCC2_MINOR:
break; consoleIrqData.name = BSP_CPM_IRQ_SCC2;
consoleIrqData.hdl = m8xx_scc2_interrupt_handler;
break;
#ifdef mpc860 #ifdef mpc860
case SCC3_MINOR: case SCC3_MINOR: