diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/vt6655/rf.h | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/vt6655/rf.h')
-rw-r--r-- | kernel/drivers/staging/vt6655/rf.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kernel/drivers/staging/vt6655/rf.h b/kernel/drivers/staging/vt6655/rf.h index 2ea21e2b0..e9c786995 100644 --- a/kernel/drivers/staging/vt6655/rf.h +++ b/kernel/drivers/staging/vt6655/rf.h @@ -33,18 +33,18 @@ #include "device.h" /*--------------------- Export Definitions -------------------------*/ -// -// Baseband RF pair definition in eeprom (Bits 6..0) -// +/* + * Baseband RF pair definition in eeprom (Bits 6..0) +*/ #define RF_RFMD2959 0x01 #define RF_MAXIMAG 0x02 #define RF_AIROHA 0x03 #define RF_UW2451 0x05 #define RF_MAXIMG 0x06 -#define RF_MAXIM2829 0x07 // RobertYu: 20041118 -#define RF_UW2452 0x08 // RobertYu: 20041210 -#define RF_AIROHA7230 0x0a // RobertYu: 20050104 +#define RF_MAXIM2829 0x07 /* RobertYu: 20041118 */ +#define RF_UW2452 0x08 /* RobertYu: 20041210 */ +#define RF_AIROHA7230 0x0a /* RobertYu: 20050104 */ #define RF_UW2453 0x0b #define RF_VT3226 0x09 @@ -63,9 +63,9 @@ #define ZONE_MKK 6 #define ZONE_ISRAEL 7 -//[20050104] CB_MAXIM2829_CHANNEL_5G_HIGH, CB_UW2452_CHANNEL_5G_HIGH: 40==>41 -#define CB_MAXIM2829_CHANNEL_5G_HIGH 41 //Index41: channel = 100, Tf = 5500MHz, set the (A3:A0=0101) D6=1 -#define CB_UW2452_CHANNEL_5G_HIGH 41 //[20041210] Index41: channel = 100, Tf = 5500MHz, change VCO2->VCO3 +/* [20050104] CB_MAXIM2829_CHANNEL_5G_HIGH, CB_UW2452_CHANNEL_5G_HIGH: 40==>41 */ +#define CB_MAXIM2829_CHANNEL_5G_HIGH 41 /* Index41: channel = 100, Tf = 5500MHz, set the (A3:A0=0101) D6=1 */ +#define CB_UW2452_CHANNEL_5G_HIGH 41 /* [20041210] Index41: channel = 100, Tf = 5500MHz, change VCO2->VCO3 */ /*--------------------- Export Classes ----------------------------*/ @@ -79,11 +79,11 @@ bool RFbInit( struct vnt_private * ); bool RFvWriteWakeProgSyn(struct vnt_private *, unsigned char byRFType, u16); -bool RFbSetPower(struct vnt_private *, unsigned int uRATE, u16); +bool RFbSetPower(struct vnt_private *, unsigned int rate, u16); bool RFbRawSetPower( struct vnt_private *, unsigned char byPwr, - unsigned int uRATE + unsigned int rate ); void @@ -93,8 +93,8 @@ RFvRSSITodBm( long *pldBm ); -//{{ RobertYu: 20050104 +/* {{ RobertYu: 20050104 */ bool RFbAL7230SelectChannelPostProcess(struct vnt_private *, u16, u16); -//}} RobertYu +/* }} RobertYu */ -#endif // __RF_H__ +#endif /* __RF_H__ */ |