Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
drivers/staging/rtl8192e/rtl_crypto.h | 80 ++--
drivers/staging/rtl8192e/rtl_debug.c | 718 ++++++++++++++++-----------------
drivers/staging/rtl8192e/rtl_debug.h | 236 ++++++------
3 files changed, 514 insertions(+), 520 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl_crypto.h b/drivers/staging/rtl8192e/rtl_crypto.h
index 7b4551d..ee57c0f 100644
--- a/drivers/staging/rtl8192e/rtl_crypto.h
+++ b/drivers/staging/rtl8192e/rtl_crypto.h
@@ -22,7 +22,7 @@
#include <linux/list.h>
#include <linux/string.h>
#include <asm/page.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
#define crypto_register_alg crypto_register_alg_rsl
#define crypto_unregister_alg crypto_unregister_alg_rsl
@@ -73,7 +73,7 @@ struct cipher_alg {
unsigned int cia_min_keysize;
unsigned int cia_max_keysize;
int (*cia_setkey)(void *ctx, const u8 *key,
- unsigned int keylen, u32 *flags);
+ unsigned int keylen, u32 *flags);
void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);
void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);
};
@@ -84,16 +84,16 @@ struct digest_alg {
void (*dia_update)(void *ctx, const u8 *data, unsigned int len);
void (*dia_final)(void *ctx, u8 *out);
int (*dia_setkey)(void *ctx, const u8 *key,
- unsigned int keylen, u32 *flags);
+ unsigned int keylen, u32 *flags);
};
struct compress_alg {
int (*coa_init)(void *ctx);
void (*coa_exit)(void *ctx);
int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
+ u8 *dst, unsigned int *dlen);
int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
+ u8 *dst, unsigned int *dlen);
};
#define cra_cipher cra_u.cipher
@@ -139,15 +139,15 @@ struct cipher_tfm {
unsigned int cit_ivsize;
u32 cit_mode;
int (*cit_setkey)(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen);
+ const u8 *key, unsigned int keylen);
int (*cit_encrypt)(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
unsigned int nbytes);
int (*cit_encrypt_iv)(struct crypto_tfm *tfm,
- struct scatterlist *dst,
- struct scatterlist *src,
- unsigned int nbytes, u8 *iv);
+ struct scatterlist *dst,
+ struct scatterlist *src,
+ unsigned int nbytes, u8 *iv);
int (*cit_decrypt)(struct crypto_tfm *tfm,
struct scatterlist *dst,
struct scatterlist *src,
@@ -162,21 +162,21 @@ struct cipher_tfm {
struct digest_tfm {
void (*dit_init)(struct crypto_tfm *tfm);
void (*dit_update)(struct crypto_tfm *tfm,
- struct scatterlist *sg, unsigned int nsg);
+ struct scatterlist *sg, unsigned int nsg);
void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
- unsigned int nsg, u8 *out);
+ unsigned int nsg, u8 *out);
int (*dit_setkey)(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen);
+ const u8 *key, unsigned int keylen);
};
struct compress_tfm {
int (*cot_compress)(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
+ const u8 *src, unsigned int slen,
+ u8 *dst, unsigned int *dlen);
int (*cot_decompress)(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen);
+ const u8 *src, unsigned int slen,
+ u8 *dst, unsigned int *dlen);
};
#define crt_cipher crt_u.cipher
@@ -274,8 +274,8 @@ static inline void crypto_digest_init(struct crypto_tfm *tfm)
}
static inline void crypto_digest_update(struct crypto_tfm *tfm,
- struct scatterlist *sg,
- unsigned int nsg)
+ struct scatterlist *sg,
+ unsigned int nsg)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
tfm->crt_digest.dit_update(tfm, sg, nsg);
@@ -288,15 +288,15 @@ static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
}
static inline void crypto_digest_digest(struct crypto_tfm *tfm,
- struct scatterlist *sg,
- unsigned int nsg, u8 *out)
+ struct scatterlist *sg,
+ unsigned int nsg, u8 *out)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
tfm->crt_digest.dit_digest(tfm, sg, nsg, out);
}
static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen)
+ const u8 *key, unsigned int keylen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
if (tfm->crt_digest.dit_setkey == NULL)
@@ -305,25 +305,25 @@ static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
}
static inline int crypto_cipher_setkey(struct crypto_tfm *tfm,
- const u8 *key, unsigned int keylen)
+ const u8 *key, unsigned int keylen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->crt_cipher.cit_setkey(tfm, key, keylen);
}
static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm,
- struct scatterlist *dst,
- struct scatterlist *src,
- unsigned int nbytes)
+ struct scatterlist *dst,
+ struct scatterlist *src,
+ unsigned int nbytes)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->crt_cipher.cit_encrypt(tfm, dst, src, nbytes);
}
static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
- struct scatterlist *dst,
- struct scatterlist *src,
- unsigned int nbytes, u8 *iv)
+ struct scatterlist *dst,
+ struct scatterlist *src,
+ unsigned int nbytes, u8 *iv)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -331,18 +331,18 @@ static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
}
static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm,
- struct scatterlist *dst,
- struct scatterlist *src,
- unsigned int nbytes)
+ struct scatterlist *dst,
+ struct scatterlist *src,
+ unsigned int nbytes)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->crt_cipher.cit_decrypt(tfm, dst, src, nbytes);
}
static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
- struct scatterlist *dst,
- struct scatterlist *src,
- unsigned int nbytes, u8 *iv)
+ struct scatterlist *dst,
+ struct scatterlist *src,
+ unsigned int nbytes, u8 *iv)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
@@ -350,30 +350,30 @@ static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
}
static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
- const u8 *src, unsigned int len)
+ const u8 *src, unsigned int len)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
memcpy(tfm->crt_cipher.cit_iv, src, len);
}
static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
- u8 *dst, unsigned int len)
+ u8 *dst, unsigned int len)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
memcpy(dst, tfm->crt_cipher.cit_iv, len);
}
static inline int crypto_comp_compress(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen)
+ const u8 *src, unsigned int slen,
+ u8 *dst, unsigned int *dlen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen);
}
static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
- const u8 *src, unsigned int slen,
- u8 *dst, unsigned int *dlen)
+ const u8 *src, unsigned int slen,
+ u8 *dst, unsigned int *dlen)
{
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl_debug.c
index 5c2d01c..22bc2dd 100644
--- a/drivers/staging/rtl8192e/rtl_debug.c
+++ b/drivers/staging/rtl8192e/rtl_debug.c
@@ -53,12 +53,10 @@ u32 DBGP_Type[DBGP_TYPE_MAX];
*---------------------------------------------------------------------------*/
void rtl8192_dbgp_flag_init(struct net_device *dev)
{
- u8 i;
+ u8 i;
for (i = 0; i < DBGP_TYPE_MAX; i++)
- {
DBGP_Type[i] = 0;
- }
} /* DBGP_Flag_Init */
@@ -67,19 +65,19 @@ void rtl8192_dbgp_flag_init(struct net_device *dev)
void print_buffer(u32 *buffer, int len)
{
int i;
- u8 *buf =(u8*)buffer;
+ u8 *buf = (u8 *)buffer;
- printk("ASCII BUFFER DUMP (len: %x):\n",len);
+ printk(KERN_INFO "ASCII BUFFER DUMP (len: %x):\n", len);
- for (i=0;i<len;i++)
- printk("%c",buf[i]);
+ for (i = 0; i < len; i++)
+ printk(KERN_INFO "%c", buf[i]);
- printk("\nBINARY BUFFER DUMP (len: %x):\n",len);
+ printk(KERN_INFO "\nBINARY BUFFER DUMP (len: %x):\n", len);
- for (i=0;i<len;i++)
- printk("%x",buf[i]);
+ for (i = 0; i < len; i++)
+ printk(KERN_INFO "%x", buf[i]);
- printk("\n");
+ printk(KERN_INFO "\n");
}
/* this is only for debug */
@@ -87,9 +85,9 @@ void dump_eprom(struct net_device *dev)
{
int i;
- for (i = 0; i < 0xff; i++) {
- RT_TRACE(COMP_INIT, "EEPROM addr %x : %x", i, eprom_read(dev,i));
- }
+ for (i = 0; i < 0xff; i++)
+ RT_TRACE(COMP_INIT, "EEPROM addr %x : %x", i,
+ eprom_read(dev, i));
}
/* this is only for debug */
@@ -102,18 +100,18 @@ void rtl8192_dump_reg(struct net_device *dev)
RT_TRACE(COMP_INIT, "Dumping NIC register map");
for (n = 0; n <= max; ) {
- printk( "\nD: %2x> ", n);
+ printk(KERN_INFO "\nD: %2x> ", n);
for (i = 0; i < 16 && n <= max; i++, n++)
- printk("%2x ", read_nic_byte(dev, n));
+ printk(KERN_INFO "%2x ", read_nic_byte(dev, n));
}
- printk("\n");
+ printk(KERN_INFO "\n");
}
/****************************************************************************
-----------------------------PROCFS STUFF-------------------------
*****************************************************************************/
/*This part is related to PROC, which will record some statistics. */
-static struct proc_dir_entry *rtl8192_proc = NULL;
+static struct proc_dir_entry *rtl8192_proc;
static int proc_get_stats_ap(char *page, char **start,
off_t offset, int count,
@@ -123,24 +121,21 @@ static int proc_get_stats_ap(char *page, char **start,
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
struct rtllib_device *ieee = priv->rtllib;
struct rtllib_network *target;
-
int len = 0;
- list_for_each_entry(target, &ieee->network_list, list) {
+ list_for_each_entry(target, &ieee->network_list, list) {
len += snprintf(page + len, count - len,
- "%s ", target->ssid);
+ "%s ", target->ssid);
- if (target->wpa_ie_len>0 || target->rsn_ie_len>0){
- len += snprintf(page + len, count - len,
- "WPA\n");
- }
- else{
- len += snprintf(page + len, count - len,
- "non_WPA\n");
- }
+ if (target->wpa_ie_len > 0 || target->rsn_ie_len > 0)
+ len += snprintf(page + len, count - len,
+ "WPA\n");
+ else
+ len += snprintf(page + len, count - len,
+ "non_WPA\n");
- }
+ }
*eof = 1;
return len;
@@ -153,25 +148,25 @@ static int proc_get_registers_0(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0x000;
- {
- len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;n++,i++)
- len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
- }
+ len += snprintf(page + len, count - len,
+ "\n####################page %x##################\n ",
+ (page0>>8));
+ len += snprintf(page + len, count - len,
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+ "0C 0D 0E 0F");
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; n++, i++)
+ len += snprintf(page + len, count - len,
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
@@ -183,25 +178,27 @@ static int proc_get_registers_1(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0x100;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
+ "\n####################page %x##################\n ",
+ (page0>>8));
len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+ "0C 0D 0E 0F");
+ for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
- "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;i++,n++)
+ "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
@@ -213,25 +210,27 @@ static int proc_get_registers_2(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0x200;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
+ "\n####################page %x##################\n ",
+ (page0 >> 8));
len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C "
+ "0D 0E 0F");
+ for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
- "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;i++,n++)
+ "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
@@ -243,25 +242,27 @@ static int proc_get_registers_3(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0x300;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
+ "\n####################page %x##################\n ",
+ (page0>>8));
len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+ "0C 0D 0E 0F");
+ for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
- "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;i++,n++)
+ "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
@@ -273,117 +274,125 @@ static int proc_get_registers_4(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0x400;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
+ "\n####################page %x##################\n ",
+ (page0>>8));
len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+ "0C 0D 0E 0F");
+ for (n = 0; n <= max;) {
len += snprintf(page + len, count - len,
- "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;i++,n++)
+ "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; i++, n++)
len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
static int proc_get_registers_5(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
+ off_t offset, int count,
+ int *eof, void *data)
{
- struct net_device *dev = data;
+ struct net_device *dev = data;
- int len = 0;
- int i,n,page0;
+ int len = 0;
+ int i, n, page0;
- int max=0xff;
- page0 = 0x500;
+ int max = 0xff;
+ page0 = 0x500;
- /* This dump the current register page */
- len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
+ /* This dump the current register page */
+ len += snprintf(page + len, count - len,
+ "\n####################page %x##################\n ",
+ (page0 >> 8));
len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len,
- "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;i++,n++)
- len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
- }
- len += snprintf(page + len, count - len,"\n");
- *eof = 1;
- return len;
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+ "0C 0D 0E 0F");
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len,
+ "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; i++, n++)
+ len += snprintf(page + len, count - len,
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
+ }
+ len += snprintf(page + len, count - len, "\n");
+ *eof = 1;
+ return len;
}
static int proc_get_registers_6(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
+ off_t offset, int count,
+ int *eof, void *data)
{
- struct net_device *dev = data;
+ struct net_device *dev = data;
- int len = 0;
- int i,n,page0;
+ int len = 0;
+ int i, n, page0;
- int max=0xff;
- page0 = 0x600;
+ int max = 0xff;
+ page0 = 0x600;
- /* This dump the current register page */
- len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
+ /* This dump the current register page */
len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len,
- "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;i++,n++)
- len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
- }
- len += snprintf(page + len, count - len,"\n");
- *eof = 1;
- return len;
+ "\n####################page %x##################\n ",
+ (page0>>8));
+ len += snprintf(page + len, count - len,
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B "
+ "0C 0D 0E 0F");
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len,
+ "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; i++, n++)
+ len += snprintf(page + len, count - len,
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
+ }
+ len += snprintf(page + len, count - len, "\n");
+ *eof = 1;
+ return len;
}
static int proc_get_registers_7(char *page, char **start,
- off_t offset, int count,
- int *eof, void *data)
+ off_t offset, int count,
+ int *eof, void *data)
{
- struct net_device *dev = data;
+ struct net_device *dev = data;
- int len = 0;
- int i,n,page0;
+ int len = 0;
+ int i, n, page0;
- int max=0xff;
- page0 = 0x700;
+ int max = 0xff;
+ page0 = 0x700;
- /* This dump the current register page */
- len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
+ /* This dump the current register page */
+ len += snprintf(page + len, count - len,
+ "\n####################page %x##################\n ",
+ (page0 >> 8));
len += snprintf(page + len, count - len,
- "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len,
- "\nD: %2x > ",n);
- for (i=0;i<16 && n<=max;i++,n++)
- len += snprintf(page + len, count - len,
- "%2.2x ",read_nic_byte(dev,(page0|n)));
- }
- len += snprintf(page + len, count - len,"\n");
- *eof = 1;
- return len;
+ "\nD: OF > 00 01 02 03 04 05 06 07 08 09 0A 0B 0C "
+ "0D 0E 0F");
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len,
+ "\nD: %2x > ", n);
+ for (i = 0; i < 16 && n <= max; i++, n++)
+ len += snprintf(page + len, count - len,
+ "%2.2x ", read_nic_byte(dev,
+ (page0 | n)));
+ }
+ len += snprintf(page + len, count - len, "\n");
+ *eof = 1;
+ return len;
}
static int proc_get_registers_8(char *page, char **start,
@@ -393,22 +402,23 @@ static int proc_get_registers_8(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0x800;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n####################page %x##################\n",
+ (page0 >> 8));
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+ "%8.8x ", rtl8192_QueryBBReg(dev,
+ (page0 | n), bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
@@ -420,22 +430,23 @@ static int proc_get_registers_9(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0x900;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n####################page %x##################\n",
+ (page0>>8));
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+ "%8.8x ", rtl8192_QueryBBReg(dev,
+ (page0 | n), bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -446,22 +457,23 @@ static int proc_get_registers_a(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0xa00;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n####################page %x##################\n",
+ (page0>>8));
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+ "%8.8x ", rtl8192_QueryBBReg(dev,
+ (page0 | n), bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -472,22 +484,23 @@ static int proc_get_registers_b(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0xb00;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n####################page %x##################\n",
+ (page0 >> 8));
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+ "%8.8x ", rtl8192_QueryBBReg(dev,
+ (page0 | n), bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -498,22 +511,23 @@ static int proc_get_registers_c(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0xc00;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n####################page %x##################\n",
+ (page0>>8));
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+ "%8.8x ", rtl8192_QueryBBReg(dev,
+ (page0 | n), bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -524,22 +538,23 @@ static int proc_get_registers_d(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0xd00;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n####################page %x##################\n",
+ (page0>>8));
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+ "%8.8x ", rtl8192_QueryBBReg(dev,
+ (page0 | n), bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -550,22 +565,23 @@ static int proc_get_registers_e(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n,page0;
+ int i, n, page0;
- int max=0xff;
+ int max = 0xff;
page0 = 0xe00;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n####################page %x##################\n ", (page0>>8));
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n####################page %x##################\n",
+ (page0>>8));
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_QueryBBReg(dev,(page0|n), bMaskDWord));
+ "%8.8x ", rtl8192_QueryBBReg(dev,
+ (page0 | n), bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -577,21 +593,22 @@ static int proc_get_reg_rf_a(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n;
+ int i, n;
- int max=0xff;
+ int max = 0xff;
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### RF-A ##################\n ");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_A,n, bMaskDWord));
+ "%8.8x ", rtl8192_phy_QueryRFReg(dev,
+ (enum rf90_radio_path)RF90_PATH_A, n,
+ bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -603,21 +620,22 @@ static int proc_get_reg_rf_b(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n;
+ int i, n;
- int max=0xff;
+ int max = 0xff;
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### RF-B ##################\n ");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_B, n, bMaskDWord));
+ "%8.8x ", rtl8192_phy_QueryRFReg(dev,
+ (enum rf90_radio_path)RF90_PATH_B, n,
+ bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -629,21 +647,22 @@ static int proc_get_reg_rf_c(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n;
+ int i, n;
- int max=0xff;
+ int max = 0xff;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n#################### RF-C ##################\n ");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ "\n#################### RF-C ##################\n");
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_C, n, bMaskDWord));
+ "%8.8x ", rtl8192_phy_QueryRFReg(dev,
+ (enum rf90_radio_path)RF90_PATH_C, n,
+ bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -655,21 +674,22 @@ static int proc_get_reg_rf_d(char *page, char **start,
struct net_device *dev = data;
int len = 0;
- int i,n;
+ int i, n;
- int max=0xff;
+ int max = 0xff;
/* This dump the current register page */
len += snprintf(page + len, count - len,
"\n#################### RF-D ##################\n ");
- for (n=0;n<=max;)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",n);
- for (i=0;i<4 && n<=max;n+=4,i++)
+ for (n = 0; n <= max;) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", n);
+ for (i = 0; i < 4 && n <= max; n += 4, i++)
len += snprintf(page + len, count - len,
- "%8.8x ",rtl8192_phy_QueryRFReg(dev, (enum rf90_radio_path)RF90_PATH_D, n, bMaskDWord));
+ "%8.8x ", rtl8192_phy_QueryRFReg(dev,
+ (enum rf90_radio_path)RF90_PATH_D, n,
+ bMaskDWord));
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -679,41 +699,38 @@ static int proc_get_cam_register_1(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
- u32 target_command=0;
- u32 target_content=0;
- u8 entry_i=0;
+ u32 target_command = 0;
+ u32 target_content = 0;
+ u8 entry_i = 0;
u32 ulStatus;
int len = 0;
- int i=100, j = 0;
+ int i = 100, j = 0;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n#################### SECURITY CAM (0-10) ##################\n ");
- for (j=0; j<11; j++)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",j);
- for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
- {
- target_command= entry_i+CAM_CONTENT_COUNT*j;
- target_command= target_command | BIT31;
-
- while((i--)>=0)
- {
+ "\n#################### SECURITY CAM (0-10) ######"
+ "############\n ");
+ for (j = 0; j < 11; j++) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", j);
+ for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+ target_command = entry_i+CAM_CONTENT_COUNT*j;
+ target_command = target_command | BIT31;
+
+ while ((i--) >= 0) {
ulStatus = read_nic_dword(dev, RWCAM);
- if (ulStatus & BIT31){
+ if (ulStatus & BIT31)
continue;
- }
- else{
+ else
break;
- }
}
write_nic_dword(dev, RWCAM, target_command);
target_content = read_nic_dword(dev, RCAMO);
- len += snprintf(page + len, count - len,"%8.8x ",target_content);
+ len += snprintf(page + len, count - len, "%8.8x ",
+ target_content);
}
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -723,41 +740,38 @@ static int proc_get_cam_register_2(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
- u32 target_command=0;
- u32 target_content=0;
- u8 entry_i=0;
+ u32 target_command = 0;
+ u32 target_content = 0;
+ u8 entry_i = 0;
u32 ulStatus;
int len = 0;
- int i=100, j = 0;
+ int i = 100, j = 0;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n#################### SECURITY CAM (11-21) ##################\n ");
- for (j=11; j<22; j++)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",j);
- for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
- {
- target_command= entry_i+CAM_CONTENT_COUNT*j;
- target_command= target_command | BIT31;
-
- while((i--)>=0)
- {
+ "\n#################### SECURITY CAM (11-21) "
+ "##################\n ");
+ for (j = 11; j < 22; j++) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", j);
+ for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+ target_command = entry_i + CAM_CONTENT_COUNT * j;
+ target_command = target_command | BIT31;
+
+ while ((i--) >= 0) {
ulStatus = read_nic_dword(dev, RWCAM);
- if (ulStatus & BIT31){
+ if (ulStatus & BIT31)
continue;
- }
- else{
+ else
break;
- }
}
write_nic_dword(dev, RWCAM, target_command);
target_content = read_nic_dword(dev, RCAMO);
- len += snprintf(page + len, count - len,"%8.8x ",target_content);
+ len += snprintf(page + len, count - len, "%8.8x ",
+ target_content);
}
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -767,41 +781,38 @@ static int proc_get_cam_register_3(char *page, char **start,
int *eof, void *data)
{
struct net_device *dev = data;
- u32 target_command=0;
- u32 target_content=0;
- u8 entry_i=0;
+ u32 target_command = 0;
+ u32 target_content = 0;
+ u8 entry_i = 0;
u32 ulStatus;
int len = 0;
- int i=100, j = 0;
+ int i = 100, j = 0;
/* This dump the current register page */
len += snprintf(page + len, count - len,
- "\n#################### SECURITY CAM (22-31) ##################\n ");
- for (j=22; j<TOTAL_CAM_ENTRY; j++)
- {
- len += snprintf(page + len, count - len, "\nD: %2x > ",j);
- for (entry_i=0;entry_i<CAM_CONTENT_COUNT;entry_i++)
- {
- target_command= entry_i+CAM_CONTENT_COUNT*j;
- target_command= target_command | BIT31;
-
- while((i--)>=0)
- {
+ "\n#################### SECURITY CAM (22-31) ######"
+ "############\n ");
+ for (j = 22; j < TOTAL_CAM_ENTRY; j++) {
+ len += snprintf(page + len, count - len, "\nD: %2x > ", j);
+ for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) {
+ target_command = entry_i + CAM_CONTENT_COUNT * j;
+ target_command = target_command | BIT31;
+
+ while ((i--) >= 0) {
ulStatus = read_nic_dword(dev, RWCAM);
- if (ulStatus & BIT31){
+ if (ulStatus & BIT31)
continue;
- }
- else{
+ else
break;
- }
}
write_nic_dword(dev, RWCAM, target_command);
target_content = read_nic_dword(dev, RCAMO);
- len += snprintf(page + len, count - len,"%8.8x ",target_content);
+ len += snprintf(page + len, count - len, "%8.8x ",
+ target_content);
}
}
- len += snprintf(page + len, count - len,"\n");
+ len += snprintf(page + len, count - len, "\n");
*eof = 1;
return len;
}
@@ -877,7 +888,7 @@ static int proc_get_stats_rx(char *page, char **start,
void rtl8192_proc_module_init(void)
{
RT_TRACE(COMP_INIT, "Initializing proc filesystem");
- rtl8192_proc=create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
+ rtl8192_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net);
}
@@ -891,7 +902,7 @@ void rtl8192_proc_remove_one(struct net_device *dev)
{
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
- printk("dev name %s\n",dev->name);
+ printk(KERN_INFO "dev name %s\n", dev->name);
if (priv->dir_dev) {
remove_proc_entry("stats-tx", priv->dir_dev);
@@ -929,194 +940,169 @@ void rtl8192_proc_init_one(struct net_device *dev)
{
struct proc_dir_entry *e;
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
+
priv->dir_dev = create_proc_entry(dev->name,
S_IFDIR | S_IRUGO | S_IXUGO,
rtl8192_proc);
if (!priv->dir_dev) {
- RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192/%s\n",
- dev->name);
+ RT_TRACE(COMP_ERR, "Unable to initialize /proc/net/rtl8192"
+ "/%s\n", dev->name);
return;
}
e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_stats_rx, dev);
- if (!e) {
- RT_TRACE(COMP_ERR,"Unable to initialize "
+ if (!e)
+ RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/stats-rx\n",
dev->name);
- }
-
e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_stats_tx, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/stats-tx\n",
dev->name);
- }
e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_stats_ap, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/stats-ap\n",
dev->name);
- }
e = create_proc_read_entry("registers-0", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_0, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-0\n",
dev->name);
- }
e = create_proc_read_entry("registers-1", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_1, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-1\n",
dev->name);
- }
e = create_proc_read_entry("registers-2", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_2, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-2\n",
dev->name);
- }
e = create_proc_read_entry("registers-3", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_3, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-3\n",
dev->name);
- }
e = create_proc_read_entry("registers-4", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_4, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-4\n",
dev->name);
- }
e = create_proc_read_entry("registers-5", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_5, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-5\n",
dev->name);
- }
e = create_proc_read_entry("registers-6", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_6, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-6\n",
dev->name);
- }
e = create_proc_read_entry("registers-7", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_7, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-7\n",
dev->name);
- }
e = create_proc_read_entry("registers-8", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_8, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-8\n",
dev->name);
- }
e = create_proc_read_entry("registers-9", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_9, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-9\n",
dev->name);
- }
e = create_proc_read_entry("registers-a", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_a, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-a\n",
dev->name);
- }
e = create_proc_read_entry("registers-b", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_b, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-b\n",
dev->name);
- }
e = create_proc_read_entry("registers-c", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_c, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-c\n",
dev->name);
- }
e = create_proc_read_entry("registers-d", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_d, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-d\n",
dev->name);
- }
e = create_proc_read_entry("registers-e", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_registers_e, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/registers-e\n",
dev->name);
- }
e = create_proc_read_entry("RF-A", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_a, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-A\n",
dev->name);
- }
e = create_proc_read_entry("RF-B", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_b, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-B\n",
dev->name);
- }
e = create_proc_read_entry("RF-C", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_c, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-C\n",
dev->name);
- }
e = create_proc_read_entry("RF-D", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_reg_rf_d, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/RF-D\n",
dev->name);
- }
e = create_proc_read_entry("SEC-CAM-1", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_cam_register_1, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/SEC-CAM-1\n",
dev->name);
- }
e = create_proc_read_entry("SEC-CAM-2", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_cam_register_2, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/SEC-CAM-2\n",
dev->name);
- }
e = create_proc_read_entry("SEC-CAM-3", S_IFREG | S_IRUGO,
priv->dir_dev, proc_get_cam_register_3, dev);
- if (!e) {
+ if (!e)
RT_TRACE(COMP_ERR, "Unable to initialize "
"/proc/net/rtl8192/%s/SEC-CAM-3\n",
dev->name);
- }
}
diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h
index 415dfca..50fb9a9 100644
--- a/drivers/staging/rtl8192e/rtl_debug.h
+++ b/drivers/staging/rtl8192e/rtl_debug.h
@@ -36,31 +36,30 @@ struct net_device;
#define DBG_LOUD 4
-#define RT_ASSERT(_Exp,Fmt) \
- if (!(_Exp)) \
- { \
- printk("Rtl819x: "); \
- printk Fmt; \
+#define RT_ASSERT(_Exp, Fmt) \
+ if (!(_Exp)) { \
+ printk("Rtl819x: "); \
+ printk Fmt; \
}
enum dbgp_flag {
FQoS = 0,
- FTX = 1,
- FRX = 2,
+ FTX = 1,
+ FRX = 2,
FSEC = 3,
FMGNT = 4,
FMLME = 5,
FRESOURCE = 6,
- FBEACON = 7,
+ FBEACON = 7,
FISR = 8,
FPHY = 9,
- FMP = 10,
- FEEPROM = 11,
+ FMP = 10,
+ FEEPROM = 11,
FPWR = 12,
- FDM = 13,
- FDBGCtrl = 14,
+ FDM = 13,
+ FDBGCtrl = 14,
FC2H = 15,
- FBT = 16,
+ FBT = 16,
FINIT = 17,
FIOCTL = 18,
DBGP_TYPE_MAX
@@ -76,10 +75,10 @@ enum dbgp_flag {
#define RX_PHY_STS BIT1
#define RX_PHY_SS BIT2
#define RX_PHY_SQ BIT3
-#define RX_PHY_ASTS BIT4
+#define RX_PHY_ASTS BIT4
#define RX_ERR_LEN BIT5
#define RX_DEFRAG BIT6
-#define RX_ERR_RATE BIT7
+#define RX_ERR_RATE BIT7
@@ -93,68 +92,68 @@ enum dbgp_flag {
#define ISR_CHK BIT0
-#define PHY_BBR BIT0
-#define PHY_BBW BIT1
-#define PHY_RFR BIT2
-#define PHY_RFW BIT3
+#define PHY_BBR BIT0
+#define PHY_BBW BIT1
+#define PHY_RFR BIT2
+#define PHY_RFW BIT3
#define PHY_MACR BIT4
#define PHY_MACW BIT5
#define PHY_ALLR BIT6
#define PHY_ALLW BIT7
#define PHY_TXPWR BIT8
-#define PHY_PWRDIFF BIT9
+#define PHY_PWRDIFF BIT9
#define MP_RX BIT0
-#define MP_SWICH_CH BIT1
+#define MP_SWICH_CH BIT1
#define EEPROM_W BIT0
#define EFUSE_PG BIT1
-#define EFUSE_READ_ALL BIT2
+#define EFUSE_READ_ALL BIT2
-#define LPS BIT0
-#define IPS BIT1
+#define LPS BIT0
+#define IPS BIT1
#define PWRSW BIT2
#define PWRHW BIT3
#define PWRHAL BIT4
#define WA_IOT BIT0
-#define DM_PWDB BIT1
+#define DM_PWDB BIT1
#define DM_Monitor BIT2
#define DM_DIG BIT3
-#define DM_EDCA_Turbo BIT4
+#define DM_EDCA_Turbo BIT4
-#define DbgCtrl_Trace BIT0
-#define DbgCtrl_InbandNoise BIT1
+#define DbgCtrl_Trace BIT0
+#define DbgCtrl_InbandNoise BIT1
#define BT_TRACE BIT0
#define BT_RFPoll BIT1
-#define C2H_Summary BIT0
-#define C2H_PacketData BIT1
-#define C2H_ContentData BIT2
+#define C2H_Summary BIT0
+#define C2H_PacketData BIT1
+#define C2H_ContentData BIT2
#define BT_TRACE BIT0
#define BT_RFPoll BIT1
#define INIT_EEPROM BIT0
-#define INIT_TxPower BIT1
+#define INIT_TxPower BIT1
#define INIT_IQK BIT2
#define INIT_RF BIT3
-#define IOCTL_TRACE BIT0
-#define IOCTL_BT_EVENT BIT1
+#define IOCTL_TRACE BIT0
+#define IOCTL_BT_EVENT BIT1
#define IOCTL_BT_EVENT_DETAIL BIT2
#define IOCTL_BT_TX_ACLDATA BIT3
#define IOCTL_BT_TX_ACLDATA_DETAIL BIT4
#define IOCTL_BT_RX_ACLDATA BIT5
-#define IOCTL_BT_RX_ACLDATA_DETAIL BIT6
+#define IOCTL_BT_RX_ACLDATA_DETAIL BIT6
#define IOCTL_BT_HCICMD BIT7
#define IOCTL_BT_HCICMD_DETAIL BIT8
-#define IOCTL_IRP BIT9
-#define IOCTL_IRP_DETAIL BIT10
-#define IOCTL_CALLBACK_FUN BIT11
-#define IOCTL_STATE BIT12
-#define IOCTL_BT_TP BIT13
-#define IOCTL_BT_LOGO BIT14
+#define IOCTL_IRP BIT9
+#define IOCTL_IRP_DETAIL BIT10
+#define IOCTL_CALLBACK_FUN BIT11
+#define IOCTL_STATE BIT12
+#define IOCTL_BT_TP BIT13
+#define IOCTL_BT_LOGO BIT14
/* 2007/07/13 MH ------For DeBuG Print modeue------*/
/*------------------------------Define structure----------------------------*/
@@ -164,97 +163,98 @@ enum dbgp_flag {
#define DEBUG_PRINT 1
#if (DEBUG_PRINT == 1)
-#define RTPRINT(dbgtype, dbgflag, printstr) \
-{ \
- if (DBGP_Type[dbgtype] & dbgflag)\
- { \
+#define RTPRINT(dbgtype, dbgflag, printstr) \
+{ \
+ if (DBGP_Type[dbgtype] & dbgflag) { \
printk printstr; \
- } \
+ } \
}
-#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)\
-{\
- if (DBGP_Type[dbgtype] & dbgflag)\
- {\
- int __i; \
- u8* ptr = (u8*)_Ptr; \
- printk printstr; \
- printk(" "); \
- for ( __i=0; __i<6; __i++ ) \
- printk("%02X%s", ptr[__i], (__i==5)?"":"-"); \
- printk("\n"); \
- }\
+#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr) \
+{ \
+ if (DBGP_Type[dbgtype] & dbgflag) { \
+ int __i; \
+ u8 *ptr = (u8 *)_Ptr; \
+ printk printstr; \
+ printk(" "); \
+ for (__i = 0; __i < 6; __i++) \
+ printk("%02X%s", ptr[__i], \
+ (__i == 5) ? "" : "-"); \
+ printk("\n"); \
+ } \
}
#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\
-{\
- if (DBGP_Type[dbgtype] & dbgflag)\
- {\
- int __i; \
- u8* ptr = (u8*)_HexData; \
- printk(_TitleString); \
- for ( __i=0; __i<(int)_HexDataLen; __i++ ) \
- { \
- printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" ");\
- if (((__i + 1) % 16) == 0) printk("\n");\
- } \
- printk("\n"); \
- }\
+{ \
+ if (DBGP_Type[dbgtype] & dbgflag) { \
+ int __i; \
+ u8 *ptr = (u8 *)_HexData; \
+ printk(_TitleString); \
+ for (__i = 0; __i < (int)_HexDataLen; __i++) { \
+ printk("%02X%s", ptr[__i], (((__i + 1) \
+ % 4) == 0) ? " " : " "); \
+ if (((__i + 1) % 16) == 0) \
+ printk("\n"); \
+ } \
+ printk("\n"); \
+ } \
}
#else
#define RTPRINT(dbgtype, dbgflag, printstr)
#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)
-#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)
+#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)
#endif
extern u32 DBGP_Type[DBGP_TYPE_MAX];
-#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \
+#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \
do {\
- if (((_Comp) & rt_global_debug_component ) && (_Level <= rt_global_debug_component )) \
- { \
- int __i; \
- u8* ptr = (u8*)_HexData; \
- printk("Rtl819x: "); \
- printk(_TitleString); \
- for ( __i=0; __i<(int)_HexDataLen; __i++ ) \
- { \
- printk("%02X%s", ptr[__i], (((__i + 1) % 4) == 0)?" ":" "); \
- if (((__i + 1) % 16) == 0) printk("\n"); \
- } \
- printk("\n"); \
+ if (((_Comp) & rt_global_debug_component) && \
+ (_Level <= rt_global_debug_component)) { \
+ int __i; \
+ u8* ptr = (u8 *)_HexData; \
+ printk(KERN_INFO "Rtl819x: "); \
+ printk(_TitleString); \
+ for (__i = 0; __i < (int)_HexDataLen; __i++) { \
+ printk("%02X%s", ptr[__i], (((__i + 1) % \
+ 4) == 0) ? " " : " "); \
+ if (((__i + 1) % 16) == 0) \
+ printk("\n"); \
+ } \
+ printk("\n"); \
} \
-}while(0);
+} while (0);
-#define DMESG(x,a...)
-#define DMESGW(x,a...)
-#define DMESGE(x,a...)
+#define DMESG(x, a...)
+#define DMESGW(x, a...)
+#define DMESGE(x, a...)
extern u32 rt_global_debug_component;
#define RT_TRACE(component, x, args...) \
-do { if (rt_global_debug_component & component) \
- printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
- ##args);\
-}while(0);
+do { \
+ if (rt_global_debug_component & component) \
+ printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
+ ##args);\
+} while (0);
#define assert(expr) \
- if (!(expr)) { \
- printk( "Assertion failed! %s,%s,%s,line=%d\n", \
- #expr,__FILE__,__func__,__LINE__); \
- }
+ if (!(expr)) { \
+ printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \
+ #expr, __FILE__, __func__, __LINE__); \
+ }
#define RT_DEBUG_DATA(level, data, datalen) \
- do{ if ((rt_global_debug_component & (level)) == (level)) \
- { \
- int _i; \
- u8* _pdata = (u8*) data; \
- printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__); \
- for (_i=0; _i<(int)(datalen); _i++) \
- { \
- printk("%2x ", _pdata[_i]); \
- if ((_i+1)%16 == 0) printk("\n"); \
- } \
- printk("\n"); \
- } \
- } while (0)
+ do { \
+ if ((rt_global_debug_component & (level)) == (level)) {\
+ int _i; \
+ u8 *_pdata = (u8 *)data; \
+ printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__); \
+ for (_i = 0; _i < (int)(datalen); _i++) { \
+ printk(KERN_INFO "%2x ", _pdata[_i]); \
+ if ((_i+1) % 16 == 0) \
+ printk("\n"); \
+ } \
+ printk(KERN_INFO "\n"); \
+ } \
+ } while (0)
struct rtl_fs_debug {
const char *name;
@@ -270,16 +270,23 @@ void dump_eprom(struct net_device *dev);
void rtl8192_dump_reg(struct net_device *dev);
/* debugfs stuff */
-static inline int rtl_debug_module_init(struct r8192_priv *priv, const char *name) {
+static inline int rtl_debug_module_init(struct r8192_priv *priv,
+ const char *name)
+{
return 0;
}
-static inline void rtl_debug_module_remove(struct r8192_priv *priv) {
+static inline void rtl_debug_module_remove(struct r8192_priv *priv)
+{
}
-static inline int rtl_create_debugfs_root(void) {
+
+static inline int rtl_create_debugfs_root(void)
+{
return 0;
}
-static inline void rtl_remove_debugfs_root(void) {
+
+static inline void rtl_remove_debugfs_root(void)
+{
}
/* proc stuff */
@@ -288,4 +295,5 @@ void rtl8192_proc_remove_one(struct net_device *dev);
void rtl8192_proc_module_init(void);
void rtl8192_proc_module_remove(void);
void rtl8192_dbgp_flag_init(struct net_device *dev);
+
#endif
--
1.7.3.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
