libertas: add simple copyback command callback

A simple callback which copies the response back into the
command buffer that was used to send the command to the
card.  Will allow for direct command processing outside
the mega-switches in cmd.c and cmdresp.c.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 78870c7704289f40c6c5caec6d1b61c4bdc8df59..c4b32a05de107239ce7b096e71d85d2516c47db3 100644 (file)
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1971,6 +1971,34 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode)
 }
 
 
+/**
+ *  @brief Simple callback that copies response back into command
+ *
+ *  @param priv        A pointer to struct lbs_private structure
+ *  @param extra       A pointer to the original command structure for which
+ *                      'resp' is a response
+ *  @param resp         A pointer to the command response
+ *
+ *  @return            0 on success, error on failure
+ */
+int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,
+                       struct cmd_header *resp)
+{
+       struct cmd_header *buf = (void *)extra;
+       uint16_t copy_len;
+
+       lbs_deb_enter(LBS_DEB_CMD);
+
+       copy_len = min(le16_to_cpu(buf->size), le16_to_cpu(resp->size));
+       lbs_deb_cmd("Copying back %u bytes; command response was %u bytes, "
+                   "copy back buffer was %u bytes", copy_len, resp->size,
+                   buf->size);
+       memcpy(buf, resp, copy_len);
+
+       lbs_deb_leave(LBS_DEB_CMD);
+       return 0;
+}
+
 /**
  *  @brief Simple way to call firmware functions
  *
@@ -1987,7 +2015,6 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode)
  *  @return            -1 in case of a higher level error, otherwise
  *                      the result code from the firmware
  */
-
 int __lbs_cmd(struct lbs_private *priv, uint16_t command,
              struct cmd_header *in_cmd, int in_cmd_size,
              int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),

diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h
index 259d3e87193f18739e22d09797ec80c54932484d..72857a1a2482e299e9eba551aba45ea4528c6f7e 100644 (file)
--- a/drivers/net/wireless/libertas/cmd.h
+++ b/drivers/net/wireless/libertas/cmd.h
@@ -10,9 +10,16 @@
        __lbs_cmd(priv, cmdnr, (struct cmd_header *) &cmd, sizeof(cmd), \
                        callback, callback_arg)
 
+#define lbs_cmd_with_response(priv, cmdnr, cmd) \
+       __lbs_cmd(priv, cmdnr, (struct cmd_header *) &cmd, sizeof(cmd), \
+                 lbs_cmd_copyback, (unsigned long) &cmd)
+ 
 int __lbs_cmd(struct lbs_private *priv, uint16_t command,
              struct cmd_header *in_cmd, int in_cmd_size, 
              int (*callback)(struct lbs_private *, unsigned long, struct cmd_header *),
              unsigned long callback_arg);
 
+int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,
+                    struct cmd_header *resp);
+
 #endif /* _LBS_CMD_H */