Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7af4c22 authored by Igor Kotrasinski's avatar Igor Kotrasinski Committed by Greg Kroah-Hartman
Browse files

usbip: vudc: Make usbip_common vudc-aware 



Add constants for VUDC events in usbip_common.h
and make use of them in usbip_common.c.

This commit is a result of cooperation between Samsung R&D Institute
Poland and Open Operating Systems Student Society at University
of Warsaw (O2S3@UW) consisting of:

    Igor Kotrasinski <ikotrasinsk@gmail.com>
    Karol Kosik <karo9@interia.eu>
    Ewelina Kosmider <3w3lfin@gmail.com>
    Dawid Lazarczyk <lazarczyk.dawid@gmail.com>
    Piotr Szulc <ps347277@students.mimuw.edu.pl>

Tutor and project owner:
    Krzysztof Opasiak <k.opasiak@samsung.com>

Signed-off-by: default avatarIgor Kotrasinski <i.kotrasinsk@samsung.com>
Signed-off-by: default avatarKarol Kosik <karo9@interia.eu>
[Small fixes and commit message update]
Signed-off-by: default avatarKrzysztof Opasiak <k.opasiak@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 602364fd

drivers/usb/usbip/usbip_common.c

+6 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2003-2008 Takahiro Hirofuchi

 * Copyright (C) 2015-2016 Samsung Electronics

 *               Krzysztof Opasiak <k.opasiak@samsung.com>

 *

 * This is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -643,7 +645,7 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb) 
			ret);

		kfree(buff);



		if (ud->side == USBIP_STUB)

		if (ud->side == USBIP_STUB || ud->side == USBIP_VUDC)

			usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);

		else

			usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
@@ -665,7 +667,7 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb) 
			"total length of iso packets %d not equal to actual length of buffer %d\n",

			total_length, urb->actual_length);



		if (ud->side == USBIP_STUB)

		if (ud->side == USBIP_STUB || ud->side == USBIP_VUDC)

			usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);

		else

			usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
@@ -723,7 +725,7 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb) 
	int ret;

	int size;



	if (ud->side == USBIP_STUB) {

	if (ud->side == USBIP_STUB || ud->side == USBIP_VUDC) {

		/* the direction of urb must be OUT. */

		if (usb_pipein(urb->pipe))

			return 0;
@@ -755,7 +757,7 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb) 
	ret = usbip_recv(ud->tcp_socket, urb->transfer_buffer, size);

	if (ret != size) {

		dev_err(&urb->dev->dev, "recv xbuf, %d\n", ret);

		if (ud->side == USBIP_STUB) {

		if (ud->side == USBIP_STUB || ud->side == USBIP_VUDC) {

			usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);

		} else {

			usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);

drivers/usb/usbip/usbip_common.h

+10 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2003-2008 Takahiro Hirofuchi

 * Copyright (C) 2015-2016 Samsung Electronics

 *               Krzysztof Opasiak <k.opasiak@samsung.com>

 *

 * This is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -234,6 +236,7 @@ struct usbip_iso_packet_descriptor { 
enum usbip_side {

	USBIP_VHCI,

	USBIP_STUB,

	USBIP_VUDC,

};



/* event handler */
@@ -248,6 +251,13 @@ enum usbip_side { 
#define	SDEV_EVENT_ERROR_SUBMIT	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)

#define	SDEV_EVENT_ERROR_MALLOC	(USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE)



#define VUDC_EVENT_REMOVED   (USBIP_EH_SHUTDOWN | USBIP_EH_RESET | USBIP_EH_BYE)

#define	VUDC_EVENT_DOWN		(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)

#define	VUDC_EVENT_ERROR_TCP	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)

/* catastrophic emulated usb error */

#define	VUDC_EVENT_ERROR_USB	(USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE)

#define	VUDC_EVENT_ERROR_MALLOC	(USBIP_EH_SHUTDOWN | USBIP_EH_UNUSABLE)



#define	VDEV_EVENT_REMOVED	(USBIP_EH_SHUTDOWN | USBIP_EH_BYE)

#define	VDEV_EVENT_DOWN		(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)

#define	VDEV_EVENT_ERROR_TCP	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)