From de05099e4956e6dee59283c823d016cb8da3b381 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 3 May 2005 22:24:19 +0000 Subject: [PATCH] 2005-05-03 Joel Sherrill * mpc8260/cpm/dpram.c, mpc8260/timer/timer.c, mpc8xx/cpm/dpram.c: Remove warnings. --- c/src/lib/libcpu/powerpc/ChangeLog | 5 +++++ c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c | 10 +++++----- c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c | 5 ----- c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 04a2067514..57291b91ff 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2005-05-03 Joel Sherrill + + * mpc8260/cpm/dpram.c, mpc8260/timer/timer.c, mpc8xx/cpm/dpram.c: + Remove warnings. + 2005-04-25 Jennifer Averett PR 779/bsp diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c b/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c index 8e97a6d4e6..b38a63ee16 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/cpm/dpram.c @@ -31,14 +31,14 @@ * - Dual-Port RAM section 3 */ static struct { - char *base; + uint8_t *base; size_t size; unsigned int used; } dpram_regions[] = { -/* { (char *)&m8260.dpram0[0], sizeof m8260.dpram0, 0 },*/ - { (char *)&m8260.dpram1[0], sizeof m8260.dpram1, 0 }, -/* { (char *)&m8260.dpram2[0], sizeof m8260.dpram2, 0 },*/ - { (char *)&m8260.dpram3[0], sizeof m8260.dpram3, 0 } +/* { (uint8_t *)&m8260.dpram0[0], sizeof m8260.dpram0, 0 },*/ + { (uint8_t *)&m8260.dpram1[0], sizeof m8260.dpram1, 0 }, +/* { (uint8_t *)&m8260.dpram2[0], sizeof m8260.dpram2, 0 },*/ + { (uint8_t *)&m8260.dpram3[0], sizeof m8260.dpram3, 0 } }; #define NUM_DPRAM_REGIONS (sizeof(dpram_regions) / sizeof(dpram_regions[0])) diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c index 5d026cd64c..eec500fd12 100644 --- a/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c +++ b/c/src/lib/libcpu/powerpc/mpc8260/timer/timer.c @@ -54,11 +54,6 @@ static volatile uint32_t Timer_starting; static rtems_boolean Timer_driver_Find_average_overhead; extern rtems_cpu_table Cpu_table; -#define rtems_cpu_configuration_get_timer_average_overhead() \ - (Cpu_table.timer_average_overhead) - -#define rtems_cpu_configuration_get_timer_least_valid() \ - (Cpu_table.timer_least_valid) /* * This is so small that this code will be reproduced where needed. diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c index 77b8a448a8..22319c3c1b 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/dpram.c @@ -28,15 +28,15 @@ * - Dual-Port RAM section 4 */ static struct { - char *base; + uint8_t *base; size_t size; unsigned int used; } dpram_regions[] = { - { (char *)&m8xx.dpram0[0], sizeof m8xx.dpram0, 0 }, - { (char *)&m8xx.dpram1[0], sizeof m8xx.dpram1, 0 }, - { (char *)&m8xx.dpram2[0], sizeof m8xx.dpram2, 0 }, - { (char *)&m8xx.dpram3[0], sizeof m8xx.dpram3, 0 }, - { (char *)&m8xx.dpram4[0], sizeof m8xx.dpram4, 0 }, + { (uint8_t *) &m8xx.dpram0[0], sizeof m8xx.dpram0, 0 }, + { (uint8_t *) &m8xx.dpram1[0], sizeof m8xx.dpram1, 0 }, + { (uint8_t *) &m8xx.dpram2[0], sizeof m8xx.dpram2, 0 }, + { (uint8_t *) &m8xx.dpram3[0], sizeof m8xx.dpram3, 0 }, + { (uint8_t *) &m8xx.dpram4[0], sizeof m8xx.dpram4, 0 }, }; #define NUM_DPRAM_REGIONS (sizeof(dpram_regions) / sizeof(dpram_regions[0]))