summaryrefslogtreecommitdiff
path: root/usbredirtestclient/usbredirtestclient.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2011-06-09 12:20:08 +0200
committerHans de Goede <hdegoede@redhat.com>2011-06-09 12:20:08 +0200
commit6d25f6f7467173b1e70a4c7e3eeea53af7ac3370 (patch)
treeba6693791acff0c27c5269e54aaf0be669518eba /usbredirtestclient/usbredirtestclient.c
parent2a837d795e024764dc504f728da4113a0aa4a8ae (diff)
Drop the usb_redir_reset_status packet type
Drop usb_redir_reset_status, instead if reconnecting to the device fails after reset the usb-host will send a usb_redir_device_disconnected packet
Diffstat (limited to 'usbredirtestclient/usbredirtestclient.c')
-rw-r--r--usbredirtestclient/usbredirtestclient.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/usbredirtestclient/usbredirtestclient.c b/usbredirtestclient/usbredirtestclient.c
index 47c4009..489ac0e 100644
--- a/usbredirtestclient/usbredirtestclient.c
+++ b/usbredirtestclient/usbredirtestclient.c
@@ -48,8 +48,6 @@ static void usbredirtestclient_device_info(void *priv,
static void usbredirtestclient_ep_info(void *priv,
struct usb_redir_ep_info_header *ep_info);
static void usbredirtestclient_device_disconnected(void *priv);
-static void usbredirtestclient_reset_status(void *priv, uint32_t id,
- struct usb_redir_reset_status_header *reset_status);
static void usbredirtestclient_configuration_status(void *priv, uint32_t id,
struct usb_redir_configuration_status_header *configuration_status);
static void usbredirtestclient_alt_setting_status(void *priv, uint32_t id,
@@ -275,7 +273,6 @@ int main(int argc, char *argv[])
parser->device_info_func = usbredirtestclient_device_info;
parser->ep_info_func = usbredirtestclient_ep_info;
parser->device_disconnected_func = usbredirtestclient_device_disconnected;
- parser->reset_status_func = usbredirtestclient_reset_status;
parser->configuration_status_func = usbredirtestclient_configuration_status;
parser->alt_setting_status_func = usbredirtestclient_alt_setting_status;
parser->iso_stream_status_func = usbredirtestclient_iso_stream_status;
@@ -287,9 +284,10 @@ int main(int argc, char *argv[])
parser->interrupt_packet_func = usbredirtestclient_interrupt_packet;
usbredirparser_init(parser, VERSION, NULL, 0, 0);
- /* Queue a reset, the other test commands will be send in response
- to the status packets of previous commands */
+ /* Queue a reset + set config the other test commands will be send in
+ response to the status packets of previous commands */
usbredirparser_send_reset(parser, reset_id);
+ usbredirparser_send_get_configuration(parser, get_config_id);
run_main_loop();
@@ -464,19 +462,6 @@ static void usbredirtestclient_device_disconnected(void *priv)
client_fd = -1;
}
-static void usbredirtestclient_reset_status(void *priv, uint32_t id,
- struct usb_redir_reset_status_header *reset_status)
-{
- switch (id) {
- case reset_id:
- printf("Reset status: %d\n", reset_status->status);
- usbredirparser_send_get_configuration(parser, get_config_id);
- break;
- default:
- fprintf(stderr, "Unexpected reset status packet, id: %d\n", id);
- }
-}
-
static void usbredirtestclient_configuration_status(void *priv, uint32_t id,
struct usb_redir_configuration_status_header *config_status)
{