aboutsummaryrefslogtreecommitdiff
path: root/src/hw/usb.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-12-31 01:56:53 -0500
committerKevin O'Connor <kevin@koconnor.net>2015-01-07 10:13:46 -0500
commiteb9f3ae5e652d24ff36f45dda80b013417f81f23 (patch)
treeea1127db8b2ed7470c84e11f59353dc91033da38 /src/hw/usb.c
parent5372a3f7c8ceec09f7ebeb2545bfff7f38840084 (diff)
downloadseabios-hppa-eb9f3ae5e652d24ff36f45dda80b013417f81f23.zip
seabios-hppa-eb9f3ae5e652d24ff36f45dda80b013417f81f23.tar.gz
seabios-hppa-eb9f3ae5e652d24ff36f45dda80b013417f81f23.tar.bz2
uhci: Merge uhci_send_control with uhci_send_bulk
Merge both the control and bulk pipe sending functions into one new function: uhci_send_pipe(). The two existing functions were similar, and by merging them the resulting code supports more flexible control transfers. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/hw/usb.c')
-rw-r--r--src/hw/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hw/usb.c b/src/hw/usb.c
index 9e6cfc8..053440c 100644
--- a/src/hw/usb.c
+++ b/src/hw/usb.c
@@ -53,7 +53,7 @@ usb_send_control(struct usb_pipe *pipe, int dir, const void *cmd, int cmdsize
switch (pipe->type) {
default:
case USB_TYPE_UHCI:
- return uhci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
+ return uhci_send_pipe(pipe, dir, cmd, cmdsize, data, datasize);
case USB_TYPE_OHCI:
return ohci_send_pipe(pipe, dir, cmd, cmdsize, data, datasize);
case USB_TYPE_EHCI:
@@ -69,7 +69,7 @@ usb_send_bulk(struct usb_pipe *pipe_fl, int dir, void *data, int datasize)
switch (GET_LOWFLAT(pipe_fl->type)) {
default:
case USB_TYPE_UHCI:
- return uhci_send_bulk(pipe_fl, dir, data, datasize);
+ return uhci_send_pipe(pipe_fl, dir, NULL, 0, data, datasize);
case USB_TYPE_OHCI:
if (MODESEGMENT)
return -1;