usb: renesas_usbhs: modify data transfer interrupt
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 6 Jun 2011 05:18:28 +0000 (14:18 +0900)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Jun 2011 16:10:08 +0000 (09:10 -0700)
On current driver, overall data transfer method was implemented in fifo.c,
but its interrupt which is member of packet queue control
was still in mod_gadget.c.
This patch move it into fifo.c.
By this patch, the packet/fifo control is independent from mod_gadget.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/renesas_usbhs/fifo.c
drivers/usb/renesas_usbhs/fifo.h
drivers/usb/renesas_usbhs/mod_gadget.c
drivers/usb/renesas_usbhs/pipe.c
drivers/usb/renesas_usbhs/pipe.h

index b5031e3a156989b253eaf0569a6daf443f733783..e9c4d3d8ef6eac49319320f8646064c8a8dbd542 100644 (file)
 /*
  *             packet info function
  */
+static int usbhsf_null_handle(struct usbhs_pkt *pkt)
+{
+       struct usbhs_priv *priv = usbhs_pipe_to_priv(pkt->pipe);
+       struct device *dev = usbhs_priv_to_dev(priv);
+
+       dev_err(dev, "null handler\n");
+
+       return -EINVAL;
+}
+
+static struct usbhs_pkt_handle usbhsf_null_handler = {
+       .prepare = usbhsf_null_handle,
+       .try_run = usbhsf_null_handle,
+};
+
 void usbhs_pkt_init(struct usbhs_pkt *pkt)
 {
        INIT_LIST_HEAD(&pkt->node);
 }
 
 void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
+                   struct usbhs_pkt_handle *handler,
                    void *buf, int len, int zero)
 {
+       struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+       struct device *dev = usbhs_priv_to_dev(priv);
+
+       if (!handler) {
+               dev_err(dev, "no handler function\n");
+               handler = &usbhsf_null_handler;
+       }
+
        list_del_init(&pkt->node);
        list_add_tail(&pkt->node, &pipe->list);
 
        pkt->pipe       = pipe;
        pkt->buf        = buf;
+       pkt->handler    = handler;
        pkt->length     = len;
        pkt->zero       = zero;
        pkt->actual     = 0;
@@ -163,12 +188,7 @@ static int usbhsf_fifo_select(struct usbhs_pipe *pipe, int write)
 /*
  *             PIO fifo functions
  */
-int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe)
-{
-       return usbhsf_fifo_select(pipe, 1);
-}
-
-int usbhs_fifo_write(struct usbhs_pkt *pkt)
+static int usbhsf_try_push(struct usbhs_pkt *pkt)
 {
        struct usbhs_pipe *pipe = pkt->pipe;
        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -181,11 +201,11 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt)
        int i, ret, len;
        int is_short, is_done;
 
-       ret = usbhs_pipe_is_accessible(pipe);
+       ret = usbhsf_fifo_select(pipe, 1);
        if (ret < 0)
                goto usbhs_fifo_write_busy;
 
-       ret = usbhsf_fifo_select(pipe, 1);
+       ret = usbhs_pipe_is_accessible(pipe);
        if (ret < 0)
                goto usbhs_fifo_write_busy;
 
@@ -246,8 +266,7 @@ int usbhs_fifo_write(struct usbhs_pkt *pkt)
                if (usbhs_pipe_is_dcp(pipe))
                        usbhs_dcp_control_transfer_done(pipe);
 
-               if (info->tx_done)
-                       info->tx_done(pkt);
+               info->done(pkt);
        }
 
        return 0;
@@ -262,8 +281,14 @@ usbhs_fifo_write_busy:
        return ret;
 }
 
