From 0d763e30551a0f0f85bd299194b7e71d3a7bd5f9 Mon Sep 17 00:00:00 2001 From: Alexander Thomas Date: Mon, 19 Sep 2011 16:56:51 +0200 Subject: [PATCH] --- yaml --- r: 268489 b: refs/heads/master c: 7518b9b8fc72a6c0ba67f33bdd4689c7dd28686a h: refs/heads/master i: 268487: 2fa9b8684ca86925484d6a85ff0a6b50c5aae42a v: v3 --- [refs] | 2 +- trunk/drivers/staging/usbip/usbip_common.h | 8 ++++---- .../drivers/staging/usbip/usbip_protocol.txt | 20 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index e253ada7c395..339d366b06c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14739feed0af86c1e7d20c22a46252889bfd887a +refs/heads/master: 7518b9b8fc72a6c0ba67f33bdd4689c7dd28686a diff --git a/trunk/drivers/staging/usbip/usbip_common.h b/trunk/drivers/staging/usbip/usbip_common.h index 074ac4267d3b..be216175ae87 100644 --- a/trunk/drivers/staging/usbip/usbip_common.h +++ b/trunk/drivers/staging/usbip/usbip_common.h @@ -126,12 +126,12 @@ extern struct device_attribute dev_attr_usbip_debug; * */ #define USBIP_CMD_SUBMIT 0x0001 -#define USBIP_RET_SUBMIT 0x0002 -#define USBIP_CMD_UNLINK 0x0003 +#define USBIP_CMD_UNLINK 0x0002 +#define USBIP_RET_SUBMIT 0x0003 #define USBIP_RET_UNLINK 0x0004 -#define USBIP_DIR_IN 0x00 -#define USBIP_DIR_OUT 0x01 +#define USBIP_DIR_OUT 0x00 +#define USBIP_DIR_IN 0x01 /** * struct usbip_header_basic - data pertinent to every request diff --git a/trunk/drivers/staging/usbip/usbip_protocol.txt b/trunk/drivers/staging/usbip/usbip_protocol.txt index 84e353b714bb..0f102081e86c 100644 --- a/trunk/drivers/staging/usbip/usbip_protocol.txt +++ b/trunk/drivers/staging/usbip/usbip_protocol.txt @@ -243,8 +243,8 @@ USBIP_CMD_SUBMIT: Submit an URB -----------+--------+------------+--------------------------------------------------- 8 | 4 | | devid -----------+--------+------------+--------------------------------------------------- - 0xC | 4 | | direction: 0: USBIP_DIR_IN - | | | 1: USBIP_DIR_OUT + 0xC | 4 | | direction: 0: USBIP_DIR_OUT + | | | 1: USBIP_DIR_IN -----------+--------+------------+--------------------------------------------------- 0x10 | 4 | | ep: endpoint number, possible values are: 0...15 -----------+--------+------------+--------------------------------------------------- @@ -285,14 +285,14 @@ USBIP_RET_SUBMIT: Reply for submitting an URB Offset | Length | Value | Description -----------+--------+------------+--------------------------------------------------- - 0 | 4 | 0x00000002 | command + 0 | 4 | 0x00000003 | command -----------+--------+------------+--------------------------------------------------- 4 | 4 | | seqnum: URB sequence number -----------+--------+------------+--------------------------------------------------- 8 | 4 | | devid -----------+--------+------------+--------------------------------------------------- - 0xC | 4 | | direction: 0: USBIP_DIR_IN - | | | 1: USBIP_DIR_OUT + 0xC | 4 | | direction: 0: USBIP_DIR_OUT + | | | 1: USBIP_DIR_IN -----------+--------+------------+--------------------------------------------------- 0x10 | 4 | | ep: endpoint number -----------+--------+------------+--------------------------------------------------- @@ -318,14 +318,14 @@ USBIP_CMD_UNLINK: Unlink an URB Offset | Length | Value | Description -----------+--------+------------+--------------------------------------------------- - 0 | 4 | 0x00000003 | command: URB unlink command + 0 | 4 | 0x00000002 | command: URB unlink command -----------+--------+------------+--------------------------------------------------- 4 | 4 | | seqnum: URB sequence number to unlink: FIXME: is this so? -----------+--------+------------+--------------------------------------------------- 8 | 4 | | devid -----------+--------+------------+--------------------------------------------------- - 0xC | 4 | | direction: 0: USBIP_DIR_IN - | | | 1: USBIP_DIR_OUT + 0xC | 4 | | direction: 0: USBIP_DIR_OUT + | | | 1: USBIP_DIR_IN -----------+--------+------------+--------------------------------------------------- 0x10 | 4 | | ep: endpoint number: zero -----------+--------+------------+--------------------------------------------------- @@ -345,8 +345,8 @@ USBIP_RET_UNLINK: Reply for URB unlink -----------+--------+------------+--------------------------------------------------- 8 | 4 | | devid -----------+--------+------------+--------------------------------------------------- - 0xC | 4 | | direction: 0: USBIP_DIR_IN - | | | 1: USBIP_DIR_OUT + 0xC | 4 | | direction: 0: USBIP_DIR_OUT + | | | 1: USBIP_DIR_IN -----------+--------+------------+--------------------------------------------------- 0x10 | 4 | | ep: endpoint number -----------+--------+------------+---------------------------------------------------