projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
[oweals/u-boot.git]
/
cpu
/
ppc4xx
/
usb_ohci.c
diff --git
a/cpu/ppc4xx/usb_ohci.c
b/cpu/ppc4xx/usb_ohci.c
index 2c80d5cb4382002f17d54e05243222826a1c5934..2607ed650c6487fc4d5bb131110cba93957d8410 100644
(file)
--- a/
cpu/ppc4xx/usb_ohci.c
+++ b/
cpu/ppc4xx/usb_ohci.c
@@
-660,7
+660,7
@@
static void td_fill (ohci_t *ohci, unsigned int info,
td->index = index;
td->data = (__u32)data;
#ifdef OHCI_FILL_TRACE
td->index = index;
td->data = (__u32)data;
#ifdef OHCI_FILL_TRACE
- if (
(usb_pipetype(urb_priv->pipe) == PIPE_BULK
) && usb_pipeout(urb_priv->pipe)) {
+ if (
usb_pipebulk(urb_priv->pipe
) && usb_pipeout(urb_priv->pipe)) {
for (i = 0; i < len; i++)
printf("td->data[%d] %#2x ",i, ((unsigned char *)td->data)[i]);
printf("\n");
for (i = 0; i < len; i++)
printf("td->data[%d] %#2x ",i, ((unsigned char *)td->data)[i]);
printf("\n");
@@
-761,7
+761,7
@@
static void dl_transfer_length(td_t * td)
tdCBP = ohci_cpu_to_le32 (td->hwCBP);
tdCBP = ohci_cpu_to_le32 (td->hwCBP);
- if (!(usb_pipe
type (lurb_priv->pipe) == PIPE_CONTROL
&&
+ if (!(usb_pipe
control(lurb_priv->pipe)
&&
((td->index == 0) || (td->index == lurb_priv->length - 1)))) {
if (tdBE != 0) {
if (td->hwCBP == 0)
((td->index == 0) || (td->index == lurb_priv->length - 1)))) {
if (tdBE != 0) {
if (td->hwCBP == 0)
@@
-1023,7
+1023,7
@@
static int ohci_submit_rh_msg(struct usb_device *dev, unsigned long pipe,
urb_priv.actual_length = 0;
pkt_print(dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe));
#endif
urb_priv.actual_length = 0;
pkt_print(dev, pipe, buffer, transfer_len, cmd, "SUB(rh)", usb_pipein(pipe));
#endif
- if (
(pipe & PIPE_INTERRUPT) == PIPE_INTERRUPT
) {
+ if (
usb_pipeint(pipe)
) {
info("Root-Hub submit IRQ: NOT implemented");
return 0;
}
info("Root-Hub submit IRQ: NOT implemented");
return 0;
}
@@
-1248,7
+1248,7
@@
int submit_common_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
/* allow more time for a BULK device to react - some are slow */
#define BULK_TO 5000 /* timeout in milliseconds */
/* allow more time for a BULK device to react - some are slow */
#define BULK_TO 5000 /* timeout in milliseconds */
- if (usb_pipe
type (pipe) == PIPE_BULK
)
+ if (usb_pipe
bulk(pipe)
)
timeout = BULK_TO;
else
timeout = 100;
timeout = BULK_TO;
else
timeout = 100;