diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-03-06 13:18:59 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2012-03-06 15:42:20 +0100 |
| commit | 5c25d7aa72112ce5eea54f37180158cf0ae65c12 (patch) | |
| tree | 2e3b37b1efa27ae7c5abff2e1162007ece4fe152 | |
| parent | 76f91a7613ec8bc6f3610cbecc74881b09316dba (diff) | |
Add usb_redir_babble status code
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | usb-redirection-protocol.txt | 13 | ||||
| -rw-r--r-- | usbredirhost/usbredirhost.c | 2 | ||||
| -rw-r--r-- | usbredirparser/usbredirproto.h | 1 |
4 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,7 @@ usbredir-0.4.2 6 March 2012 --------------------------- +-Add usb_redir_babble status code + -usbredirhost: -Ensure we always re-attach kernel drivers on cleanup -Make set_config handling more robust diff --git a/usb-redirection-protocol.txt b/usb-redirection-protocol.txt index 081508a..bdfe337 100644 --- a/usb-redirection-protocol.txt +++ b/usb-redirection-protocol.txt @@ -1,4 +1,4 @@ -USB Network Redirection protocol description version 0.4 (22 February 2012) +USB Network Redirection protocol description version 0.4.2 (6 March 2012) Revisions --------- @@ -59,8 +59,14 @@ Version 0.4, released 22 February 2012 - Add an usb_redir_device_disconnect_ack packet and an usb_redir_cap_device_disconnect_ack capability flag -USB redirerection protocol version 0.4 --------------------------------------- +Version 0.4.1, released 25 February 2012 +- No protocol changes + +Version 0.4.2, released 6 March 2012 +- Add usb_redir_babble status code + +USB redirerection protocol version 0.4.2 +---------------------------------------- The protocol described in this document is meant for tunneling usb transfers to a single usb device. Note: not an entire hub, only a single device. @@ -174,6 +180,7 @@ enum { usb_redir_ioerror, /* IO error */ usb_redir_stall, /* Stalled */ usb_redir_timeout, /* Request timed out */ + usb_redir_babble, /* The device has "babbled" */ }; Note that in future versions there may be additional status codes to signal diff --git a/usbredirhost/usbredirhost.c b/usbredirhost/usbredirhost.c index 6804346..50820c3 100644 --- a/usbredirhost/usbredirhost.c +++ b/usbredirhost/usbredirhost.c @@ -274,7 +274,7 @@ static int libusb_status_or_error_to_redir_status(struct usbredirhost *host, usbredirhost_handle_disconnect(host); return usb_redir_ioerror; case LIBUSB_TRANSFER_OVERFLOW: - return usb_redir_ioerror; + return usb_redir_babble; case LIBUSB_ERROR_INVALID_PARAM: return usb_redir_inval; diff --git a/usbredirparser/usbredirproto.h b/usbredirparser/usbredirproto.h index 6e4670b..2866e22 100644 --- a/usbredirparser/usbredirproto.h +++ b/usbredirparser/usbredirproto.h @@ -49,6 +49,7 @@ enum { usb_redir_ioerror, /* IO error */ usb_redir_stall, /* Stalled */ usb_redir_timeout, /* Request timed out */ + usb_redir_babble, /* The device has "babbled" (since 0.4.2) */ }; enum { |