-int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe)
+struct usbhs_pkt_handle usbhs_fifo_push_handler = {
+       .prepare = usbhsf_try_push,
+       .try_run = usbhsf_try_push,
+};
+
+static int usbhsf_prepare_pop(struct usbhs_pkt *pkt)
 {
+       struct usbhs_pipe *pipe = pkt->pipe;
        int ret;
 
        /*
@@ -279,7 +304,7 @@ int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe)
        return ret;
 }
 
-int usbhs_fifo_read(struct usbhs_pkt *pkt)
+static int usbhsf_try_pop(struct usbhs_pkt *pkt)
 {
        struct usbhs_pipe *pipe = pkt->pipe;
        struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
@@ -355,9 +380,124 @@ usbhs_fifo_read_end:
                usbhsf_rx_irq_ctrl(pipe, 0);
                usbhs_pipe_disable(pipe);
 
-               if (info->rx_done)
-                       info->rx_done(pkt);
+               info->done(pkt);
        }
 
        return 0;
 }
+
+struct usbhs_pkt_handle usbhs_fifo_pop_handler = {
+       .prepare = usbhsf_prepare_pop,
+       .try_run = usbhsf_try_pop,
+};
+
+/*
+ *             handler function
+ */
+static int usbhsf_ctrl_stage_end(struct usbhs_pkt *pkt)
+{
+       struct usbhs_pipe *pipe = pkt->pipe;
+       struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
+       struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
+
+       usbhs_dcp_control_transfer_done(pipe);
+
+       info->done(pkt);
+
+       return 0;
+}
+
+struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler = {
+       .prepare = usbhsf_ctrl_stage_end,
+       .try_run = usbhsf_ctrl_stage_end,
+};
+
+/*
+ *             irq functions
+ */
+static int usbhsf_irq_empty(struct usbhs_priv *priv,
+                           struct usbhs_irq_state *irq_state)
+{
+       struct usbhs_pipe *pipe;
+       struct usbhs_pkt *pkt;
+       struct device *dev = usbhs_priv_to_dev(priv);
+       int i, ret;
+
+       if (!irq_state->bempsts) {
+               dev_err(dev, "debug %s !!\n", __func__);
+               return -EIO;
+       }
+
+       dev_dbg(dev, "irq empty [0x%04x]\n", irq_state->bempsts);
+
+       /*
+        * search interrupted "pipe"
+        * not "uep".
+        */
+       usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
+               if (!(irq_state->bempsts & (1 << i)))
+                       continue;
+
+               pkt = usbhs_pkt_get(pipe);
+               ret = usbhs_pkt_run(pkt);
+               if (ret < 0)
+                       dev_err(dev, "irq_empty run_error %d : %d\n", i, ret);
+       }
+
+       return 0;
+}
+
+static int usbhsf_irq_ready(struct usbhs_priv *priv,
+                           struct usbhs_irq_state *irq_state)
+{
+       struct usbhs_pipe *pipe;
+       struct usbhs_pkt *pkt;
+       struct device *dev = usbhs_priv_to_dev(priv);
+       int i, ret;
+
+       if (!irq_state->brdysts) {
+               dev_err(dev, "debug %s !!\n", __func__);
+               return -EIO;
+       }
+
+       dev_dbg(dev, "irq ready [0x%04x]\n", irq_state->brdysts);
+
+       /*
+        * search interrupted "pipe"
+        * not "uep".
+        */
+       usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
+               if (!(irq_state->brdysts & (1 << i)))
+                       continue;
+
+               pkt = usbhs_pkt_get(pipe);
+               ret = usbhs_pkt_run(pkt);
+               if (ret < 0)
+                       dev_err(dev, "irq_ready run_error %d : %d\n", i, ret);
+       }
+
+       return 0;
+}
+
+/*
+ *             fifo init
+ */
+void usbhs_fifo_init(struct usbhs_priv *priv)
+{
+       struct usbhs_mod *mod = usbhs_mod_get_current(priv);
+
+       mod->irq_empty          = usbhsf_irq_empty;
+       mod->irq_ready          = usbhsf_irq_ready;
+       mod->irq_bempsts        = 0;
+       mod->irq_brdysts        = 0;
+}
+
+void usbhs_fifo_quit(struct usbhs_priv *priv)
+{
+       struct usbhs_mod *mod = usbhs_mod_get_current(priv);
+
+       mod->irq_empty          = NULL;
+       mod->irq_ready          = NULL;
+       mod->irq_bempsts        = 0;
+       mod->irq_brdysts        = 0;
+}
index 04d8cddaf812ba940c68a8f7e4e00f72281bfc77..eab3258e98343638be884d13c18f4e6bde79ed5c 100644 (file)
 
 #include "pipe.h"
 
