userspace: userspace tools v1.0.0

The new and improved (well somewhat, with a ways to go) userspace utility. mfm:pts/8[~/tmp/userspace] May26 05:18:31 % ./src/usbip help usage: usbip [--debug] [version] [help] <command> <args> attach Attach a remote USB device detach Detach a remote USB device list List exported or local USB devices bind Bind device to usbip-host.ko unbind Unbind device from usbip-host.ko This first commit of the userspace `usbip' utility uses to same implementation as the old tools, `usbip' and `usbip_bind_driver'. Nothing significant has changed so compatibility with windows has _not_ been broken. However, the tools remain broken in many ways due to the old implementation. Signed-off-by: matt mooney <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
george-hopkins · Sep 14, 2017 · 133bc67 · 133bc67
1 parent 7475e33
commit 133bc67
Show file tree

Hide file tree

Showing 19 changed files with 1,285 additions and 1,381 deletions.
diff --git a/userspace/config_windows.h b/userspace/config_windows.h
@@ -12,7 +12,7 @@
 #define PACKAGE_NAME "usbip"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "usbip 0.2.0"
+#define PACKAGE_STRING "usbip 1.0.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "usbip"
@@ -21,12 +21,12 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.2.0"
+#define PACKAGE_VERSION "1.0.0"
 
 /* numeric version number */
-#define USBIP_VERSION 0x000106
+#define USBIP_VERSION 0x000100
 
 /* Version number of package */
-#define VERSION "0.2.0"
+#define VERSION "1.0.0"
 
 #endif
diff --git a/userspace/configure.ac b/userspace/configure.ac
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Keep this file in sync with config_windows.h.
 
 AC_PREREQ(2.59)
-AC_INIT([usbip], [0.2.0], [[email protected]])
-AC_DEFINE([USBIP_VERSION], [0x000106], [numeric version number])
+AC_INIT([usbip], [1.0.0], [[email protected]])
+AC_DEFINE([USBIP_VERSION], [0x00000100], [binary-coded decimal version number])
 
 CURRENT=0
 REVISION=1

diff --git a/userspace/libsrc/usbip.h b/userspace/libsrc/usbip.h
@@ -36,8 +36,10 @@ typedef signed int ssize_t;
 #endif /* !__linux__ */
 
 #include "usbip_common.h"
+#ifdef __linux__
 #include "stub_driver.h"
 #include "vhci_driver.h"
+#endif
 #ifdef DMALLOC
 #include <dmalloc.h>
 #endif

diff --git a/userspace/libsrc/usbip_common.h b/userspace/libsrc/usbip_common.h
@@ -27,7 +27,8 @@
 #include <sysfs/libsysfs.h>
 #include <netdb.h>
 #include <sys/socket.h>
-
+#else
+#include "usbip.h"
 #endif
 
 #ifndef USBIDS_FILE

diff --git a/userspace/src/Makefile.am b/userspace/src/Makefile.am
@@ -2,9 +2,10 @@ AM_CPPFLAGS := -I$(top_srcdir)/libsrc -DUSBIDS_FILE='"@USBIDS_DIR@/usb.ids"'
 AM_CFLAGS   := @EXTRA_CFLAGS@ @PACKAGE_CFLAGS@
 LDADD       := $(top_srcdir)/libsrc/libusbip.la @PACKAGE_LIBS@
 
-sbin_PROGRAMS := usbip usbipd usbip_bind_driver
+sbin_PROGRAMS := usbip usbipd
 
-usbip_SOURCES := usbip.c usbip_network.c usbip_network.h
-usbipd_SOURCES := usbipd.c usbip_network.c usbip_network.h
-usbip_bind_driver_SOURCES := bind-driver.c utils.c utils.h \
-			     usbip_network.h usbip_network.c
+usbip_SOURCES := usbip.c utils.c usbip_network.c \
+		 usbip_attach.c usbip_detach.c usbip_list.c \
+		 usbip_bind.c usbip_unbind.c
+
+usbipd_SOURCES := usbipd.c usbip_network.c