Mercurial > ecos-v3_0-branch
changeset 2701:8fede7f6c559
* src/hal_diag.c: Changed confusing SCI0/1 comments to SCI1/2
| author | asl |
|---|---|
| date | Tue, 23 Dec 2008 18:31:45 +0000 |
| parents | 99efb5fe625e |
| children | 933a098bce82 |
| files | packages/hal/powerpc/cme555/current/ChangeLog packages/hal/powerpc/cme555/current/src/hal_diag.c packages/hal/powerpc/ec555/current/ChangeLog packages/hal/powerpc/ec555/current/src/hal_diag.c |
| diffstat | 4 files changed, 16 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/hal/powerpc/cme555/current/ChangeLog +++ b/packages/hal/powerpc/cme555/current/ChangeLog @@ -4,6 +4,10 @@ 2008-11-07 Jonathan Larmour <jifl@eCos * include/pkgconf/mlt_powerpc_cme555_rom.ldi: Add SECTION_eh_frame and SECTION_RELOCS. +2008-09-02 Steven Clugston <steven.clugston@ncl.ac.uk> + + * src/hal_diag.c: Changed confusing SCI0/1 comments to SCI1/2 + 2003-12-16 Gary Thomas <gary@mlbassoc.com> * misc/redboot_ROM.ecm: @@ -63,9 +67,6 @@ 2002-04-24 Bob Koninckx <bob.koninckx@ // // This exception does not invalidate any other reasons why a work based on // this file might be covered by the GNU General Public License. -// -// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc. -// at http://sources.redhat.com/ecos/ecos-license/ // ------------------------------------------- //####ECOSGPLCOPYRIGHTEND#### //===========================================================================
--- a/packages/hal/powerpc/cme555/current/src/hal_diag.c +++ b/packages/hal/powerpc/cme555/current/src/hal_diag.c @@ -32,9 +32,6 @@ // // This exception does not invalidate any other reasons why a work based on // this file might be covered by the GNU General Public License. -// -// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc. -// at http://sources.redhat.com/ecos/ecos-license/ // ------------------------------------------- //####ECOSGPLCOPYRIGHTEND#### //============================================================================= @@ -85,8 +82,8 @@ cyg_hal_plf_comms_init(void) //----------------------------------------------------------------------------- // There are two serial ports. -#define CYG_DEV_SERIAL_BASE_A 0x305008 // SCI0 -#define CYG_DEV_SERIAL_BASE_B 0x305020 // SCI1 +#define CYG_DEV_SERIAL_BASE_A 0x305008 // SCI1 +#define CYG_DEV_SERIAL_BASE_B 0x305020 // SCI2 //----------------------------------------------------------------------------- // Define CYG_DEVICE_SERIAL_RS232_SCIBR @@ -273,13 +270,13 @@ static channel_data_t channels[2] = { { (cyg_uint16*)CYG_DEV_SERIAL_BASE_A, 1000, CYGNUM_HAL_INTERRUPT_SIU_LVL0, - CYGNUM_HAL_INTERRUPT_IMB3_SCI0_RX, + CYGNUM_HAL_INTERRUPT_IMB3_SCI1_RX, 0, CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD }, { (cyg_uint16*)CYG_DEV_SERIAL_BASE_B, 1000, CYGNUM_HAL_INTERRUPT_SIU_LVL0, - CYGNUM_HAL_INTERRUPT_IMB3_SCI1_RX, + CYGNUM_HAL_INTERRUPT_IMB3_SCI2_RX, 0, CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD } };
--- a/packages/hal/powerpc/ec555/current/ChangeLog +++ b/packages/hal/powerpc/ec555/current/ChangeLog @@ -10,6 +10,10 @@ 2008-11-07 Jonathan Larmour <jifl@eCos * include/pkgconf/mlt_powerpc_ec555_f08_s08_rom.ldi: Add SECTION_eh_frame and SECTION_RELOCS. +2008-09-02 Steven Clugston <steven.clugston@ncl.ac.uk> + + * src/hal_diag.c: Changed confusing SCI0/1 comments to SCI1/2 + 2004-09-23 Bob Koninckx <bob.koninckx@o-3s.com> * src/ec555.S: Updated memory controller settings for ethernet card. Now
--- a/packages/hal/powerpc/ec555/current/src/hal_diag.c +++ b/packages/hal/powerpc/ec555/current/src/hal_diag.c @@ -85,8 +85,8 @@ cyg_hal_plf_comms_init(void) //----------------------------------------------------------------------------- // There are two serial ports. -#define CYG_DEV_SERIAL_BASE_A 0x305008 // SCI0 -#define CYG_DEV_SERIAL_BASE_B 0x305020 // SCI1 +#define CYG_DEV_SERIAL_BASE_A 0x305008 // SCI1 +#define CYG_DEV_SERIAL_BASE_B 0x305020 // SCI2 //----------------------------------------------------------------------------- // Define CYG_DEVICE_SERIAL_RS232_SCIBR @@ -273,11 +273,11 @@ cyg_hal_plf_serial_putc(void* __ch_data, static channel_data_t channels[2] = { { (cyg_uint16*)CYG_DEV_SERIAL_BASE_A, 1000, - CYGNUM_HAL_INTERRUPT_IMB3_SCI0_RX, + CYGNUM_HAL_INTERRUPT_IMB3_SCI1_RX, CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD }, { (cyg_uint16*)CYG_DEV_SERIAL_BASE_B, 1000, - CYGNUM_HAL_INTERRUPT_IMB3_SCI1_RX, + CYGNUM_HAL_INTERRUPT_IMB3_SCI2_RX, CYGNUM_HAL_VIRTUAL_VECTOR_CONSOLE_CHANNEL_BAUD } };