+struct usbhs_pkt_handle;
 struct usbhs_pkt {
        struct list_head node;
        struct usbhs_pipe *pipe;
+       struct usbhs_pkt_handle *handler;
        void *buf;
        int length;
        int actual;
        int zero;
 };
 
+struct usbhs_pkt_handle {
+       int (*prepare)(struct usbhs_pkt *pkt);
+       int (*try_run)(struct usbhs_pkt *pkt);
+};
+
 /*
  * fifo
  */
-int usbhs_fifo_write(struct usbhs_pkt *pkt);
-int usbhs_fifo_read(struct usbhs_pkt *pkt);
-int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe);
-int usbhs_fifo_prepare_read(struct usbhs_pipe *pipe);
+void usbhs_fifo_init(struct usbhs_priv *priv);
+void usbhs_fifo_quit(struct usbhs_priv *priv);
 
 /*
  * packet info
  */
+extern struct usbhs_pkt_handle usbhs_fifo_push_handler;
+extern struct usbhs_pkt_handle usbhs_fifo_pop_handler;
+extern struct usbhs_pkt_handle usbhs_ctrl_stage_end_handler;
+
 void usbhs_pkt_init(struct usbhs_pkt *pkt);
 void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
+                   struct usbhs_pkt_handle *handler,
                    void *buf, int len, int zero);
 void usbhs_pkt_pop(struct usbhs_pkt *pkt);
 struct usbhs_pkt *usbhs_pkt_get(struct usbhs_pipe *pipe);
 
+#define usbhs_pkt_start(p)     ((p)->handler->prepare(p))
+#define usbhs_pkt_run(p)       ((p)->handler->try_run(p))
+
 #endif /* RENESAS_USB_FIFO_H */
