2009-08-06 Joel Sherrill <joel.sherrill@oarcorp.com>

	* bspcmdline01/bspcmdline01.scn, bspcmdline01/init.c: Add rtems_ as
	prefix to all routines.

3 files changed, 57 insertions, 51 deletions

diff --git a/testsuites/libtests/ChangeLog b/testsuites/libtests/ChangeLog
index d329c911cf..9f0d0462ce 100644
--- a/testsuites/libtests/ChangeLog
+++ b/testsuites/libtests/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-06	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* bspcmdline01/bspcmdline01.scn, bspcmdline01/init.c: Add rtems_ as
+	prefix to all routines.
+
 2009-08-05	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac: Add test for new BSP Boot Command Line
diff --git a/testsuites/libtests/bspcmdline01/bspcmdline01.scn b/testsuites/libtests/bspcmdline01/bspcmdline01.scn
index 4c9efc9e1a..52fd1ad3ab 100644
--- a/testsuites/libtests/bspcmdline01/bspcmdline01.scn
+++ b/testsuites/libtests/bspcmdline01/bspcmdline01.scn
@@ -2,45 +2,45 @@
 BSP does not have a boot command line
 
 Test Parameter Error Conditions
-bsp_cmdline_get_param - name=NULL - returns NULL
-bsp_cmdline_get_param - result=NULL - returns NULL
-bsp_cmdline_get_param - length=0 - returns NULL
-bsp_cmdline_get_param_raw - name=NULL - returns NULL
-bsp_cmdline_get_param - bsp_boot_cmdline=NULL - returns NULL
-bsp_cmdline_get_param_raw - bsp_boot_cmdline=NULL - returns NULL
+rtems_bsp_cmdline_get_param - name=NULL - returns NULL
+rtems_bsp_cmdline_get_param - result=NULL - returns NULL
+rtems_bsp_cmdline_get_param - length=0 - returns NULL
+rtems_bsp_cmdline_get_param_raw - name=NULL - returns NULL
+rtems_bsp_cmdline_get_param - bsp_boot_cmdline=NULL - returns NULL
+rtems_bsp_cmdline_get_param_raw - bsp_boot_cmdline=NULL - returns NULL
 
 Testing for param=(--arg)
   Command Line : (--arg=)
-bsp_cmdline_get_param_raw(--arg)
-bsp_cmdline_get_param_raw(--arg) returned (--arg=)
-bsp_cmdline_get_param_rhs(--arg)
-bsp_cmdline_get_param_rhs(--arg) returned (ZERO_LENGTH_STRING) value=(ZERO_LENGTH_STRING)
+rtems_bsp_cmdline_get_param_raw(--arg)
+rtems_bsp_cmdline_get_param_raw(--arg) returned (--arg=)
+rtems_bsp_cmdline_get_param_rhs(--arg)
+rtems_bsp_cmdline_get_param_rhs(--arg) returned (ZERO_LENGTH_STRING) value=(ZERO_LENGTH_STRING)
 
 Testing for param=(-g) - Expect NULL
   Command Line : (--arg=)
-bsp_cmdline_get_param_raw(-g)
-bsp_cmdline_get_param_raw(-g) returned NULL
-bsp_cmdline_get_param_rhs(-g)
-bsp_cmdline_get_param_rhs(-g) returned NULL
+rtems_bsp_cmdline_get_param_raw(-g)
+rtems_bsp_cmdline_get_param_raw(-g) returned NULL
+rtems_bsp_cmdline_get_param_rhs(-g)
+rtems_bsp_cmdline_get_param_rhs(-g) returned NULL
 
 Testing for param=(-name)
   Command Line : (--ip=192.168.1.151 --name=fred)
