From b5bb3d6f598ee99e6842a5b6b3ebc8dc4690e3b5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 6 Jul 1998 14:52:30 +0000 Subject: Update from Geoffroy Montel (g_montel@yahoo.com) to get in sync with termios and eliminate warnings. --- c/src/lib/libbsp/m68k/gen68340/README | 2 ++ c/src/lib/libbsp/m68k/gen68340/console/console.c | 31 +++++++++------------- .../libbsp/m68k/gen68340/start/startfor340only.s | 8 ++---- .../m68k/gen68340/start340/startfor340only.s | 8 ++---- c/src/lib/libbsp/m68k/gen68340/timer/timer.c | 6 +++-- 5 files changed, 23 insertions(+), 32 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/gen68340/README b/c/src/lib/libbsp/m68k/gen68340/README index 4ebaaf583b..8b85a8f8ad 100644 --- a/c/src/lib/libbsp/m68k/gen68340/README +++ b/c/src/lib/libbsp/m68k/gen68340/README @@ -24,6 +24,7 @@ # # WARNING: there's still no KA9Q driver! I hope it will come in the next RTEMS version! # + BSP NAME: gen68340 BOARD: Generic 68360 as described in Motorola MC68340 User's Manual BOARD: Home made MC68340 board @@ -34,6 +35,7 @@ COPROCESSORS: none MODE: not applicable DEBUG MONITOR: none (Hardware provides BDM) +DEBUG SETUP: EST Vision Ice PERIPHERALS =========== diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c index adeff172ed..2796ca119d 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c @@ -65,17 +65,6 @@ unsigned char Error_Status_B = 0; /* error status on Channel A */ #define Enable_Interrupts_Tx_B if (USE_INTERRUPTS_B) set_DUIER(m340_TxRDYB) #define Disable_Interrupts_Tx_B if (USE_INTERRUPTS_B) unset_DUIER(m340_TxRDYB) -/****************************************************** - Name: erreur - Input parameters: string - Output parameters: - - Description: small error routine :) - *****************************************************/ -static void erreur (char * string) -{ - fprintf(stderr, string); -} - /****************************************************** Name: InterruptHandler Input parameters: vector number @@ -307,7 +296,6 @@ dbugInitialise () rtems_isr_entry old_handler; rtems_status_code sc; - proc_ptr ignored; extern void _Debug_ISR_Handler_Console(void); sc = rtems_interrupt_catch (InterruptHandler, @@ -317,7 +305,10 @@ dbugInitialise () /* uncomment this if you want to pass control to your own ISR handler it may be usefull to do so to check for performances with an oscilloscope */ /* - _CPU_ISR_install_raw_handler( CONSOLE_VECTOR, _Debug_ISR_Handler_Console, &ignored ); + { + proc_ptr ignored; + _CPU_ISR_install_raw_handler( CONSOLE_VECTOR, _Debug_ISR_Handler_Console, &ignored ); + } */ /* @@ -391,7 +382,6 @@ dbugInitialise () rtems_isr_entry old_handler; rtems_status_code sc; - proc_ptr ignored; extern void _Debug_ISR_Handler_Console(void); sc = rtems_interrupt_catch (InterruptHandler, @@ -401,7 +391,10 @@ dbugInitialise () /* uncomment this if you want to pass control to your own ISR handler it may be usefull to do so to check for performances with an oscilloscope */ /* - _CPU_ISR_install_raw_handler( CONSOLE_VECTOR, _Debug_ISR_Handler_Console, &ignored ); + { + proc_ptr ignored; + _CPU_ISR_install_raw_handler( CONSOLE_VECTOR, _Debug_ISR_Handler_Console, &ignored ); + } */ /* @@ -474,8 +467,8 @@ dbugInitialise () in the receive buffer TO DO: add the channel # to check for!! *****************************************************/ -static void -SetAttributes (struct termios *t, int minor) +static int +SetAttributes (int minor, const struct termios *t) { rtems_interrupt_level level; float ispeed, ospeed; @@ -526,6 +519,8 @@ SetAttributes (struct termios *t, int minor) dbugInitialise(); rtems_interrupt_enable (level); } + + return 0; } /****************************************************** @@ -734,7 +729,7 @@ rtems_device_driver console_control( rtems_libio_ioctl_args_t *args = arg; if (args->command == RTEMS_IO_SET_ATTRIBUTES) - SetAttributes ((struct termios *)args->buffer, minor); + SetAttributes (minor, (struct termios *)args->buffer); return rtems_termios_ioctl (arg); } diff --git a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s b/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s index 46882efeda..930694f02e 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s +++ b/c/src/lib/libbsp/m68k/gen68340/start/startfor340only.s @@ -342,7 +342,7 @@ BEGIN_CODE dc.l _crt0_cold_start /* reset PC */ dc.l _crt0_warm_start - .ascii "BOOT XHM68K/Spectra for ASTECC PLATFORM" + .ascii "RTEMS" dc.w 0 .align 2 @@ -413,9 +413,7 @@ sync_wait: moveq.l #0x07,d1 _b_cs: -/* move.l (a1)+, (a2)+ */ - move.l (a1)+, d2 - move.l d2, (a2)+ + move.l (a1)+, (a2)+ dbra d1,_b_cs /* fill RAM if COLDSTART */ @@ -431,8 +429,6 @@ _fill_loop: subq.l #1,d1 bne _fill_loop -/* jsr __initcopy */ - _dont_fill: jmp SYM(_Init68340) | Start C code (which never returns) diff --git a/c/src/lib/libbsp/m68k/gen68340/start340/startfor340only.s b/c/src/lib/libbsp/m68k/gen68340/start340/startfor340only.s index 46882efeda..930694f02e 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start340/startfor340only.s +++ b/c/src/lib/libbsp/m68k/gen68340/start340/startfor340only.s @@ -342,7 +342,7 @@ BEGIN_CODE dc.l _crt0_cold_start /* reset PC */ dc.l _crt0_warm_start - .ascii "BOOT XHM68K/Spectra for ASTECC PLATFORM" + .ascii "RTEMS" dc.w 0 .align 2 @@ -413,9 +413,7 @@ sync_wait: moveq.l #0x07,d1 _b_cs: -/* move.l (a1)+, (a2)+ */ - move.l (a1)+, d2 - move.l d2, (a2)+ + move.l (a1)+, (a2)+ dbra d1,_b_cs /* fill RAM if COLDSTART */ @@ -431,8 +429,6 @@ _fill_loop: subq.l #1,d1 bne _fill_loop -/* jsr __initcopy */ - _dont_fill: jmp SYM(_Init68340) | Start C code (which never returns) diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c index a2bc2186fb..a6baa5d003 100644 --- a/c/src/lib/libbsp/m68k/gen68340/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68340/timer/timer.c @@ -191,7 +191,6 @@ void Fifo_Full_Timer_initialize (void) rtems_isr_entry old_handler; rtems_status_code sc; - proc_ptr ignored; extern void _Debug_ISR_Handler_Console(void); sc = rtems_interrupt_catch (InterruptHandler, @@ -201,7 +200,10 @@ void Fifo_Full_Timer_initialize (void) /* uncomment this if you want to pass control to your own ISR handler it may be usefull to do so to check for performances with an oscilloscope */ /* - _CPU_ISR_install_raw_handler( TIMER1_VECTOR, _Debug_ISR_Handler_Console, &ignored ); + { + proc_ptr ignored; + _CPU_ISR_install_raw_handler( TIMER1_VECTOR, _Debug_ISR_Handler_Console, &ignored ); + } */ } } /* fifo full mode on a uart */ -- cgit v1.2.3