index 298984f533dd15586c33c58e3eb846c22a6f4ee6..50c7566369eb7756abe841acb51c418be45b5937 100644 (file)
@@ -31,7 +31,6 @@ struct usbhsg_request {
 
 #define EP_NAME_SIZE 8
 struct usbhsg_gpriv;
-struct usbhsg_pipe_handle;
 struct usbhsg_uep {
        struct usb_ep            ep;
        struct usbhs_pipe       *pipe;
@@ -39,7 +38,7 @@ struct usbhsg_uep {
        char ep_name[EP_NAME_SIZE];
 
        struct usbhsg_gpriv *gpriv;
-       struct usbhsg_pipe_handle *handler;
+       struct usbhs_pkt_handle *handler;
 };
 
 struct usbhsg_gpriv {
@@ -57,11 +56,6 @@ struct usbhsg_gpriv {
 #define USBHSG_STATUS_WEDGE            (1 << 2)
 };
 
-struct usbhsg_pipe_handle {
-       int (*prepare)(struct usbhsg_uep *uep, struct usbhsg_request *ureq);
-       int (*try_run)(struct usbhsg_uep *uep, struct usbhsg_request *ureq);
-};
-
 struct usbhsg_recip_handle {
        char *name;
        int (*device)(struct usbhs_priv *priv, struct usbhsg_uep *uep,
@@ -164,7 +158,8 @@ static void usbhsg_queue_push(struct usbhsg_uep *uep,
        /*
         *********  assume under spin lock  *********
         */
-       usbhs_pkt_push(pipe, pkt, req->buf, req->length, req->zero);
+       usbhs_pkt_push(pipe, pkt, uep->handler,
+                      req->buf, req->length, req->zero);
        req->actual = 0;
        req->status = -EINPROGRESS;
 
@@ -187,22 +182,15 @@ static struct usbhsg_request *usbhsg_queue_get(struct usbhsg_uep *uep)
        return usbhsg_pkt_to_ureq(pkt);
 }
 
-#define usbhsg_queue_prepare(uep) __usbhsg_queue_handler(uep, 1);
-#define usbhsg_queue_handle(uep)  __usbhsg_queue_handler(uep, 0);
-static int __usbhsg_queue_handler(struct usbhsg_uep *uep, int prepare)
+static int usbhsg_queue_start(struct usbhsg_uep *uep)
 {
        struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);
-       struct device *dev = usbhsg_gpriv_to_dev(gpriv);
-       struct usbhsg_request *ureq;
+       struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
+       struct usbhs_pkt *pkt;
        spinlock_t *lock;
        unsigned long flags;
        int ret = 0;
 
-       if (!uep->handler) {
-               dev_err(dev, "no handler function\n");
-               return -EIO;
-       }
-
        /*
         * CAUTION [*queue handler*]
         *
@@ -224,13 +212,10 @@ static int __usbhsg_queue_handler(struct usbhsg_uep *uep, int prepare)
        /******************  spin try lock *******************/
        lock = usbhsg_trylock(gpriv, &flags);
 
-       ureq = usbhsg_queue_get(uep);
-       if (ureq) {
-               if (prepare)
-                       ret = uep->handler->prepare(uep, ureq);
-               else
-                       ret = uep->handler->try_run(uep, ureq);
-       }
+       pkt = usbhs_pkt_get(pipe);
+       if (pkt)
+               ret = usbhs_pkt_start(pkt);
+
        usbhsg_unlock(lock, &flags);
        /********************  spin unlock ******************/
 
@@ -277,59 +262,10 @@ static void usbhsg_queue_pop(struct usbhsg_uep *uep,
 
        /* more request ? */
        if (0 == status)
-               usbhsg_queue_prepare(uep);
+               usbhsg_queue_start(uep);
 }
 
-/*
- *             irq enable/disable function
- */
-#define usbhsg_irq_callback_ctrl(uep, status, enable)                  \
-       ({                                                              \
-               struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);  \
-               struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);      \
-               struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);  \
-               struct usbhs_mod *mod = usbhs_mod_get_current(priv);    \
-               if (!mod)                                               \
-                       return;                                         \
-               if (enable)                                             \
-                       mod->irq_##status |= (1 << usbhs_pipe_number(pipe)); \
-               else                                                    \
-                       mod->irq_##status &= ~(1 << usbhs_pipe_number(pipe)); \
-               usbhs_irq_callback_update(priv, mod);                   \
-       })
-
-static void usbhsg_irq_empty_ctrl(struct usbhsg_uep *uep, int enable)
-{
-       usbhsg_irq_callback_ctrl(uep, bempsts, enable);
-}
-
-static void usbhsg_irq_ready_ctrl(struct usbhsg_uep *uep, int enable)
-{
-       usbhsg_irq_callback_ctrl(uep, brdysts, enable);
-}
-
-/*
- *             handler function
- */
-static int usbhsg_try_run_ctrl_stage_end(struct usbhsg_uep *uep,
-                                        struct usbhsg_request *ureq)
-{
-       struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
-
-       /*
-        *********  assume under spin lock  *********
-        */
-
-       usbhs_dcp_control_transfer_done(pipe);
-       usbhsg_queue_pop(uep, ureq, 0);
-
-       return 0;
-}
-
-/*
- *             packet send hander
- */
-static void usbhsg_send_packet_done(struct usbhs_pkt *pkt)
+static void usbhsg_queue_done(struct usbhs_pkt *pkt)
 {
        struct usbhs_pipe *pipe = pkt->pipe;
        struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);
@@ -340,108 +276,6 @@ static void usbhsg_send_packet_done(struct usbhs_pkt *pkt)
        usbhsg_queue_pop(uep, ureq, 0);
 }
 
-static int usbhsg_try_run_send_packet(struct usbhsg_uep *uep,
-                                     struct usbhsg_request *ureq)
-{
-       struct usbhs_pkt *pkt = usbhsg_ureq_to_pkt(ureq);
-
-       /*
-        *********  assume under spin lock  *********
-        */
-
-       usbhs_fifo_write(pkt);
-
-       return 0;
-}
-
-static int usbhsg_prepare_send_packet(struct usbhsg_uep *uep,
-                                     struct usbhsg_request *ureq)
-{
-       struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
-
-       /*
-        *********  assume under spin lock  *********
-        */
-
-       usbhs_fifo_prepare_write(pipe);
-       usbhsg_try_run_send_packet(uep, ureq);
-
-       return 0;
-}
-
-/*
- *             packet recv hander
- */
-static void usbhsg_receive_packet_done(struct usbhs_pkt *pkt)
-{
-       struct usbhs_pipe *pipe = pkt->pipe;
-       struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);
-       struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);
-
-       ureq->req.actual = pkt->actual;
-
-       usbhsg_queue_pop(uep, ureq, 0);
-}
-
-static int usbhsg_try_run_receive_packet(struct usbhsg_uep *uep,
-                                        struct usbhsg_request *ureq)
-{
-       struct usbhs_pkt *pkt = usbhsg_ureq_to_pkt(ureq);
-
-       /*
-        *********  assume under spin lock  *********
-        */
-
-       return usbhs_fifo_read(pkt);
-}
-
-static int usbhsg_prepare_receive_packet(struct usbhsg_uep *uep,
-                                        struct usbhsg_request *ureq)
-{
-       struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
-
-       /*
-        *********  assume under spin lock  *********
-        */
-
-       return usbhs_fifo_prepare_read(pipe);
-}
-
-static struct usbhsg_pipe_handle usbhsg_handler_send_by_empty = {
-       .prepare        = usbhsg_prepare_send_packet,
-       .try_run        = usbhsg_try_run_send_packet,
-};
-
-static struct usbhsg_pipe_handle usbhsg_handler_send_by_ready = {
-       .prepare        = usbhsg_prepare_send_packet,
-       .try_run        = usbhsg_try_run_send_packet,
-};
-
-static struct usbhsg_pipe_handle usbhsg_handler_recv_by_ready = {
-       .prepare        = usbhsg_prepare_receive_packet,
-       .try_run        = usbhsg_try_run_receive_packet,
-};
-
-static struct usbhsg_pipe_handle usbhsg_handler_ctrl_stage_end = {
-       .prepare        = usbhsg_try_run_ctrl_stage_end,
-       .try_run        = usbhsg_try_run_ctrl_stage_end,
-};
-
-/*
- * DCP pipe can NOT use "ready interrupt" for "send"
- * it should use "empty" interrupt.
- * see
- *   "Operation" - "Interrupt Function" - "BRDY Interrupt"
- *
- * on the other hand, normal pipe can use "ready interrupt" for "send"
- * even though it is single/double buffer
- */
-#define usbhsg_handler_send_ctrl       usbhsg_handler_send_by_empty
-#define usbhsg_handler_recv_ctrl       usbhsg_handler_recv_by_ready
-
-#define usbhsg_handler_send_packet     usbhsg_handler_send_by_ready
-#define usbhsg_handler_recv_packet     usbhsg_handler_recv_by_ready
-
 /*
  *             USB_TYPE_STANDARD / clear feature functions
  */
