Update files to match FreeBSD layout

Add compatibility with Newlib header files.  Some FreeBSD header files
are mapped by the translation script:

     o rtems/bsd/sys/_types.h
     o rtems/bsd/sys/errno.h
     o rtems/bsd/sys/lock.h
     o rtems/bsd/sys/param.h
     o rtems/bsd/sys/resource.h
     o rtems/bsd/sys/time.h
     o rtems/bsd/sys/timespec.h
     o rtems/bsd/sys/types.h
     o rtems/bsd/sys/unistd.h

It is now possible to include <sys/socket.h> directly for example.

Generate one Makefile which builds everything including tests.

24 files changed, 53 insertions, 320 deletions

diff --git a/testsuite/Makefile b/testsuite/Makefile
deleted file mode 100644
index e0c8ebbf..00000000
--- a/testsuite/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-#  $Id$
-#
-
-include ../config.inc
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(RTEMS_SHARE)/make/directory.cfg
-
-# Basic Tests
-SUBDIRS  = swi01
-SUBDIRS += timeout01
-# USB Tests
-SUBDIRS += usb01 
-
-# Network Tests
-SUBDIRS += init01
-SUBDIRS += netshell01
-SUBDIRS += loopback01
diff --git a/testsuite/init01/init.c b/testsuite/include/rtems/bsd/test/default-init.h
index 028dcde3..c3150f5f 100644
--- a/testsuite/init01/init.c
+++ b/testsuite/include/rtems/bsd/test/default-init.h
@@ -2,20 +2,19 @@
  *  Shared Network Test Initialization File
  */
 
+#ifndef RTEMS_BSD_TEST_DEFAULT_INIT_H
+#define RTEMS_BSD_TEST_DEFAULT_INIT_H
+
 #include <bsp.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <freebsd/bsd.h>
