aboutsummaryrefslogtreecommitdiff
path: root/src/hw/usb.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-10-16 11:59:45 -0400
committerKevin O'Connor <kevin@koconnor.net>2014-10-16 14:46:38 -0400
commitf3329439f7a27484d17bea550cf2c1682c6e6e4e (patch)
tree64dd6732790b3246b60b3b9a8f6cb55bf2d7e17a /src/hw/usb.c
parent222bad4745d4f6e6e86dc4ff37176f8b74fac23f (diff)
downloadseabios-hppa-f3329439f7a27484d17bea550cf2c1682c6e6e4e.zip
seabios-hppa-f3329439f7a27484d17bea550cf2c1682c6e6e4e.tar.gz
seabios-hppa-f3329439f7a27484d17bea550cf2c1682c6e6e4e.tar.bz2
usb: Rename free_pipe() to usb_free_pipe()
Also, pass in usbdev to usb_free_pipe(). Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/hw/usb.c')
-rw-r--r--src/hw/usb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hw/usb.c b/src/hw/usb.c
index dfd2c89..c7cb674 100644
--- a/src/hw/usb.c
+++ b/src/hw/usb.c
@@ -53,7 +53,7 @@ usb_update_pipe(struct usbdevice_s *usbdev, struct usb_pipe *pipe
case USB_TYPE_XHCI:
return xhci_update_pipe(usbdev, pipe, epdesc);
default:
- free_pipe(pipe);
+ usb_free_pipe(usbdev, pipe);
return usb_alloc_pipe(usbdev, epdesc);
}
}
@@ -134,7 +134,7 @@ usb_send_default_control(struct usb_pipe *pipe, const struct usb_ctrlrequest *re
// Free an allocated control or bulk pipe.
void
-free_pipe(struct usb_pipe *pipe)
+usb_free_pipe(struct usbdevice_s *usbdev, struct usb_pipe *pipe)
{
ASSERT32FLAT();
if (!pipe)
@@ -312,7 +312,7 @@ usb_set_address(struct usbdevice_s *usbdev)
req.wLength = 0;
int ret = usb_send_default_control(usbdev->defpipe, &req, NULL);
if (ret) {
- free_pipe(usbdev->defpipe);
+ usb_free_pipe(usbdev, usbdev->defpipe);
return -1;
}
@@ -436,7 +436,7 @@ usb_hub_port_setup(void *data)
// Configure the device
int count = configure_usb_device(usbdev);
- free_pipe(usbdev->defpipe);
+ usb_free_pipe(usbdev, usbdev->defpipe);
if (!count)
hub->op->disconnect(hub, port);
hub->devcount += count;