[toolchain] fix uClibc v0.9.30 build on x86_64

[openwrt.git] / package / libertas / src / if_sdio.c

diff --git a/package/libertas/src/if_sdio.c b/package/libertas/src/if_sdio.c
index 85675c5..51f664b 100644 (file)
--- a/package/libertas/src/if_sdio.c
+++ b/package/libertas/src/if_sdio.c
@@ -19,7 +19,7 @@
  * current block size.
  *
  * As SDIO is still new to the kernel, it is unfortunately common with
  * current block size.
  *
  * As SDIO is still new to the kernel, it is unfortunately common with

- * bugs in the host controllers related to that. One such bug is that 
+ * bugs in the host controllers related to that. One such bug is that

  * controllers cannot do transfers that aren't a multiple of 4 bytes.
  * If you don't have time to fix the host controller driver, you can
  * work around the problem by modifying if_sdio_host_to_card() and
  * controllers cannot do transfers that aren't a multiple of 4 bytes.
  * If you don't have time to fix the host controller driver, you can
  * work around the problem by modifying if_sdio_host_to_card() and


@@ -91,8 +91,6 @@ struct if_sdio_card {
        const char              *firmware;
 
        u8                      buffer[65536];
        const char              *firmware;
 
        u8                      buffer[65536];

-       u8                      int_cause;
-       u32                     event;

 
        spinlock_t              lock;
        struct if_sdio_packet   *packets;
 
        spinlock_t              lock;
        struct if_sdio_packet   *packets;


@@ -129,19 +127,13 @@ static u16 if_sdio_read_scratch(struct if_sdio_card *card, int *err)
 static int if_sdio_handle_cmd(struct if_sdio_card *card,
                u8 *buffer, unsigned size)
 {
 static int if_sdio_handle_cmd(struct if_sdio_card *card,
                u8 *buffer, unsigned size)
 {

+       struct lbs_private *priv = card->priv;

        int ret;
        unsigned long flags;
        int ret;
        unsigned long flags;

+       u8 i;

 
        lbs_deb_enter(LBS_DEB_SDIO);
 
 
        lbs_deb_enter(LBS_DEB_SDIO);
 

-       spin_lock_irqsave(&card->priv->driver_lock, flags);
-
-       if (!card->priv->cur_cmd) {
-               lbs_deb_sdio("discarding spurious response\n");
-               ret = 0;
-               goto out;
-       }
-

        if (size > LBS_CMD_BUFFER_SIZE) {
                lbs_deb_sdio("response packet too large (%d bytes)\n",
                        (int)size);
        if (size > LBS_CMD_BUFFER_SIZE) {
                lbs_deb_sdio("response packet too large (%d bytes)\n",
                        (int)size);


@@ -149,20 +141,20 @@ static int if_sdio_handle_cmd(struct if_sdio_card *card,
                goto out;
        }
 
                goto out;
        }
 

-       memcpy(card->priv->cur_cmd->cmdbuf, buffer, size);
-       card->priv->upld_len = size;
+       spin_lock_irqsave(&priv->driver_lock, flags);

 
 

-       card->int_cause |= MRVDRV_CMD_UPLD_RDY;
+       i = (priv->resp_idx == 0) ? 1 : 0;
+       BUG_ON(priv->resp_len[i]);
+       priv->resp_len[i] = size;
+       memcpy(priv->resp_buf[i], buffer, size);
+       lbs_notify_command_response(priv, i);

 
 

-       lbs_interrupt(card->priv);
+       spin_unlock_irqrestore(&card->priv->driver_lock, flags);

 
        ret = 0;
 
 out:
 
        ret = 0;
 
 out:

-       spin_unlock_irqrestore(&card->priv->driver_lock, flags);
-

        lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);
        lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);

-

        return ret;
 }
 
        return ret;
 }
 


@@ -208,7 +200,6 @@ static int if_sdio_handle_event(struct if_sdio_card *card,
                u8 *buffer, unsigned size)
 {
        int ret;
                u8 *buffer, unsigned size)
 {
        int ret;

-       unsigned long flags;

        u32 event;
 
        lbs_deb_enter(LBS_DEB_SDIO);
        u32 event;
 
        lbs_deb_enter(LBS_DEB_SDIO);


@@ -228,18 +219,9 @@ static int if_sdio_handle_event(struct if_sdio_card *card,
                event |= buffer[2] << 16;
                event |= buffer[1] << 8;
                event |= buffer[0] << 0;
                event |= buffer[2] << 16;
                event |= buffer[1] << 8;
                event |= buffer[0] << 0;

-               event <<= SBI_EVENT_CAUSE_SHIFT;

        }
 
        }
 

-       spin_lock_irqsave(&card->priv->driver_lock, flags);
-
-       card->event = event;
-       card->int_cause |= MRVDRV_CARDEVENT;
-
-       lbs_interrupt(card->priv);
-
-       spin_unlock_irqrestore(&card->priv->driver_lock, flags);
-
+       lbs_queue_event(card->priv, event & 0xFF);

        ret = 0;
 
 out:
        ret = 0;
 
 out:


@@ -776,37 +758,6 @@ out:
        return ret;
 }
 
        return ret;
 }
 

-static int if_sdio_get_int_status(struct lbs_private *priv, u8 *ireg)
-{
-       struct if_sdio_card *card;
-
-       lbs_deb_enter(LBS_DEB_SDIO);
-
-       card = priv->card;
-
-       *ireg = card->int_cause;
-       card->int_cause = 0;
-
-       lbs_deb_leave(LBS_DEB_SDIO);
-
-       return 0;
-}
-
-static int if_sdio_read_event_cause(struct lbs_private *priv)
-{
-       struct if_sdio_card *card;
-
-       lbs_deb_enter(LBS_DEB_SDIO);
-
-       card = priv->card;
-
-       priv->eventcause = card->event;
-
-       lbs_deb_leave(LBS_DEB_SDIO);
-
-       return 0;
-}
-

 /*******************************************************************/
 /* SDIO callbacks                                                  */
 /*******************************************************************/
 /*******************************************************************/
 /* SDIO callbacks                                                  */
 /*******************************************************************/


@@ -869,6 +820,10 @@ static int if_sdio_probe(struct sdio_func *func,
                if (sscanf(func->card->info[i],
                                "ID: %x", &model) == 1)
                        break;
                if (sscanf(func->card->info[i],
                                "ID: %x", &model) == 1)
                        break;

+               if (!strcmp(func->card->info[i], "IBIS Wireless SDIO Card")) {
+                       model = 4;
+                       break;
+               }

        }
 
        if (i == func->card->num_info) {
        }
 
        if (i == func->card->num_info) {


@@ -955,8 +910,6 @@ static int if_sdio_probe(struct sdio_func *func,
 
        priv->card = card;
        priv->hw_host_to_card = if_sdio_host_to_card;
 
        priv->card = card;
        priv->hw_host_to_card = if_sdio_host_to_card;

-       priv->hw_get_int_status = if_sdio_get_int_status;
-       priv->hw_read_event_cause = if_sdio_read_event_cause;

 
        priv->fw_ready = 1;
 
 
        priv->fw_ready = 1;