diff options
Diffstat (limited to '')
50 files changed, 104 insertions, 70 deletions
diff --git a/bsps/m68k/av5282/clock/clock.c b/bsps/m68k/av5282/clock/clock.c index b1e169b4c9..1c4a6a0ba7 100644 --- a/bsps/m68k/av5282/clock/clock.c +++ b/bsps/m68k/av5282/clock/clock.c @@ -14,7 +14,7 @@ /* * Periodic interval timer interrupt handler */ -#define Clock_driver_support_at_tick() \ +#define Clock_driver_support_at_tick(arg) \ do { \ MCF5282_PIT3_PCSR |= MCF5282_PIT_PCSR_PIF; \ } while (0) \ diff --git a/bsps/m68k/av5282/include/tm27.h b/bsps/m68k/av5282/include/tm27.h index 1e1dc77e59..899cd6562c 100644 --- a/bsps/m68k/av5282/include/tm27.h +++ b/bsps/m68k/av5282/include/tm27.h @@ -26,6 +26,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 ) #define Cause_tm27_intr() asm volatile ("trap #3"); diff --git a/bsps/m68k/csb360/include/tm27.h b/bsps/m68k/csb360/include/tm27.h index 5f2fd8a383..27b96a5370 100644 --- a/bsps/m68k/csb360/include/tm27.h +++ b/bsps/m68k/csb360/include/tm27.h @@ -28,6 +28,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 34, 1 ) #define Cause_tm27_intr() asm volatile ("trap #2"); diff --git a/bsps/m68k/gen68340/console/console.c b/bsps/m68k/gen68340/console/console.c index 34c18bc129..0f5e26d9e8 100644 --- a/bsps/m68k/gen68340/console/console.c +++ b/bsps/m68k/gen68340/console/console.c @@ -600,7 +600,7 @@ rtems_device_driver console_open( SetAttributes, /* setAttributes */ NULL, /* stopRemoteTx */ NULL, /* startRemoteTx */ - 1 /* outputUsesInterrupts */ + TERMIOS_IRQ_DRIVEN /* outputUsesInterrupts */ }; static const rtems_termios_callbacks pollCallbacks = { @@ -611,7 +611,7 @@ rtems_device_driver console_open( SetAttributes, /* setAttributes */ NULL, /* stopRemoteTx */ NULL, /* startRemoteTx */ - 0 /* outputUsesInterrupts */ + TERMIOS_POLLED /* outputUsesInterrupts */ }; if (minor==UART_CHANNEL_A) { diff --git a/bsps/m68k/gen68360/clock/clock.c b/bsps/m68k/gen68360/clock/clock.c index 966b20dae4..07da6a034d 100644 --- a/bsps/m68k/gen68360/clock/clock.c +++ b/bsps/m68k/gen68360/clock/clock.c @@ -33,7 +33,7 @@ static unsigned long nsec; * Application code can override this by * setting M360DefaultWatchdogFeeder to zero. */ -#define Clock_driver_support_at_tick() \ +#define Clock_driver_support_at_tick(arg) \ do { \ nsec += pit_nsec_per_tick; \ if (nsec >= rtems_nsec_per_tick) \ diff --git a/bsps/m68k/gen68360/console/console.c b/bsps/m68k/gen68360/console/console.c index 4d0f2bcb20..a2292dbab9 100644 --- a/bsps/m68k/gen68360/console/console.c +++ b/bsps/m68k/gen68360/console/console.c @@ -308,7 +308,7 @@ rtems_device_driver console_open( smc1SetAttributes, /* setAttributes */ NULL, /* stopRemoteTx */ NULL, /* startRemoteTx */ - 1 /* outputUsesInterrupts */ + TERMIOS_IRQ_DRIVEN /* outputUsesInterrupts */ }; static const rtems_termios_callbacks pollCallbacks = { smc1Initialize, /* firstOpen */ @@ -318,7 +318,7 @@ rtems_device_driver console_open( smc1SetAttributes, /* setAttributes */ NULL, /* stopRemoteTx */ NULL, /* startRemoteTx */ - 0 /* outputUsesInterrupts */ + TERMIOS_POLLED /* outputUsesInterrupts */ }; /* diff --git a/bsps/m68k/gen68360/include/tm27.h b/bsps/m68k/gen68360/include/tm27.h index 5523a4a345..6134f15d68 100644 --- a/bsps/m68k/gen68360/include/tm27.h +++ b/bsps/m68k/gen68360/include/tm27.h @@ -29,6 +29,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 34, 1 ) #define Cause_tm27_intr() asm volatile ("trap #2"); diff --git a/bsps/m68k/gen68360/spi/m360_spi.h b/bsps/m68k/gen68360/spi/m360_spi.h index 63d38f3808..a470f3786a 100644 --- a/bsps/m68k/gen68360/spi/m360_spi.h +++ b/bsps/m68k/gen68360/spi/m360_spi.h @@ -9,7 +9,7 @@ */ /* - * Copyright (c) 2008 embedded brains GmbH. All rights reserved. + * Copyright (c) 2008 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/README b/bsps/m68k/genmcf548x/README index 4411e9a05e..395434097f 100644 --- a/bsps/m68k/genmcf548x/README +++ b/bsps/m68k/genmcf548x/README @@ -1,6 +1,6 @@ # RTEMS generic mcf548x BSP # -# Copyright (c) 2007 embedded brains GmbH. All rights reserved. +# Copyright (c) 2007 embedded brains GmbH & Co. KG # # Parts of the code has been derived from the "dBUG source code" # package Freescale is providing for M548X EVBs. The usage of diff --git a/bsps/m68k/genmcf548x/btimer/btimer.c b/bsps/m68k/genmcf548x/btimer/btimer.c index 3e82fde8ac..f22b8380d8 100644 --- a/bsps/m68k/genmcf548x/btimer/btimer.c +++ b/bsps/m68k/genmcf548x/btimer/btimer.c @@ -21,7 +21,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/clock/clock.c b/bsps/m68k/genmcf548x/clock/clock.c index bb419a2760..fbb2c8592f 100644 --- a/bsps/m68k/genmcf548x/clock/clock.c +++ b/bsps/m68k/genmcf548x/clock/clock.c @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2008 embedded brains GmbH. All rights reserved. + * Copyright (c) 2008 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -62,7 +62,7 @@ /* * Periodic interval timer interrupt handler */ -#define Clock_driver_support_at_tick() \ +#define Clock_driver_support_at_tick(arg) \ do { \ MCF548X_SLT_SSR0 = MCF548X_SLT_SSR_ST; \ } while (0) \ diff --git a/bsps/m68k/genmcf548x/console/console.c b/bsps/m68k/genmcf548x/console/console.c index d87012ace2..6dcf08e4f1 100644 --- a/bsps/m68k/genmcf548x/console/console.c +++ b/bsps/m68k/genmcf548x/console/console.c @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/include/bsp.h b/bsps/m68k/genmcf548x/include/bsp.h index 28fb7b99fc..2fc519f7cb 100644 --- a/bsps/m68k/genmcf548x/include/bsp.h +++ b/bsps/m68k/genmcf548x/include/bsp.h @@ -28,7 +28,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/include/bsp/irq.h b/bsps/m68k/genmcf548x/include/bsp/irq.h index 2b514ce724..a4a45683c2 100644 --- a/bsps/m68k/genmcf548x/include/bsp/irq.h +++ b/bsps/m68k/genmcf548x/include/bsp/irq.h @@ -9,7 +9,7 @@ */ /* - * Copyright (c) 2013 embedded brains GmbH. All rights reserved. + * Copyright (c) 2013 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/include/tm27.h b/bsps/m68k/genmcf548x/include/tm27.h index ad51ee7915..6d793b1f17 100644 --- a/bsps/m68k/genmcf548x/include/tm27.h +++ b/bsps/m68k/genmcf548x/include/tm27.h @@ -26,6 +26,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 ) #define Cause_tm27_intr() asm volatile ("trap #3"); diff --git a/bsps/m68k/genmcf548x/irq/intc-icr-init-values.c b/bsps/m68k/genmcf548x/irq/intc-icr-init-values.c index d75876e80d..5f3c3c4ece 100644 --- a/bsps/m68k/genmcf548x/irq/intc-icr-init-values.c +++ b/bsps/m68k/genmcf548x/irq/intc-icr-init-values.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Copyright (c) 2013 embedded brains GmbH. All rights reserved. + * Copyright (c) 2013 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/irq/irq.c b/bsps/m68k/genmcf548x/irq/irq.c index 944ded0772..0a1f8794e0 100644 --- a/bsps/m68k/genmcf548x/irq/irq.c +++ b/bsps/m68k/genmcf548x/irq/irq.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Copyright (c) 2013, 2021 embedded brains GmbH. All rights reserved. + * Copyright (C) 2013, 2021 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/mcdma/mcdma_glue.c b/bsps/m68k/genmcf548x/mcdma/mcdma_glue.c index 7e7bbd5596..2dc2bc77dc 100644 --- a/bsps/m68k/genmcf548x/mcdma/mcdma_glue.c +++ b/bsps/m68k/genmcf548x/mcdma/mcdma_glue.c @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 2004-2009 embedded brains GmbH. All rights reserved. + * Copyright (C) 2004, 2009 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/start/bspstart.c b/bsps/m68k/genmcf548x/start/bspstart.c index e821170ed8..d2c40758b6 100644 --- a/bsps/m68k/genmcf548x/start/bspstart.c +++ b/bsps/m68k/genmcf548x/start/bspstart.c @@ -18,7 +18,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/start/cache.c b/bsps/m68k/genmcf548x/start/cache.c index 419fb2bbb1..5d310bfbcf 100644 --- a/bsps/m68k/genmcf548x/start/cache.c +++ b/bsps/m68k/genmcf548x/start/cache.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Copyright (c) 2007-2014 embedded brains GmbH. All rights reserved. + * Copyright (C) 2007, 2014 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/start/init548x.c b/bsps/m68k/genmcf548x/start/init548x.c index ed57206a55..db8298c155 100644 --- a/bsps/m68k/genmcf548x/start/init548x.c +++ b/bsps/m68k/genmcf548x/start/init548x.c @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2008 embedded brains GmbH. All rights reserved. + * Copyright (c) 2008 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/start/linkcmds.COBRA5475 b/bsps/m68k/genmcf548x/start/linkcmds.COBRA5475 index 0bf1d449fc..7b40df41c9 100644 --- a/bsps/m68k/genmcf548x/start/linkcmds.COBRA5475 +++ b/bsps/m68k/genmcf548x/start/linkcmds.COBRA5475 @@ -22,7 +22,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine index 45ba3add83..edde586031 100644 --- a/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine +++ b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine @@ -22,7 +22,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine.flash b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine.flash index b005d462b3..cbcf2ae76d 100644 --- a/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine.flash +++ b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine.flash @@ -22,7 +22,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/genmcf548x/start/start.S b/bsps/m68k/genmcf548x/start/start.S index f9ba27bc86..25948706e5 100644 --- a/bsps/m68k/genmcf548x/start/start.S +++ b/bsps/m68k/genmcf548x/start/start.S @@ -20,7 +20,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/include/bsp/linker-symbols.h b/bsps/m68k/include/bsp/linker-symbols.h index 43148fb3b3..e7e707e7df 100644 --- a/bsps/m68k/include/bsp/linker-symbols.h +++ b/bsps/m68k/include/bsp/linker-symbols.h @@ -9,7 +9,7 @@ */ /* - * Copyright (c) 2008-2013 embedded brains GmbH. All rights reserved. + * Copyright (C) 2008, 2013 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/include/mcf548x/mcdma_glue.h b/bsps/m68k/include/mcf548x/mcdma_glue.h index a676234c9b..baac6a62c7 100644 --- a/bsps/m68k/include/mcf548x/mcdma_glue.h +++ b/bsps/m68k/include/mcf548x/mcdma_glue.h @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 2004, 2009 embedded brains GmbH. All rights reserved. + * Copyright (C) 2004, 2009 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/include/mcf548x/mcf548x.h b/bsps/m68k/include/mcf548x/mcf548x.h index dac9e20e10..8b69291356 100644 --- a/bsps/m68k/include/mcf548x/mcf548x.h +++ b/bsps/m68k/include/mcf548x/mcf548x.h @@ -21,7 +21,7 @@ */ /* - * Copyright (c) 2007 embedded brains GmbH. All rights reserved. + * Copyright (c) 2007 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bsps/m68k/mcf5206elite/console/console.c b/bsps/m68k/mcf5206elite/console/console.c index bbf343d0f3..20272af780 100644 --- a/bsps/m68k/mcf5206elite/console/console.c +++ b/bsps/m68k/mcf5206elite/console/console.c @@ -278,7 +278,7 @@ console_open(rtems_device_major_number major, console_set_attributes, /* setAttributes */ console_stop_remote_tx, /* stopRemoteTx */ console_start_remote_tx, /* startRemoteTx */ - 1 /* outputUsesInterrupts */ + TERMIOS_IRQ_DRIVEN /* outputUsesInterrupts */ }; static const rtems_termios_callbacks poll_callbacks = { console_first_open, /* firstOpen */ @@ -288,7 +288,7 @@ console_open(rtems_device_major_number major, console_set_attributes, /* setAttributes */ console_stop_remote_tx, /* stopRemoteTx */ console_start_remote_tx, /* startRemoteTx */ - 0 /* outputUsesInterrupts */ + TERMIOS_POLLED /* outputUsesInterrupts */ }; switch (console_mode) { diff --git a/bsps/m68k/mcf5206elite/include/tm27.h b/bsps/m68k/mcf5206elite/include/tm27.h index 2abef68311..6190993f0c 100644 --- a/bsps/m68k/mcf5206elite/include/tm27.h +++ b/bsps/m68k/mcf5206elite/include/tm27.h @@ -24,6 +24,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 34, 1 ) #define Cause_tm27_intr() asm volatile ("trap #2"); diff --git a/bsps/m68k/mcf52235/clock/clock.c b/bsps/m68k/mcf52235/clock/clock.c index d5e1817536..eb28e5d328 100644 --- a/bsps/m68k/mcf52235/clock/clock.c +++ b/bsps/m68k/mcf52235/clock/clock.c @@ -93,6 +93,6 @@ static void Clock_driver_support_initialize_hardware(void) ); } -#define Clock_driver_timecounter_tick() mcf52235_tc_tick() +#define Clock_driver_timecounter_tick(arg) mcf52235_tc_tick() #include "../../../shared/dev/clock/clockimpl.h" diff --git a/bsps/m68k/mcf52235/include/tm27.h b/bsps/m68k/mcf52235/include/tm27.h index b4b62ef721..12775fc953 100644 --- a/bsps/m68k/mcf52235/include/tm27.h +++ b/bsps/m68k/mcf52235/include/tm27.h @@ -24,6 +24,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 ) #define Cause_tm27_intr() asm volatile ("trap #3"); diff --git a/bsps/m68k/mcf5225x/clock/clock.c b/bsps/m68k/mcf5225x/clock/clock.c index 9a9c7cabe4..3cd76aa17a 100644 --- a/bsps/m68k/mcf5225x/clock/clock.c +++ b/bsps/m68k/mcf5225x/clock/clock.c @@ -93,6 +93,6 @@ static void Clock_driver_support_initialize_hardware(void) ); } -#define Clock_driver_timecounter_tick() mcf5225x_tc_tick() +#define Clock_driver_timecounter_tick(arg) mcf5225x_tc_tick() #include "../../../shared/dev/clock/clockimpl.h" diff --git a/bsps/m68k/mcf5225x/include/tm27.h b/bsps/m68k/mcf5225x/include/tm27.h index fcf1c4f8aa..93dc07878b 100644 --- a/bsps/m68k/mcf5225x/include/tm27.h +++ b/bsps/m68k/mcf5225x/include/tm27.h @@ -24,6 +24,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 ) #define Cause_tm27_intr() asm volatile ("trap #3"); diff --git a/bsps/m68k/mcf5235/clock/clock.c b/bsps/m68k/mcf5235/clock/clock.c index 8b848de006..2aebd8385c 100644 --- a/bsps/m68k/mcf5235/clock/clock.c +++ b/bsps/m68k/mcf5235/clock/clock.c @@ -14,7 +14,7 @@ /* * Periodic interval timer interrupt handler */ -#define Clock_driver_support_at_tick() \ +#define Clock_driver_support_at_tick(arg) \ do { \ MCF5235_PIT_PCSR3 |= MCF5235_PIT_PCSR_PIF; \ } while (0) \ diff --git a/bsps/m68k/mcf5235/include/tm27.h b/bsps/m68k/mcf5235/include/tm27.h index 92a85c789a..ae6f34e7b8 100644 --- a/bsps/m68k/mcf5235/include/tm27.h +++ b/bsps/m68k/mcf5235/include/tm27.h @@ -24,6 +24,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 ) #define Cause_tm27_intr() asm volatile ("trap #3"); diff --git a/bsps/m68k/mcf5329/clock/clock.c b/bsps/m68k/mcf5329/clock/clock.c index 6ad46fe5a1..2833111572 100644 --- a/bsps/m68k/mcf5329/clock/clock.c +++ b/bsps/m68k/mcf5329/clock/clock.c @@ -92,6 +92,6 @@ static void Clock_driver_support_initialize_hardware(void) ); } -#define Clock_driver_timecounter_tick() mcf5329_tc_tick() +#define Clock_driver_timecounter_tick(arg) mcf5329_tc_tick() #include "../../../shared/dev/clock/clockimpl.h" diff --git a/bsps/m68k/mcf5329/include/tm27.h b/bsps/m68k/mcf5329/include/tm27.h index 33376540ac..98e02cf170 100644 --- a/bsps/m68k/mcf5329/include/tm27.h +++ b/bsps/m68k/mcf5329/include/tm27.h @@ -24,6 +24,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 ) #define Cause_tm27_intr() asm volatile ("trap #3"); diff --git a/bsps/m68k/mrm332/btimer/btimer.c b/bsps/m68k/mrm332/btimer/btimer.c index 4aa3cd013e..138884dd32 100644 --- a/bsps/m68k/mrm332/btimer/btimer.c +++ b/bsps/m68k/mrm332/btimer/btimer.c @@ -31,8 +31,6 @@ bool benchmark_timer_find_average_overhead; -extern rtems_isr Clock_isr(void); - void benchmark_timer_initialize( void ) { } diff --git a/bsps/m68k/mrm332/console/sci.c b/bsps/m68k/mrm332/console/sci.c index c6b4933f13..cf9370b2eb 100644 --- a/bsps/m68k/mrm332/console/sci.c +++ b/bsps/m68k/mrm332/console/sci.c @@ -268,7 +268,7 @@ static const rtems_termios_callbacks SciInterruptCallbacks = SciSetAttributes, /* set attributes */ NULL, /* stop remote xmit */ NULL, /* start remote xmit */ - TRUE /* output uses interrupts */ + TERMIOS_IRQ_DRIVEN /* output uses interrupts */ }; /***************************************************************************** @@ -284,7 +284,7 @@ static const rtems_termios_callbacks SciPolledCallbacks = SciSetAttributes, /* set attributes */ NULL, /* stop remote xmit */ NULL, /* start remote xmit */ - FALSE /* output uses interrupts */ + TERMIOS_POLLED /* output uses interrupts */ }; diff --git a/bsps/m68k/mvme147/include/tm27.h b/bsps/m68k/mvme147/include/tm27.h index 5b548a888a..17609a8375 100644 --- a/bsps/m68k/mvme147/include/tm27.h +++ b/bsps/m68k/mvme147/include/tm27.h @@ -25,6 +25,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), \ SOFT_1_VECTOR, 1 ) diff --git a/bsps/m68k/mvme147s/include/tm27.h b/bsps/m68k/mvme147s/include/tm27.h index 48ae0f459a..0e9f993ee9 100644 --- a/bsps/m68k/mvme147s/include/tm27.h +++ b/bsps/m68k/mvme147s/include/tm27.h @@ -25,6 +25,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), \ SOFT_1_VECTOR, 1 ) diff --git a/bsps/m68k/mvme162/include/tm27.h b/bsps/m68k/mvme162/include/tm27.h index 750408d009..6ff48d79e0 100644 --- a/bsps/m68k/mvme162/include/tm27.h +++ b/bsps/m68k/mvme162/include/tm27.h @@ -25,6 +25,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) \ set_vector( (handler), VBR1 * 0x10 + 0x8, 1 ); \ lcsr->intr_level[2] |= 3; \ diff --git a/bsps/m68k/mvme167/console/console.c b/bsps/m68k/mvme167/console/console.c index 0499ac46b3..e9084924fa 100644 --- a/bsps/m68k/mvme167/console/console.c +++ b/bsps/m68k/mvme167/console/console.c @@ -1515,7 +1515,7 @@ rtems_device_driver console_open( NULL, /* setAttributes */ NULL, /* stopRemoteTx */ NULL, /* startRemoteTx */ - 0 /* outputUsesInterrupts */ + TERMIOS_POLLED /* outputUsesInterrupts */ }; static const rtems_termios_callbacks intrCallbacks = { @@ -1526,7 +1526,7 @@ rtems_device_driver console_open( cd2401_setAttributes, /* setAttributes */ cd2401_stopRemoteTx, /* stopRemoteTx */ cd2401_startRemoteTx, /* startRemoteTx */ - 1 /* outputUsesInterrupts */ + TERMIOS_IRQ_DRIVEN /* outputUsesInterrupts */ }; if ( NVRAM_CONFIGURE ) diff --git a/bsps/m68k/mvme167/include/tm27.h b/bsps/m68k/mvme167/include/tm27.h index 5b65311794..7f84ec3c0d 100644 --- a/bsps/m68k/mvme167/include/tm27.h +++ b/bsps/m68k/mvme167/include/tm27.h @@ -24,6 +24,8 @@ */ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) \ set_vector( (handler), VBR1 * 0x10 + 0x8, 1 ); \ lcsr->intr_level[2] |= 3; \ diff --git a/bsps/m68k/shared/cache/cache.h b/bsps/m68k/shared/cache/cache.h index 18797d4695..0fb63f7d2f 100644 --- a/bsps/m68k/shared/cache/cache.h +++ b/bsps/m68k/shared/cache/cache.h @@ -76,10 +76,10 @@ /* Only the mc68030 has a data cache; it is writethrough only. */ -RTEMS_INLINE_ROUTINE void _CPU_cache_flush_1_data_line(const void * d_addr) {} -RTEMS_INLINE_ROUTINE void _CPU_cache_flush_entire_data(void) {} +static inline void _CPU_cache_flush_1_data_line(const void * d_addr) {} +static inline void _CPU_cache_flush_entire_data(void) {} -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_1_data_line( +static inline void _CPU_cache_invalidate_1_data_line( const void * d_addr ) { @@ -88,27 +88,27 @@ RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_1_data_line( _CPU_CACR_OR(0x00000400); } -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_entire_data(void) +static inline void _CPU_cache_invalidate_entire_data(void) { _CPU_CACR_OR( 0x00000800 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_freeze_data(void) +static inline void _CPU_cache_freeze_data(void) { _CPU_CACR_OR( 0x00000200 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_unfreeze_data(void) +static inline void _CPU_cache_unfreeze_data(void) { _CPU_CACR_AND( 0xFFFFFDFF ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_enable_data(void) +static inline void _CPU_cache_enable_data(void) { _CPU_CACR_OR( 0x00000100 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_disable_data(void) +static inline void _CPU_cache_disable_data(void) { _CPU_CACR_AND( 0xFFFFFEFF ); } @@ -117,7 +117,7 @@ RTEMS_INLINE_ROUTINE void _CPU_cache_disable_data(void) /* Both the 68020 and 68030 have instruction caches */ -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_1_instruction_line( +static inline void _CPU_cache_invalidate_1_instruction_line( const void * d_addr ) { @@ -126,27 +126,27 @@ RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_1_instruction_line( _CPU_CACR_OR( 0x00000004 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_entire_instruction(void) +static inline void _CPU_cache_invalidate_entire_instruction(void) { _CPU_CACR_OR( 0x00000008 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_freeze_instruction(void) +static inline void _CPU_cache_freeze_instruction(void) { _CPU_CACR_OR( 0x00000002); } -RTEMS_INLINE_ROUTINE void _CPU_cache_unfreeze_instruction(void) +static inline void _CPU_cache_unfreeze_instruction(void) { _CPU_CACR_AND( 0xFFFFFFFD ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_enable_instruction(void) +static inline void _CPU_cache_enable_instruction(void) { _CPU_CACR_OR( 0x00000001 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_disable_instruction(void) +static inline void _CPU_cache_disable_instruction(void) { _CPU_CACR_AND( 0xFFFFFFFE ); } @@ -155,12 +155,12 @@ RTEMS_INLINE_ROUTINE void _CPU_cache_disable_instruction(void) #elif ( defined(__mc68040__) || defined (__mc68060__) ) /* Cannot be frozen */ -RTEMS_INLINE_ROUTINE void _CPU_cache_freeze_data(void) {} -RTEMS_INLINE_ROUTINE void _CPU_cache_unfreeze_data(void) {} -RTEMS_INLINE_ROUTINE void _CPU_cache_freeze_instruction(void) {} -RTEMS_INLINE_ROUTINE void _CPU_cache_unfreeze_instruction(void) {} +static inline void _CPU_cache_freeze_data(void) {} +static inline void _CPU_cache_unfreeze_data(void) {} +static inline void _CPU_cache_freeze_instruction(void) {} +static inline void _CPU_cache_unfreeze_instruction(void) {} -RTEMS_INLINE_ROUTINE void _CPU_cache_flush_1_data_line( +static inline void _CPU_cache_flush_1_data_line( const void * d_addr ) { @@ -168,7 +168,7 @@ RTEMS_INLINE_ROUTINE void _CPU_cache_flush_1_data_line( __asm__ volatile ( "cpushl %%dc,(%0)" :: "a" (p_address) ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_1_data_line( +static inline void _CPU_cache_invalidate_1_data_line( const void * d_addr ) { @@ -176,44 +176,44 @@ RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_1_data_line( __asm__ volatile ( "cinvl %%dc,(%0)" :: "a" (p_address) ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_flush_entire_data(void) +static inline void _CPU_cache_flush_entire_data(void) { __asm__ volatile ( "cpusha %%dc" :: ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_entire_data(void) +static inline void _CPU_cache_invalidate_entire_data(void) { __asm__ volatile ( "cinva %%dc" :: ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_enable_data(void) +static inline void _CPU_cache_enable_data(void) { _CPU_CACR_OR( 0x80000000 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_disable_data(void) +static inline void _CPU_cache_disable_data(void) { _CPU_CACR_AND( 0x7FFFFFFF ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_1_instruction_line( +static inline void _CPU_cache_invalidate_1_instruction_line( const void * i_addr ) { void * p_address = (void *) _CPU_virtual_to_physical( i_addr ); __asm__ volatile ( "cinvl %%ic,(%0)" :: "a" (p_address) ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_invalidate_entire_instruction(void) +static inline void _CPU_cache_invalidate_entire_instruction(void) { __asm__ volatile ( "cinva %%ic" :: ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_enable_instruction(void) +static inline void _CPU_cache_enable_instruction(void) { _CPU_CACR_OR( 0x00008000 ); } -RTEMS_INLINE_ROUTINE void _CPU_cache_disable_instruction(void) +static inline void _CPU_cache_disable_instruction(void) { _CPU_CACR_AND( 0xFFFF7FFF ); } diff --git a/bsps/m68k/shared/doxygen.h b/bsps/m68k/shared/doxygen.h index 573ec104ec..400a2852ca 100644 --- a/bsps/m68k/shared/doxygen.h +++ b/bsps/m68k/shared/doxygen.h @@ -1,4 +1,12 @@ /** + * @file + * + * @ingroup RTEMSImplDoxygen + * + * @brief This header file defines m68k-specific groups. + */ + +/** * @defgroup RTEMSBSPsM68k Motorola 68000 and NXP ColdFire (m68k) * * @ingroup RTEMSBSPs diff --git a/bsps/m68k/shared/start/linkcmds.base b/bsps/m68k/shared/start/linkcmds.base index 66987c0b19..79f46367e9 100644 --- a/bsps/m68k/shared/start/linkcmds.base +++ b/bsps/m68k/shared/start/linkcmds.base @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Copyright (c) 2008, 2018 embedded brains GmbH. All rights reserved. + * Copyright (C) 2008, 2018 embedded brains GmbH & Co. KG * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -130,7 +130,7 @@ SECTIONS { } > REGION_TEXT AT > REGION_TEXT_LOAD .data.rel.ro : ALIGN_WITH_INPUT { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) - *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) + *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) } > REGION_TEXT AT > REGION_TEXT_LOAD .jcr : ALIGN_WITH_INPUT { KEEP (*(.jcr)) diff --git a/bsps/m68k/uC5282/clock/clock.c b/bsps/m68k/uC5282/clock/clock.c index 59d67af296..f7bed25b8b 100644 --- a/bsps/m68k/uC5282/clock/clock.c +++ b/bsps/m68k/uC5282/clock/clock.c @@ -150,6 +150,6 @@ int bsp_cpu_load_percentage(void) 0; } -#define Clock_driver_timecounter_tick() uC5282_tc_tick() +#define Clock_driver_timecounter_tick(arg) uC5282_tc_tick() #include "../../../shared/dev/clock/clockimpl.h" diff --git a/bsps/m68k/uC5282/include/tm27.h b/bsps/m68k/uC5282/include/tm27.h index 6d8e2cc344..86a1920177 100644 --- a/bsps/m68k/uC5282/include/tm27.h +++ b/bsps/m68k/uC5282/include/tm27.h @@ -29,6 +29,8 @@ #define MUST_WAIT_FOR_INTERRUPT 0 +#define TM27_USE_VECTOR_HANDLER + #define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 ) #define Cause_tm27_intr() asm volatile ("trap #3"); |