diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-28 19:16:22 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-04-28 19:16:22 +0000 |
| commit | 427bb7d1d45737bc385b5af9e4830d43d7025d38 (patch) | |
| tree | 072c71f469261cfe732b4c3d0e6351a91636016d /c/src/lib/libbsp/m68k/gen68360 | |
| parent | 2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-427bb7d1d45737bc385b5af9e4830d43d7025d38.tar.bz2 | |
2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com>
* startup/init68360.c, timer/timer.c: Remove warnings.
Diffstat (limited to 'c/src/lib/libbsp/m68k/gen68360')
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/startup/init68360.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68360/timer/timer.c | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 29d088d7ca..9945b91e1a 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,7 @@ +2010-04-28 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * startup/init68360.c, timer/timer.c: Remove warnings. + 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com> * network/network.c: Fix warning. diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c index 7149d62bd0..efbd679639 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c +++ b/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c @@ -14,6 +14,9 @@ #include <bsp.h> #include <rtems/m68k/m68360.h> +extern void _CopyDataClearBSSAndStart (unsigned long ramSize); +extern void *RamBase; +extern void *_RomBase; /* From linkcmds */ /* * Declare the m360 structure here for the benefit of the debugger @@ -44,9 +47,6 @@ void _Init68360 (void) int i; m68k_isr_entry *vbr; unsigned long ramSize; - extern void _CopyDataClearBSSAndStart (unsigned long ramSize); - extern void *RamBase; - extern void *_RomBase; /* From linkcmds */ #if (defined (__mc68040__)) /* diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c index f169a00db7..c541765d30 100644 --- a/c/src/lib/libbsp/m68k/gen68360/timer/timer.c +++ b/c/src/lib/libbsp/m68k/gen68360/timer/timer.c @@ -72,7 +72,10 @@ benchmark_timer_initialize (void) int benchmark_timer_read (void) { - return *(uint32_t*)&m360.tcn1; + unsigned short val; + + val = m360.tcn1; + return val; } void |