Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 260020
b: refs/heads/master
c: 3c6e9e8
h: refs/heads/master
v: v3
  • Loading branch information
matt mooney authored and Greg Kroah-Hartman committed Jul 8, 2011
1 parent 3fb7e4f commit ea5e4ce
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 90 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e2ec6b4e391a877a9069e1ccc824c5c18dd62eb0
refs/heads/master: 3c6e9e8f350c95fbf17736e42ce273f10094d529
10 changes: 5 additions & 5 deletions trunk/drivers/staging/usbip/userspace/src/usbip_attach.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static int query_import_device(int sockfd, char *busid)
memset(&reply, 0, sizeof(reply));

/* send a request */
rc = usbip_send_op_common(sockfd, OP_REQ_IMPORT, 0);
rc = usbip_net_send_op_common(sockfd, OP_REQ_IMPORT, 0);
if (rc < 0) {
err("send op_common");
return -1;
Expand All @@ -125,20 +125,20 @@ static int query_import_device(int sockfd, char *busid)

PACK_OP_IMPORT_REQUEST(0, &request);

rc = usbip_send(sockfd, (void *) &request, sizeof(request));
rc = usbip_net_send(sockfd, (void *) &request, sizeof(request));
if (rc < 0) {
err("send op_import_request");
return -1;
}

/* receive a reply */
rc = usbip_recv_op_common(sockfd, &code);
/* recieve a reply */
rc = usbip_net_recv_op_common(sockfd, &code);
if (rc < 0) {
err("recv op_common");
return -1;
}

rc = usbip_recv(sockfd, (void *) &reply, sizeof(reply));
rc = usbip_net_recv(sockfd, (void *) &reply, sizeof(reply));
if (rc < 0) {
err("recv op_import_reply");
return -1;
Expand Down
26 changes: 14 additions & 12 deletions trunk/drivers/staging/usbip/userspace/src/usbip_list.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,22 @@ static int get_exported_devices(char *host, int sockfd)
unsigned int i;
int j, rc;

rc = usbip_send_op_common(sockfd, OP_REQ_DEVLIST, 0);
rc = usbip_net_send_op_common(sockfd, OP_REQ_DEVLIST, 0);
if (rc < 0) {
dbg("usbip_send_op_common failed");
dbg("usbip_net_send_op_common failed");
return -1;
}

rc = usbip_recv_op_common(sockfd, &code);
rc = usbip_net_recv_op_common(sockfd, &code);
if (rc < 0) {
dbg("usbip_recv_op_common failed");
dbg("usbip_net_recv_op_common failed");
return -1;
}

memset(&reply, 0, sizeof(reply));
rc = usbip_recv(sockfd, &reply, sizeof(reply));
rc = usbip_net_recv(sockfd, &reply, sizeof(reply));
if (rc < 0) {
dbg("usbip_recv_op_devlist failed");
dbg("usbip_net_recv_op_devlist failed");
return -1;
}
PACK_OP_DEVLIST_REPLY(0, &reply);
Expand All @@ -88,12 +88,12 @@ static int get_exported_devices(char *host, int sockfd)

for (i = 0; i < reply.ndev; i++) {
memset(&udev, 0, sizeof(udev));
rc = usbip_recv(sockfd, &udev, sizeof(udev));
rc = usbip_net_recv(sockfd, &udev, sizeof(udev));
if (rc < 0) {
dbg("usbip_recv failed: usbip_usb_device[%d]", i);
dbg("usbip_net_recv failed: usbip_usb_device[%d]", i);
return -1;
}
pack_usb_device(0, &udev);
usbip_net_pack_usb_device(0, &udev);

usbip_names_get_product(product_name, sizeof(product_name),
udev.idVendor, udev.idProduct);
Expand All @@ -105,12 +105,14 @@ static int get_exported_devices(char *host, int sockfd)
printf("%8s: %s\n", "", class_name);

for (j = 0; j < udev.bNumInterfaces; j++) {
rc = usbip_recv(sockfd, &uintf, sizeof(uintf));
rc = usbip_net_recv(sockfd, &uintf, sizeof(uintf));
if (rc < 0) {
dbg("usbip_recv failed: usbip_usb_intf[%d]", j);
dbg("usbip_net_recv failed: usbip_usb_intf[%d]",
j);

return -1;
}
pack_usb_interface(0, &uintf);
usbip_net_pack_usb_interface(0, &uintf);

usbip_names_get_class(class_name, sizeof(class_name),
uintf.bInterfaceClass,
Expand Down
56 changes: 29 additions & 27 deletions trunk/drivers/staging/usbip/userspace/src/usbip_network.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "usbip_common.h"
#include "usbip_network.h"

void pack_uint32_t(int pack, uint32_t *num)
void usbip_net_pack_uint32_t(int pack, uint32_t *num)
{
uint32_t i;

Expand All @@ -40,7 +40,7 @@ void pack_uint32_t(int pack, uint32_t *num)
*num = i;
}

void pack_uint16_t(int pack, uint16_t *num)
void usbip_net_pack_uint16_t(int pack, uint16_t *num)
{
uint16_t i;

Expand All @@ -52,24 +52,26 @@ void pack_uint16_t(int pack, uint16_t *num)
*num = i;
}

void pack_usb_device(int pack, struct usbip_usb_device *udev)
void usbip_net_pack_usb_device(int pack, struct usbip_usb_device *udev)
{
pack_uint32_t(pack, &udev->busnum);
pack_uint32_t(pack, &udev->devnum);
pack_uint32_t(pack, &udev->speed );
usbip_net_pack_uint32_t(pack, &udev->busnum);
usbip_net_pack_uint32_t(pack, &udev->devnum);
usbip_net_pack_uint32_t(pack, &udev->speed );

pack_uint16_t(pack, &udev->idVendor );
pack_uint16_t(pack, &udev->idProduct);
pack_uint16_t(pack, &udev->bcdDevice);
usbip_net_pack_uint16_t(pack, &udev->idVendor);
usbip_net_pack_uint16_t(pack, &udev->idProduct);
usbip_net_pack_uint16_t(pack, &udev->bcdDevice);
}

void pack_usb_interface(int pack __attribute__((unused)),
struct usbip_usb_interface *udev __attribute__((unused)))
void usbip_net_pack_usb_interface(int pack __attribute__((unused)),
struct usbip_usb_interface *udev
__attribute__((unused)))
{
/* uint8_t members need nothing */
}

static ssize_t usbip_xmit(int sockfd, void *buff, size_t bufflen, int sending)
static ssize_t usbip_net_xmit(int sockfd, void *buff, size_t bufflen,
int sending)
{
ssize_t nbytes;
ssize_t total = 0;
Expand All @@ -95,17 +97,17 @@ static ssize_t usbip_xmit(int sockfd, void *buff, size_t bufflen, int sending)
return total;
}

ssize_t usbip_recv(int sockfd, void *buff, size_t bufflen)
ssize_t usbip_net_recv(int sockfd, void *buff, size_t bufflen)
{
return usbip_xmit(sockfd, buff, bufflen, 0);
return usbip_net_xmit(sockfd, buff, bufflen, 0);
}

ssize_t usbip_send(int sockfd, void *buff, size_t bufflen)
ssize_t usbip_net_send(int sockfd, void *buff, size_t bufflen)
{
return usbip_xmit(sockfd, buff, bufflen, 1);
return usbip_net_xmit(sockfd, buff, bufflen, 1);
}

int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status)
int usbip_net_send_op_common(int sockfd, uint32_t code, uint32_t status)
{
struct op_common op_common;
int rc;
Expand All @@ -118,25 +120,25 @@ int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status)

PACK_OP_COMMON(1, &op_common);

rc = usbip_send(sockfd, &op_common, sizeof(op_common));
rc = usbip_net_send(sockfd, &op_common, sizeof(op_common));
if (rc < 0) {
dbg("usbip_send failed: %d", rc);
dbg("usbip_net_send failed: %d", rc);
return -1;
}

return 0;
}

int usbip_recv_op_common(int sockfd, uint16_t *code)
int usbip_net_recv_op_common(int sockfd, uint16_t *code)
{
struct op_common op_common;
int rc;

memset(&op_common, 0, sizeof(op_common));

rc = usbip_recv(sockfd, &op_common, sizeof(op_common));
rc = usbip_net_recv(sockfd, &op_common, sizeof(op_common));
if (rc < 0) {
dbg("usbip_recv failed: %d", rc);
dbg("usbip_net_recv failed: %d", rc);
goto err;
}

Expand Down Expand Up @@ -171,7 +173,7 @@ int usbip_recv_op_common(int sockfd, uint16_t *code)
return -1;
}

int usbip_set_reuseaddr(int sockfd)
int usbip_net_set_reuseaddr(int sockfd)
{
const int val = 1;
int ret;
Expand All @@ -183,7 +185,7 @@ int usbip_set_reuseaddr(int sockfd)
return ret;
}

int usbip_set_nodelay(int sockfd)
int usbip_net_set_nodelay(int sockfd)
{
const int val = 1;
int ret;
Expand All @@ -195,7 +197,7 @@ int usbip_set_nodelay(int sockfd)
return ret;
}

int usbip_set_keepalive(int sockfd)
int usbip_net_set_keepalive(int sockfd)
{
const int val = 1;
int ret;
Expand Down Expand Up @@ -236,9 +238,9 @@ int usbip_net_tcp_connect(char *hostname, char *service)
continue;

/* should set TCP_NODELAY for usbip */
usbip_set_nodelay(sockfd);
usbip_net_set_nodelay(sockfd);
/* TODO: write code for heartbeat */
usbip_set_keepalive(sockfd);
usbip_net_set_keepalive(sockfd);

if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) == 0)
break;
Expand Down
39 changes: 19 additions & 20 deletions trunk/drivers/staging/usbip/userspace/src/usbip_network.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ struct op_common {
} __attribute__((packed));

#define PACK_OP_COMMON(pack, op_common) do {\
pack_uint16_t(pack, &(op_common)->version);\
pack_uint16_t(pack, &(op_common)->code );\
pack_uint32_t(pack, &(op_common)->status );\
usbip_net_pack_uint16_t(pack, &(op_common)->version);\
usbip_net_pack_uint16_t(pack, &(op_common)->code );\
usbip_net_pack_uint32_t(pack, &(op_common)->status );\
} while (0)

/* ---------------------------------------------------------------------- */
Expand Down Expand Up @@ -79,7 +79,7 @@ struct op_import_reply {
} while (0)

#define PACK_OP_IMPORT_REPLY(pack, reply) do {\
pack_usb_device(pack, &(reply)->udev);\
usbip_net_pack_usb_device(pack, &(reply)->udev);\
} while (0)

