aboutsummaryrefslogtreecommitdiff
path: root/src/hw/usb.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2014-12-30 21:16:04 -0500
committerKevin O'Connor <kevin@koconnor.net>2015-01-07 10:13:46 -0500
commitabd674200825ef0df1cb8560b774e24db01cb9f2 (patch)
treed849d23ce42abacd1005fce0712de48400d9773c /src/hw/usb.c
parent1bd976b7befb7d65cbfa778ba2eb03e30cb76068 (diff)
downloadseabios-hppa-abd674200825ef0df1cb8560b774e24db01cb9f2.zip
seabios-hppa-abd674200825ef0df1cb8560b774e24db01cb9f2.tar.gz
seabios-hppa-abd674200825ef0df1cb8560b774e24db01cb9f2.tar.bz2
ehci: Merge ehci_send_control with ehci_send_bulk
Merge both the control and bulk pipe sending functions into one new function: ehci_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 75412f9..ed2db8a 100644
--- a/src/hw/usb.c
+++ b/src/hw/usb.c
@@ -57,7 +57,7 @@ usb_send_control(struct usb_pipe *pipe, int dir, const void *cmd, int cmdsize
case USB_TYPE_OHCI:
return ohci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
case USB_TYPE_EHCI:
- return ehci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
+ return ehci_send_pipe(pipe, dir, cmd, cmdsize, data, datasize);
case USB_TYPE_XHCI:
return xhci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
}
@@ -75,7 +75,7 @@ usb_send_bulk(struct usb_pipe *pipe_fl, int dir, void *data, int datasize)
return -1;
return ohci_send_bulk(pipe_fl, dir, data, datasize);
case USB_TYPE_EHCI:
- return ehci_send_bulk(pipe_fl, dir, data, datasize);
+ return ehci_send_pipe(pipe_fl, dir, NULL, 0, data, datasize);
case USB_TYPE_XHCI:
if (MODESEGMENT)
return -1;