-
-/* XXX should these be in a header? */
-void print_test_name(void);
-void test_main(void);
+#include <rtems/bsd/bsd.h>
 
 rtems_task Init(
   rtems_task_argument ignored
 )
 {
-  print_test_name();
+  puts( "*** " TEST_NAME " TEST ***" );
 
   /*
    *  BSD must support the new "shared IRQ PIC implementation" at this point.
@@ -34,7 +33,6 @@ rtems_task Init(
 
 /* configuration information */
 
-/* NOTICE: the clock driver is explicitly disabled */
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
 #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
 
@@ -55,7 +53,7 @@ rtems_task Init(
  * FreeBSD TCP/IP Initialization
  */
 
-#include <freebsd/machine/rtems-bsd-sysinit.h>
+#include <machine/rtems-bsd-sysinit.h>
 
 #define CONFIGURE_NEED_NET
 /* only include FXP and PCI for i386/pc386 for debug on qemu (for now) */
@@ -71,6 +69,7 @@ char static_hints[] = {
   "hint.fxp.0.prefer_iomap=1\0\n"
 };
 
-#include "nic-sysinit.h"
+#include <rtems/bsd/test/nic-sysinit.h>
 
 /* end of file */
+#endif /* RTEMS_BSD_TEST_DEFAULT_INIT_H */
diff --git a/testsuite/include/rtems/bsd/test/nic-sysinit.h b/testsuite/include/rtems/bsd/test/nic-sysinit.h
index dbad732d..752fe601 100644
--- a/testsuite/include/rtems/bsd/test/nic-sysinit.h
+++ b/testsuite/include/rtems/bsd/test/nic-sysinit.h
@@ -33,7 +33,7 @@
  */
 
 
-#include <freebsd/machine/rtems-bsd-sysinit.h>
+#include <machine/rtems-bsd-sysinit.h>
 
 /*
  *  We "read" that and generate references and nexus devices
diff --git a/testsuite/init01/.gitignore b/testsuite/init01/.gitignore
deleted file mode 100644
index adaff0b8..00000000
--- a/testsuite/init01/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-undefined.txt
diff --git a/testsuite/init01/Makefile b/testsuite/init01/Makefile
deleted file mode 100644
index 1e7ac313..00000000
--- a/testsuite/init01/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#  $Id$
-#
-
-include ../../config.inc
-
-PGM=${ARCH}/init01.exe
-
-# optional managers required
-MANAGERS=all
-
-# C source names
-C_FILES = init.c test_main.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include
-LINK_LIBS += $(INSTALL_BASE)/libbsdc.a
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a ${REL_ARGS}
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-OBJS= $(C_O_FILES)
-CLEAN_ADDITIONS += undefined.txt
-
-all:    ${ARCH} $(PGM)
-
-$(PGM): $(OBJS)
-	-$(make-exe)
diff --git a/testsuite/init01/test_main.c b/testsuite/init01/test_main.c
index 649a578b..88de0648 100644
--- a/testsuite/init01/test_main.c
+++ b/testsuite/init01/test_main.c
@@ -3,22 +3,18 @@
  *  that the target is alive after initializing the TCP/IP stack.
  */
 
-#include <bsp.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <freebsd/bsd.h>
+#include <unistd.h>
 
-void print_test_name(void)
-{
-  printf( "\n\n*** LIBFREEBSD INITIALIZATION TEST ***\n" );
-}
+#define TEST_NAME "LIBBSD INIT 1"
 
-void test_main(void)
+static void test_main(void)
 {
   puts( "Sleeping to see what happens" );
   sleep( 5 );
 
-  printf( "*** END OF LIBFREEBSD INITIALIZATION TEST ***\n" );
+  puts( "*** END OF " TEST_NAME " TEST ***" );
   exit( 0 );
 }
 
@@ -47,3 +43,4 @@ struct rtems_bsdnet_config rtems_bsdnet_config = {
     0
 };
 
+#include <rtems/bsd/test/default-init.h>
diff --git a/testsuite/loopback01/.gitignore b/testsuite/loopback01/.gitignore
deleted file mode 100644
index 27bb1279..00000000
--- a/testsuite/loopback01/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-init.c
diff --git a/testsuite/loopback01/Makefile b/testsuite/loopback01/Makefile
deleted file mode 100644
index 7998aba6..00000000
--- a/testsuite/loopback01/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#  $Id$
-#
-
-include ../../config.inc
-
-PGM=${ARCH}/loopback01.exe
-
-# optional managers required
-MANAGERS=all
-
-# C source names
-C_FILES = init.c test_main.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include
-AM_CPPFLAGS += -I ../init01
-LINK_LIBS += $(INSTALL_BASE)/libbsdc.a
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a ${REL_ARGS}
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-OBJS= $(C_O_FILES)
-CLEAN_ADDITIONS += init.c
-
-all:    init.c ${ARCH} $(PGM)
-
-init.c: ../init01/init.c
-	cp ../init01/init.c .
-
-$(PGM): $(OBJS)
-	-$(make-exe)
diff --git a/testsuite/loopback01/test_main.c b/testsuite/loopback01/test_main.c
index b21fc87e..6f58f329 100644
--- a/testsuite/loopback01/test_main.c
+++ b/testsuite/loopback01/test_main.c
@@ -9,19 +9,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-void print_test_name(void)
-{
-  printf( "\n\n*** LIBFREEBSD LOOPBACK SOCKET01 TEST ***\n" );
-}
-
-
-/* XXX remaining init configuration to evaluate */
-#define CONFIGURE_INIT_TASK_STACK_SIZE    (10*1024)
-#define CONFIGURE_INIT_TASK_PRIORITY    50
-#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
-                                           RTEMS_NO_TIMESLICE | \
-                                           RTEMS_NO_ASR | \
-                                           RTEMS_INTERRUPT_LEVEL(0))
+#define TEST_NAME "LIBBSD LOOPBACK 1"
 
 #include <rtems/error.h>
 #include <stdio.h>
@@ -224,7 +212,7 @@ static rtems_task clientTask(rtems_task_argument arg)
 /*
  * RTEMS Startup Task
  */
-void test_main(void)
+static void test_main(void)
 {
   rtems_status_code    sc;
   rtems_task_priority  old;
@@ -270,6 +258,8 @@ void test_main(void)
   spawnTask(clientTask, 120, 6);
 
   rtems_task_wake_after(500);
-  puts( "*** END OF LOOPBACK TEST ***" );
+  puts( "*** END OF " TEST_NAME " TEST ***" );
   exit( 0 );
 }
+
+#include <rtems/bsd/test/default-init.h>
diff --git a/testsuite/mghttpd01/.gitignore b/testsuite/mghttpd01/.gitignore
deleted file mode 100644
index 27bb1279..00000000
--- a/testsuite/mghttpd01/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-init.c
diff --git a/testsuite/mghttpd01/Makefile b/testsuite/mghttpd01/Makefile
deleted file mode 100644
index 4444a517..00000000
--- a/testsuite/mghttpd01/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-#  $Id$
-#
-
-include ../../config.inc
-
-PGM=${ARCH}/mghttpd01.exe
-
-# optional managers required
-MANAGERS=all
-
-# XXX = mghttpd01.doc mghttpd01.scn
-# C source names
-C_FILES = init.c test-http-client.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include
-AM_CPPFLAGS += -I ../init01
-AM_CPPFLAGS += -I ${r}/testsuites/support/include
-LINK_LIBS += $(INSTALL_BASE)/libmghttpd.a
-LINK_LIBS += $(INSTALL_BASE)/libbsdc.a
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-OBJS= $(C_O_FILES)
-CLEAN_ADDITIONS += init.c
-
-all:    init.c ${ARCH} $(PGM)
-
-init.c: ../init01/init.c
-	cp ../init01/init.c .
-
-$(PGM): $(OBJS)
-	-$(make-exe)
diff --git a/testsuite/netshell01/.gitignore b/testsuite/netshell01/.gitignore
deleted file mode 100644
index 27bb1279..00000000
--- a/testsuite/netshell01/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-init.c
diff --git a/testsuite/netshell01/Makefile b/testsuite/netshell01/Makefile
deleted file mode 100644
index e0179c22..00000000
--- a/testsuite/netshell01/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-include ../../config.inc
-
-PGM=${ARCH}/netshell01.exe
-
-# optional managers required
-MANAGERS=all
-
-# C source names
-C_FILES = init.c test_main.c shellconfig.c ns_parser_vars.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include
-AM_CPPFLAGS += -I ../init01
-LINK_LIBS += $(INSTALL_BASE)/libbsdc.a
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a -lm ${REL_ARGS} 
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-OBJS= $(C_O_FILES)
-CLEAN_ADDITIONS += init.c
-
-all:    init.c ${ARCH} $(PGM)
-
-init.c: ../init01/init.c
-	cp ../init01/init.c .
-
-$(PGM): $(OBJS)
-	-$(make-exe)
diff --git a/testsuite/netshell01/test_main.c b/testsuite/netshell01/test_main.c
index 65304849..b56d8307 100644
--- a/testsuite/netshell01/test_main.c
+++ b/testsuite/netshell01/test_main.c
@@ -11,20 +11,19 @@
 
 #include <rtems/shell.h>
 
-void print_test_name(void)
-{
-  printf( "\n\n*** LIBFREEBSD NETWORK SHELL TEST ***\n" );
-}
+#define TEST_NAME "LIBBSD NETSHELL 1"
 
 /*
  * RTEMS Startup Task
  */
-void test_main(void)
+static void test_main(void)
 {
   rtems_shell_env_t env = rtems_global_shell_env;
 
   rtems_shell_main_loop( &env );
 
-  puts( "*** END OF NETWORK SHELL TEST ***" );
+  puts( "*** END OF " TEST_NAME " TEST ***" );
   exit( 0 );
 }
+
+#include <rtems/bsd/test/default-init.h>
diff --git a/testsuite/swi01/Makefile b/testsuite/swi01/Makefile
deleted file mode 100644
index f5de48f4..00000000
--- a/testsuite/swi01/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-include ../../config.inc
-
-APP=swi01
-PGM=${ARCH}/$(APP).exe
-
-# optional managers required
-MANAGERS=all
-
-# C source names
-C_FILES = init.c swi_test.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a ${REL_ARGS}
-CFLAGS += $(DEPFLAGS) $(GCCFLAGS) $(AM_CPPFLAGS) -Wno-unused -Wl,-Map,$(APP).map
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-OBJS= $(C_O_FILES)
-CLEAN_ADDITIONS += $(APP).map
-
-all:    ${ARCH} $(PGM)
-
-$(PGM): $(OBJS)
-	-$(make-exe)
diff --git a/testsuite/swi01/init.c b/testsuite/swi01/init.c
index 9bc13dc6..57d77f80 100644
--- a/testsuite/swi01/init.c
+++ b/testsuite/swi01/init.c
@@ -34,7 +34,7 @@
 
 #include <rtems.h>
 
-#include <freebsd/bsd.h>
+#include <rtems/bsd/bsd.h>
 
 #include "swi_test.h"
 
diff --git a/testsuite/swi01/swi_test.c b/testsuite/swi01/swi_test.c
index 99ba94f4..093458e7 100644
--- a/testsuite/swi01/swi_test.c
+++ b/testsuite/swi01/swi_test.c
@@ -34,19 +34,19 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
-#include <freebsd/sys/types.h>
-#include <freebsd/sys/systm.h>
+#include <sys/types.h>
+#include <sys/systm.h>
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/bus.h>
-#include <freebsd/sys/interrupt.h>
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/interrupt.h>
 
 #define SWI_TEST_THREAD_PRIO (0)
 
 // Time to wait for swi-test-handler
-#define SWI_SLEEP_TIME (100)
+#define SWI_SLEEP_TIME (1)
 
 enum arg {
 	HANDLER_NOT_VISITED,
@@ -78,7 +78,7 @@ void swi_test_normal_handler()
 
 	swi_sched(test_ih, 0);
 
-	usleep(SWI_SLEEP_TIME);
+	sleep(SWI_SLEEP_TIME);
 	
 	assert(argument == HANDLER_VISITED);
 }
@@ -98,7 +98,7 @@ void swi_test_exclusive_handler()
 
 	swi_sched(test_ih, 0);
 	
-	usleep(SWI_SLEEP_TIME);
+	sleep(SWI_SLEEP_TIME);
 	
 	assert(argument == HANDLER_VISITED);
 }
