diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2007-12-11 06:37:19 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2007-12-11 06:37:19 +0000 |
| commit | ccd92869b89e11d46b00f8a662b68963fb658bd4 (patch) | |
| tree | 99b4d186831d93dd77f6673330afb5d34a961021 /c/src/lib/libbsp | |
| parent | 2007-12-10 Till Straumann <strauman@slac.stanford.edu> (diff) | |
| download | rtems-ccd92869b89e11d46b00f8a662b68963fb658bd4.tar.bz2 | |
2007-12-10 Till Straumann <strauman@slac.stanford.edu>
* shared/openpic/openpic.c: fixed wrong register
address in openpic_gettimer().
Diffstat (limited to 'c/src/lib/libbsp')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/openpic/openpic.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index e5f843ec0d..9a8c30d6ec 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,5 +1,10 @@ 2007-12-10 Till Straumann <strauman@slac.stanford.edu> + * shared/openpic/openpic.c: fixed wrong register + address in openpic_gettimer(). + +2007-12-10 Till Straumann <strauman@slac.stanford.edu> + * shared/motorola/vpd.c, shared/motorola/vpd.h: added code (originally developed for 'beatnik') to read MotLoad VPD data from i2c eeprom. diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c index 52de079062..9e738493d0 100644 --- a/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c +++ b/c/src/lib/libbsp/powerpc/shared/openpic/openpic.c @@ -511,7 +511,7 @@ void openpic_settimer(unsigned int timer, unsigned int base_count, int irq_enabl unsigned int openpic_gettimer(unsigned int timer) { check_arg_timer(timer); - return (openpic_read(&OpenPIC->Global.Timer[timer]) & ~OPENPIC_MASK); + return (openpic_read(&OpenPIC->Global.Timer[timer].Current_Count) & ~OPENPIC_MASK); } /* -------- Interrupt Sources ---------------------------------------------- */ |