@@ -473,7 +307,7 @@ static int usbhsg_recip_handler_std_clear_endpoint(struct usbhs_priv *priv,
 
        usbhsg_recip_handler_std_control_done(priv, uep, ctrl);
 
-       usbhsg_queue_prepare(uep);
+       usbhsg_queue_start(uep);
 
        return 0;
 }
@@ -580,13 +414,13 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
 
        switch (stage) {
        case READ_DATA_STAGE:
-               dcp->handler = &usbhsg_handler_send_ctrl;
+               dcp->handler = &usbhs_fifo_push_handler;
                break;
        case WRITE_DATA_STAGE:
-               dcp->handler = &usbhsg_handler_recv_ctrl;
+               dcp->handler = &usbhs_fifo_pop_handler;
                break;
        case NODATA_STATUS_STAGE:
-               dcp->handler = &usbhsg_handler_ctrl_stage_end;
+               dcp->handler = &usbhs_ctrl_stage_end_handler;
                break;
        default:
                return ret;
@@ -620,72 +454,6 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
        return ret;
 }
 
-static int usbhsg_irq_empty(struct usbhs_priv *priv,
-                           struct usbhs_irq_state *irq_state)
-{
-       struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
-       struct usbhsg_uep *uep;
-       struct usbhs_pipe *pipe;
-       struct device *dev = usbhsg_gpriv_to_dev(gpriv);
-       int i, ret;
-
-       if (!irq_state->bempsts) {
-               dev_err(dev, "debug %s !!\n", __func__);
-               return -EIO;
-       }
-
-       dev_dbg(dev, "irq empty [0x%04x]\n", irq_state->bempsts);
-
-       /*
-        * search interrupted "pipe"
-        * not "uep".
-        */
-       usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
-               if (!(irq_state->bempsts & (1 << i)))
-                       continue;
-
-               uep     = usbhsg_pipe_to_uep(pipe);
-               ret     = usbhsg_queue_handle(uep);
-               if (ret < 0)
-                       dev_err(dev, "send error %d : %d\n", i, ret);
-       }
-
-       return 0;
-}
-
-static int usbhsg_irq_ready(struct usbhs_priv *priv,
-                           struct usbhs_irq_state *irq_state)
-{
-       struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
-       struct usbhsg_uep *uep;
-       struct usbhs_pipe *pipe;
-       struct device *dev = usbhsg_gpriv_to_dev(gpriv);
-       int i, ret;
-
-       if (!irq_state->brdysts) {
-               dev_err(dev, "debug %s !!\n", __func__);
-               return -EIO;
-       }
-
-       dev_dbg(dev, "irq ready [0x%04x]\n", irq_state->brdysts);
-
-       /*
-        * search interrupted "pipe"
-        * not "uep".
-        */
-       usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
-               if (!(irq_state->brdysts & (1 << i)))
-                       continue;
-
-               uep     = usbhsg_pipe_to_uep(pipe);
-               ret     = usbhsg_queue_handle(uep);
-               if (ret < 0)
-                       dev_err(dev, "receive error %d : %d\n", i, ret);
-       }
-
-       return 0;
-}
-
 /*
  *
  *             usb_dcp_ops
@@ -716,7 +484,6 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep)
 {
        struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
        struct usbhsg_request *ureq;
-       int disable = 0;
 
        /*
         *********  assume under spin lock  *********
@@ -724,12 +491,6 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep)
 
        usbhs_pipe_disable(pipe);
 
-       /*
-        * disable pipe irq
-        */
-       usbhsg_irq_empty_ctrl(uep, disable);
-       usbhsg_irq_ready_ctrl(uep, disable);
-
        while (1) {
                ureq = usbhsg_queue_get(uep);
                if (!ureq)
@@ -782,9 +543,9 @@ static int usbhsg_ep_enable(struct usb_ep *ep,
                pipe->mod_private       = uep;
 
                if (usb_endpoint_dir_in(desc))
-                       uep->handler = &usbhsg_handler_send_packet;
+                       uep->handler = &usbhs_fifo_push_handler;
                else
-                       uep->handler = &usbhsg_handler_recv_packet;
+                       uep->handler = &usbhs_fifo_pop_handler;
 
                ret = 0;
        }
@@ -879,7 +640,7 @@ static int usbhsg_ep_queue(struct usb_ep *ep, struct usb_request *req,
        usbhsg_unlock(lock, &flags);
        /********************  spin unlock ******************/
 
-       usbhsg_queue_prepare(uep);
+       usbhsg_queue_start(uep);
 
        return ret;
 }
@@ -1006,8 +767,8 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status)
         * pipe initialize and enable DCP
         */
        usbhs_pipe_init(priv,
-                       usbhsg_send_packet_done,
-                       usbhsg_receive_packet_done);
+                       usbhsg_queue_done);
+       usbhs_fifo_init(priv);
        usbhsg_uep_init(gpriv);
        usbhsg_dcp_enable(dcp);
 
