From 5797b67d2dd448f78f899ef26b1c41788ecc5516 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 1 Aug 2007 21:51:23 +0000 Subject: [PATCH] 2007-08-01 Joel Sherrill * Makefile.am, startup/bspstart.c: Use shared ShowBATS() method. --- c/src/lib/libbsp/powerpc/ep1a/ChangeLog | 4 ++++ c/src/lib/libbsp/powerpc/ep1a/Makefile.am | 3 ++- .../libbsp/powerpc/ep1a/startup/bspstart.c | 24 ++----------------- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog index 65329356c3..cc86ddabb7 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ep1a/ChangeLog @@ -1,3 +1,7 @@ +2007-08-01 Joel Sherrill + + * Makefile.am, startup/bspstart.c: Use shared ShowBATS() method. + 2007-07-10 Thomas Doerfler * irq/irq_init.c: adapted to shared exception code diff --git a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am index 91fb2f6d59..5652cd0286 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ep1a/Makefile.am @@ -29,7 +29,8 @@ startup_rel_SOURCES = startup/bspstart.c ../../shared/bootcard.c \ ../../powerpc/shared/startup/sbrk.c ../../shared/bspclean.c \ ../../shared/gnatinstallhandler.c \ ../../powerpc/shared/startup/pgtbl_setup.c \ - ../../powerpc/shared/startup/pgtbl_activate.c + ../../powerpc/shared/startup/pgtbl_activate.c \ + ../../powerpc/shared/showbats.c startup_rel_CPPFLAGS = $(AM_CPPFLAGS) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c index e08f688395..de1f3ec8c6 100644 --- a/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c @@ -40,34 +40,14 @@ extern void bsp_cleanup(void); extern Triv121PgTbl BSP_pgtbl_setup(); extern void BSP_pgtbl_activate(); extern void BSP_vme_config(); +extern void ShowBATS(); unsigned int rsPMCQ1Init(); SPR_RW(SPRG0) SPR_RW(SPRG1) -void ShowBATS(){ - uint32_t lower; - uint32_t upper; - - __MFSPR(536, upper); - __MFSPR(537, lower); - printk("BAT0 %08x %08x\n", upper, lower ); - - __MFSPR(538, upper); - __MFSPR(539, lower); - printk("BAT1 %08x %08x\n", upper, lower ); - - __MFSPR(540, upper); - __MFSPR(541, lower); - printk("BAT2 %08x %08x\n", upper, lower ); - - __MFSPR(542, upper); - __MFSPR(543, lower); - printk("BAT3 %08x %08x\n", upper, lower ); - -} - uint8_t LightIdx = 0; + void BSP_Increment_Light(){ uint8_t data; data = *GENERAL_REGISTER1;