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

Update for status-checks.h changes.

Browse Source
This commit is contained in:
Thomas Doerfler
2008-10-10 15:46:32 +00:00
parent 9a9f662f33
commit 74954943d2
6 changed files with 100 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/powerpc/ChangeLog
View File

@@ -1,3 +1,7 @@
2008-10-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/clock/clock.c: Update for status-checks.h changes.
2008-10-02 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-10-02 Joel Sherrill <joel.sherrill@oarcorp.com>
* shared/startup/bspgetworkarea.c: Change size_t to ssize_t on * shared/startup/bspgetworkarea.c: Change size_t to ssize_t on

5
c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-10-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
* startup/bspstart.c, startup/sd-card-init.c, tests/tests.c: Update for
status-checks.h changes.
2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com> 2008-10-02 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, preinstall.am: Use shared tm27.h stub. * Makefile.am, preinstall.am: Use shared tm27.h stub.

26
c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
View File

@@ -36,7 +36,7 @@
#include <rtems/status-checks.h> #include <rtems/status-checks.h>
#define DEBUG_DONE() DEBUG_PRINT( "Done\n") #define DEBUG_DONE() RTEMS_DEBUG_PRINT( "Done\n")
#define MPC55XX_INTERRUPT_STACK_SIZE 0x1000 #define MPC55XX_INTERRUPT_STACK_SIZE 0x1000
@@ -81,7 +81,7 @@ void bsp_predriver_hook()
{ {
rtems_status_code sc = RTEMS_SUCCESSFUL; rtems_status_code sc = RTEMS_SUCCESSFUL;
DEBUG_PRINT( "Initialize eDMA ...\n"); RTEMS_DEBUG_PRINT( "Initialize eDMA ...\n");
sc = mpc55xx_edma_init(); sc = mpc55xx_edma_init();
if (sc != RTEMS_SUCCESSFUL) { if (sc != RTEMS_SUCCESSFUL) {
BSP_panic( "Cannot initialize eDMA"); BSP_panic( "Cannot initialize eDMA");
@@ -157,15 +157,15 @@ void bsp_start(void)
SIU.PCR [89].R = 0x400; SIU.PCR [89].R = 0x400;
SIU.PCR [90].R = 0x400; SIU.PCR [90].R = 0x400;
DEBUG_PRINT( "BSP start ...\n"); RTEMS_DEBUG_PRINT( "BSP start ...\n");
DEBUG_PRINT( "System clock : %i\n", mpc55xx_get_system_clock()); RTEMS_DEBUG_PRINT( "System clock : %i\n", mpc55xx_get_system_clock());
DEBUG_PRINT( "Memory start : 0x%08x\n", bsp_ram_start); RTEMS_DEBUG_PRINT( "Memory start : 0x%08x\n", bsp_ram_start);
DEBUG_PRINT( "Memory end : 0x%08x\n", bsp_ram_end); RTEMS_DEBUG_PRINT( "Memory end : 0x%08x\n", bsp_ram_end);
DEBUG_PRINT( "Memory size : 0x%08x\n", bsp_ram_end - bsp_ram_start); RTEMS_DEBUG_PRINT( "Memory size : 0x%08x\n", bsp_ram_end - bsp_ram_start);
DEBUG_PRINT( "Interrupt stack start : 0x%08x\n", interrupt_stack_start); RTEMS_DEBUG_PRINT( "Interrupt stack start : 0x%08x\n", interrupt_stack_start);
DEBUG_PRINT( "Interrupt stack end : 0x%08x\n", interrupt_stack_start + interrupt_stack_size); RTEMS_DEBUG_PRINT( "Interrupt stack end : 0x%08x\n", interrupt_stack_start + interrupt_stack_size);
DEBUG_PRINT( "Interrupt stack size : 0x%08x\n", interrupt_stack_size); RTEMS_DEBUG_PRINT( "Interrupt stack size : 0x%08x\n", interrupt_stack_size);
/* /*
* Get CPU identification dynamically. Note that the get_ppc_cpu_type() * Get CPU identification dynamically. Note that the get_ppc_cpu_type()
@@ -182,7 +182,7 @@ void bsp_start(void)
mpc55xx_ebi_init(); mpc55xx_ebi_init();
/* Initialize exceptions */ /* Initialize exceptions */
DEBUG_PRINT( "Initialize exceptions ...\n"); RTEMS_DEBUG_PRINT( "Initialize exceptions ...\n");
ppc_exc_initialize( ppc_exc_initialize(
PPC_INTERRUPT_DISABLE_MASK_DEFAULT, PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
interrupt_stack_start, interrupt_stack_start,
@@ -191,14 +191,14 @@ void bsp_start(void)
DEBUG_DONE(); DEBUG_DONE();
/* Initialize interrupts */ /* Initialize interrupts */
DEBUG_PRINT( "Initialize interrupts ...\n"); RTEMS_DEBUG_PRINT( "Initialize interrupts ...\n");
if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) { if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) {
BSP_panic( "Cannot initialize interrupts"); BSP_panic( "Cannot initialize interrupts");
} else { } else {
DEBUG_DONE(); DEBUG_DONE();
} }
DEBUG_PRINT( "BSP start done\n"); RTEMS_DEBUG_PRINT( "BSP start done\n");
return; return;

16
c/src/lib/libbsp/powerpc/mpc55xxevb/startup/sd-card-init.c
View File

@@ -40,7 +40,7 @@ static rtems_status_code mpc55xx_dspi_init(void)
union SIU_PCR_tag pcr = MPC55XX_ZERO_FLAGS; union SIU_PCR_tag pcr = MPC55XX_ZERO_FLAGS;
rv = rtems_libi2c_initialize(); rv = rtems_libi2c_initialize();
CHECK_RVSC( rv, "rtems_libi2c_initialize"); RTEMS_CHECK_RV_SC( rv, "rtems_libi2c_initialize");
/* DSPI D inputs are taken from DSPI C */ /* DSPI D inputs are taken from DSPI C */
SIU.DISR.R = 0x000000FC; SIU.DISR.R = 0x000000FC;
@@ -82,7 +82,7 @@ static rtems_status_code mpc55xx_dspi_init(void)
for (i = 0; i < MPC55XX_DSPI_NUMBER; ++i) { for (i = 0; i < MPC55XX_DSPI_NUMBER; ++i) {
device_name [8] = (char) ('0' + i); device_name [8] = (char) ('0' + i);
rv = rtems_libi2c_register_bus( device_name, (rtems_libi2c_bus_t *) &mpc55xx_dspi_bus_table [i]); rv = rtems_libi2c_register_bus( device_name, (rtems_libi2c_bus_t *) &mpc55xx_dspi_bus_table [i]);
CHECK_RVSC( rv, device_name); RTEMS_CHECK_RV_SC( rv, device_name);
} }
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
@@ -148,22 +148,22 @@ rtems_status_code mpc55xx_sd_card_init(void)
int rv = 0; int rv = 0;
sd_card_driver_entry *e = &sd_card_driver_table [0]; sd_card_driver_entry *e = &sd_card_driver_table [0];
DEBUG_PRINT( "Task started\n"); RTEMS_DEBUG_PRINT( "Task started\n");
sc = mpc55xx_dspi_init(); sc = mpc55xx_dspi_init();
CHECK_SC( rv, "Intitalize DSPI bus"); RTEMS_CHECK_SC( rv, "Intitalize DSPI bus");
rv = rtems_libi2c_register_drv( e->device_name, (rtems_libi2c_drv_t *) e, mpc55xx_dspi_bus_table [0].bus_number, 0); rv = rtems_libi2c_register_drv( e->device_name, (rtems_libi2c_drv_t *) e, mpc55xx_dspi_bus_table [0].bus_number, 0);
CHECK_RVSC( rv, "Register SD Card driver"); RTEMS_CHECK_RV_SC( rv, "Register SD Card driver");
sc = rtems_ide_part_table_initialize( MPC55XX_DEVICE_FILE); sc = rtems_ide_part_table_initialize( MPC55XX_DEVICE_FILE);
CHECK_SC( sc, "Initialize IDE partition table"); RTEMS_CHECK_SC( sc, "Initialize IDE partition table");
rv = mkdir( MPC55XX_MOUNT_POINT, S_IRWXU); rv = mkdir( MPC55XX_MOUNT_POINT, S_IRWXU);
CHECK_RVSC( rv, "Create mount point"); RTEMS_CHECK_RV_SC( rv, "Create mount point");
rv = rtems_fsmount( mpc55xx_fs_table, sizeof( mpc55xx_fs_table) / sizeof( mpc55xx_fs_table [0]), NULL); rv = rtems_fsmount( mpc55xx_fs_table, sizeof( mpc55xx_fs_table) / sizeof( mpc55xx_fs_table [0]), NULL);
CHECK_RVSC( rv, "Mount file systems"); RTEMS_CHECK_RV_SC( rv, "Mount file systems");
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }

138
c/src/lib/libbsp/powerpc/mpc55xxevb/tests/tests.c
View File

@@ -84,19 +84,19 @@ static rtems_task test_mpc55xx_dspi_writer( rtems_task_argument arg)
rtems_libi2c_read_write_t read_and_write = { rd_buf : NULL, wr_buf : NULL, byte_cnt : 0 }; rtems_libi2c_read_write_t read_and_write = { rd_buf : NULL, wr_buf : NULL, byte_cnt : 0 };
int i = 0; int i = 0;
DEBUG_PRINT( "Task started\n"); RTEMS_DEBUG_PRINT( "Task started\n");
device = rtems_libi2c_register_drv( NULL, &test_mpc55xx_dspi_drv, test_mpc55xx_dspi_bus [2], 0); device = rtems_libi2c_register_drv( NULL, &test_mpc55xx_dspi_drv, test_mpc55xx_dspi_bus [2], 0);
CHECK_RV_TASK( device, "rtems_libi2c_register_drv"); RTEMS_CHECK_RV_TASK( device, "rtems_libi2c_register_drv");
sc = rtems_libi2c_send_start( device); sc = rtems_libi2c_send_start( device);
CHECK_SC_TASK( sc, "rtems_libi2c_send_start"); RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_start");
rv = rtems_libi2c_ioctl( device, RTEMS_LIBI2C_IOCTL_SET_TFRMODE, &test_mpc55xx_dspi_transfer_mode); rv = rtems_libi2c_ioctl( device, RTEMS_LIBI2C_IOCTL_SET_TFRMODE, &test_mpc55xx_dspi_transfer_mode);
CHECK_RV_TASK( rv, "rtems_libi2c_ioctl"); RTEMS_CHECK_RV_TASK( rv, "rtems_libi2c_ioctl");
sc = rtems_libi2c_send_addr( device, MPC55XX_TEST_DSPI_ADDRESS); sc = rtems_libi2c_send_addr( device, MPC55XX_TEST_DSPI_ADDRESS);
CHECK_SC_TASK( sc, "rtems_libi2c_send_addr"); RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_addr");
for (i = 0; i < MPC55XX_TEST_DSPI_BUFSIZE; ++i) { for (i = 0; i < MPC55XX_TEST_DSPI_BUFSIZE; ++i) {
test_mpc55xx_dspi_writer_outbuf [0] [i] = 0xa5; test_mpc55xx_dspi_writer_outbuf [0] [i] = 0xa5;
@@ -113,37 +113,37 @@ static rtems_task test_mpc55xx_dspi_writer( rtems_task_argument arg)
tic(); tic();
/* sc = rtems_semaphore_obtain( test_mpc55xx_dspi_pong, RTEMS_WAIT, RTEMS_NO_TIMEOUT); */ /* sc = rtems_semaphore_obtain( test_mpc55xx_dspi_pong, RTEMS_WAIT, RTEMS_NO_TIMEOUT); */
/* CHECK_SC_TASK( sc, "rtems_semaphore_obtain"); */ /* RTEMS_CHECK_SC_TASK( sc, "rtems_semaphore_obtain"); */
DEBUG_PRINT( "Ping\n"); RTEMS_DEBUG_PRINT( "Ping\n");
/* sc = rtems_libi2c_send_start( device); */ /* sc = rtems_libi2c_send_start( device); */
/* CHECK_SC_TASK( sc, "rtems_libi2c_send_start"); */ /* RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_start"); */
/* sc = rtems_libi2c_send_addr( device, MPC55XX_TEST_DSPI_ADDRESS); */ /* sc = rtems_libi2c_send_addr( device, MPC55XX_TEST_DSPI_ADDRESS); */
/* CHECK_SC_TASK( sc, "rtems_libi2c_send_addr"); */ /* RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_addr"); */
rv = rtems_libi2c_ioctl( device, RTEMS_LIBI2C_IOCTL_READ_WRITE, &read_and_write); rv = rtems_libi2c_ioctl( device, RTEMS_LIBI2C_IOCTL_READ_WRITE, &read_and_write);
CHECK_RV_TASK( rv, "rtems_libi2c_ioctl: RTEMS_LIBI2C_IOCTL_READ_WRITE"); RTEMS_CHECK_RV_TASK( rv, "rtems_libi2c_ioctl: RTEMS_LIBI2C_IOCTL_READ_WRITE");
/* rv = rtems_libi2c_write_bytes( device, test_mpc55xx_dspi_writer_outbuf [0], MPC55XX_TEST_DSPI_BUFSIZE); */ /* rv = rtems_libi2c_write_bytes( device, test_mpc55xx_dspi_writer_outbuf [0], MPC55XX_TEST_DSPI_BUFSIZE); */
/* CHECK_RV_TASK( rv, "rtems_libi2c_write_bytes"); */ /* RTEMS_CHECK_RV_TASK( rv, "rtems_libi2c_write_bytes"); */
/* sc = rtems_libi2c_send_stop( device); */ /* sc = rtems_libi2c_send_stop( device); */
/* CHECK_SC_TASK( sc, "rtems_libi2c_send_stop"); */ /* RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_stop"); */
toggle = toggle ? 0 : 1; toggle = toggle ? 0 : 1;
read_and_write.wr_buf = test_mpc55xx_dspi_writer_outbuf [toggle]; read_and_write.wr_buf = test_mpc55xx_dspi_writer_outbuf [toggle];
/* sc = rtems_semaphore_release( test_mpc55xx_dspi_ping); */ /* sc = rtems_semaphore_release( test_mpc55xx_dspi_ping); */
/* CHECK_SC_TASK( sc, "rtems_semaphore_release"); */ /* RTEMS_CHECK_SC_TASK( sc, "rtems_semaphore_release"); */
} }
sc = rtems_libi2c_send_stop( device); sc = rtems_libi2c_send_stop( device);
CHECK_SC_TASK( sc, "rtems_libi2c_send_stop"); RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_stop");
sc = rtems_task_delete( RTEMS_SELF); sc = rtems_task_delete( RTEMS_SELF);
CHECK_SC_TASK( sc, "rtems_task_delete"); RTEMS_CHECK_SC_TASK( sc, "rtems_task_delete");
} }
static rtems_task test_mpc55xx_dspi_reader( rtems_task_argument arg) static rtems_task test_mpc55xx_dspi_reader( rtems_task_argument arg)
@@ -153,43 +153,43 @@ static rtems_task test_mpc55xx_dspi_reader( rtems_task_argument arg)
rtems_device_minor_number device; rtems_device_minor_number device;
int i = 0; int i = 0;
DEBUG_PRINT( "Task started\n"); RTEMS_DEBUG_PRINT( "Task started\n");
device = rtems_libi2c_register_drv( NULL, &test_mpc55xx_dspi_drv, test_mpc55xx_dspi_bus [3], 0); device = rtems_libi2c_register_drv( NULL, &test_mpc55xx_dspi_drv, test_mpc55xx_dspi_bus [3], 0);
CHECK_RV_TASK( device, "rtems_libi2c_register_drv"); RTEMS_CHECK_RV_TASK( device, "rtems_libi2c_register_drv");
sc = rtems_libi2c_send_start( device); sc = rtems_libi2c_send_start( device);
CHECK_SC_TASK( sc, "rtems_libi2c_send_start"); RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_start");
rv = rtems_libi2c_ioctl( device, RTEMS_LIBI2C_IOCTL_SET_TFRMODE, &test_mpc55xx_dspi_transfer_mode); rv = rtems_libi2c_ioctl( device, RTEMS_LIBI2C_IOCTL_SET_TFRMODE, &test_mpc55xx_dspi_transfer_mode);
CHECK_RV_TASK( rv, "rtems_libi2c_ioctl"); RTEMS_CHECK_RV_TASK( rv, "rtems_libi2c_ioctl");
sc = rtems_libi2c_send_addr( device, MPC55XX_TEST_DSPI_ADDRESS); sc = rtems_libi2c_send_addr( device, MPC55XX_TEST_DSPI_ADDRESS);
CHECK_SC_TASK( sc, "rtems_libi2c_send_addr"); RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_addr");
for (i = 0; i < MPC55XX_TEST_DSPI_BUFSIZE; ++i) { for (i = 0; i < MPC55XX_TEST_DSPI_BUFSIZE; ++i) {
test_mpc55xx_dspi_reader_inbuf [i] = -1; test_mpc55xx_dspi_reader_inbuf [i] = -1;
} }
sc = rtems_semaphore_obtain( test_mpc55xx_dspi_ping, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain( test_mpc55xx_dspi_ping, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
CHECK_SC_TASK( sc, "rtems_semaphore_obtain"); RTEMS_CHECK_SC_TASK( sc, "rtems_semaphore_obtain");
DEBUG_PRINT( "Pong\n"); RTEMS_DEBUG_PRINT( "Pong\n");
sc = rtems_semaphore_release( test_mpc55xx_dspi_pong); sc = rtems_semaphore_release( test_mpc55xx_dspi_pong);
CHECK_SC_TASK( sc, "rtems_semaphore_release"); RTEMS_CHECK_SC_TASK( sc, "rtems_semaphore_release");
while (1) { while (1) {
sc = rtems_semaphore_obtain( test_mpc55xx_dspi_ping, RTEMS_WAIT, RTEMS_NO_TIMEOUT); sc = rtems_semaphore_obtain( test_mpc55xx_dspi_ping, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
CHECK_SC_TASK( sc, "rtems_semaphore_obtain"); RTEMS_CHECK_SC_TASK( sc, "rtems_semaphore_obtain");
DEBUG_PRINT( "Pong\n"); RTEMS_DEBUG_PRINT( "Pong\n");
rv = rtems_libi2c_read_bytes( device, test_mpc55xx_dspi_reader_inbuf, MPC55XX_TEST_DSPI_BUFSIZE); rv = rtems_libi2c_read_bytes( device, test_mpc55xx_dspi_reader_inbuf, MPC55XX_TEST_DSPI_BUFSIZE);
CHECK_RV_TASK( rv, "rtems_libi2c_read_bytes"); RTEMS_CHECK_RV_TASK( rv, "rtems_libi2c_read_bytes");
sc = rtems_semaphore_release( test_mpc55xx_dspi_pong); sc = rtems_semaphore_release( test_mpc55xx_dspi_pong);
CHECK_SC_TASK( sc, "rtems_semaphore_release"); RTEMS_CHECK_SC_TASK( sc, "rtems_semaphore_release");
printk( "Time: %i, Value: 0x%02x%02x%02x%02x\n", tac(), printk( "Time: %i, Value: 0x%02x%02x%02x%02x\n", tac(),
test_mpc55xx_dspi_reader_inbuf [0], test_mpc55xx_dspi_reader_inbuf [1], test_mpc55xx_dspi_reader_inbuf [0], test_mpc55xx_dspi_reader_inbuf [1],
@@ -197,10 +197,10 @@ static rtems_task test_mpc55xx_dspi_reader( rtems_task_argument arg)
} }
sc = rtems_libi2c_send_stop( device); sc = rtems_libi2c_send_stop( device);
CHECK_SC_TASK( sc, "rtems_libi2c_send_stop"); RTEMS_CHECK_SC_TASK( sc, "rtems_libi2c_send_stop");
sc = rtems_task_delete( RTEMS_SELF); sc = rtems_task_delete( RTEMS_SELF);
CHECK_SC_TASK( sc, "rtems_task_delete"); RTEMS_CHECK_SC_TASK( sc, "rtems_task_delete");
} }
rtems_task test_sd_card( rtems_task_argument arg); rtems_task test_sd_card( rtems_task_argument arg);
@@ -219,7 +219,7 @@ rtems_status_code mpc55xx_dspi_register(void)
test_mpc55xx_intc( 0); test_mpc55xx_intc( 0);
rv = rtems_libi2c_initialize(); rv = rtems_libi2c_initialize();
CHECK_RVSC( rv, "rtems_libi2c_initialize"); RTEMS_CHECK_RV_SC( rv, "rtems_libi2c_initialize");
/* DSPI D inputs are taken from DSPI C */ /* DSPI D inputs are taken from DSPI C */
SIU.DISR.R = 0x000000FC; SIU.DISR.R = 0x000000FC;
@@ -261,7 +261,7 @@ rtems_status_code mpc55xx_dspi_register(void)
for (i = 0; i < MPC55XX_DSPI_NUMBER; ++i) { for (i = 0; i < MPC55XX_DSPI_NUMBER; ++i) {
device_name [8] = '0' + i; device_name [8] = '0' + i;
rv = rtems_libi2c_register_bus( device_name, (rtems_libi2c_bus_t *) &mpc55xx_dspi_bus_table [i]); rv = rtems_libi2c_register_bus( device_name, (rtems_libi2c_bus_t *) &mpc55xx_dspi_bus_table [i]);
CHECK_RVSC( rv, device_name); RTEMS_CHECK_RV_SC( rv, device_name);
test_mpc55xx_dspi_bus [i] = rv; test_mpc55xx_dspi_bus [i] = rv;
} }
@@ -272,7 +272,7 @@ rtems_status_code mpc55xx_dspi_register(void)
RTEMS_NO_PRIORITY, RTEMS_NO_PRIORITY,
&test_mpc55xx_dspi_ping &test_mpc55xx_dspi_ping
); );
CHECK_SC( sc, "rtems_semaphore_create"); RTEMS_CHECK_SC( sc, "rtems_semaphore_create");
sc = rtems_semaphore_create ( sc = rtems_semaphore_create (
rtems_build_name ( 'P', 'O', 'N', 'G'), rtems_build_name ( 'P', 'O', 'N', 'G'),
@@ -281,7 +281,7 @@ rtems_status_code mpc55xx_dspi_register(void)
RTEMS_NO_PRIORITY, RTEMS_NO_PRIORITY,
&test_mpc55xx_dspi_pong &test_mpc55xx_dspi_pong
); );
CHECK_SC( sc, "rtems_semaphore_create"); RTEMS_CHECK_SC( sc, "rtems_semaphore_create");
#if 0 #if 0
rtems_id writer_task_id; rtems_id writer_task_id;
@@ -295,7 +295,7 @@ rtems_status_code mpc55xx_dspi_register(void)
RTEMS_DEFAULT_ATTRIBUTES, RTEMS_DEFAULT_ATTRIBUTES,
&writer_task_id &writer_task_id
); );
CHECK_SC( sc, "rtems_task_create"); RTEMS_CHECK_SC( sc, "rtems_task_create");
sc = rtems_task_create( sc = rtems_task_create(
rtems_build_name( 'T', 'R', 'D', 'R'), rtems_build_name( 'T', 'R', 'D', 'R'),
1, 1,
@@ -304,12 +304,12 @@ rtems_status_code mpc55xx_dspi_register(void)
RTEMS_DEFAULT_ATTRIBUTES, RTEMS_DEFAULT_ATTRIBUTES,
&reader_task_id &reader_task_id
); );
CHECK_SC( sc, "rtems_task_create"); RTEMS_CHECK_SC( sc, "rtems_task_create");
sc = rtems_task_start( writer_task_id, test_mpc55xx_dspi_writer, 0); sc = rtems_task_start( writer_task_id, test_mpc55xx_dspi_writer, 0);
CHECK_SC( sc, "rtems_task_start"); RTEMS_CHECK_SC( sc, "rtems_task_start");
sc = rtems_task_start( reader_task_id, test_mpc55xx_dspi_reader, 0); sc = rtems_task_start( reader_task_id, test_mpc55xx_dspi_reader, 0);
CHECK_SC( sc, "rtems_task_start"); RTEMS_CHECK_SC( sc, "rtems_task_start");
#endif #endif
rtems_id sd_card_task_id; rtems_id sd_card_task_id;
@@ -321,9 +321,9 @@ rtems_status_code mpc55xx_dspi_register(void)
RTEMS_DEFAULT_ATTRIBUTES, RTEMS_DEFAULT_ATTRIBUTES,
&sd_card_task_id &sd_card_task_id
); );
CHECK_SC( sc, "rtems_task_create"); RTEMS_CHECK_SC( sc, "rtems_task_create");
sc = rtems_task_start( sd_card_task_id, test_sd_card, 0); sc = rtems_task_start( sd_card_task_id, test_sd_card, 0);
CHECK_SC( sc, "rtems_task_start"); RTEMS_CHECK_SC( sc, "rtems_task_start");
rtems_id intc_id; rtems_id intc_id;
sc = rtems_task_create( sc = rtems_task_create(
@@ -334,12 +334,12 @@ rtems_status_code mpc55xx_dspi_register(void)
RTEMS_DEFAULT_ATTRIBUTES, RTEMS_DEFAULT_ATTRIBUTES,
&intc_id &intc_id
); );
CHECK_SC( sc, "rtems_task_create"); RTEMS_CHECK_SC( sc, "rtems_task_create");
sc = rtems_task_start( intc_id, test_mpc55xx_intc, 0); sc = rtems_task_start( intc_id, test_mpc55xx_intc, 0);
CHECK_SC( sc, "rtems_task_start"); RTEMS_CHECK_SC( sc, "rtems_task_start");
sc = rtems_task_delete( RTEMS_SELF); sc = rtems_task_delete( RTEMS_SELF);
CHECK_SC( sc, "rtems_task_delete"); RTEMS_CHECK_SC( sc, "rtems_task_delete");
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }
@@ -388,11 +388,11 @@ static int test_sd_card_print_dir( const char* dirname, unsigned level)
/* Open */ /* Open */
dir = opendir( dirname); dir = opendir( dirname);
rv = dir == NULL ? -1 : 0; rv = dir == NULL ? -1 : 0;
CHECK_RV( rv, "Open directory"); RTEMS_CHECK_RV( rv, "Open directory");
/* Change CWD */ /* Change CWD */
rv = chdir( dirname); rv = chdir( dirname);
CHECK_RV( rv, "Change directory"); RTEMS_CHECK_RV( rv, "Change directory");
/* Read */ /* Read */
ent = readdir( dir); ent = readdir( dir);
@@ -404,7 +404,7 @@ static int test_sd_card_print_dir( const char* dirname, unsigned level)
printk( "<%s>\n", ent->d_name); printk( "<%s>\n", ent->d_name);
if (S_ISDIR( s.st_mode)) { if (S_ISDIR( s.st_mode)) {
rv = test_sd_card_print_dir( ent->d_name, level + 1); rv = test_sd_card_print_dir( ent->d_name, level + 1);
CHECK_RV( rv, "Next directory"); RTEMS_CHECK_RV( rv, "Next directory");
} }
} }
ent = readdir( dir); ent = readdir( dir);
@@ -412,11 +412,11 @@ static int test_sd_card_print_dir( const char* dirname, unsigned level)
/* Change CWD */ /* Change CWD */
rv = chdir( ".."); rv = chdir( "..");
CHECK_RV( rv, "Change directory"); RTEMS_CHECK_RV( rv, "Change directory");
/* Close */ /* Close */
rv = closedir( dir); rv = closedir( dir);
CHECK_RV( rv, "Close directory"); RTEMS_CHECK_RV( rv, "Close directory");
return 0; return 0;
} }
@@ -459,10 +459,10 @@ rtems_task test_sd_card( rtems_task_argument arg)
char file_name [] = "00000000.TXT"; char file_name [] = "00000000.TXT";
uint8_t *buf = NULL; uint8_t *buf = NULL;
DEBUG_PRINT( "Task started\n"); RTEMS_DEBUG_PRINT( "Task started\n");
minor = rtems_libi2c_register_drv( e->device_name, (rtems_libi2c_drv_t *) e, test_mpc55xx_dspi_bus [0], 0); minor = rtems_libi2c_register_drv( e->device_name, (rtems_libi2c_drv_t *) e, test_mpc55xx_dspi_bus [0], 0);
CHECK_RV_TASK( (int) minor, "rtems_libi2c_register_drv"); RTEMS_CHECK_RV_TASK( (int) minor, "rtems_libi2c_register_drv");
buf = malloc( TEST_SD_CARD_BIGBUF_SIZE); buf = malloc( TEST_SD_CARD_BIGBUF_SIZE);
for (i = 0; i < TEST_SD_CARD_BIGBUF_SIZE; ++i) { for (i = 0; i < TEST_SD_CARD_BIGBUF_SIZE; ++i) {
@@ -475,38 +475,38 @@ rtems_task test_sd_card( rtems_task_argument arg)
buf [i - 1] = '\n'; buf [i - 1] = '\n';
rv = test_sd_card_print_dir( "/dev", 0); rv = test_sd_card_print_dir( "/dev", 0);
CHECK_RV_TASK( rv, "Print directory"); RTEMS_CHECK_RV_TASK( rv, "Print directory");
sc = rtems_ide_part_table_initialize( TEST_SD_CARD_DEVICE_FILE); sc = rtems_ide_part_table_initialize( TEST_SD_CARD_DEVICE_FILE);
CHECK_SC_TASK( sc, "Initialize IDE partition table"); RTEMS_CHECK_SC_TASK( sc, "Initialize IDE partition table");
rv = test_sd_card_print_dir( "/dev", 0); rv = test_sd_card_print_dir( "/dev", 0);
CHECK_RV_TASK( rv, "Print directory"); RTEMS_CHECK_RV_TASK( rv, "Print directory");
rv = mkdir( TEST_SD_CARD_MOUNT_POINT, S_IRWXU); rv = mkdir( TEST_SD_CARD_MOUNT_POINT, S_IRWXU);
CHECK_RV_TASK( rv, "Create mount point"); RTEMS_CHECK_RV_TASK( rv, "Create mount point");
rv = rtems_fsmount( test_sd_card_fs_table, sizeof( test_sd_card_fs_table) / sizeof( test_sd_card_fs_table [0]), NULL); rv = rtems_fsmount( test_sd_card_fs_table, sizeof( test_sd_card_fs_table) / sizeof( test_sd_card_fs_table [0]), NULL);
CHECK_RV_TASK( rv, "Mount file systems"); RTEMS_CHECK_RV_TASK( rv, "Mount file systems");
/*rv = test_sd_card_print_dir( TEST_SD_CARD_MOUNT_POINT, 0); */ /*rv = test_sd_card_print_dir( TEST_SD_CARD_MOUNT_POINT, 0); */
/*CHECK_RV_TASK( rv, "Print directory"); */ /*RTEMS_CHECK_RV_TASK( rv, "Print directory"); */
rv = mkdir( TEST_SD_CARD_DIRECTORY, S_IRWXU); rv = mkdir( TEST_SD_CARD_DIRECTORY, S_IRWXU);
rv = chdir( TEST_SD_CARD_DIRECTORY); rv = chdir( TEST_SD_CARD_DIRECTORY);
CHECK_RV_TASK( rv, "Change directory"); RTEMS_CHECK_RV_TASK( rv, "Change directory");
i = 0; i = 0;
while (1) { while (1) {
snprintf( file_name, 13, "%08i.TXT", i); snprintf( file_name, 13, "%08i.TXT", i);
tic(); tic();
fd = creat( file_name, S_IREAD | S_IWRITE); fd = creat( file_name, S_IREAD | S_IWRITE);
CHECK_RV_TASK( fd, "Create file"); RTEMS_CHECK_RV_TASK( fd, "Create file");
rv = write( fd, buf, TEST_SD_CARD_BIGBUF_SIZE); rv = write( fd, buf, TEST_SD_CARD_BIGBUF_SIZE);
CHECK_RV_TASK( rv, "Write file"); RTEMS_CHECK_RV_TASK( rv, "Write file");
rv = close( fd); rv = close( fd);
CHECK_RV_TASK( rv, "Close file"); RTEMS_CHECK_RV_TASK( rv, "Close file");
t = tac(); t = tac();
avg = ((uint64_t) avg * ((uint64_t) i) + (uint64_t) t) / ((uint64_t) i + 1); avg = ((uint64_t) avg * ((uint64_t) i) + (uint64_t) t) / ((uint64_t) i + 1);
printk( "%s: %u (%u)\n", file_name, tac(), avg); printk( "%s: %u (%u)\n", file_name, tac(), avg);
@@ -514,10 +514,10 @@ rtems_task test_sd_card( rtems_task_argument arg)
} }
rv = chdir( ".."); rv = chdir( "..");
CHECK_RV_TASK( rv, "Change directory"); RTEMS_CHECK_RV_TASK( rv, "Change directory");
rv = test_sd_card_print_dir( TEST_SD_CARD_DIRECTORY, 0); rv = test_sd_card_print_dir( TEST_SD_CARD_DIRECTORY, 0);
CHECK_RV_TASK( rv, "Print directory"); RTEMS_CHECK_RV_TASK( rv, "Print directory");
#if 0 #if 0
@@ -526,7 +526,7 @@ rtems_task test_sd_card( rtems_task_argument arg)
const char device_name [] = "/dev/spi0.sd-card-0"; const char device_name [] = "/dev/spi0.sd-card-0";
fd = open( device_name, O_RDWR); fd = open( device_name, O_RDWR);
CHECK_RV_TASK( fd, "open"); RTEMS_CHECK_RV_TASK( fd, "open");
while (1) { while (1) {
for (i = 0; i < TEST_SD_CARD_BUF_SIZE; ++i) { for (i = 0; i < TEST_SD_CARD_BUF_SIZE; ++i) {
test_sd_card_buf [i] = b; test_sd_card_buf [i] = b;
@@ -538,11 +538,11 @@ rtems_task test_sd_card( rtems_task_argument arg)
} }
} }
rv = close( fd); rv = close( fd);
CHECK_RV_TASK( rv, "close"); RTEMS_CHECK_RV_TASK( rv, "close");
/* Read */ /* Read */
fd = open( device_name, O_RDWR); fd = open( device_name, O_RDWR);
CHECK_RV_TASK( fd, "open"); RTEMS_CHECK_RV_TASK( fd, "open");
while (1) { while (1) {
rv = read( fd, test_sd_card_buf, TEST_SD_CARD_BUF_SIZE); rv = read( fd, test_sd_card_buf, TEST_SD_CARD_BUF_SIZE);
if (rv < 0) { if (rv < 0) {
@@ -554,11 +554,11 @@ rtems_task test_sd_card( rtems_task_argument arg)
} }
} }
rv = close( fd); rv = close( fd);
CHECK_RV_TASK( rv, "close"); RTEMS_CHECK_RV_TASK( rv, "close");
#endif #endif
sc = rtems_task_delete( RTEMS_SELF); sc = rtems_task_delete( RTEMS_SELF);
CHECK_SC_TASK( sc, "rtems_task_delete"); RTEMS_CHECK_SC_TASK( sc, "rtems_task_delete");
} }
#define ITER 4 #define ITER 4
@@ -582,10 +582,10 @@ static rtems_status_code test_mpc55xx_edma(void)
RTEMS_NO_PRIORITY, RTEMS_NO_PRIORITY,
&transfer_update &transfer_update
); );
CHECK_SC( sc, "rtems_semaphore_create"); RTEMS_CHECK_SC( sc, "rtems_semaphore_create");
rv = mpc55xx_edma_obtain_channel( channel, &error_status, transfer_update); rv = mpc55xx_edma_obtain_channel( channel, &error_status, transfer_update);
CHECK_RV( rv, "mpc55xx_edma_obtain_channel"); RTEMS_CHECK_RV( rv, "mpc55xx_edma_obtain_channel");
int i = 0; int i = 0;
for (i = 0; i < BUFSIZE; ++i) { for (i = 0; i < BUFSIZE; ++i) {
@@ -620,7 +620,7 @@ static rtems_status_code test_mpc55xx_edma(void)
if (sc == RTEMS_TIMEOUT) { if (sc == RTEMS_TIMEOUT) {
continue; continue;
} }
CHECK_SC( sc, "rtems_semaphore_obtain"); RTEMS_CHECK_SC( sc, "rtems_semaphore_obtain");
} }
printk( "%s: Error status: 0x%08x\n", __func__, error_status); printk( "%s: Error status: 0x%08x\n", __func__, error_status);
} }

2
c/src/lib/libbsp/powerpc/shared/clock/clock.c
View File

@@ -201,7 +201,7 @@ rtems_device_driver Clock_initialize( rtems_device_major_number major, rtems_dev
/* Check decrementer value */ /* Check decrementer value */
if (ppc_clock_decrementer_value == 0) { if (ppc_clock_decrementer_value == 0) {
ppc_clock_decrementer_value = PPC_CLOCK_DECREMENTER_MAX; ppc_clock_decrementer_value = PPC_CLOCK_DECREMENTER_MAX;
SYSLOG_ERROR( "Decrementer value would be zero, will be set to maximum value instead\n"); RTEMS_SYSLOG_ERROR( "Decrementer value would be zero, will be set to maximum value instead\n");
} }
/* Set the nanoseconds since last tick handler */ /* Set the nanoseconds since last tick handler */