Changeset 7964475 in mainline for uspace/app

Timestamp:

2010-12-10T15:08:26Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

c01255c

Parents:

b5ec347 (diff), cdc1aa1 (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 with development/

Location:

uspace/app

Files:

• netecho/print_error.c (modified) (1 diff)
• tester/Makefile (modified) (1 diff)
• tester/adt/usbaddrkeep.c (added)
• tester/adt/usbaddrkeep.def (added)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (1 diff)
• usbinfo/Makefile (added)
• usbinfo/dump.c (added)
• usbinfo/main.c (added)
• usbinfo/usbinfo.h (added)

uspace/app/netecho/print_error.c

@@ -164 +164 @@
         case EDESTADDRREQ:
                 fprintf(output, "Destination address required (%d) error", error_code);
-        case TRY_AGAIN:
+        case EAGAIN:
                 fprintf(output, "Try again (%d) error", error_code);
         default:

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

@@ -65 +65 @@
 #include "mm/malloc1.def"
 #include "hw/serial/serial1.def"
+#include "adt/usbaddrkeep.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -82 +82 @@
 extern const char *test_malloc1(void);
 extern const char *test_serial1(void);
+extern const char *test_usbaddrkeep(void);
 
 extern test_t tests[];