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

staging: "rtl8192e/r8192u" typo change ContiuneDiffCount.

Browse source 
As mentioned by jesper juhl, we should probably change ContiuneDiffCount
to ContinueDiffCount. Below you will find the changes to do so.  I have
compile tested this and everything builds with the changes, as for
testing on the hardware I am unable to do.

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Justin P. Mattock 2012-05-01 08:34:14 -07:00 committed by Greg Kroah-Hartman
parent 8ef3a7ed35
commit 4c234ebcf4
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/rtl8192e/rtl8192e/rtl_core.h
View file

@ -943,7 +943,7 @@ struct r8192_priv {
bool bfsync_processing; bool bfsync_processing;
u32 rate_record; u32 rate_record;
u32 rateCountDiffRecord; u32 rateCountDiffRecord;
u32 ContiuneDiffCount; u32 ContinueDiffCount;
bool bswitch_fsync; bool bswitch_fsync;
u8 framesync; u8 framesync;
u32 framesyncC34; u32 framesyncC34;

20
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
View file

@ -2615,22 +2615,22 @@ void dm_fsync_timer_callback(unsigned long data)
rate_count_diff; rate_count_diff;
if (DiffNum >= if (DiffNum >=
priv->rtllib->fsync_seconddiff_ratethreshold) priv->rtllib->fsync_seconddiff_ratethreshold)
priv->ContiuneDiffCount++; priv->ContinueDiffCount++;
else else
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
if (priv->ContiuneDiffCount >= 2) { if (priv->ContinueDiffCount >= 2) {
bSwitchFromCountDiff = true; bSwitchFromCountDiff = true;
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
} }
} else { } else {
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
} }
if (rate_count_diff <= if (rate_count_diff <=
priv->rtllib->fsync_firstdiff_ratethreshold) { priv->rtllib->fsync_firstdiff_ratethreshold) {
bSwitchFromCountDiff = true; bSwitchFromCountDiff = true;
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
} }
priv->rate_record = rate_count; priv->rate_record = rate_count;
priv->rateCountDiffRecord = rate_count_diff; priv->rateCountDiffRecord = rate_count_diff;
@ -2677,10 +2677,10 @@ void dm_fsync_timer_callback(unsigned long data)
write_nic_byte(dev, 0xC36, 0x5c); write_nic_byte(dev, 0xC36, 0x5c);
write_nic_byte(dev, 0xC3e, 0x96); write_nic_byte(dev, 0xC3e, 0x96);
} }
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
} }
RT_TRACE(COMP_HALDM, "ContiuneDiffCount %d\n", priv->ContiuneDiffCount); RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount);
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d " RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d "
"bSwitchFsync %d\n", priv->rate_record, rate_count, "bSwitchFsync %d\n", priv->rate_record, rate_count,
rate_count_diff, priv->bswitch_fsync); rate_count_diff, priv->bswitch_fsync);
@ -2723,7 +2723,7 @@ static void dm_EndSWFsync(struct net_device *dev)
write_nic_byte(dev, 0xC3e, 0x96); write_nic_byte(dev, 0xC3e, 0x96);
} }
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
} }
@ -2735,7 +2735,7 @@ static void dm_StartSWFsync(struct net_device *dev)
RT_TRACE(COMP_HALDM, "%s\n", __func__); RT_TRACE(COMP_HALDM, "%s\n", __func__);
priv->rate_record = 0; priv->rate_record = 0;
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
priv->rateCountDiffRecord = 0; priv->rateCountDiffRecord = 0;
priv->bswitch_fsync = false; priv->bswitch_fsync = false;

2
drivers/staging/rtl8192u/r8192U.h
View file

@ -1116,7 +1116,7 @@ typedef struct r8192_priv
bool bfsync_processing; // 500ms Fsync timer is active or not bool bfsync_processing; // 500ms Fsync timer is active or not
u32 rate_record; u32 rate_record;
u32 rateCountDiffRecord; u32 rateCountDiffRecord;
u32 ContiuneDiffCount; u32 ContinueDiffCount;
bool bswitch_fsync; bool bswitch_fsync;
u8 framesync; u8 framesync;

20
drivers/staging/rtl8192u/r8192U_dm.c
View file

@ -3379,28 +3379,28 @@ extern void dm_fsync_timer_callback(unsigned long data)
u32 DiffNum = priv->rateCountDiffRecord - rate_count_diff; u32 DiffNum = priv->rateCountDiffRecord - rate_count_diff;
// Continue count // Continue count
if(DiffNum >= priv->ieee80211->fsync_seconddiff_ratethreshold) if(DiffNum >= priv->ieee80211->fsync_seconddiff_ratethreshold)
priv->ContiuneDiffCount++; priv->ContinueDiffCount++;
else else
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
// Continue count over // Continue count over
if(priv->ContiuneDiffCount >=2) if(priv->ContinueDiffCount >=2)
{ {
bSwitchFromCountDiff = true; bSwitchFromCountDiff = true;
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
} }
} }
else else
{ {
// Stop the continued count // Stop the continued count
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
} }
//If Count diff <= FsyncRateCountThreshold //If Count diff <= FsyncRateCountThreshold
if(rate_count_diff <= priv->ieee80211->fsync_firstdiff_ratethreshold) if(rate_count_diff <= priv->ieee80211->fsync_firstdiff_ratethreshold)
{ {
bSwitchFromCountDiff = true; bSwitchFromCountDiff = true;
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
} }
priv->rate_record = rate_count; priv->rate_record = rate_count;
priv->rateCountDiffRecord = rate_count_diff; priv->rateCountDiffRecord = rate_count_diff;
@ -3468,14 +3468,14 @@ extern void dm_fsync_timer_callback(unsigned long data)
#endif #endif
write_nic_byte(dev, 0xC3e, 0x96); write_nic_byte(dev, 0xC3e, 0x96);
} }
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
#ifdef RTL8190P #ifdef RTL8190P
write_nic_dword(dev, rOFDM0_RxDetector2, 0x164052cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x164052cd);
#else #else
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
#endif #endif
} }
RT_TRACE(COMP_HALDM, "ContiuneDiffCount %d\n", priv->ContiuneDiffCount); RT_TRACE(COMP_HALDM, "ContinueDiffCount %d\n", priv->ContinueDiffCount);
RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n", priv->rate_record, rate_count, rate_count_diff , priv->bswitch_fsync); RT_TRACE(COMP_HALDM, "rateRecord %d rateCount %d, rateCountdiff %d bSwitchFsync %d\n", priv->rate_record, rate_count, rate_count_diff , priv->bswitch_fsync);
} }
@ -3507,7 +3507,7 @@ static void dm_EndSWFsync(struct net_device *dev)
write_nic_byte(dev, 0xC3e, 0x96); write_nic_byte(dev, 0xC3e, 0x96);
} }
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
#ifndef RTL8190P #ifndef RTL8190P
write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c52cd);
#endif #endif
@ -3524,7 +3524,7 @@ static void dm_StartSWFsync(struct net_device *dev)
// Initial rate record to zero, start to record. // Initial rate record to zero, start to record.
priv->rate_record = 0; priv->rate_record = 0;
// Initialize continue diff count to zero, start to record. // Initialize continue diff count to zero, start to record.
priv->ContiuneDiffCount = 0; priv->ContinueDiffCount = 0;
priv->rateCountDiffRecord = 0; priv->rateCountDiffRecord = 0;
priv->bswitch_fsync = false; priv->bswitch_fsync = false;