RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
	of the Configuration Table. Use the RTEMS provided accessor macros to
	obtain configuration fields.
This commit is contained in:
Joel Sherrill
2007-12-11 15:49:53 +00:00
parent cba8eabd23
commit 12bd47efc0
56 changed files with 144 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/i386/i386ex/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

6
c/src/lib/libbsp/i386/i386ex/clock/ckinit.c
View File

@@ -55,7 +55,7 @@ void Clock_isr()
Clock_driver_ticks += 1; Clock_driver_ticks += 1;
if ( Clock_isrs == 1 ) { if ( Clock_isrs == 1 ) {
rtems_clock_tick(); rtems_clock_tick();
Clock_isrs = Clock_initial_isr_value; /* BSP_Configuration.microseconds_per_tick / 1000;*/ Clock_isrs = Clock_initial_isr_value; /* rtems_configuration_get_microseconds_per_tick() / 1000;*/
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;
@@ -96,7 +96,7 @@ rtems_device_driver Clock_initialize(
Clock_isrs = Clock_isrs =
Clock_initial_isr_value = Clock_initial_isr_value =
BSP_Configuration.microseconds_per_tick / 1000; /* ticks per clock_isr */ rtems_configuration_get_microseconds_per_tick() / 1000; /* ticks per clock_isr */
/* /*
* configure the counter timer ( should be based on microsecs/tick ) * configure the counter timer ( should be based on microsecs/tick )
@@ -105,7 +105,7 @@ rtems_device_driver Clock_initialize(
*/ */
ClockOff ( &clockIrqData ); ClockOff ( &clockIrqData );
timer_counter_init_value = BSP_Configuration.microseconds_per_tick / Clock_isrs; timer_counter_init_value = rtems_configuration_get_microseconds_per_tick() / Clock_isrs;
clock_lsb = (unsigned char)timer_counter_init_value; clock_lsb = (unsigned char)timer_counter_init_value;
clock_msb = timer_counter_init_value >> 8; clock_msb = timer_counter_init_value >> 8;

4
c/src/lib/libbsp/i386/i386ex/include/bsp.h
View File

@@ -88,10 +88,6 @@ extern "C" {
* NOTE: Use the standard Clock driver entry * NOTE: Use the standard Clock driver entry
*/ */
/* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
#define IDT_SIZE 256 #define IDT_SIZE 256
#define GDT_SIZE 8192 #define GDT_SIZE 8192

16
c/src/lib/libbsp/i386/i386ex/startup/bspstart.c
View File

@@ -27,14 +27,6 @@ void bsp_clean_up(void);
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
/* /*
* Tells us where to put the workspace in case remote debugger is present. * Tells us where to put the workspace in case remote debugger is present.
*/ */
@@ -72,7 +64,7 @@ void bsp_pretasking_hook(void)
if (heap_start & (CPU_ALIGNMENT-1)) if (heap_start & (CPU_ALIGNMENT-1))
heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
heap_size = BSP_Configuration.work_space_start -(void *) heap_start ; heap_size = Configuration.work_space_start -(void *) heap_start ;
heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */ heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */
heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */ heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */
@@ -93,10 +85,10 @@ void bsp_start( void )
{ {
void rtems_irq_mngt_init(); void rtems_irq_mngt_init();
BSP_Configuration.work_space_start = (void *) Configuration.work_space_start = (void *)
RAM_END - BSP_Configuration.work_space_size; RAM_END - rtems_configuration_get_work_space_size();
#ifdef DEBUG #ifdef DEBUG
printk("workspace size = 0x%x\nstart = 0x%x, RAM_END = 0x%x\n",BSP_Configuration.work_space_size, BSP_Configuration.work_space_start, RAM_END ); printk("workspace size = 0x%x\nstart = 0x%x, RAM_END = 0x%x\n",rtems_configuration_get_work_space_size(), Configuration.work_space_start, RAM_END );
#endif #endif
/* /*

6
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

4
c/src/lib/libbsp/i386/pc386/clock/ckinit.c
View File

@@ -141,10 +141,10 @@ static void clockOn(const rtems_irq_connect_data* unused)
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs_per_tick = 1; Clock_isrs_per_tick = 1;
if (BSP_Configuration.microseconds_per_tick == 0) if (rtems_configuration_get_microseconds_per_tick() == 0)
microseconds_per_isr = 10000; /* default 10 ms */ microseconds_per_isr = 10000; /* default 10 ms */
else else
microseconds_per_isr = BSP_Configuration.microseconds_per_tick; microseconds_per_isr = rtems_configuration_get_microseconds_per_tick();
while (US_TO_TICK(microseconds_per_isr) > 65535) while (US_TO_TICK(microseconds_per_isr) > 65535)
{ {
Clock_isrs_per_tick *= 10; Clock_isrs_per_tick *= 10;

2
c/src/lib/libbsp/i386/pc386/include/bsp.h
View File

@@ -164,8 +164,6 @@ extern int rtems_dec21140_driver_attach(struct rtems_bsdnet_ifconfig *, int);
extern interrupt_gate_descriptor Interrupt_descriptor_table[IDT_SIZE]; extern interrupt_gate_descriptor Interrupt_descriptor_table[IDT_SIZE];
extern segment_descriptors Global_descriptor_table [GDT_SIZE]; extern segment_descriptors Global_descriptor_table [GDT_SIZE];
extern rtems_configuration_table BSP_Configuration;
/* User provided BSP configuration table. */
extern uint32_t rtemsFreeMemStart; extern uint32_t rtemsFreeMemStart;
/* Address of start of free memory - should be used when creating new /* Address of start of free memory - should be used when creating new
partitions or regions and updated afterwards. */ partitions or regions and updated afterwards. */

29
c/src/lib/libbsp/i386/pc386/startup/bspstart.c
View File

@@ -70,13 +70,6 @@ uint32_t rtemsFreeMemStart;
/* Address of start of free memory - should be updated /* Address of start of free memory - should be updated
after creating new partitions or regions. */ after creating new partitions or regions. */
/* The original BSP configuration table from the application and our copy of it
with some changes. */
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname; /* Program name - from main(). */
/*-------------------------------------------------------------------------+ /*-------------------------------------------------------------------------+
| External Prototypes | External Prototypes
@@ -184,8 +177,8 @@ void bsp_start_default( void )
if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */ if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */
rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
BSP_Configuration.work_space_start = (void *)rtemsFreeMemStart; Configuration.work_space_start = (void *)rtemsFreeMemStart;
rtemsFreeMemStart += BSP_Configuration.work_space_size; rtemsFreeMemStart += rtems_configuration_get_work_space_size();
/* /*
* Init rtems interrupt management * Init rtems interrupt management
@@ -204,27 +197,13 @@ void bsp_start_default( void )
printk("PCI bus: could not initialize PCI BIOS interface\n"); printk("PCI bus: could not initialize PCI BIOS interface\n");
} }
/*
* The following information is very useful when debugging.
*/
#if 0 #if 0
printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size );
printk( "maximum_extensions = 0x%x\n", BSP_Configuration.maximum_extensions );
printk( "microseconds_per_tick = 0x%x\n",
BSP_Configuration.microseconds_per_tick );
printk( "ticks_per_timeslice = 0x%x\n",
BSP_Configuration.ticks_per_timeslice );
printk( "number_of_device_drivers = 0x%x\n",
BSP_Configuration.number_of_device_drivers );
printk( "Device_driver_table = 0x%x\n",
BSP_Configuration.Device_driver_table );
printk( "_heap_size = 0x%x\n", _heap_size ); printk( "_heap_size = 0x%x\n", _heap_size );
printk( "_stack_size = 0x%x\n", _stack_size ); printk( "_stack_size = 0x%x\n", _stack_size );
printk( "rtemsFreeMemStart = 0x%x\n", rtemsFreeMemStart ); printk( "rtemsFreeMemStart = 0x%x\n", rtemsFreeMemStart );
printk( "work_space_start = 0x%x\n", BSP_Configuration.work_space_start ); printk( "work_space_start = 0x%x\n", rtems_configuration_get_work_space_start() );
printk( "work_space_size = 0x%x\n", BSP_Configuration.work_space_size ); printk( "work_space_size = 0x%x\n", rtems_configuration_get_work_space_size() );
#endif #endif
} /* bsp_start */ } /* bsp_start */

6
c/src/lib/libbsp/i386/ts_386ex/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

6
c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c
View File

@@ -50,7 +50,7 @@ void Clock_isr()
Clock_driver_ticks += 1; Clock_driver_ticks += 1;
if ( Clock_isrs == 1 ) { if ( Clock_isrs == 1 ) {
rtems_clock_tick(); rtems_clock_tick();
Clock_isrs = Clock_initial_isr_value; /* BSP_Configuration.microseconds_per_tick / 1000;*/ Clock_isrs = Clock_initial_isr_value; /* rtems_configuration_get_microseconds_per_tick() / 1000;*/
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;
@@ -114,7 +114,7 @@ rtems_device_driver Clock_initialize(
Clock_isrs = Clock_isrs =
Clock_initial_isr_value = Clock_initial_isr_value =
BSP_Configuration.microseconds_per_tick / 1000; /* ticks per clock_isr */ rtems_configuration_get_microseconds_per_tick() / 1000; /* ticks per clock_isr */
/* /*
* configure the counter timer ( should be based on microsecs/tick ) * configure the counter timer ( should be based on microsecs/tick )
@@ -123,7 +123,7 @@ rtems_device_driver Clock_initialize(
*/ */
ClockOff ( &clockIrqData ); ClockOff ( &clockIrqData );
timer_counter_init_value = BSP_Configuration.microseconds_per_tick / Clock_isrs; timer_counter_init_value = rtems_configuration_get_microseconds_per_tick() / Clock_isrs;
clock_lsb = (unsigned char)timer_counter_init_value; clock_lsb = (unsigned char)timer_counter_init_value;
clock_msb = timer_counter_init_value >> 8; clock_msb = timer_counter_init_value >> 8;

2
c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
View File

@@ -132,8 +132,6 @@ extern void Wait_X_ms (unsigned);
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
#define IDT_SIZE 256 #define IDT_SIZE 256
#define GDT_SIZE 3 #define GDT_SIZE 3

28
c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c
View File

@@ -26,14 +26,6 @@ void bsp_clean_up(void);
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
/* /*
* Tells us where to put the workspace in case remote debugger is present. * Tells us where to put the workspace in case remote debugger is present.
*/ */
@@ -71,7 +63,7 @@ void bsp_pretasking_hook(void)
if (heap_start & (CPU_ALIGNMENT-1)) if (heap_start & (CPU_ALIGNMENT-1))
heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
heap_size = BSP_Configuration.work_space_start -(void *) heap_start ; heap_size = Configuration.work_space_start -(void *) heap_start ;
heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */ heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */
bsp_libc_init((void *) heap_start, heap_size, 0); bsp_libc_init((void *) heap_start, heap_size, 0);
@@ -91,8 +83,8 @@ void bsp_start( void )
{ {
void rtems_irq_mngt_init(); void rtems_irq_mngt_init();
BSP_Configuration.work_space_start = (void *) Configuration.work_space_start = (void *)
RAM_END - BSP_Configuration.work_space_size; RAM_END - rtems_configuration_get_work_space_size();
/* /*
* Init rtems_interrupt_management * Init rtems_interrupt_management
@@ -111,19 +103,13 @@ void bsp_start( void )
#ifdef BSP_DEBUG #ifdef BSP_DEBUG
printk( "RAM_START = 0x%x\nRAM_END = 0x%x\n", RAM_START, RAM_END ); printk( "RAM_START = 0x%x\nRAM_END = 0x%x\n", RAM_START, RAM_END );
printk( "work_space_start = 0x%x\n", printk( "work_space_start = 0x%x\n",
BSP_Configuration.work_space_start ); Configuration.work_space_start );
printk( "work_space_size = 0x%x\n", printk( "work_space_size = 0x%x\n",
BSP_Configuration.work_space_size ); rtems_configuration_get_work_space_size() );
printk( "maximum_extensions = 0x%x\n",
BSP_Configuration.maximum_extensions );
printk( "microseconds_per_tick = 0x%x\n", printk( "microseconds_per_tick = 0x%x\n",
BSP_Configuration.microseconds_per_tick ); rtems_configuration_get_microseconds_per_tick() );
printk( "ticks_per_timeslice = 0x%x\n", printk( "ticks_per_timeslice = 0x%x\n",
BSP_Configuration.ticks_per_timeslice ); rtems_configuration_get_ticks_per_timeslice() );
printk( "number_of_device_drivers = 0x%x\n",
BSP_Configuration.number_of_device_drivers );
printk( "Device_driver_table = 0x%x\n",
BSP_Configuration.Device_driver_table );
/* printk( "_heap_size = 0x%x\n", _heap_size ); /* printk( "_heap_size = 0x%x\n", _heap_size );
printk( "_stack_size = 0x%x\n", _stack_size ); */ printk( "_stack_size = 0x%x\n", _stack_size ); */

6
c/src/lib/libbsp/m68k/gen68340/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

2
c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
View File

@@ -108,7 +108,7 @@ Install_clock (rtems_isr_entry clock_isr)
/* sets the PITR count value */ /* sets the PITR count value */
/* this assumes a 32.765 kHz crystal */ /* this assumes a 32.765 kHz crystal */
usecs_per_tick = BSP_Configuration.microseconds_per_tick; usecs_per_tick = rtems_configuration_get_microseconds_per_tick();
/* find out whether prescaler should be enabled or not */ /* find out whether prescaler should be enabled or not */
if ( usecs_per_tick <= 31128 ) { if ( usecs_per_tick <= 31128 ) {
pitr_tmp = ( usecs_per_tick * 8192 ) / 1000000 ; pitr_tmp = ( usecs_per_tick * 8192 ) / 1000000 ;

8
c/src/lib/libbsp/m68k/gen68340/include/bsp.h
View File

@@ -63,16 +63,8 @@ extern "C" {
* NOTE: Use the standard Clock driver entry * NOTE: Use the standard Clock driver entry
*/ */
/*
* How many libio files we want
*/
#define BSP_LIBIO_MAX_FDS 20
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern m68k_isr_entry M68Kvec[]; /* vector table address */
/* functions */ /* functions */

12
c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c
View File

@@ -25,16 +25,6 @@
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* Initialize whatever libc we are using /* Initialize whatever libc we are using
* called from postdriver hook * called from postdriver hook
*/ */
@@ -71,5 +61,5 @@ void bsp_start( void )
* not malloc'ed. It is just "pulled from the air". * not malloc'ed. It is just "pulled from the air".
*/ */
BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; Configuration.work_space_start = (void *)&_WorkspaceBase;
} }

6
c/src/lib/libbsp/m68k/idp/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

2
c/src/lib/libbsp/m68k/idp/clock/ckinit.c
View File

@@ -77,7 +77,7 @@ rtems_isr Clock_isr(
libgcc.a for gcc with software floating point support, this is not libgcc.a for gcc with software floating point support, this is not
a problem */ a problem */
Clock_isrs = Clock_isrs =
(int)(BSP_Configuration.microseconds_per_tick / 1000); (int)(rtems_configuration_get_microseconds_per_tick() / 1000);
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;

2
c/src/lib/libbsp/m68k/idp/include/bsp.h
View File

@@ -45,8 +45,6 @@
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern m68k_isr_entry M68Kvec[]; /* vector table address */
/* functions */ /* functions */

12
c/src/lib/libbsp/m68k/idp/startup/bspstart.c
View File

@@ -27,16 +27,6 @@ extern struct duart_regs duart_info;
void led_putnum(); void led_putnum();
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -89,7 +79,7 @@ void bsp_start( void )
rtems_cache_enable_instruction(); rtems_cache_enable_instruction();
rtems_cache_enable_data(); rtems_cache_enable_data();
BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; Configuration.work_space_start = (void *) &_WorkspaceBase;
/* led_putnum('e'); * for debugging purposes only */ /* led_putnum('e'); * for debugging purposes only */

6
c/src/lib/libbsp/m68k/mrm332/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

4
c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c
View File

@@ -44,7 +44,7 @@ rtems_isr Clock_isr(rtems_vector_number vector)
if ( Clock_isrs == 1 ) { if ( Clock_isrs == 1 ) {
rtems_clock_tick(); rtems_clock_tick();
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;
@@ -55,7 +55,7 @@ void Install_clock(
) )
{ {
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );

3
c/src/lib/libbsp/m68k/mrm332/include/bsp.h
View File

@@ -91,12 +91,9 @@ extern char _copy_data_from_rom[];
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern m68k_isr_entry M68Kvec[]; /* vector table address */
extern int stack_size; extern int stack_size;
extern int stack_start; extern int stack_start;
/* /*

11
c/src/lib/libbsp/m68k/mrm332/startup/bspstart.c
View File

@@ -19,15 +19,6 @@
#include <string.h> #include <string.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -65,5 +56,5 @@ void bsp_start( void )
m68k_get_vbr( vbr ); m68k_get_vbr( vbr );
BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; Configuration.work_space_start = (void *) &_WorkspaceBase;
} }

6
c/src/lib/libbsp/m68k/mvme136/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

4
c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
View File

@@ -66,7 +66,7 @@ rtems_isr Clock_isr(
if ( Clock_isrs == 1 ) { if ( Clock_isrs == 1 ) {
rtems_clock_tick(); rtems_clock_tick();
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;
@@ -79,7 +79,7 @@ void Install_clock(
volatile struct z8036_map *timer; volatile struct z8036_map *timer;
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
timer = (struct z8036_map *) 0xfffb0000; timer = (struct z8036_map *) 0xfffb0000;

2
c/src/lib/libbsp/m68k/mvme136/include/bsp.h
View File

@@ -90,8 +90,6 @@ struct w_m681_info {
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
/* M68681 DUART chip register variables */ /* M68681 DUART chip register variables */
EXTERN volatile struct r_m681_info *_Read_m681; /* M68681 read registers */ EXTERN volatile struct r_m681_info *_Read_m681; /* M68681 read registers */

11
c/src/lib/libbsp/m68k/mvme136/startup/bspstart.c
View File

@@ -21,15 +21,6 @@
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
#include <rtems/zilog/z8036.h> #include <rtems/zilog/z8036.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -71,5 +62,5 @@ void bsp_start( void )
rtems_cache_enable_instruction(); rtems_cache_enable_instruction();
BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; Configuration.work_space_start = (void *) &_WorkspaceBase;
} }

6
c/src/lib/libbsp/m68k/mvme147/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

4
c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
View File

@@ -54,7 +54,7 @@ rtems_isr Clock_isr(rtems_vector_number vector)
if (Clock_isrs == 1) { if (Clock_isrs == 1) {
rtems_clock_tick(); rtems_clock_tick();
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;
@@ -64,7 +64,7 @@ void Install_clock(rtems_isr_entry clock_isr )
{ {
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
Old_ticker = (rtems_isr_entry) set_vector( clock_isr, TIMER_2_VECTOR, 1 ); Old_ticker = (rtems_isr_entry) set_vector( clock_isr, TIMER_2_VECTOR, 1 );

2
c/src/lib/libbsp/m68k/mvme147/include/bsp.h
View File

@@ -116,8 +116,6 @@ struct pcc_map {
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern m68k_isr_entry M68Kvec[]; /* vector table address */
/* /*

11
c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
View File

@@ -24,15 +24,6 @@
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -79,5 +70,5 @@ void bsp_start( void )
rtems_cache_enable_instruction(); rtems_cache_enable_instruction();
rtems_cache_enable_data(); rtems_cache_enable_data();
BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; Configuration.work_space_start = (void *) &_WorkspaceBase;
} }

6
c/src/lib/libbsp/m68k/mvme162/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

4
c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
View File

@@ -58,7 +58,7 @@ rtems_isr Clock_isr(rtems_vector_number vector)
if ( Clock_isrs == 1 ) { if ( Clock_isrs == 1 ) {
rtems_clock_tick(); rtems_clock_tick();
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;
@@ -68,7 +68,7 @@ void Install_clock(rtems_isr_entry clock_isr )
{ {
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
lcsr->vector_base |= MASK_INT; /* unmask VMEchip2 interrupts */ lcsr->vector_base |= MASK_INT; /* unmask VMEchip2 interrupts */

2
c/src/lib/libbsp/m68k/mvme162/include/bsp.h
View File

@@ -177,8 +177,6 @@ typedef volatile struct {
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern m68k_isr_entry M68Kvec[]; /* vector table address */
/* functions */ /* functions */

11
c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
View File

@@ -28,15 +28,6 @@
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
#include <page_table.h> #include <page_table.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -95,5 +86,5 @@ void bsp_start( void )
page_table_init(); page_table_init();
BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; Configuration.work_space_start = (void *) &_WorkspaceBase;
} }

6
c/src/lib/libbsp/m68k/mvme167/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

4
c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
View File

@@ -101,7 +101,7 @@ rtems_isr VMEchip2_T2_isr(
long i; long i;
long ct; /* Number of T2 ticks per RTEMS ticks */ long ct; /* Number of T2 ticks per RTEMS ticks */
ct = BSP_Configuration.microseconds_per_tick / 1000; ct = rtems_configuration_get_microseconds_per_tick() / 1000;
/* /*
* May have missed interrupts, so should look at the overflow counter. * May have missed interrupts, so should look at the overflow counter.
@@ -149,7 +149,7 @@ rtems_isr VMEchip2_T2_isr(
void VMEchip2_T2_initialize( void ) void VMEchip2_T2_initialize( void )
{ {
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
lcsr->intr_ena &= 0xFDFFFFFF; /* Disable tick timer 2 interrupt */ lcsr->intr_ena &= 0xFDFFFFFF; /* Disable tick timer 2 interrupt */
lcsr->intr_clear = 0x02000000; /* Clear tick timer 2 interrupt */ lcsr->intr_clear = 0x02000000; /* Clear tick timer 2 interrupt */

8
c/src/lib/libbsp/m68k/mvme167/include/bsp.h
View File

@@ -332,16 +332,8 @@ m68k_isr_entry set_vector(
* NOTE: Use the standard Clock driver entry * NOTE: Use the standard Clock driver entry
*/ */
/*
* How many libio files we want
*/
#define BSP_LIBIO_MAX_FDS 20
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern m68k_isr_entry M68Kvec[]; /* vector table address */
#ifdef __cplusplus #ifdef __cplusplus

16
c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
View File

@@ -26,15 +26,9 @@
#include <page_table.h> #include <page_table.h>
#include <fatal.h> #include <fatal.h>
/* /* XXX If RTEMS let the BSP replace the default fatal error handler... */
* The original table from the application (in ROM) and our copy of it with
* some changes. Configuration is defined in <confdefs.h>. Make sure that
* our configuration tables are uninitialized so that they get allocated in
* the .bss section (RAM).
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
rtems_extensions_table user_extension_table; rtems_extensions_table user_extension_table;
/* /*
* Use the shared implementations of the following routines. * Use the shared implementations of the following routines.
* Look in rtems/c/src/lib/libbsp/shared/bsppost.c and * Look in rtems/c/src/lib/libbsp/shared/bsppost.c and
@@ -127,9 +121,9 @@ void bsp_start( void )
* supply one with our own fatal error handler that returns control to * supply one with our own fatal error handler that returns control to
* 167Bug. * 167Bug.
*/ */
if ( BSP_Configuration.User_extension_table == NULL ) { if ( Configuration.User_extension_table == NULL ) {
user_extension_table.fatal = bsp_fatal_error_occurred; user_extension_table.fatal = bsp_fatal_error_occurred;
BSP_Configuration.User_extension_table = &user_extension_table; Configuration.User_extension_table = &user_extension_table;
} }
/* /*
@@ -137,5 +131,5 @@ void bsp_start( void )
* tell the RTEMS configuration where it is. This memory is * tell the RTEMS configuration where it is. This memory is
* not malloc'ed. It is just "pulled from the air". * not malloc'ed. It is just "pulled from the air".
*/ */
BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; Configuration.work_space_start = (void *)&_WorkspaceBase;
} }

6
c/src/lib/libbsp/m68k/ods68302/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

4
c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c
View File

@@ -73,7 +73,7 @@ rtems_isr Clock_isr(
if ( Clock_isrs == 1 ) { if ( Clock_isrs == 1 ) {
rtems_clock_tick(); rtems_clock_tick();
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
} }
else else
Clock_isrs -= 1; Clock_isrs -= 1;
@@ -85,7 +85,7 @@ void Install_clock(
{ {
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
set_vector( clock_isr, CLOCK_VECTOR, 1 ); set_vector( clock_isr, CLOCK_VECTOR, 1 );

2
c/src/lib/libbsp/m68k/ods68302/include/bsp.h
View File

@@ -83,8 +83,6 @@ extern "C" {
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern m68k_isr_entry M68Kvec[]; /* vector table address */ extern m68k_isr_entry M68Kvec[]; /* vector table address */
/* functions */ /* functions */

12
c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c
View File

@@ -20,16 +20,6 @@
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
rtems_interrupt_level bsp_isr_level;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -58,5 +48,5 @@ void bsp_start( void )
* not malloc'ed. It is just "pulled from the air". * not malloc'ed. It is just "pulled from the air".
*/ */
BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; Configuration.work_space_start = (void *) &_WorkspaceBase;
} }

6
c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

2
c/src/lib/libbsp/no_cpu/no_bsp/clock/ckinit.c
View File

@@ -94,7 +94,7 @@ void Install_clock(
*/ */
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000;
Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
/* /*

4
c/src/lib/libbsp/no_cpu/no_bsp/include/bsp.h
View File

@@ -41,10 +41,6 @@ extern "C" {
#define RAM_START 0 #define RAM_START 0
#define RAM_END 0x100000 #define RAM_END 0x100000
/* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
/* /*
* Device Driver Table Entries * Device Driver Table Entries
*/ */

11
c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
View File

@@ -20,15 +20,6 @@
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -88,5 +79,5 @@ void bsp_start( void )
* not malloc'ed. It is just "pulled from the air". * not malloc'ed. It is just "pulled from the air".
*/ */
BSP_Configuration.work_space_start = (void *) 0; Configuration.work_space_start = (void *) 0;
} }

6
c/src/lib/libbsp/sh/simsh4/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field

6
c/src/lib/libbsp/sh/simsh4/clock/ckinit.c
View File

@@ -77,7 +77,7 @@ Clock_isr (rtems_vector_number vector)
void void
Clock_exit(void) Clock_exit(void)
{ {
if (BSP_Configuration.ticks_per_timeslice) if (rtems_configuration_get_ticks_per_timeslice())
{ {
/* disable all timer1 interrupts */ /* disable all timer1 interrupts */
set_clock_period(0); set_clock_period(0);
@@ -100,9 +100,9 @@ Install_clock(rtems_isr_entry clock_isr)
uint32_t period; uint32_t period;
Clock_driver_ticks = 0; Clock_driver_ticks = 0;
if (BSP_Configuration.ticks_per_timeslice) { if (rtems_configuration_get_ticks_per_timeslice()) {
rtems_isr_entry old_isr; rtems_isr_entry old_isr;
period = bsp_clicks_per_second / BSP_Configuration.ticks_per_timeslice; period = bsp_clicks_per_second / rtems_configuration_get_ticks_per_timeslice();
/* Configure timer interrupts */ /* Configure timer interrupts */
set_clock_period(period); set_clock_period(period);

1
c/src/lib/libbsp/sh/simsh4/include/bsp.h
View File

@@ -87,7 +87,6 @@ extern void *CPU_Interrupt_stack_high ;
/* miscellaneous stuff assumed to exist */ /* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
extern void bsp_cleanup( void ); extern void bsp_cleanup( void );
/* /*

13
c/src/lib/libbsp/sh/simsh4/startup/bspstart.c
View File

@@ -36,17 +36,8 @@
*/ */
uint32_t bsp_clicks_per_second; uint32_t bsp_clicks_per_second;
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern void bsp_hw_init(void); extern void bsp_hw_init(void);
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
char *rtems_progname;
/* /*
* Use the shared implementations of the following routines * Use the shared implementations of the following routines
*/ */
@@ -111,8 +102,8 @@ void bsp_start(void)
* not malloc'ed. It is just "pulled from the air". * not malloc'ed. It is just "pulled from the air".
*/ */
BSP_Configuration.work_space_start = (void *) &WorkSpaceStart ; Configuration.work_space_start = (void *) &WorkSpaceStart ;
BSP_Configuration.work_space_size = rtems_configuration_get_work_space_size() =
(uint32_t) &WorkSpaceEnd - (uint32_t) &WorkSpaceEnd -
(uint32_t) &WorkSpaceStart ; (uint32_t) &WorkSpaceStart ;

6
c/src/lib/libbsp/sparc/leon3/ChangeLog
View File

@@ -1,3 +1,9 @@
2007-12-11 Joel Sherrill <joel.sherrill@OARcorp.com>
* clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies
of the Configuration Table. Use the RTEMS provided accessor macros to
obtain configuration fields.
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* amba/amba.c, clock/ckinit.c, console/console.c, include/bsp.h, * amba/amba.c, clock/ckinit.c, console/console.c, include/bsp.h,

4
c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
View File

@@ -31,8 +31,6 @@
* The Real Time Clock Counter Timer uses this trap type. * The Real Time Clock Counter Timer uses this trap type.
*/ */
extern rtems_configuration_table Configuration;
#if defined(RTEMS_MULTIPROCESSING) #if defined(RTEMS_MULTIPROCESSING)
#define LEON3_CLOCK_INDEX \ #define LEON3_CLOCK_INDEX \
(rtems_configuration_get_user_multiprocessing_table() ? LEON3_Cpu_Index : 0) (rtems_configuration_get_user_multiprocessing_table() ? LEON3_Cpu_Index : 0)
@@ -83,7 +81,7 @@ static int clkirq;
#define Clock_driver_support_initialize_hardware() \ #define Clock_driver_support_initialize_hardware() \
do { \ do { \
LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].reload = \ LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].reload = \
BSP_Configuration.microseconds_per_tick - 1; \ rtems_configuration_get_microseconds_per_tick() - 1; \
\ \
LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].conf = \ LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].conf = \
LEON3_GPTIMER_EN | LEON3_GPTIMER_RL | \ LEON3_GPTIMER_EN | LEON3_GPTIMER_RL | \

2
c/src/lib/libbsp/sparc/leon3/include/bsp.h
View File

@@ -119,8 +119,6 @@ void BSP_fatal_return( void );
void bsp_spurious_initialize( void ); void bsp_spurious_initialize( void );
extern rtems_configuration_table BSP_Configuration; /* owned by BSP */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

16
c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
View File

@@ -26,24 +26,14 @@
#include <bsp.h> #include <bsp.h>
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
/*
* The original table from the application and our copy of it with
* some changes.
*/
extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration;
/* /*
* Tells us where to put the workspace in case remote debugger is present. * Tells us where to put the workspace in case remote debugger is present.
*/ */
extern uint32_t rdb_start; extern uint32_t rdb_start;
/* /*
* Tells us if data cache snooping is available * Tells us if data cache snooping is available
*/ */
int CPU_SPARC_HAS_SNOOPING; int CPU_SPARC_HAS_SNOOPING;
void bsp_postdriver_hook(void); void bsp_postdriver_hook(void);
@@ -86,7 +76,7 @@ void bsp_pretasking_hook(void)
if (heap_start & (CPU_ALIGNMENT-1)) if (heap_start & (CPU_ALIGNMENT-1))
heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
heap_size = BSP_Configuration.work_space_start - (void *)&end - STACK_SIZE; heap_size = Configuration.work_space_start - (void *)&end - STACK_SIZE;
heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */ heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */
bsp_libc_init((void *) heap_start, heap_size, 0); bsp_libc_init((void *) heap_start, heap_size, 0);
@@ -111,14 +101,14 @@ void bsp_start( void )
unsigned char *work_space_start; unsigned char *work_space_start;
work_space_start = work_space_start =
(unsigned char *)rdb_start - BSP_Configuration.work_space_size; (unsigned char *)rdb_start - rtems_configuration_get_work_space_size();
if ( work_space_start <= (unsigned char *)&end ) { if ( work_space_start <= (unsigned char *)&end ) {
printk( "bspstart: Not enough RAM!!!\n" ); printk( "bspstart: Not enough RAM!!!\n" );
BSP_fatal_return(); BSP_fatal_return();
} }
BSP_Configuration.work_space_start = work_space_start; Configuration.work_space_start = work_space_start;
CPU_SPARC_HAS_SNOOPING = set_snooping(); CPU_SPARC_HAS_SNOOPING = set_snooping();
} }