diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-06-06 14:18:03 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-07 09:10:07 -0700 |
| commit | e8d548d549688d335236f7f6f8bcee141a207ff8 (patch) | |
| tree | 6adc569824995e4e8e6cf21ed1428a89da9a8118 /drivers/usb/renesas_usbhs/mod_gadget.c | |
| parent | ad6f2a8bc53b7cc104f481a648ce357528cc08eb (diff) | |
| download | op-kernel-dev-e8d548d549688d335236f7f6f8bcee141a207ff8.zip op-kernel-dev-e8d548d549688d335236f7f6f8bcee141a207ff8.tar.gz | |
usb: renesas_usbhs: fifo became independent from pipe.
Current renesas_usbhs has PIO data transfer mode which controls CFIFO.
And it was implemented in pipe.c.
But, fifo control method needs more flexible implementation
to support DMAEngine.
This patch create fifo.c, and it became independent from pipe.c.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/renesas_usbhs/mod_gadget.c')
| -rw-r--r-- | drivers/usb/renesas_usbhs/mod_gadget.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c index 206cfab..128c8da 100644 --- a/drivers/usb/renesas_usbhs/mod_gadget.c +++ b/drivers/usb/renesas_usbhs/mod_gadget.c @@ -376,7 +376,7 @@ static int usbhsg_try_run_send_packet(struct usbhsg_uep *uep, * - after callback_update, * - before queue_pop / stage_end */ - usbhs_fifo_enable(pipe); + usbhs_pipe_enable(pipe); /* * all data were sent ? @@ -454,7 +454,7 @@ static int usbhsg_try_run_receive_packet(struct usbhsg_uep *uep, int disable = 0; uep->handler->irq_mask(uep, disable); - usbhs_fifo_disable(pipe); + usbhs_pipe_disable(pipe); usbhsg_queue_pop(uep, ureq, 0); } @@ -546,9 +546,9 @@ static int usbhsg_recip_handler_std_clear_endpoint(struct usbhs_priv *priv, struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep); if (!usbhsg_status_has(gpriv, USBHSG_STATUS_WEDGE)) { - usbhs_fifo_disable(pipe); + usbhs_pipe_disable(pipe); usbhs_pipe_clear_sequence(pipe); - usbhs_fifo_enable(pipe); + usbhs_pipe_enable(pipe); } usbhsg_recip_handler_std_control_done(priv, uep, ctrl); @@ -695,7 +695,7 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv, ret = gpriv->driver->setup(&gpriv->gadget, &ctrl); if (ret < 0) - usbhs_fifo_stall(pipe); + usbhs_pipe_stall(pipe); return ret; } @@ -803,7 +803,7 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep) ********* assume under spin lock ********* */ - usbhs_fifo_disable(pipe); + usbhs_pipe_disable(pipe); /* * disable pipe irq @@ -1016,9 +1016,9 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) halt, usbhs_pipe_number(pipe)); if (halt) - usbhs_fifo_stall(pipe); + usbhs_pipe_stall(pipe); else - usbhs_fifo_disable(pipe); + usbhs_pipe_disable(pipe); if (halt && wedge) usbhsg_status_set(gpriv, USBHSG_STATUS_WEDGE); |