@@ -124,7 +124,7 @@ void swi_test_error_intr_entropy_set()
 		SWI_TEST_THREAD_PRIO, INTR_ENTROPY, &test_ih);
 	assert(retval == EINVAL);
 	
-	usleep(SWI_SLEEP_TIME);
+	sleep(SWI_SLEEP_TIME);
 	
 	assert(argument == HANDLER_NOT_VISITED);
 }
@@ -148,7 +148,7 @@ void swi_test_error_name_null()
 		SWI_TEST_THREAD_PRIO, 0, &test_ih);
 	assert(retval == EINVAL);
 	
-	usleep(SWI_SLEEP_TIME);
+	sleep(SWI_SLEEP_TIME);
 	
 	assert(argument == HANDLER_NOT_VISITED);
 }
@@ -166,7 +166,7 @@ void swi_test_error_handler_null()
 		SWI_TEST_THREAD_PRIO, 0, &test_ih);
 	assert(retval == EINVAL);
 	
-	usleep(SWI_SLEEP_TIME);
+	sleep(SWI_SLEEP_TIME);
 	
 	assert(argument == HANDLER_NOT_VISITED);
 }
@@ -189,7 +189,7 @@ void swi_test_error_has_allready_exclusive()
 		SWI_TEST_THREAD_PRIO, 0, &test_ih2);
 	assert(retval == EINVAL);
 	