/* ---------------------------------------------------------------------- */
Expand All @@ -98,7 +98,7 @@ struct op_export_reply {


#define PACK_OP_EXPORT_REQUEST(pack, request) do {\
pack_usb_device(pack, &(request)->udev);\
usbip_net_pack_usb_device(pack, &(request)->udev);\
} while (0)

#define PACK_OP_EXPORT_REPLY(pack, reply) do {\
Expand All @@ -119,7 +119,7 @@ struct op_unexport_reply {
} __attribute__((packed));

#define PACK_OP_UNEXPORT_REQUEST(pack, request) do {\
pack_usb_device(pack, &(request)->udev);\
usbip_net_pack_usb_device(pack, &(request)->udev);\
} while (0)

#define PACK_OP_UNEXPORT_REPLY(pack, reply) do {\
Expand Down Expand Up @@ -164,22 +164,21 @@ struct op_devlist_reply_extra {
} while (0)

#define PACK_OP_DEVLIST_REPLY(pack, reply) do {\
pack_uint32_t(pack, &(reply)->ndev);\
usbip_net_pack_uint32_t(pack, &(reply)->ndev);\
} while (0)

void pack_uint32_t(int pack, uint32_t *num);
void pack_uint16_t(int pack, uint16_t *num);
void pack_usb_device(int pack, struct usbip_usb_device *udev);
void pack_usb_interface(int pack, struct usbip_usb_interface *uinf);

