Changeset a81a1d09 in mainline for uspace/app/tester

Timestamp:

2011-05-11T16:49:28Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• adt/usbaddrkeep.def (deleted)
• tester.c (modified) (1 diff)
• tester.h (modified) (1 diff)

uspace/app/tester/Makefile

@@ -31 +31 @@
 BINARY = tester
 
-LIBS += $(LIBUSB_PREFIX)/libusb.a
-EXTRA_CFLAGS += -I$(LIBUSB_PREFIX)/include
-
 SOURCES = \
         tester.c \
-        adt/usbaddrkeep.c \
         thread/thread1.c \
         print/print1.c \

uspace/app/tester/tester.c

@@ -64 +64 @@
 #include "mm/mapping1.def"
 #include "hw/serial/serial1.def"
-#include "adt/usbaddrkeep.def"
 #include "hw/misc/virtchar1.def"
 #include "devs/devman1.def"

uspace/app/tester/tester.h

@@ -80 +80 @@
 extern const char *test_mapping1(void);
 extern const char *test_serial1(void);
-extern const char *test_usbaddrkeep(void);
 extern const char *test_virtchar1(void);
 extern const char *test_devman1(void);