summaryrefslogtreecommitdiffstats
path: root/c/src/lib
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c2
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/clock/clock.c2
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c2
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c2
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c7
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c8
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/tod/tod.c1
7 files changed, 16 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
index 379dc3751c..c0726bc613 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/universe.c
@@ -162,7 +162,9 @@ void initialize_universe()
{
rtems_unsigned32 jumper_selection;
rtems_unsigned32 pci_id;
+#if (SCORE603E_USE_SDS) | (SCORE603E_USE_OPEN_FIRMWARE) | (SCORE603E_USE_NONE)
volatile rtems_unsigned32 universe_temp_value;
+#endif
/*
* Read the VME jumper location to determine the VME base address
diff --git a/c/src/lib/libbsp/powerpc/score603e/clock/clock.c b/c/src/lib/libbsp/powerpc/score603e/clock/clock.c
index dc7fcf8fc8..15bc98e728 100644
--- a/c/src/lib/libbsp/powerpc/score603e/clock/clock.c
+++ b/c/src/lib/libbsp/powerpc/score603e/clock/clock.c
@@ -170,7 +170,7 @@ rtems_device_driver Clock_initialize(
Clock_Decrementer_value = (int) &CPU_PPC_CLICKS_PER_MS *
(BSP_Configuration.microseconds_per_tick / 1000);
- Install_clock( Clock_isr );
+ Install_clock( (rtems_isr_entry) Clock_isr );
/*
* make major/minor avail to others such as shared memory driver
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c b/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c
index 349f669fc8..e354c53526 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c
+++ b/c/src/lib/libbsp/powerpc/score603e/console/tbl85c30.c
@@ -136,7 +136,7 @@ const Port_85C30_info Ports_85C30 [ NUM_Z85C30_PORTS ] = {
&Chips_85C30[1],
},
-#if defined(HAS_PMC_PSC8)
+#if (HAS_PMC_PSC8)
{
(volatile unsigned char *) SCORE603E_85C30_CTRL_4,
(volatile unsigned char *) SCORE603E_85C30_DATA_4,
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
index 6281a31136..938aeeddc5 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Hwr_init.c
@@ -83,9 +83,9 @@ void init_RTC()
void init_PCI()
{
+#if (SCORE603E_USE_SDS) | (SCORE603E_USE_OPEN_FIRMWARE) | (SCORE603E_USE_NONE)
rtems_unsigned32 value;
-#if (SCORE603E_USE_SDS) | (SCORE603E_USE_OPEN_FIRMWARE) | (SCORE603E_USE_NONE)
/*
* NOTE: Accessing any memory location not mapped by the BAT
* registers will cause a TLB miss exception.
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
index a914ded36b..6575c7425a 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
@@ -130,7 +130,8 @@ void initialize_PMC() {
/*
* Bit 0 and 1 HI cause Medium Loopback to occur.
*/
- PMC_addr = SCORE603E_PMC_SERIAL_ADDRESS( 0x100000 );
+ PMC_addr = (volatile rtems_unsigned32 *)
+ SCORE603E_PMC_SERIAL_ADDRESS( 0x100000 );
data = *PMC_addr;
/* *PMC_addr = data | 0x3; */
*PMC_addr = data & 0xfc;
@@ -152,7 +153,8 @@ void initialize_PMC() {
PMC_addr = SCORE603E_PCI_DEVICE_ADDRESS( 0x14 );
*PMC_addr = (SCORE603E_PCI_REGISTER_BASE >> 24) & 0x3f;
- PMC_addr = SCORE603E_PMC_SERIAL_ADDRESS( 0x100000 );
+ PMC_addr = (volatile rtems_unsigned32 *)
+ SCORE603E_PMC_SERIAL_ADDRESS( 0x100000 );
data = *PMC_addr;
*PMC_addr = data & 0xfc;
@@ -170,6 +172,7 @@ void initialize_PMC() {
void SCORE603e_bsp_postdriver_hook(void)
{
+ extern void Init_EE_mask_init(void);
bsp_postdriver_hook();
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
index 548772ff86..1967ca62a5 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/genpvec.c
@@ -18,6 +18,8 @@
#include "chain.h"
#include <assert.h>
+#include <stdio.h> /* for sprintf */
+
/*
* Proto types for this file
@@ -141,14 +143,16 @@ rtems_isr external_exception_ISR (
EE_ISR_Type *node;
rtems_unsigned16 value;
char err_msg[100];
+#if (HAS_PMC_PSC8)
rtems_unsigned16 PMC_irq;
rtems_unsigned16 check_irq;
rtems_unsigned16 status_word;
+#endif
index = read_and_clear_irq();
if ( index >= NUM_LIRQ ) {
- sprintf(err_msg,"ERROR:: Invalid interrupt number (%02x)\n", index);
- DEBUG_puts( err_msg);
+ sprintf( err_msg, "ERROR:: Invalid interrupt number (%02x)\n", index );
+ DEBUG_puts( err_msg );
return;
}
diff --git a/c/src/lib/libbsp/powerpc/score603e/tod/tod.c b/c/src/lib/libbsp/powerpc/score603e/tod/tod.c
index e6333e8b6f..6b82e29f11 100644
--- a/c/src/lib/libbsp/powerpc/score603e/tod/tod.c
+++ b/c/src/lib/libbsp/powerpc/score603e/tod/tod.c
@@ -141,7 +141,6 @@ void ICM7170_SetTOD(
rtems_time_of_day *rtc_tod
)
{
- int ticks;
int year;
year = rtc_tod->year;