-bsp_cmdline_get_param_raw(-name)
-bsp_cmdline_get_param_raw(-name) returned (-name=fred)
-bsp_cmdline_get_param_rhs(-name)
-bsp_cmdline_get_param_rhs(-name) returned (fred) value=(fred)
+rtems_bsp_cmdline_get_param_raw(-name)
+rtems_bsp_cmdline_get_param_raw(-name) returned (-name=fred)
+rtems_bsp_cmdline_get_param_rhs(-name)
+rtems_bsp_cmdline_get_param_rhs(-name) returned (fred) value=(fred)
 
 Testing for param=(-ip)
   Command Line : (--ip=192.168.1.151 --name=fred)
-bsp_cmdline_get_param_raw(-ip)
-bsp_cmdline_get_param_raw(-ip) returned (-ip=192.168.1.151 --name=fred)
-bsp_cmdline_get_param_rhs(-ip)
-bsp_cmdline_get_param_rhs(-ip) returned (192.168.1.151) value=(192.168.1.151)
+rtems_bsp_cmdline_get_param_raw(-ip)
+rtems_bsp_cmdline_get_param_raw(-ip) returned (-ip=192.168.1.151 --name=fred)
+rtems_bsp_cmdline_get_param_rhs(-ip)
+rtems_bsp_cmdline_get_param_rhs(-ip) returned (192.168.1.151) value=(192.168.1.151)
 
 Testing for param=(-name)
   Command Line : (--ip=192.168.1.151 --name="joel and michele" --cpu=fast)
-bsp_cmdline_get_param_raw(-name)
-bsp_cmdline_get_param_raw(-name) returned (-name="joel and michele" --cpu=fast)
-bsp_cmdline_get_param_rhs(-name)
-bsp_cmdline_get_param_rhs(-name) returned (joel and michele) value=(joel and michele)
+rtems_bsp_cmdline_get_param_raw(-name)
+rtems_bsp_cmdline_get_param_raw(-name) returned (-name="joel and michele" --cpu=fast)
+rtems_bsp_cmdline_get_param_rhs(-name)
+rtems_bsp_cmdline_get_param_rhs(-name) returned (joel and michele) value=(joel and michele)
 *** END OF OF PARSING BOOT COMMAND STRING ***
diff --git a/testsuites/libtests/bspcmdline01/init.c b/testsuites/libtests/bspcmdline01/init.c
index 629e4f6f9a..3fe67f186d 100644
--- a/testsuites/libtests/bspcmdline01/init.c
+++ b/testsuites/libtests/bspcmdline01/init.c
@@ -21,30 +21,31 @@ void test_errors(void)
 
   bsp_boot_cmdline = NULL;
 
-  puts( "bsp_cmdline_get_param - name=NULL - returns NULL" );
-  p = bsp_cmdline_get_param( NULL, result, 32 );
+  puts( "rtems_bsp_cmdline_get_param - name=NULL - returns NULL" );
+  p = rtems_bsp_cmdline_get_param( NULL, result, 32 );
   assert( p == NULL );
 
-  puts( "bsp_cmdline_get_param - result=NULL - returns NULL" );
-  p = bsp_cmdline_get_param( "name", NULL, 32 );
+  puts( "rtems_bsp_cmdline_get_param - result=NULL - returns NULL" );
+  p = rtems_bsp_cmdline_get_param( "name", NULL, 32 );
   assert( p == NULL );
 
-  puts( "bsp_cmdline_get_param - length=0 - returns NULL" );
-  p = bsp_cmdline_get_param( "name", result, 0 );
+  puts( "rtems_bsp_cmdline_get_param - length=0 - returns NULL" );
+  p = rtems_bsp_cmdline_get_param( "name", result, 0 );
   assert( p == NULL );
 
-  puts( "bsp_cmdline_get_param_raw - name=NULL - returns NULL" );
-  p = bsp_cmdline_get_param_raw( NULL );
+  puts( "rtems_bsp_cmdline_get_param_raw - name=NULL - returns NULL" );
+  p = rtems_bsp_cmdline_get_param_raw( NULL );
   assert( p == NULL );
 
   bsp_boot_cmdline = NULL;
   
