summaryrefslogtreecommitdiffstats
path: root/testsuite/usb01
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2013-10-09 22:52:54 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2013-10-10 09:08:23 +0200
commite599318e912d8836c59d8b5202e3e31a6b8dcae9 (patch)
tree1172b8b830a1c3236e45c834c2b80e01325ea144 /testsuite/usb01
parentMove files to match FreeBSD layout (diff)
downloadrtems-libbsd-e599318e912d8836c59d8b5202e3e31a6b8dcae9.tar.bz2
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.
Diffstat (limited to 'testsuite/usb01')
-rw-r--r--testsuite/usb01/Makefile33
-rw-r--r--testsuite/usb01/init.c16
-rw-r--r--testsuite/usb01/usb-sysinit.h2
3 files changed, 4 insertions, 47 deletions
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>