-	usleep(SWI_SLEEP_TIME);
+	sleep(SWI_SLEEP_TIME);
 	
 	assert(argument == HANDLER_NOT_VISITED);
 }
diff --git a/testsuite/timeout01/Makefile b/testsuite/timeout01/Makefile
deleted file mode 100644
index 78a4b7ed..00000000
--- a/testsuite/timeout01/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-include ../../config.inc
-
-APP = timeout01
-PGM=${ARCH}/$(APP).exe
-
-# optional managers required
-MANAGERS=all
-
-# C source names
-C_FILES = init.c timeout_helper.c timeout_test.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a ${REL_ARGS}
-CFLAGS += $(DEPFLAGS) $(GCCFLAGS) $(AM_CPPFLAGS) -Wno-unused -Wl,-Map,$(APP).map
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-OBJS= $(C_O_FILES)
-CLEAN_ADDITIONS += $(APP).map *.dep
-
-all:    ${ARCH} $(PGM)
-
-$(PGM): $(OBJS)
-	-$(make-exe)
diff --git a/testsuite/timeout01/init.c b/testsuite/timeout01/init.c
index f1bd5291..e632bb0a 100644
--- a/testsuite/timeout01/init.c
+++ b/testsuite/timeout01/init.c
@@ -35,7 +35,7 @@
 
 #include <rtems.h>
 
-#include <freebsd/bsd.h>
+#include <rtems/bsd/bsd.h>
 
 #include "timeout_test.h"
 #include "timeout_helper.h"
diff --git a/testsuite/timeout01/timeout_helper.c b/testsuite/timeout01/timeout_helper.c
index 88d8510d..060fef0b 100644
--- a/testsuite/timeout01/timeout_helper.c
+++ b/testsuite/timeout01/timeout_helper.c
@@ -29,10 +29,10 @@
  * SUCH DAMAGE.
  */
 
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/systm.h>
+#include <sys/param.h>
+#include <sys/systm.h>
 
 #include <assert.h>
 #include <malloc.h>
