redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8712: rtl8712_efuse.c: Remove leading p from variable names 

Remove leading 'p' from the name of the pointer variable padapter.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
alistair/sunxi64-5.4-dsi
Nishka Dasgupta 2019-06-20 17:22:56 +05:30 committed by Greg Kroah-Hartman
parent f745aa4096
commit fbcfbf6536
1 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
drivers/staging/rtl8712/rtl8712_efuse.c
View File

@ -23,7 +23,7 @@
/* reserve 3 bytes for HW stop read */ /* reserve 3 bytes for HW stop read */
static int efuse_available_max_size = EFUSE_MAX_SIZE - 3 /*0x1FD*/; static int efuse_available_max_size = EFUSE_MAX_SIZE - 3 /*0x1FD*/;
static void efuse_reg_ctrl(struct _adapter *padapter, u8 bPowerOn) static void efuse_reg_ctrl(struct _adapter *adapter, u8 bPowerOn)
{ {
u8 tmpu8 = 0; u8 tmpu8 = 0;
@ -31,53 +31,53 @@ static void efuse_reg_ctrl(struct _adapter *padapter, u8 bPowerOn)
/* -----------------e-fuse pwr & clk reg ctrl --------------- /* -----------------e-fuse pwr & clk reg ctrl ---------------
* Enable LDOE25 Macro Block * Enable LDOE25 Macro Block
*/ */
tmpu8 = r8712_read8(padapter, EFUSE_TEST + 3); tmpu8 = r8712_read8(adapter, EFUSE_TEST + 3);
tmpu8 |= 0x80; tmpu8 |= 0x80;
r8712_write8(padapter, EFUSE_TEST + 3, tmpu8); r8712_write8(adapter, EFUSE_TEST + 3, tmpu8);
msleep(20); /* for some platform , need some delay time */ msleep(20); /* for some platform , need some delay time */
/* Change Efuse Clock for write action to 40MHZ */ /* Change Efuse Clock for write action to 40MHZ */
r8712_write8(padapter, EFUSE_CLK_CTRL, 0x03); r8712_write8(adapter, EFUSE_CLK_CTRL, 0x03);
msleep(20); /* for some platform , need some delay time */ msleep(20); /* for some platform , need some delay time */
} else { } else {
/* -----------------e-fuse pwr & clk reg ctrl ----------------- /* -----------------e-fuse pwr & clk reg ctrl -----------------
* Disable LDOE25 Macro Block * Disable LDOE25 Macro Block
*/ */
tmpu8 = r8712_read8(padapter, EFUSE_TEST + 3); tmpu8 = r8712_read8(adapter, EFUSE_TEST + 3);
tmpu8 &= 0x7F; tmpu8 &= 0x7F;
r8712_write8(padapter, EFUSE_TEST + 3, tmpu8); r8712_write8(adapter, EFUSE_TEST + 3, tmpu8);
/* Change Efuse Clock for write action to 500K */ /* Change Efuse Clock for write action to 500K */
r8712_write8(padapter, EFUSE_CLK_CTRL, 0x02); r8712_write8(adapter, EFUSE_CLK_CTRL, 0x02);
} }
} }
/* /*
* Before write E-Fuse, this function must be called. * Before write E-Fuse, this function must be called.
*/ */
u8 r8712_efuse_reg_init(struct _adapter *padapter) u8 r8712_efuse_reg_init(struct _adapter *adapter)
{ {
return true; return true;
} }
void r8712_efuse_reg_uninit(struct _adapter *padapter) void r8712_efuse_reg_uninit(struct _adapter *adapter)
{ {
efuse_reg_ctrl(padapter, false); efuse_reg_ctrl(adapter, false);
} }
static u8 efuse_one_byte_read(struct _adapter *padapter, u16 addr, u8 *data) static u8 efuse_one_byte_read(struct _adapter *adapter, u16 addr, u8 *data)
{ {
u8 tmpidx = 0, bResult; u8 tmpidx = 0, bResult;
/* -----------------e-fuse reg ctrl --------------------------------- */ /* -----------------e-fuse reg ctrl --------------------------------- */
r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
r8712_write8(padapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) | r8712_write8(adapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) |
(r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC)); (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC));
r8712_write8(padapter, EFUSE_CTRL + 3, 0x72); /* read cmd */ r8712_write8(adapter, EFUSE_CTRL + 3, 0x72); /* read cmd */
/* wait for complete */ /* wait for complete */
while (!(0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && while (!(0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) &&
(tmpidx < 100)) (tmpidx < 100))
tmpidx++; tmpidx++;
if (tmpidx < 100) { if (tmpidx < 100) {
*data = r8712_read8(padapter, EFUSE_CTRL); *data = r8712_read8(adapter, EFUSE_CTRL);
bResult = true; bResult = true;
} else { } else {
*data = 0xff; *data = 0xff;
@ -86,18 +86,18 @@ static u8 efuse_one_byte_read(struct _adapter *padapter, u16 addr, u8 *data)
return bResult; return bResult;
} }
static u8 efuse_one_byte_write(struct _adapter *padapter, u16 addr, u8 data) static u8 efuse_one_byte_write(struct _adapter *adapter, u16 addr, u8 data)
{ {
u8 tmpidx = 0, bResult; u8 tmpidx = 0, bResult;
/* -----------------e-fuse reg ctrl -------------------------------- */ /* -----------------e-fuse reg ctrl -------------------------------- */
r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
r8712_write8(padapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) | r8712_write8(adapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) |
(r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC)); (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC));
r8712_write8(padapter, EFUSE_CTRL, data); /* data */ r8712_write8(adapter, EFUSE_CTRL, data); /* data */
r8712_write8(padapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */ r8712_write8(adapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */
/* wait for complete */ /* wait for complete */
while ((0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && while ((0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) &&
(tmpidx < 100)) (tmpidx < 100))
tmpidx++; tmpidx++;
if (tmpidx < 100) if (tmpidx < 100)
@ -107,32 +107,32 @@ static u8 efuse_one_byte_write(struct _adapter *padapter, u16 addr, u8 data)
return bResult; return bResult;
} }
static u8 efuse_one_byte_rw(struct _adapter *padapter, u8 bRead, u16 addr, static u8 efuse_one_byte_rw(struct _adapter *adapter, u8 bRead, u16 addr,
u8 *data) u8 *data)
{ {
u8 tmpidx = 0, tmpv8 = 0, bResult; u8 tmpidx = 0, tmpv8 = 0, bResult;
/* -----------------e-fuse reg ctrl --------------------------------- */ /* -----------------e-fuse reg ctrl --------------------------------- */
r8712_write8(padapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */ r8712_write8(adapter, EFUSE_CTRL + 1, (u8)(addr & 0xFF)); /* address */
tmpv8 = ((u8)((addr >> 8) & 0x03)) | tmpv8 = ((u8)((addr >> 8) & 0x03)) |
(r8712_read8(padapter, EFUSE_CTRL + 2) & 0xFC); (r8712_read8(adapter, EFUSE_CTRL + 2) & 0xFC);
r8712_write8(padapter, EFUSE_CTRL + 2, tmpv8); r8712_write8(adapter, EFUSE_CTRL + 2, tmpv8);
if (bRead) { if (bRead) {
r8712_write8(padapter, EFUSE_CTRL + 3, 0x72); /* read cmd */ r8712_write8(adapter, EFUSE_CTRL + 3, 0x72); /* read cmd */
while (!(0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && while (!(0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) &&
(tmpidx < 100)) (tmpidx < 100))
tmpidx++; tmpidx++;
if (tmpidx < 100) { if (tmpidx < 100) {
*data = r8712_read8(padapter, EFUSE_CTRL); *data = r8712_read8(adapter, EFUSE_CTRL);
bResult = true; bResult = true;
} else { } else {
*data = 0; *data = 0;
bResult = false; bResult = false;
} }
} else { } else {
r8712_write8(padapter, EFUSE_CTRL, *data); /* data */ r8712_write8(adapter, EFUSE_CTRL, *data); /* data */
r8712_write8(padapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */ r8712_write8(adapter, EFUSE_CTRL + 3, 0xF2); /* write cmd */
while ((0x80 & r8712_read8(padapter, EFUSE_CTRL + 3)) && while ((0x80 & r8712_read8(adapter, EFUSE_CTRL + 3)) &&
(tmpidx < 100)) (tmpidx < 100))
tmpidx++; tmpidx++;
if (tmpidx < 100) if (tmpidx < 100)
@ -143,12 +143,12 @@ static u8 efuse_one_byte_rw(struct _adapter *padapter, u8 bRead, u16 addr,
return bResult; return bResult;
} }
static u8 efuse_is_empty(struct _adapter *padapter, u8 *empty) static u8 efuse_is_empty(struct _adapter *adapter, u8 *empty)
{ {
u8 value, ret = true; u8 value, ret = true;
/* read one byte to check if E-Fuse is empty */ /* read one byte to check if E-Fuse is empty */
if (efuse_one_byte_rw(padapter, true, 0, &value)) { if (efuse_one_byte_rw(adapter, true, 0, &value)) {
if (value == 0xFF) if (value == 0xFF)
*empty = true; *empty = true;
else else
@ -159,7 +159,7 @@ static u8 efuse_is_empty(struct _adapter *padapter, u8 *empty)
return ret; return ret;
} }
void r8712_efuse_change_max_size(struct _adapter *padapter) void r8712_efuse_change_max_size(struct _adapter *adapter)
{ {
u16 pre_pg_data_saddr = 0x1FB; u16 pre_pg_data_saddr = 0x1FB;
u16 i; u16 i;
@ -167,7 +167,7 @@ void r8712_efuse_change_max_size(struct _adapter *padapter)
u8 pre_pg_data[5]; u8 pre_pg_data[5];
for (i = 0; i < pre_pg_data_size; i++) for (i = 0; i < pre_pg_data_size; i++)
efuse_one_byte_read(padapter, pre_pg_data_saddr + i, efuse_one_byte_read(adapter, pre_pg_data_saddr + i,
&pre_pg_data[i]); &pre_pg_data[i]);
if ((pre_pg_data[0] == 0x03) && (pre_pg_data[1] == 0x00) && if ((pre_pg_data[0] == 0x03) && (pre_pg_data[1] == 0x00) &&
(pre_pg_data[2] == 0x00) && (pre_pg_data[3] == 0x00) && (pre_pg_data[2] == 0x00) && (pre_pg_data[3] == 0x00) &&
@ -175,7 +175,7 @@ void r8712_efuse_change_max_size(struct _adapter *padapter)
efuse_available_max_size -= pre_pg_data_size; efuse_available_max_size -= pre_pg_data_size;
} }
int r8712_efuse_get_max_size(struct _adapter *padapter) int r8712_efuse_get_max_size(struct _adapter *adapter)
{ {
return efuse_available_max_size; return efuse_available_max_size;
} }
@ -206,14 +206,14 @@ static void pgpacket_copy_data(const u8 word_en, const u8 *sourdata,
} }
} }
u16 r8712_efuse_get_current_size(struct _adapter *padapter) u16 r8712_efuse_get_current_size(struct _adapter *adapter)
{ {
int bContinual = true; int bContinual = true;
u16 efuse_addr = 0; u16 efuse_addr = 0;
u8 hworden = 0; u8 hworden = 0;
u8 efuse_data, word_cnts = 0; u8 efuse_data, word_cnts = 0;
while (bContinual && efuse_one_byte_read(padapter, efuse_addr, while (bContinual && efuse_one_byte_read(adapter, efuse_addr,
&efuse_data) && (efuse_addr < efuse_available_max_size)) { &efuse_data) && (efuse_addr < efuse_available_max_size)) {
if (efuse_data != 0xFF) { if (efuse_data != 0xFF) {
hworden = efuse_data & 0x0F; hworden = efuse_data & 0x0F;
@ -227,7 +227,7 @@ u16 r8712_efuse_get_current_size(struct _adapter *padapter)
return efuse_addr; return efuse_addr;
} }
u8 r8712_efuse_pg_packet_read(struct _adapter *padapter, u8 offset, u8 *data) u8 r8712_efuse_pg_packet_read(struct _adapter *adapter, u8 offset, u8 *data)
{ {
u8 hoffset = 0, hworden = 0, word_cnts = 0; u8 hoffset = 0, hworden = 0, word_cnts = 0;
u16 efuse_addr = 0; u16 efuse_addr = 0;
@ -242,7 +242,7 @@ u8 r8712_efuse_pg_packet_read(struct _adapter *padapter, u8 offset, u8 *data)
return false; return false;
memset(data, 0xFF, sizeof(u8) * PGPKT_DATA_SIZE); memset(data, 0xFF, sizeof(u8) * PGPKT_DATA_SIZE);
while (efuse_addr < efuse_available_max_size) { while (efuse_addr < efuse_available_max_size) {
if (efuse_one_byte_read(padapter, efuse_addr, &efuse_data)) { if (efuse_one_byte_read(adapter, efuse_addr, &efuse_data)) {
if (efuse_data == 0xFF) if (efuse_data == 0xFF)
break; break;
hoffset = (efuse_data >> 4) & 0x0F; hoffset = (efuse_data >> 4) & 0x0F;
@ -252,7 +252,7 @@ u8 r8712_efuse_pg_packet_read(struct _adapter *padapter, u8 offset, u8 *data)
memset(tmpdata, 0xFF, PGPKT_DATA_SIZE); memset(tmpdata, 0xFF, PGPKT_DATA_SIZE);
for (tmpidx = 0; tmpidx < word_cnts * 2; for (tmpidx = 0; tmpidx < word_cnts * 2;
tmpidx++) { tmpidx++) {
if (efuse_one_byte_read(padapter, if (efuse_one_byte_read(adapter,
efuse_addr + 1 + tmpidx, efuse_addr + 1 + tmpidx,
&efuse_data)) { &efuse_data)) {
tmpdata[tmpidx] = efuse_data; tmpdata[tmpidx] = efuse_data;
@ -271,7 +271,7 @@ u8 r8712_efuse_pg_packet_read(struct _adapter *padapter, u8 offset, u8 *data)
return ret; return ret;
} }
static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr) static u8 fix_header(struct _adapter *adapter, u8 header, u16 header_addr)
{ {
struct PGPKT_STRUCT pkt; struct PGPKT_STRUCT pkt;
u8 offset, word_en, value; u8 offset, word_en, value;
@ -287,7 +287,7 @@ static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr)
/* retrieve original data */ /* retrieve original data */
addr = 0; addr = 0;
while (addr < header_addr) { while (addr < header_addr) {
if (!efuse_one_byte_read(padapter, addr++, &value)) { if (!efuse_one_byte_read(adapter, addr++, &value)) {
ret = false; ret = false;
break; break;
} }
@ -301,13 +301,13 @@ static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr)
if (BIT(i) & word_en) { if (BIT(i) & word_en) {
if (BIT(i) & pkt.word_en) { if (BIT(i) & pkt.word_en) {
if (efuse_one_byte_read( if (efuse_one_byte_read(
padapter, addr, adapter, addr,
&value)) &value))
pkt.data[i * 2] = value; pkt.data[i * 2] = value;
else else
return false; return false;
if (efuse_one_byte_read( if (efuse_one_byte_read(
padapter, adapter,
addr + 1, addr + 1,
&value)) &value))
pkt.data[i * 2 + 1] = pkt.data[i * 2 + 1] =
@ -325,24 +325,24 @@ static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr)
/* fill original data */ /* fill original data */
for (i = 0; i < PGPKG_MAX_WORDS; i++) { for (i = 0; i < PGPKG_MAX_WORDS; i++) {
if (BIT(i) & pkt.word_en) { if (BIT(i) & pkt.word_en) {
efuse_one_byte_write(padapter, addr, pkt.data[i * 2]); efuse_one_byte_write(adapter, addr, pkt.data[i * 2]);
efuse_one_byte_write(padapter, addr + 1, efuse_one_byte_write(adapter, addr + 1,
pkt.data[i * 2 + 1]); pkt.data[i * 2 + 1]);
/* additional check */ /* additional check */
if (!efuse_one_byte_read(padapter, addr, &value)) { if (!efuse_one_byte_read(adapter, addr, &value)) {
ret = false; ret = false;
} else if (pkt.data[i * 2] != value) { } else if (pkt.data[i * 2] != value) {
ret = false; ret = false;
if (value == 0xFF) /* write again */ if (value == 0xFF) /* write again */
efuse_one_byte_write(padapter, addr, efuse_one_byte_write(adapter, addr,
pkt.data[i * 2]); pkt.data[i * 2]);
} }
if (!efuse_one_byte_read(padapter, addr + 1, &value)) { if (!efuse_one_byte_read(adapter, addr + 1, &value)) {
ret = false; ret = false;
} else if (pkt.data[i * 2 + 1] != value) { } else if (pkt.data[i * 2 + 1] != value) {
ret = false; ret = false;
if (value == 0xFF) /* write again */ if (value == 0xFF) /* write again */
efuse_one_byte_write(padapter, addr + 1, efuse_one_byte_write(adapter, addr + 1,
pkt.data[i * 2 + pkt.data[i * 2 +
1]); 1]);
} }
@ -352,7 +352,7 @@ static u8 fix_header(struct _adapter *padapter, u8 header, u16 header_addr)
return ret; return ret;
} }
u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset, u8 r8712_efuse_pg_packet_write(struct _adapter *adapter, const u8 offset,
const u8 word_en, const u8 *data) const u8 word_en, const u8 *data)
{ {
u8 pg_header = 0; u8 pg_header = 0;
@ -363,7 +363,7 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
u8 bResult = true; u8 bResult = true;
/* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */ /* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */
efuse_data = r8712_read8(padapter, EFUSE_CLK_CTRL); efuse_data = r8712_read8(adapter, EFUSE_CLK_CTRL);
if (efuse_data != 0x03) if (efuse_data != 0x03)
return false; return false;
pg_header = MAKE_EFUSE_HEADER(offset, word_en); pg_header = MAKE_EFUSE_HEADER(offset, word_en);
@ -371,15 +371,15 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
repeat_times = 0; repeat_times = 0;
efuse_addr = 0; efuse_addr = 0;
while (efuse_addr < efuse_available_max_size) { while (efuse_addr < efuse_available_max_size) {
curr_size = r8712_efuse_get_current_size(padapter); curr_size = r8712_efuse_get_current_size(adapter);
if ((curr_size + 1 + target_word_cnts * 2) > if ((curr_size + 1 + target_word_cnts * 2) >
efuse_available_max_size) efuse_available_max_size)
return false; /*target_word_cnts + pg header(1 byte)*/ return false; /*target_word_cnts + pg header(1 byte)*/
efuse_addr = curr_size; /* current size is also the last addr*/ efuse_addr = curr_size; /* current size is also the last addr*/
efuse_one_byte_write(padapter, efuse_addr, pg_header); /*hdr*/ efuse_one_byte_write(adapter, efuse_addr, pg_header); /*hdr*/
sub_repeat = 0; sub_repeat = 0;
/* check if what we read is what we write */ /* check if what we read is what we write */
while (!efuse_one_byte_read(padapter, efuse_addr, while (!efuse_one_byte_read(adapter, efuse_addr,
&efuse_data)) { &efuse_data)) {
if (++sub_repeat > _REPEAT_THRESHOLD_) { if (++sub_repeat > _REPEAT_THRESHOLD_) {
bResult = false; /* continue to blind write */ bResult = false; /* continue to blind write */
@ -394,10 +394,10 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
/* go to next address */ /* go to next address */
efuse_addr++; efuse_addr++;
for (i = 0; i < target_word_cnts * 2; i++) { for (i = 0; i < target_word_cnts * 2; i++) {
efuse_one_byte_write(padapter, efuse_one_byte_write(adapter,
efuse_addr + i, efuse_addr + i,
*(data + i)); *(data + i));
if (!efuse_one_byte_read(padapter, if (!efuse_one_byte_read(adapter,
efuse_addr + i, efuse_addr + i,
&efuse_data)) &efuse_data))
bResult = false; bResult = false;
@ -411,7 +411,7 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
if (efuse_data == 0xFF) if (efuse_data == 0xFF)
return bResult; /* nothing damaged. */ return bResult; /* nothing damaged. */
/* call rescue procedure */ /* call rescue procedure */
if (!fix_header(padapter, efuse_data, efuse_addr)) if (!fix_header(adapter, efuse_data, efuse_addr))
return false; /* rescue fail */ return false; /* rescue fail */
if (++repeat_times > _REPEAT_THRESHOLD_) /* fail */ if (++repeat_times > _REPEAT_THRESHOLD_) /* fail */
@ -421,7 +421,7 @@ u8 r8712_efuse_pg_packet_write(struct _adapter *padapter, const u8 offset,
return bResult; return bResult;
} }
u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr, u8 r8712_efuse_access(struct _adapter *adapter, u8 bRead, u16 start_addr,
u16 cnts, u8 *data) u16 cnts, u8 *data)
{ {
int i; int i;
@ -432,7 +432,7 @@ u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr,
if (!bRead && ((start_addr + cnts) > if (!bRead && ((start_addr + cnts) >
efuse_available_max_size)) efuse_available_max_size))
return false; return false;
if (!bRead && !r8712_efuse_reg_init(padapter)) if (!bRead && !r8712_efuse_reg_init(adapter))
return false; return false;
/* -----------------e-fuse one byte read / write ---------------------*/ /* -----------------e-fuse one byte read / write ---------------------*/
for (i = 0; i < cnts; i++) { for (i = 0; i < cnts; i++) {
@ -440,17 +440,17 @@ u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr,
res = false; res = false;
break; break;
} }
res = efuse_one_byte_rw(padapter, bRead, start_addr + i, res = efuse_one_byte_rw(adapter, bRead, start_addr + i,
data + i); data + i);
if (!bRead && !res) if (!bRead && !res)
break; break;
} }
if (!bRead) if (!bRead)
r8712_efuse_reg_uninit(padapter); r8712_efuse_reg_uninit(adapter);
return res; return res;
} }
u8 r8712_efuse_map_read(struct _adapter *padapter, u16 addr, u16 cnts, u8 *data) u8 r8712_efuse_map_read(struct _adapter *adapter, u16 addr, u16 cnts, u8 *data)
{ {
u8 offset, ret = true; u8 offset, ret = true;
u8 pktdata[PGPKT_DATA_SIZE]; u8 pktdata[PGPKT_DATA_SIZE];
@ -458,13 +458,13 @@ u8 r8712_efuse_map_read(struct _adapter *padapter, u16 addr, u16 cnts, u8 *data)
if ((addr + cnts) > EFUSE_MAP_MAX_SIZE) if ((addr + cnts) > EFUSE_MAP_MAX_SIZE)
return false; return false;
if (efuse_is_empty(padapter, &offset) && offset) { if (efuse_is_empty(adapter, &offset) && offset) {
for (i = 0; i < cnts; i++) for (i = 0; i < cnts; i++)
data[i] = 0xFF; data[i] = 0xFF;
return ret; return ret;
} }
offset = (addr >> 3) & 0xF; offset = (addr >> 3) & 0xF;
ret = r8712_efuse_pg_packet_read(padapter, offset, pktdata); ret = r8712_efuse_pg_packet_read(adapter, offset, pktdata);
i = addr & 0x7; /* pktdata index */ i = addr & 0x7; /* pktdata index */
idx = 0; /* data index */ idx = 0; /* data index */
@ -475,14 +475,14 @@ u8 r8712_efuse_map_read(struct _adapter *padapter, u16 addr, u16 cnts, u8 *data)
return ret; return ret;
} }
offset++; offset++;
if (!r8712_efuse_pg_packet_read(padapter, offset, pktdata)) if (!r8712_efuse_pg_packet_read(adapter, offset, pktdata))
ret = false; ret = false;
i = 0; i = 0;
} while (1); } while (1);
return ret; return ret;
} }
u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts, u8 r8712_efuse_map_write(struct _adapter *adapter, u16 addr, u16 cnts,
u8 *data) u8 *data)
{ {
u8 offset, word_en, empty; u8 offset, word_en, empty;
@ -492,10 +492,10 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,
if ((addr + cnts) > EFUSE_MAP_MAX_SIZE) if ((addr + cnts) > EFUSE_MAP_MAX_SIZE)
return false; return false;
/* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */ /* check if E-Fuse Clock Enable and E-Fuse Clock is 40M */
empty = r8712_read8(padapter, EFUSE_CLK_CTRL); empty = r8712_read8(adapter, EFUSE_CLK_CTRL);
if (empty != 0x03) if (empty != 0x03)
return false; return false;
if (efuse_is_empty(padapter, &empty)) { if (efuse_is_empty(adapter, &empty)) {
if (empty) if (empty)
memset(pktdata, 0xFF, PGPKT_DATA_SIZE); memset(pktdata, 0xFF, PGPKT_DATA_SIZE);
} else { } else {
@ -503,7 +503,7 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,
} }
offset = (addr >> 3) & 0xF; offset = (addr >> 3) & 0xF;
if (!empty) if (!empty)
if (!r8712_efuse_pg_packet_read(padapter, offset, pktdata)) if (!r8712_efuse_pg_packet_read(adapter, offset, pktdata))
return false; return false;
word_en = 0xF; word_en = 0xF;
memset(newdata, 0xFF, PGPKT_DATA_SIZE); memset(newdata, 0xFF, PGPKT_DATA_SIZE);
@ -546,14 +546,14 @@ u8 r8712_efuse_map_write(struct _adapter *padapter, u16 addr, u16 cnts,
} }
if (word_en != 0xF) if (word_en != 0xF)
if (!r8712_efuse_pg_packet_write(padapter, offset, if (!r8712_efuse_pg_packet_write(adapter, offset,
word_en, newdata)) word_en, newdata))
return false; return false;
if (idx == cnts) if (idx == cnts)
break; break;
offset++; offset++;
if (!empty) if (!empty)
if (!r8712_efuse_pg_packet_read(padapter, offset, if (!r8712_efuse_pg_packet_read(adapter, offset,
pktdata)) pktdata))
return false; return false;
i = 0; i = 0;