From db1eb5fd27fb7bf5ecda74378353e1b05b80ee85 Mon Sep 17 00:00:00 2001 From: emaste Date: Tue, 12 Aug 2014 14:53:02 +0000 Subject: [PATCH] MFC cleanup of libusb20 example r257779 by hselasky: - Use libusb20_strerror() function instead of custom usb_error() one. - Rename "aux.[ch]" to "util.[ch]" which is a more common name for utility functions and allows checkout on some non-FreeBSD systems where the "aux.*" namespace is reserved. - Fix some compile warnings while at it. r257796 by glebius: Finish r257779. PR: 183728 git-svn-id: svn://svn.freebsd.org/base/stable/10@269879 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- ObsoleteFiles.inc | 3 + share/examples/Makefile | 4 +- share/examples/libusb20/Makefile | 9 +- share/examples/libusb20/aux.c | 120 ---------------------- share/examples/libusb20/bulk.c | 16 +-- share/examples/libusb20/control.c | 17 +-- share/examples/libusb20/util.c | 50 +++++++++ share/examples/libusb20/{aux.h => util.h} | 1 - 8 files changed, 77 insertions(+), 143 deletions(-) delete mode 100644 share/examples/libusb20/aux.c create mode 100644 share/examples/libusb20/util.c rename share/examples/libusb20/{aux.h => util.h} (92%) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index dc991db5d..950e43089 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20140812: example files removed +OLD_FILES+=usr/share/examples/libusb20/aux.c +OLD_FILES+=usr/share/examples/libusb20/aux.h # 20140728: Remove an obsolete man page OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz diff --git a/share/examples/Makefile b/share/examples/Makefile index 70eadc1fb..37f3d3106 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -107,8 +107,8 @@ XFILES= BSD_daemon/FreeBSD.pfa \ kld/syscall/test/call.c \ libusb20/Makefile \ libusb20/README \ - libusb20/aux.c \ - libusb20/aux.h \ + libusb20/util.c \ + libusb20/util.h \ libusb20/bulk.c \ libusb20/control.c \ libvgl/Makefile \ diff --git a/share/examples/libusb20/Makefile b/share/examples/libusb20/Makefile index 6f870a192..f0da6bf52 100644 --- a/share/examples/libusb20/Makefile +++ b/share/examples/libusb20/Makefile @@ -1,13 +1,14 @@ # $FreeBSD$ TARGETS= bulk control +CFLAGS+= -Wall all: $(TARGETS) -bulk: bulk.o aux.o - $(CC) $(CFLAGS) -o bulk bulk.o aux.o -lusb +bulk: bulk.o util.o + $(CC) $(CFLAGS) -o bulk bulk.o util.o -lusb -control: control.o aux.o - $(CC) $(CFLAGS) -o control control.o aux.o -lusb +control: control.o util.o + $(CC) $(CFLAGS) -o control control.o util.o -lusb clean: rm -f $(TARGETS) *.o *~ diff --git a/share/examples/libusb20/aux.c b/share/examples/libusb20/aux.c deleted file mode 100644 index 434972aa7..000000000 --- a/share/examples/libusb20/aux.c +++ /dev/null @@ -1,120 +0,0 @@ -/* ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp): - * wrote this file. As long as you retain this notice you - * can do whatever you want with this stuff. If we meet some day, and you think - * this stuff is worth it, you can buy me a beer in return. Joerg Wunsch - * ---------------------------------------------------------------------------- - * - * $FreeBSD$ - */ - -/* - * Helper functions common to all examples - */ - -#include -#include -#include - -#include -#include - -#include "aux.h" - -/* - * Return a textual description for error "r". - */ -const char * -usb_error(enum libusb20_error r) -{ - const char *msg = "UNKNOWN"; - - switch (r) - { - case LIBUSB20_SUCCESS: - msg = "success"; - break; - - case LIBUSB20_ERROR_IO: - msg = "IO error"; - break; - - case LIBUSB20_ERROR_INVALID_PARAM: - msg = "Invalid parameter"; - break; - - case LIBUSB20_ERROR_ACCESS: - msg = "Access denied"; - break; - - case LIBUSB20_ERROR_NO_DEVICE: - msg = "No such device"; - break; - - case LIBUSB20_ERROR_NOT_FOUND: - msg = "Entity not found"; - break; - - case LIBUSB20_ERROR_BUSY: - msg = "Resource busy"; - break; - - case LIBUSB20_ERROR_TIMEOUT: - msg = "Operation timed out"; - break; - - case LIBUSB20_ERROR_OVERFLOW: - msg = "Overflow"; - break; - - case LIBUSB20_ERROR_PIPE: - msg = "Pipe error"; - break; - - case LIBUSB20_ERROR_INTERRUPTED: - msg = "System call interrupted"; - break; - - case LIBUSB20_ERROR_NO_MEM: - msg = "Insufficient memory"; - break; - - case LIBUSB20_ERROR_NOT_SUPPORTED: - msg = "Operation not supported"; - break; - - case LIBUSB20_ERROR_OTHER: - msg = "Other error"; - break; - } - - return msg; -} - -/* - * Print "len" bytes from "buf" in hex, followed by an ASCII - * representation (somewhat resembling the output of hd(1)). - */ -void -print_formatted(uint8_t *buf, uint32_t len) -{ - int i, j; - - for (j = 0; j < len; j += 16) - { - printf("%02x: ", j); - - for (i = 0; i < 16 && i + j < len; i++) - printf("%02x ", buf[i + j]); - printf(" "); - for (i = 0; i < 16 && i + j < len; i++) - { - uint8_t c = buf[i + j]; - if(c >= ' ' && c <= '~') - printf("%c", (char)c); - else - putchar('.'); - } - putchar('\n'); - } -} diff --git a/share/examples/libusb20/bulk.c b/share/examples/libusb20/bulk.c index 7b6b02c00..08ba029c0 100644 --- a/share/examples/libusb20/bulk.c +++ b/share/examples/libusb20/bulk.c @@ -41,7 +41,7 @@ #include #include -#include "aux.h" +#include "util.h" /* * If you want to see the details of the internal datastructures @@ -74,7 +74,7 @@ doit(struct libusb20_device *dev) */ if ((rv = libusb20_dev_open(dev, 2)) != 0) { - fprintf(stderr, "libusb20_dev_open: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_dev_open: %s\n", libusb20_strerror(rv)); return; } @@ -84,7 +84,7 @@ doit(struct libusb20_device *dev) */ if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0) { - fprintf(stderr, "libusb20_dev_set_config_index: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_dev_set_config_index: %s\n", libusb20_strerror(rv)); return; } @@ -97,7 +97,7 @@ doit(struct libusb20_device *dev) if (xfr_in == NULL || xfr_out == NULL) { - fprintf(stderr, "libusb20_tr_get_pointer: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_get_pointer: %s\n", libusb20_strerror(rv)); return; } @@ -107,12 +107,12 @@ doit(struct libusb20_device *dev) */ if ((rv = libusb20_tr_open(xfr_out, 0, 1, out_ep)) != 0) { - fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_open: %s\n", libusb20_strerror(rv)); return; } if ((rv = libusb20_tr_open(xfr_in, 0, 1, in_ep)) != 0) { - fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_open: %s\n", libusb20_strerror(rv)); return; } @@ -124,7 +124,7 @@ doit(struct libusb20_device *dev) if ((rv = libusb20_tr_bulk_intr_sync(xfr_out, out_buf, out_len, &rlen, TIMEOUT)) != 0) { - fprintf(stderr, "libusb20_tr_bulk_intr_sync (OUT): %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_bulk_intr_sync (OUT): %s\n", libusb20_strerror(rv)); } printf("sent %d bytes\n", rlen); } @@ -132,7 +132,7 @@ doit(struct libusb20_device *dev) if ((rv = libusb20_tr_bulk_intr_sync(xfr_in, in_buf, BUFLEN, &rlen, TIMEOUT)) != 0) { - fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", libusb20_strerror(rv)); } printf("received %d bytes\n", rlen); if (rlen > 0) diff --git a/share/examples/libusb20/control.c b/share/examples/libusb20/control.c index 0a9d15206..724ef5979 100644 --- a/share/examples/libusb20/control.c +++ b/share/examples/libusb20/control.c @@ -11,8 +11,6 @@ /* * Simple demo program to illustrate the handling of FreeBSD's * libusb20. - * - * XXX */ /* @@ -38,12 +36,15 @@ #include #include #include +#include #include #include #include +#include "util.h" + /* * If you want to see the details of the internal datastructures * in the debugger, unifdef the following. @@ -86,7 +87,7 @@ doit(struct libusb20_device *dev) */ if ((rv = libusb20_dev_open(dev, 1)) != 0) { - fprintf(stderr, "libusb20_dev_open: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_dev_open: %s\n", libusb20_strerror(rv)); return; } @@ -96,7 +97,7 @@ doit(struct libusb20_device *dev) */ if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0) { - fprintf(stderr, "libusb20_dev_set_config_index: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_dev_set_config_index: %s\n", libusb20_strerror(rv)); return; } @@ -126,7 +127,7 @@ doit(struct libusb20_device *dev) 0 /* flags */)) != 0) { fprintf(stderr, - "libusb20_dev_request_sync: %s\n", usb_error(rv)); + "libusb20_dev_request_sync: %s\n", libusb20_strerror(rv)); } printf("sent %d bytes\n", actlen); if ((setup.bmRequestType & 0x80) != 0) @@ -146,7 +147,7 @@ doit(struct libusb20_device *dev) if (xfr_intr == NULL) { - fprintf(stderr, "libusb20_tr_get_pointer: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_get_pointer: %s\n", libusb20_strerror(rv)); return; } @@ -155,7 +156,7 @@ doit(struct libusb20_device *dev) */ if ((rv = libusb20_tr_open(xfr_intr, 0, 1, intr_ep)) != 0) { - fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_open: %s\n", libusb20_strerror(rv)); return; } @@ -165,7 +166,7 @@ doit(struct libusb20_device *dev) if ((rv = libusb20_tr_bulk_intr_sync(xfr_intr, in_buf, BUFLEN, &rlen, TIMEOUT)) != 0) { - fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", usb_error(rv)); + fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", libusb20_strerror(rv)); } printf("received %d bytes\n", rlen); if (rlen > 0) diff --git a/share/examples/libusb20/util.c b/share/examples/libusb20/util.c new file mode 100644 index 000000000..4a24ee0cf --- /dev/null +++ b/share/examples/libusb20/util.c @@ -0,0 +1,50 @@ +/* ---------------------------------------------------------------------------- + * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp): + * wrote this file. As long as you retain this notice you + * can do whatever you want with this stuff. If we meet some day, and you think + * this stuff is worth it, you can buy me a beer in return. Joerg Wunsch + * ---------------------------------------------------------------------------- + * + * $FreeBSD$ + */ + +/* + * Helper functions common to all examples + */ + +#include +#include +#include + +#include +#include + +#include "util.h" + +/* + * Print "len" bytes from "buf" in hex, followed by an ASCII + * representation (somewhat resembling the output of hd(1)). + */ +void +print_formatted(uint8_t *buf, uint32_t len) +{ + int i, j; + + for (j = 0; j < len; j += 16) + { + printf("%02x: ", j); + + for (i = 0; i < 16 && i + j < len; i++) + printf("%02x ", buf[i + j]); + printf(" "); + for (i = 0; i < 16 && i + j < len; i++) + { + uint8_t c = buf[i + j]; + if(c >= ' ' && c <= '~') + printf("%c", (char)c); + else + putchar('.'); + } + putchar('\n'); + } +} diff --git a/share/examples/libusb20/aux.h b/share/examples/libusb20/util.h similarity index 92% rename from share/examples/libusb20/aux.h rename to share/examples/libusb20/util.h index d43ea4e57..5fd2a6e09 100644 --- a/share/examples/libusb20/aux.h +++ b/share/examples/libusb20/util.h @@ -11,5 +11,4 @@ #include #include -const char *usb_error(enum libusb20_error r); void print_formatted(uint8_t *buf, uint32_t len); -- 2.45.0