diff --git a/testsuite/timeout01/timeout_test.c b/testsuite/timeout01/timeout_test.c
index b89feb84..8ce0b41e 100644
--- a/testsuite/timeout01/timeout_test.c
+++ b/testsuite/timeout01/timeout_test.c
@@ -34,15 +34,15 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <freebsd/machine/rtems-bsd-config.h>
+#include <machine/rtems-bsd-config.h>
 
-#include <freebsd/sys/types.h>
-#include <freebsd/sys/systm.h>
+#include <rtems/bsd/sys/types.h>
+#include <sys/systm.h>
 
-#include <freebsd/sys/param.h>
-#include <freebsd/sys/lock.h>
-#include <freebsd/sys/mutex.h>
-#include <freebsd/sys/rwlock.h>
+#include <rtems/bsd/sys/param.h>
+#include <rtems/bsd/sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/rwlock.h>
 
 #define TIMEOUT_MILLISECONDS	(100)
 
diff --git a/testsuite/usb01/Makefile b/testsuite/usb01/Makefile
deleted file mode 100644
index d12a215d..00000000
--- a/testsuite/usb01/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-
-include ../../config.inc
-
-APP=usb01
-PGM=${ARCH}/$(APP).exe
-
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-C_PIECES = init test-file-system
-C_O_FILES = $(C_PIECES:%=%.o)
-C_DEP_FILES = $(C_PIECES:%=%.dep)
-
-OBJS= $(C_O_FILES)
-
-DEPFLAGS = -MT $@ -MD -MP -MF $*.dep
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include -I.
-CLEAN_ADDITIONS += $(APP).exe $(ARCH)/$(APP).map $(C_DEP_FILES)
-CLEAN_ADDITIONS += $(C_DEP_FILES)
-
-CFLAGS += $(DEPFLAGS) $(GCCFLAGS) $(AM_CPPFLAGS)
-CFLAGS += -Wno-unused
-CFLAGS += -Wl,-Map,$(ARCH)/$(APP).map
-
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a
-
-all: $(ARCH) $(PGM)
-
-$(PGM): $(C_O_FILES)
-	$(make-exe)
-
--include $(C_DEP_FILES)
diff --git a/testsuite/usb01/init.c b/testsuite/usb01/init.c
index 0bde78d7..517d1544 100644
--- a/testsuite/usb01/init.c
+++ b/testsuite/usb01/init.c
@@ -31,7 +31,7 @@
 #include <rtems/shell.h>
 #include <rtems/console.h>
 #include <rtems/diskdevs.h>
-#include <freebsd/bsd.h>
+#include <rtems/bsd/bsd.h>
 
 #include "test.h"
 
@@ -295,19 +295,9 @@ static void Init(rtems_task_argument arg)
 #define CONFIGURE_BDBUF_CACHE_MEMORY_SIZE (WORKER_COUNT * 512)
 #define CONFIGURE_BDBUF_MAX_READ_AHEAD_BLOCKS 0
 
-#define CONFIGURE_MAXIMUM_TASKS 64
-#define CONFIGURE_MAXIMUM_DRIVERS 4
-#define CONFIGURE_MAXIMUM_SEMAPHORES 64
-#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES 4
-#define CONFIGURE_MAXIMUM_TIMERS 64
-#define CONFIGURE_MAXIMUM_PERIODS 4
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
-#define CONFIGURE_MAXIMUM_BARRIERS 1
+#define CONFIGURE_UNLIMITED_OBJECTS
 
-#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 32
-#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 64
-
-#define CONFIGURE_EXTRA_TASK_STACKS (1 * 1024 * 1024)
+#define CONFIGURE_UNIFIED_WORK_AREAS
 
 #define CONFIGURE_RTEMS_INIT_TASKS_TABLE
 
diff --git a/testsuite/usb01/usb-sysinit.h b/testsuite/usb01/usb-sysinit.h
index 367ea69a..0ee09dd1 100644
--- a/testsuite/usb01/usb-sysinit.h
+++ b/testsuite/usb01/usb-sysinit.h
@@ -20,7 +20,7 @@
  * http://www.rtems.com/license/LICENSE.
  */
 
-#include <freebsd/machine/rtems-bsd-sysinit.h>
+#include <machine/rtems-bsd-sysinit.h>
 
 #include <bsp.h>