@@ -1026,10 +787,6 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status)
         */
        mod->irq_dev_state      = usbhsg_irq_dev_state;
        mod->irq_ctrl_stage     = usbhsg_irq_ctrl_stage;
-       mod->irq_empty          = usbhsg_irq_empty;
-       mod->irq_ready          = usbhsg_irq_ready;
-       mod->irq_bempsts        = 0;
-       mod->irq_brdysts        = 0;
        usbhs_irq_callback_update(priv, mod);
 
 usbhsg_try_start_unlock:
@@ -1059,13 +816,11 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status)
            !usbhsg_status_has(gpriv, USBHSG_STATUS_REGISTERD))
                goto usbhsg_try_stop_unlock;
 
+       usbhs_fifo_quit(priv);
+
        /* disable all irq */
        mod->irq_dev_state      = NULL;
        mod->irq_ctrl_stage     = NULL;
-       mod->irq_empty          = NULL;
-       mod->irq_ready          = NULL;
-       mod->irq_bempsts        = 0;
-       mod->irq_brdysts        = 0;
        usbhs_irq_callback_update(priv, mod);
 
        usbhsg_dcp_disable(dcp);
index 6e77791f07c87203f8b1ed6ba86df2af32a6b3e3..56137d59e3b261d48490d26c4aa1261bef381924 100644 (file)
@@ -532,13 +532,18 @@ static struct usbhs_pipe *usbhsp_get_pipe(struct usbhs_priv *priv, u32 type)
 }
 
 void usbhs_pipe_init(struct usbhs_priv *priv,
-                    void (*tx_done)(struct usbhs_pkt *pkt),
-                    void (*rx_done)(struct usbhs_pkt *pkt))
+                    void (*done)(struct usbhs_pkt *pkt))
 {
        struct usbhs_pipe_info *info = usbhs_priv_to_pipeinfo(priv);
+       struct device *dev = usbhs_priv_to_dev(priv);
        struct usbhs_pipe *pipe;
        int i;
 
+       if (!done) {
+               dev_err(dev, "no done function\n");
+               return;
+       }
+
        /*
         * FIXME
         *
@@ -565,8 +570,7 @@ void usbhs_pipe_init(struct usbhs_priv *priv,
                usbhsp_pipectrl_set(pipe, ACLRM, 0);
        }
 
-       info->tx_done = tx_done;
-       info->rx_done = rx_done;
+       info->done = done;
 }
 
 struct usbhs_pipe *usbhs_pipe_malloc(struct usbhs_priv *priv,
index 535e6aa434c745b122662223534c43dc795fe0e3..20e3cf46f70cd5975581db3c432625a2755b9b12 100644 (file)
@@ -42,8 +42,7 @@ struct usbhs_pipe_info {
        int size;       /* array size of "pipe" */
        int bufnmb_last;        /* FIXME : driver needs good allocator */
 
-       void (*tx_done)(struct usbhs_pkt *pkt);
-       void (*rx_done)(struct usbhs_pkt *pkt);
+       void (*done)(struct usbhs_pkt *pkt);
 };
 
 /*
@@ -82,8 +81,7 @@ void usbhs_pipe_remove(struct usbhs_priv *priv);
 int usbhs_pipe_is_dir_in(struct usbhs_pipe *pipe);
 int usbhs_pipe_is_dir_host(struct usbhs_pipe *pipe);
 void usbhs_pipe_init(struct usbhs_priv *priv,
-                    void (*tx_done)(struct usbhs_pkt *pkt),
-                    void (*rx_done)(struct usbhs_pkt *pkt));
+                    void (*done)(struct usbhs_pkt *pkt));
 int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe);
 void usbhs_pipe_clear_sequence(struct usbhs_pipe *pipe);
 int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);