ssize_t usbip_recv(int sockfd, void *buff, size_t bufflen);
ssize_t usbip_send(int sockfd, void *buff, size_t bufflen);
int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status);
int usbip_recv_op_common(int sockfd, uint16_t *code);
int usbip_set_reuseaddr(int sockfd);
int usbip_set_nodelay(int sockfd);
int usbip_set_keepalive(int sockfd);

void usbip_net_pack_uint32_t(int pack, uint32_t *num);
void usbip_net_pack_uint16_t(int pack, uint16_t *num);
void usbip_net_pack_usb_device(int pack, struct usbip_usb_device *udev);
void usbip_net_pack_usb_interface(int pack, struct usbip_usb_interface *uinf);

ssize_t usbip_net_recv(int sockfd, void *buff, size_t bufflen);
ssize_t usbip_net_send(int sockfd, void *buff, size_t bufflen);
int usbip_net_send_op_common(int sockfd, uint32_t code, uint32_t status);
int usbip_net_recv_op_common(int sockfd, uint16_t *code);
int usbip_net_set_reuseaddr(int sockfd);
int usbip_net_set_nodelay(int sockfd);
int usbip_net_set_keepalive(int sockfd);
int usbip_net_tcp_connect(char *hostname, char *port);

#endif /* __USBIP_NETWORK_H */
Loading

0 comments on commit ea5e4ce

Please sign in to comment.