projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reduce the kernel verbosity of the ps3_system_bus_match output
[openwrt.git] / package / libertas / src / debugfs.c
diff --git a/package/libertas/src/debugfs.c b/package/libertas/src/debugfs.c
index f4858bd..2174717 100644 (file)
--- a/package/libertas/src/debugfs.c
+++ b/package/libertas/src/debugfs.c
@@ -10,6 +10,7 @@
 #include "decl.h"
 #include "host.h"
 #include "debugfs.h"
 #include "decl.h"
 #include "host.h"
 #include "debugfs.h"
+#include "cmd.h"
 
 static struct dentry *lbs_dir;
 static char *szStates[] = {
 
 static struct dentry *lbs_dir;
 static char *szStates[] = {
@@ -103,71 +104,64 @@ static ssize_t lbs_sleepparams_write(struct file *file,
                                loff_t *ppos)
 {
        struct lbs_private *priv = file->private_data;
                                loff_t *ppos)
 {
        struct lbs_private *priv = file->private_data;
-       ssize_t buf_size, res;
+       ssize_t buf_size, ret;
+       struct sleep_params sp;
        int p1, p2, p3, p4, p5, p6;
        unsigned long addr = get_zeroed_page(GFP_KERNEL);
        char *buf = (char *)addr;
 
        buf_size = min(count, len - 1);
        if (copy_from_user(buf, user_buf, buf_size)) {
        int p1, p2, p3, p4, p5, p6;
        unsigned long addr = get_zeroed_page(GFP_KERNEL);
        char *buf = (char *)addr;
 
        buf_size = min(count, len - 1);
        if (copy_from_user(buf, user_buf, buf_size)) {
-               res = -EFAULT;
+               ret = -EFAULT;
                goto out_unlock;
        }
                goto out_unlock;
        }
-       res = sscanf(buf, "%d %d %d %d %d %d", &p1, &p2, &p3, &p4, &p5, &p6);
-       if (res != 6) {
-               res = -EFAULT;
+       ret = sscanf(buf, "%d %d %d %d %d %d", &p1, &p2, &p3, &p4, &p5, &p6);
+       if (ret != 6) {
+               ret = -EINVAL;
                goto out_unlock;
        }
                goto out_unlock;
        }
-       priv->sp.sp_error = p1;
-       priv->sp.sp_offset = p2;
-       priv->sp.sp_stabletime = p3;
-       priv->sp.sp_calcontrol = p4;
-       priv->sp.sp_extsleepclk = p5;
-       priv->sp.sp_reserved = p6;
-
-       res = lbs_prepare_and_send_command(priv,
-                               CMD_802_11_SLEEP_PARAMS,
-                               CMD_ACT_SET,
-                               CMD_OPTION_WAITFORRSP, 0, NULL);
-
-       if (!res)
-               res = count;
-       else
-               res = -EINVAL;
+       sp.sp_error = p1;
+       sp.sp_offset = p2;
+       sp.sp_stabletime = p3;
+       sp.sp_calcontrol = p4;
+       sp.sp_extsleepclk = p5;
+       sp.sp_reserved = p6;
+
+       ret = lbs_cmd_802_11_sleep_params(priv, CMD_ACT_SET, &sp);
+       if (!ret)
+               ret = count;
+       else if (ret > 0)
+               ret = -EINVAL;
 
 out_unlock:
        free_page(addr);
 
 out_unlock:
        free_page(addr);
-       return res;
+       return ret;
 }
 
 static ssize_t lbs_sleepparams_read(struct file *file, char __user *userbuf,
                                  size_t count, loff_t *ppos)
 {
        struct lbs_private *priv = file->private_data;
 }
 
 static ssize_t lbs_sleepparams_read(struct file *file, char __user *userbuf,
                                  size_t count, loff_t *ppos)
 {
        struct lbs_private *priv = file->private_data;
-       ssize_t res;
+       ssize_t ret;
        size_t pos = 0;
        size_t pos = 0;
+       struct sleep_params sp;
        unsigned long addr = get_zeroed_page(GFP_KERNEL);
        char *buf = (char *)addr;
 
        unsigned long addr = get_zeroed_page(GFP_KERNEL);
        char *buf = (char *)addr;
 
-       res = lbs_prepare_and_send_command(priv,
-                               CMD_802_11_SLEEP_PARAMS,
-                               CMD_ACT_GET,
-                               CMD_OPTION_WAITFORRSP, 0, NULL);
-       if (res) {
-               res = -EFAULT;
+       ret = lbs_cmd_802_11_sleep_params(priv, CMD_ACT_GET, &sp);
+       if (ret)
                goto out_unlock;
                goto out_unlock;
-       }
 
 
-       pos += snprintf(buf, len, "%d %d %d %d %d %d\n", priv->sp.sp_error,
-                       priv->sp.sp_offset, priv->sp.sp_stabletime,
-                       priv->sp.sp_calcontrol, priv->sp.sp_extsleepclk,
-                       priv->sp.sp_reserved);
+       pos += snprintf(buf, len, "%d %d %d %d %d %d\n", sp.sp_error,
+                       sp.sp_offset, sp.sp_stabletime,
+                       sp.sp_calcontrol, sp.sp_extsleepclk,
+                       sp.sp_reserved);
 
 
-       res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+       ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
 
 out_unlock:
        free_page(addr);
 
 out_unlock:
        free_page(addr);
-       return res;
+       return ret;
 }
 
 static ssize_t lbs_extscan(struct file *file, const char __user *userbuf,
 }
 
 static ssize_t lbs_extscan(struct file *file, const char __user *userbuf,
@@ -295,7 +289,7 @@ static ssize_t lbs_setuserscan(struct file *file,
 
        if (!buf)
                return -ENOMEM;
 
        if (!buf)
                return -ENOMEM;
-               
+
        buf_size = min(count, len - 1);
        if (copy_from_user(buf, userbuf, buf_size)) {
                res = -EFAULT;
        buf_size = min(count, len - 1);
        if (copy_from_user(buf, userbuf, buf_size)) {
                res = -EFAULT;
@@ -352,20 +346,19 @@ static ssize_t lbs_setuserscan(struct file *file,
  * and returns a pointer to the first data byte of the TLV, or to NULL
  * if the TLV hasn't been found.
  */
  * and returns a pointer to the first data byte of the TLV, or to NULL
  * if the TLV hasn't been found.
  */
-static void *lbs_tlv_find(u16 tlv_type, const u8 *tlv, u16 size)
+static void *lbs_tlv_find(uint16_t tlv_type, const uint8_t *tlv, uint16_t size)
 {
 {
-       __le16 le_type = cpu_to_le16(tlv_type);
-       ssize_t pos = 0;
        struct mrvlietypesheader *tlv_h;
        struct mrvlietypesheader *tlv_h;
+       uint16_t length;
+       ssize_t pos = 0;
+
        while (pos < size) {
        while (pos < size) {
-               u16 length;
                tlv_h = (struct mrvlietypesheader *) tlv;
                tlv_h = (struct mrvlietypesheader *) tlv;
-               if (tlv_h->type == le_type)
-                       return tlv_h;
-               if (tlv_h->len == 0)
+               if (!tlv_h->len)
                        return NULL;
                        return NULL;
-               length = le16_to_cpu(tlv_h->len) +
-                       sizeof(struct mrvlietypesheader);
+               if (tlv_h->type == cpu_to_le16(tlv_type))
+                       return tlv_h;
+               length = le16_to_cpu(tlv_h->len) + sizeof(*tlv_h);
                pos += length;
                tlv += length;
        }
                pos += length;
                tlv += length;
        }
@@ -373,100 +366,100 @@ static void *lbs_tlv_find(u16 tlv_type, const u8 *tlv, u16 size)
 }
 
 
 }
 
 
-/*
- * This just gets the bitmap of currently subscribed events. Used when
- * adding an additonal event subscription.
- */
-static u16 lbs_get_events_bitmap(struct lbs_private *priv)
-{
-       ssize_t res;
-
-       struct cmd_ds_802_11_subscribe_event *events = kzalloc(
-               sizeof(struct cmd_ds_802_11_subscribe_event),
-               GFP_KERNEL);
-
-       res = lbs_prepare_and_send_command(priv,
-                       CMD_802_11_SUBSCRIBE_EVENT, CMD_ACT_GET,
-                       CMD_OPTION_WAITFORRSP, 0, events);
-
-       if (res) {
-               kfree(events);
-               return 0;
-       }
-       return le16_to_cpu(events->events);
-}
-
-
-static ssize_t lbs_threshold_read(
-       u16 tlv_type, u16 event_mask,
-       struct file *file, char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_threshold_read(uint16_t tlv_type, uint16_t event_mask,
+                                 struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
 {
 {
+       struct cmd_ds_802_11_subscribe_event *subscribed;
+       struct mrvlietypes_thresholds *got;
        struct lbs_private *priv = file->private_data;
        struct lbs_private *priv = file->private_data;
-       ssize_t res = 0;
+       ssize_t ret = 0;
        size_t pos = 0;
        size_t pos = 0;
-       unsigned long addr = get_zeroed_page(GFP_KERNEL);
-       char *buf = (char *)addr;
+       char *buf;
        u8 value;
        u8 freq;
        int events = 0;
 
        u8 value;
        u8 freq;
        int events = 0;
 
-       struct cmd_ds_802_11_subscribe_event *subscribed = kzalloc(
-               sizeof(struct cmd_ds_802_11_subscribe_event),
-               GFP_KERNEL);
-       struct mrvlietypes_thresholds *got;
+       buf = (char *)get_zeroed_page(GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
 
 
-       res = lbs_prepare_and_send_command(priv,
-                       CMD_802_11_SUBSCRIBE_EVENT, CMD_ACT_GET,
-                       CMD_OPTION_WAITFORRSP, 0, subscribed);
-       if (res) {
-               kfree(subscribed);
-               return res;
+       subscribed = kzalloc(sizeof(*subscribed), GFP_KERNEL);
+       if (!subscribed) {
+               ret = -ENOMEM;
+               goto out_page;
        }
 
        }
 
+       subscribed->hdr.size = cpu_to_le16(sizeof(*subscribed));
+       subscribed->action = cpu_to_le16(CMD_ACT_GET);
+
+       ret = lbs_cmd_with_response(priv, CMD_802_11_SUBSCRIBE_EVENT, subscribed);
+       if (ret)
+               goto out_cmd;
+
        got = lbs_tlv_find(tlv_type, subscribed->tlv, sizeof(subscribed->tlv));
        if (got) {
                value = got->value;
                freq  = got->freq;
                events = le16_to_cpu(subscribed->events);
        got = lbs_tlv_find(tlv_type, subscribed->tlv, sizeof(subscribed->tlv));
        if (got) {
                value = got->value;
                freq  = got->freq;
                events = le16_to_cpu(subscribed->events);
-       }
-       kfree(subscribed);
 
 
-       if (got)
                pos += snprintf(buf, len, "%d %d %d\n", value, freq,
                pos += snprintf(buf, len, "%d %d %d\n", value, freq,
-                       !!(events & event_mask));
+                               !!(events & event_mask));
+       }
 
 
-       res = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
+       ret = simple_read_from_buffer(userbuf, count, ppos, buf, pos);
 
 
-       free_page(addr);
-       return res;
+ out_cmd:
+       kfree(subscribed);
+
+ out_page:
+       free_page((unsigned long)buf);
+       return ret;
 }
 
 
 }
 
 
-static ssize_t lbs_threshold_write(
-       u16 tlv_type, u16 event_mask,
-       struct file *file,
-       const char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_threshold_write(uint16_t tlv_type, uint16_t event_mask,
+                                  struct file *file,
+                                  const char __user *userbuf, size_t count,
+                                  loff_t *ppos)
 {
 {
-       struct lbs_private *priv = file->private_data;
-       ssize_t res, buf_size;
-       int value, freq, curr_mask, new_mask;
-       unsigned long addr = get_zeroed_page(GFP_KERNEL);
-       char *buf = (char *)addr;
        struct cmd_ds_802_11_subscribe_event *events;
        struct cmd_ds_802_11_subscribe_event *events;
+       struct mrvlietypes_thresholds *tlv;
+       struct lbs_private *priv = file->private_data;
+       ssize_t buf_size;
+       int value, freq, new_mask;
+       uint16_t curr_mask;
+       char *buf;
+       int ret;
+
+       buf = (char *)get_zeroed_page(GFP_KERNEL);
+       if (!buf)
+               return -ENOMEM;
 
        buf_size = min(count, len - 1);
        if (copy_from_user(buf, userbuf, buf_size)) {
 
        buf_size = min(count, len - 1);
        if (copy_from_user(buf, userbuf, buf_size)) {
-               res = -EFAULT;
-               goto out_unlock;
+               ret = -EFAULT;
+               goto out_page;
        }
        }
-       res = sscanf(buf, "%d %d %d", &value, &freq, &new_mask);
-       if (res != 3) {
-               res = -EFAULT;
-               goto out_unlock;
+       ret = sscanf(buf, "%d %d %d", &value, &freq, &new_mask);
+       if (ret != 3) {
+               ret = -EINVAL;
+               goto out_page;
        }
        }
-       curr_mask = lbs_get_events_bitmap(priv);
+       events = kzalloc(sizeof(*events), GFP_KERNEL);
+       if (!events) {
+               ret = -ENOMEM;
+               goto out_page;
+       }
+
+       events->hdr.size = cpu_to_le16(sizeof(*events));
+       events->action = cpu_to_le16(CMD_ACT_GET);
+
+       ret = lbs_cmd_with_response(priv, CMD_802_11_SUBSCRIBE_EVENT, events);
+       if (ret)
+               goto out_events;
+
+       curr_mask = le16_to_cpu(events->events);
 
        if (new_mask)
                new_mask = curr_mask | event_mask;
 
        if (new_mask)
                new_mask = curr_mask | event_mask;
@@ -474,147 +467,128 @@ static ssize_t lbs_threshold_write(
                new_mask = curr_mask & ~event_mask;
 
        /* Now everything is set and we can send stuff down to the firmware */
                new_mask = curr_mask & ~event_mask;
 
        /* Now everything is set and we can send stuff down to the firmware */
-       events = kzalloc(
-               sizeof(struct cmd_ds_802_11_subscribe_event),
-               GFP_KERNEL);
-       if (events) {
-               struct mrvlietypes_thresholds *tlv =
-                       (struct mrvlietypes_thresholds *) events->tlv;
-               events->action = cpu_to_le16(CMD_ACT_SET);
-               events->events = cpu_to_le16(new_mask);
-               tlv->header.type = cpu_to_le16(tlv_type);
-               tlv->header.len = cpu_to_le16(
-                       sizeof(struct mrvlietypes_thresholds) -
-                       sizeof(struct mrvlietypesheader));
-               tlv->value = value;
-               if (tlv_type != TLV_TYPE_BCNMISS)
-                       tlv->freq = freq;
-               lbs_prepare_and_send_command(priv,
-                       CMD_802_11_SUBSCRIBE_EVENT, CMD_ACT_SET,
-                       CMD_OPTION_WAITFORRSP, 0, events);
-               kfree(events);
-       }
 
 
-       res = count;
-out_unlock:
-       free_page(addr);
-       return res;
+       tlv = (void *)events->tlv;
+
+       events->action = cpu_to_le16(CMD_ACT_SET);
+       events->events = cpu_to_le16(new_mask);
+       tlv->header.type = cpu_to_le16(tlv_type);
+       tlv->header.len = cpu_to_le16(sizeof(*tlv) - sizeof(tlv->header));
+       tlv->value = value;
+       if (tlv_type != TLV_TYPE_BCNMISS)
+               tlv->freq = freq;
+
+       /* The command header, the event mask, and the one TLV */
+       events->hdr.size = cpu_to_le16(sizeof(events->hdr) + 2 + sizeof(*tlv));
+
+       ret = lbs_cmd_with_response(priv, CMD_802_11_SUBSCRIBE_EVENT, events);
+
+       if (!ret)
+               ret = count;
+ out_events:
+       kfree(events);
+ out_page:
+       free_page((unsigned long)buf);
+       return ret;
 }
 
 
 }
 
 
-static ssize_t lbs_lowrssi_read(
-       struct file *file, char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_lowrssi_read(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
 {
        return lbs_threshold_read(TLV_TYPE_RSSI_LOW, CMD_SUBSCRIBE_RSSI_LOW,
 {
        return lbs_threshold_read(TLV_TYPE_RSSI_LOW, CMD_SUBSCRIBE_RSSI_LOW,
-               file, userbuf, count, ppos);
+                                 file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_lowrssi_write(
-       struct file *file, const char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_lowrssi_write(struct file *file, const char __user *userbuf,
+                                size_t count, loff_t *ppos)
 {
        return lbs_threshold_write(TLV_TYPE_RSSI_LOW, CMD_SUBSCRIBE_RSSI_LOW,
 {
        return lbs_threshold_write(TLV_TYPE_RSSI_LOW, CMD_SUBSCRIBE_RSSI_LOW,
-               file, userbuf, count, ppos);
+                                  file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_lowsnr_read(
-       struct file *file, char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_lowsnr_read(struct file *file, char __user *userbuf,
+                              size_t count, loff_t *ppos)
 {
        return lbs_threshold_read(TLV_TYPE_SNR_LOW, CMD_SUBSCRIBE_SNR_LOW,
 {
        return lbs_threshold_read(TLV_TYPE_SNR_LOW, CMD_SUBSCRIBE_SNR_LOW,
-               file, userbuf, count, ppos);
+                                 file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_lowsnr_write(
-       struct file *file, const char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_lowsnr_write(struct file *file, const char __user *userbuf,
+                               size_t count, loff_t *ppos)
 {
        return lbs_threshold_write(TLV_TYPE_SNR_LOW, CMD_SUBSCRIBE_SNR_LOW,
 {
        return lbs_threshold_write(TLV_TYPE_SNR_LOW, CMD_SUBSCRIBE_SNR_LOW,
-               file, userbuf, count, ppos);
+                                  file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_failcount_read(
-       struct file *file, char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_failcount_read(struct file *file, char __user *userbuf,
+                                 size_t count, loff_t *ppos)
 {
        return lbs_threshold_read(TLV_TYPE_FAILCOUNT, CMD_SUBSCRIBE_FAILCOUNT,
 {
        return lbs_threshold_read(TLV_TYPE_FAILCOUNT, CMD_SUBSCRIBE_FAILCOUNT,
-               file, userbuf, count, ppos);
+                                 file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_failcount_write(
-       struct file *file, const char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_failcount_write(struct file *file, const char __user *userbuf,
+                                  size_t count, loff_t *ppos)
 {
        return lbs_threshold_write(TLV_TYPE_FAILCOUNT, CMD_SUBSCRIBE_FAILCOUNT,
 {
        return lbs_threshold_write(TLV_TYPE_FAILCOUNT, CMD_SUBSCRIBE_FAILCOUNT,
-               file, userbuf, count, ppos);
+                                  file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_highrssi_read(
-       struct file *file, char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_highrssi_read(struct file *file, char __user *userbuf,
+                                size_t count, loff_t *ppos)
 {
        return lbs_threshold_read(TLV_TYPE_RSSI_HIGH, CMD_SUBSCRIBE_RSSI_HIGH,
 {
        return lbs_threshold_read(TLV_TYPE_RSSI_HIGH, CMD_SUBSCRIBE_RSSI_HIGH,
-               file, userbuf, count, ppos);
+                                 file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_highrssi_write(
-       struct file *file, const char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_highrssi_write(struct file *file, const char __user *userbuf,
+                                 size_t count, loff_t *ppos)
 {
        return lbs_threshold_write(TLV_TYPE_RSSI_HIGH, CMD_SUBSCRIBE_RSSI_HIGH,
 {
        return lbs_threshold_write(TLV_TYPE_RSSI_HIGH, CMD_SUBSCRIBE_RSSI_HIGH,
-               file, userbuf, count, ppos);
+                                  file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_highsnr_read(
-       struct file *file, char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_highsnr_read(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
 {
        return lbs_threshold_read(TLV_TYPE_SNR_HIGH, CMD_SUBSCRIBE_SNR_HIGH,
 {
        return lbs_threshold_read(TLV_TYPE_SNR_HIGH, CMD_SUBSCRIBE_SNR_HIGH,
-               file, userbuf, count, ppos);
+                                 file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_highsnr_write(
-       struct file *file, const char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_highsnr_write(struct file *file, const char __user *userbuf,
+                                size_t count, loff_t *ppos)
 {
        return lbs_threshold_write(TLV_TYPE_SNR_HIGH, CMD_SUBSCRIBE_SNR_HIGH,
 {
        return lbs_threshold_write(TLV_TYPE_SNR_HIGH, CMD_SUBSCRIBE_SNR_HIGH,
-               file, userbuf, count, ppos);
+                                  file, userbuf, count, ppos);
 }
 
 }
 
-static ssize_t lbs_bcnmiss_read(
-       struct file *file, char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_bcnmiss_read(struct file *file, char __user *userbuf,
+                               size_t count, loff_t *ppos)
 {
        return lbs_threshold_read(TLV_TYPE_BCNMISS, CMD_SUBSCRIBE_BCNMISS,
 {
        return lbs_threshold_read(TLV_TYPE_BCNMISS, CMD_SUBSCRIBE_BCNMISS,
-               file, userbuf, count, ppos);
+                                 file, userbuf, count, ppos);
 }
 
 
 }
 
 
-static ssize_t lbs_bcnmiss_write(
-       struct file *file, const char __user *userbuf,
-       size_t count, loff_t *ppos)
+static ssize_t lbs_bcnmiss_write(struct file *file, const char __user *userbuf,
+                                size_t count, loff_t *ppos)
 {
        return lbs_threshold_write(TLV_TYPE_BCNMISS, CMD_SUBSCRIBE_BCNMISS,
 {
        return lbs_threshold_write(TLV_TYPE_BCNMISS, CMD_SUBSCRIBE_BCNMISS,
-               file, userbuf, count, ppos);
+                                  file, userbuf, count, ppos);
 }
 
 
 
 }
 
 
 
-
-
-
-
-
 static ssize_t lbs_rdmac_read(struct file *file, char __user *userbuf,
                                  size_t count, loff_t *ppos)
 {
 static ssize_t lbs_rdmac_read(struct file *file, char __user *userbuf,
                                  size_t count, loff_t *ppos)
 {
Personal OpenWRT clone
This page took 0.037128 seconds and 4 git commands to generate.