-  puts( "bsp_cmdline_get_param - bsp_boot_cmdline=NULL - returns NULL" );
-  p = bsp_cmdline_get_param( "name", result, 5 );
+  puts( "rtems_bsp_cmdline_get_param - bsp_boot_cmdline=NULL - returns NULL" );
+  p = rtems_bsp_cmdline_get_param( "name", result, 5 );
   assert( p == NULL );
 
-  puts( "bsp_cmdline_get_param_raw - bsp_boot_cmdline=NULL - returns NULL" );
-  p = bsp_cmdline_get_param_raw( "name" );
+  puts(
+    "rtems_bsp_cmdline_get_param_raw - bsp_boot_cmdline=NULL - returns NULL" );
+  p = rtems_bsp_cmdline_get_param_raw( "name" );
   assert( p == NULL );
 }
 
@@ -69,38 +70,38 @@ void test_search(
     cmdline
   );
 
-  printf( "bsp_cmdline_get_param_raw(%s)\n", param );
-  p = bsp_cmdline_get_param_raw( param );
+  printf( "rtems_bsp_cmdline_get_param_raw(%s)\n", param );
+  p = rtems_bsp_cmdline_get_param_raw( param );
   if ( null_expected ) {
     if ( p )
-      puts( "ERROR - bsp_cmdline_get_param_raw did not return NULL" );
+      puts( "ERROR - rtems_bsp_cmdline_get_param_raw did not return NULL" );
     else
-      printf( "bsp_cmdline_get_param_raw(%s) returned NULL\n", param );
+      printf( "rtems_bsp_cmdline_get_param_raw(%s) returned NULL\n", param );
     assert( !p );
   } else {
     if ( p )
-      printf( "bsp_cmdline_get_param_raw(%s) returned (%s)\n", param, p );
+      printf( "rtems_bsp_cmdline_get_param_raw(%s) returned (%s)\n", param, p );
     else
-      printf( "bsp_cmdline_get_param_raw(%s) returned NULL\n", param );
+      printf( "rtems_bsp_cmdline_get_param_raw(%s) returned NULL\n", param );
     
     assert( p );
   }
 
-  printf( "bsp_cmdline_get_param_rhs(%s)\n", param );
+  printf( "rtems_bsp_cmdline_get_param_rhs(%s)\n", param );
   length = sizeof(value);
-  p = bsp_cmdline_get_param_rhs( param, value, length );
+  p = rtems_bsp_cmdline_get_param_rhs( param, value, length );
   if ( null_expected ) {
     if ( p )
-      puts( "ERROR - bsp_cmdline_get_param_rhs did not return NULL" );
+      puts( "ERROR - rtems_bsp_cmdline_get_param_rhs did not return NULL" );
     else
-      printf( "bsp_cmdline_get_param_rhs(%s) returned NULL\n", param );
+      printf( "rtems_bsp_cmdline_get_param_rhs(%s) returned NULL\n", param );
     assert( !p );
   } else {
     if ( !p )
-      puts( "ERROR - bsp_cmdline_get_param_rhs returned NULL" );
+      puts( "ERROR - rtems_bsp_cmdline_get_param_rhs returned NULL" );
     assert( p );
     printf(
-      "bsp_cmdline_get_param_rhs(%s) returned (%s) value=(%s)\n",
+      "rtems_bsp_cmdline_get_param_rhs(%s) returned (%s) value=(%s)\n",
       param,
       ((*p == '\0') ? "ZERO_LENGTH_STRING" : p ),
       ((*value == '\0') ? "ZERO_LENGTH_STRING" : value )
@@ -115,7 +116,7 @@ rtems_task Init(
 {
   puts( "\n\n*** TEST OF PARSING BOOT COMMAND STRING ***" );
 
-  if ( bsp_cmdline_get() ) {
+  if ( rtems_bsp_cmdline_get() ) {
     printf(
       "BSP has a boot command line:\n"
       "%s\n",