From 20c9be39d3f04d5ff10e76f22e28cc220af1aac4 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 16 Oct 2014 11:55:16 -0400 Subject: usb: Rename ?hci_control() to ?hci_send_control() This is just function renaming - no code implementation changes. Signed-off-by: Kevin O'Connor --- src/hw/usb-ehci.c | 4 ++-- src/hw/usb-ehci.h | 4 ++-- src/hw/usb-ohci.c | 4 ++-- src/hw/usb-ohci.h | 4 ++-- src/hw/usb-uhci.c | 4 ++-- src/hw/usb-uhci.h | 4 ++-- src/hw/usb-xhci.c | 4 ++-- src/hw/usb-xhci.h | 4 ++-- src/hw/usb.c | 16 ++++++++-------- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/hw') diff --git a/src/hw/usb-ehci.c b/src/hw/usb-ehci.c index f5ee5bf..6e32e04 100644 --- a/src/hw/usb-ehci.c +++ b/src/hw/usb-ehci.c @@ -550,8 +550,8 @@ fillTDbuffer(struct ehci_qtd *td, u16 maxpacket, const void *buf, int bytes) } int -ehci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datasize) +ehci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datasize) { ASSERT32FLAT(); if (! CONFIG_USB_EHCI) diff --git a/src/hw/usb-ehci.h b/src/hw/usb-ehci.h index fcb8d94..6346d78 100644 --- a/src/hw/usb-ehci.h +++ b/src/hw/usb-ehci.h @@ -8,8 +8,8 @@ struct usb_endpoint_descriptor; struct usb_pipe *ehci_alloc_pipe(struct usbdevice_s *usbdev , struct usb_endpoint_descriptor *epdesc); struct usb_pipe; -int ehci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datasize); +int ehci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datasize); int ehci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize); int ehci_poll_intr(struct usb_pipe *p, void *data); diff --git a/src/hw/usb-ohci.c b/src/hw/usb-ohci.c index 7a22057..b9c5d4c 100644 --- a/src/hw/usb-ohci.c +++ b/src/hw/usb-ohci.c @@ -443,8 +443,8 @@ wait_ed(struct ohci_ed *ed, int timeout) } int -ohci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datasize) +ohci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datasize) { if (! CONFIG_USB_OHCI) return -1; diff --git a/src/hw/usb-ohci.h b/src/hw/usb-ohci.h index 3cae21f..14d2b1a 100644 --- a/src/hw/usb-ohci.h +++ b/src/hw/usb-ohci.h @@ -8,8 +8,8 @@ struct usb_endpoint_descriptor; struct usb_pipe *ohci_alloc_pipe(struct usbdevice_s *usbdev , struct usb_endpoint_descriptor *epdesc); struct usb_pipe; -int ohci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datasize); +int ohci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datasize); int ohci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize); int ohci_poll_intr(struct usb_pipe *p, void *data); diff --git a/src/hw/usb-uhci.c b/src/hw/usb-uhci.c index a34f6db..bd9e317 100644 --- a/src/hw/usb-uhci.c +++ b/src/hw/usb-uhci.c @@ -441,8 +441,8 @@ wait_td(struct uhci_td *td, u32 end) } int -uhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datasize) +uhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datasize) { ASSERT32FLAT(); if (! CONFIG_USB_UHCI) diff --git a/src/hw/usb-uhci.h b/src/hw/usb-uhci.h index 2916465..6b675bb 100644 --- a/src/hw/usb-uhci.h +++ b/src/hw/usb-uhci.h @@ -8,8 +8,8 @@ struct usb_endpoint_descriptor; struct usb_pipe *uhci_alloc_pipe(struct usbdevice_s *usbdev , struct usb_endpoint_descriptor *epdesc); struct usb_pipe; -int uhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datasize); +int uhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datasize); int uhci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize); int uhci_poll_intr(struct usb_pipe *p, void *data); diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c index eafa4cb..470cece 100644 --- a/src/hw/usb-xhci.c +++ b/src/hw/usb-xhci.c @@ -1113,8 +1113,8 @@ xhci_update_pipe(struct usbdevice_s *usbdev, struct usb_pipe *upipe } int -xhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datalen) +xhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datalen) { if (!CONFIG_USB_XHCI) return -1; diff --git a/src/hw/usb-xhci.h b/src/hw/usb-xhci.h index bd98d17..7639409 100644 --- a/src/hw/usb-xhci.h +++ b/src/hw/usb-xhci.h @@ -14,8 +14,8 @@ struct usb_pipe *xhci_alloc_pipe(struct usbdevice_s *usbdev struct usb_pipe *xhci_update_pipe(struct usbdevice_s *usbdev , struct usb_pipe *pipe , struct usb_endpoint_descriptor *epdesc); -int xhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize - , void *data, int datasize); +int xhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize + , void *data, int datasize); int xhci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize); int xhci_poll_intr(struct usb_pipe *p, void *data); diff --git a/src/hw/usb.c b/src/hw/usb.c index 153e153..f870481 100644 --- a/src/hw/usb.c +++ b/src/hw/usb.c @@ -60,20 +60,20 @@ usb_update_pipe(struct usbdevice_s *usbdev, struct usb_pipe *pipe // Send a message on a control pipe using the default control descriptor. static int -send_control(struct usb_pipe *pipe, int dir, const void *cmd, int cmdsize - , void *data, int datasize) +usb_send_control(struct usb_pipe *pipe, int dir, const void *cmd, int cmdsize + , void *data, int datasize) { ASSERT32FLAT(); switch (pipe->type) { default: case USB_TYPE_UHCI: - return uhci_control(pipe, dir, cmd, cmdsize, data, datasize); + return uhci_send_control(pipe, dir, cmd, cmdsize, data, datasize); case USB_TYPE_OHCI: - return ohci_control(pipe, dir, cmd, cmdsize, data, datasize); + return ohci_send_control(pipe, dir, cmd, cmdsize, data, datasize); case USB_TYPE_EHCI: - return ehci_control(pipe, dir, cmd, cmdsize, data, datasize); + return ehci_send_control(pipe, dir, cmd, cmdsize, data, datasize); case USB_TYPE_XHCI: - return xhci_control(pipe, dir, cmd, cmdsize, data, datasize); + return xhci_send_control(pipe, dir, cmd, cmdsize, data, datasize); } } @@ -128,8 +128,8 @@ int send_default_control(struct usb_pipe *pipe, const struct usb_ctrlrequest *req , void *data) { - return send_control(pipe, req->bRequestType & USB_DIR_IN - , req, sizeof(*req), data, req->wLength); + return usb_send_control(pipe, req->bRequestType & USB_DIR_IN + , req, sizeof(*req), data, req->wLength); } // Free an allocated control or bulk pipe. -- cgit v1.1