2009-07-24 Joel Sherrill <joel.sherrill@oarcorp.com>

	* sp40/Makefile.am, sp40/init.c, sp40/sp40.scn: Attempt to write test
	to catch two remaining uncovered cases in rtems_io_register_driver.
	* sp40/system.h: Removed.

1 files changed, 55 insertions, 12 deletions

diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
index 9bc55c2e90..be0f0c87f4 100644
--- a/testsuites/sptests/sp40/init.c
+++ b/testsuites/sptests/sp40/init.c
@@ -11,30 +11,73 @@
  *  $Id$
  */
 
-#define CONFIGURE_INIT
-#include "system.h"
+#include <tmacros.h>
+
+rtems_device_driver test_open(
+     rtems_device_major_number  minor,
+     rtems_device_minor_number  major,
+     void                      *ignored
+)
+{
+}
 
+rtems_driver_address_table test_driver = {
+  NULL,                               /* initialization procedure */
+  test_open,                          /* open request procedure */
+  NULL,                               /* close request procedure */
+  NULL,                               /* read request procedure */
+  NULL,                               /* write request procedure */
+  NULL,                               /* special functions procedure */
+};
 rtems_task Init(
   rtems_task_argument argument
 )
 {
-  puts( "\n\n*** TEST 40 ***" );
+  rtems_status_code         sc;
+  rtems_device_major_number registered;
 
-  puts( "TBD - Write test case matching this description" );
+  puts( "\n\n*** TEST 40 ***" );
 
   /*
-   *  Register two drivers to fill up the table
+   *  Register a driver with init == NULL and open != NULL
    */
 
-  /* add major = 4 */
+  puts( "Init - rtems_io_register_driver - init == NULL, open != NULL OK" );
+  sc = rtems_io_register_driver( 0, &test_driver, &registered );
+  printf( "Init - Major slot returned = %d\n", (int) registered );
+  directive_failed( sc, "rtems_io_register_driver" );
 
-  /* add major = 3 */
-
-  /*
-   *  Unregister major = 3 to leave slot which is not at
-   *  the end of the Driver Table.
-   */
+  puts( "Init - rtems_io_register_driver - used slot" );
+  sc = rtems_io_register_driver( 1, &test_driver, &registered );
+  fatal_directive_status(
+    sc,
+    RTEMS_RESOURCE_IN_USE,
+    "rtems_io_register_driver slot in use"
+  );
 
   puts( "*** END OF TEST 40 ***" );
   rtems_test_exit( 0 );
 }
+
+
+/* functions */
+
+rtems_task Init(
+  rtems_task_argument argument
+);
+
+/* configuration information */
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+/* more one more driver slot than are statically configured */
+#define CONFIGURE_MAXIMUM_DRIVERS 4
+
+#define CONFIGURE_MAXIMUM_TASKS  1
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/* end of include file */