Commit fbd5d17b authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by John W. Linville

zd1211rw: rename CR* macros to ZD_CR*

With compat-wireless CR* macros in zd_usb.h conflict with CR macros in
include/asm-generic/termbits.h. So rename CR* macros to ZD_CR*.

Conversion was done with using sed and then 'over 80 character line'
checkpatch.pl warnings and comment indents were fixed.
Reported-by: default avatarWalter Goldens <goldenstranger@yahoo.com>
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 26cd322b
This diff is collapsed.
This diff is collapsed.
...@@ -55,7 +55,7 @@ struct zd_rf { ...@@ -55,7 +55,7 @@ struct zd_rf {
* defaults to 1 (yes) */ * defaults to 1 (yes) */
u8 update_channel_int:1; u8 update_channel_int:1;
/* whether CR47 should be patched from the EEPROM, if the appropriate /* whether ZD_CR47 should be patched from the EEPROM, if the appropriate
* flag is set in the POD. The vendor driver suggests that this should * flag is set in the POD. The vendor driver suggests that this should
* be done for all RF's, but a bug in their code prevents but their * be done for all RF's, but a bug in their code prevents but their
* HW_OverWritePhyRegFromE2P() routine from ever taking effect. */ * HW_OverWritePhyRegFromE2P() routine from ever taking effect. */
......
...@@ -152,44 +152,44 @@ static int rf2959_init_hw(struct zd_rf *rf) ...@@ -152,44 +152,44 @@ static int rf2959_init_hw(struct zd_rf *rf)
struct zd_chip *chip = zd_rf_to_chip(rf); struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs[] = { static const struct zd_ioreq16 ioreqs[] = {
{ CR2, 0x1E }, { CR9, 0x20 }, { CR10, 0x89 }, { ZD_CR2, 0x1E }, { ZD_CR9, 0x20 }, { ZD_CR10, 0x89 },
{ CR11, 0x00 }, { CR15, 0xD0 }, { CR17, 0x68 }, { ZD_CR11, 0x00 }, { ZD_CR15, 0xD0 }, { ZD_CR17, 0x68 },
{ CR19, 0x4a }, { CR20, 0x0c }, { CR21, 0x0E }, { ZD_CR19, 0x4a }, { ZD_CR20, 0x0c }, { ZD_CR21, 0x0E },
{ CR23, 0x48 }, { ZD_CR23, 0x48 },
/* normal size for cca threshold */ /* normal size for cca threshold */
{ CR24, 0x14 }, { ZD_CR24, 0x14 },
/* { CR24, 0x20 }, */ /* { ZD_CR24, 0x20 }, */
{ CR26, 0x90 }, { CR27, 0x30 }, { CR29, 0x20 }, { ZD_CR26, 0x90 }, { ZD_CR27, 0x30 }, { ZD_CR29, 0x20 },
{ CR31, 0xb2 }, { CR32, 0x43 }, { CR33, 0x28 }, { ZD_CR31, 0xb2 }, { ZD_CR32, 0x43 }, { ZD_CR33, 0x28 },
{ CR38, 0x30 }, { CR34, 0x0f }, { CR35, 0xF0 }, { ZD_CR38, 0x30 }, { ZD_CR34, 0x0f }, { ZD_CR35, 0xF0 },
{ CR41, 0x2a }, { CR46, 0x7F }, { CR47, 0x1E }, { ZD_CR41, 0x2a }, { ZD_CR46, 0x7F }, { ZD_CR47, 0x1E },
{ CR51, 0xc5 }, { CR52, 0xc5 }, { CR53, 0xc5 }, { ZD_CR51, 0xc5 }, { ZD_CR52, 0xc5 }, { ZD_CR53, 0xc5 },
{ CR79, 0x58 }, { CR80, 0x30 }, { CR81, 0x30 }, { ZD_CR79, 0x58 }, { ZD_CR80, 0x30 }, { ZD_CR81, 0x30 },
{ CR82, 0x00 }, { CR83, 0x24 }, { CR84, 0x04 }, { ZD_CR82, 0x00 }, { ZD_CR83, 0x24 }, { ZD_CR84, 0x04 },
{ CR85, 0x00 }, { CR86, 0x10 }, { CR87, 0x2A }, { ZD_CR85, 0x00 }, { ZD_CR86, 0x10 }, { ZD_CR87, 0x2A },
{ CR88, 0x10 }, { CR89, 0x24 }, { CR90, 0x18 }, { ZD_CR88, 0x10 }, { ZD_CR89, 0x24 }, { ZD_CR90, 0x18 },
/* { CR91, 0x18 }, */ /* { ZD_CR91, 0x18 }, */
/* should solve continous CTS frame problems */ /* should solve continous CTS frame problems */
{ CR91, 0x00 }, { ZD_CR91, 0x00 },
{ CR92, 0x0a }, { CR93, 0x00 }, { CR94, 0x01 }, { ZD_CR92, 0x0a }, { ZD_CR93, 0x00 }, { ZD_CR94, 0x01 },
{ CR95, 0x00 }, { CR96, 0x40 }, { CR97, 0x37 }, { ZD_CR95, 0x00 }, { ZD_CR96, 0x40 }, { ZD_CR97, 0x37 },
{ CR98, 0x05 }, { CR99, 0x28 }, { CR100, 0x00 }, { ZD_CR98, 0x05 }, { ZD_CR99, 0x28 }, { ZD_CR100, 0x00 },
{ CR101, 0x13 }, { CR102, 0x27 }, { CR103, 0x27 }, { ZD_CR101, 0x13 }, { ZD_CR102, 0x27 }, { ZD_CR103, 0x27 },
{ CR104, 0x18 }, { CR105, 0x12 }, { ZD_CR104, 0x18 }, { ZD_CR105, 0x12 },
/* normal size */ /* normal size */
{ CR106, 0x1a }, { ZD_CR106, 0x1a },
/* { CR106, 0x22 }, */ /* { ZD_CR106, 0x22 }, */
{ CR107, 0x24 }, { CR108, 0x0a }, { CR109, 0x13 }, { ZD_CR107, 0x24 }, { ZD_CR108, 0x0a }, { ZD_CR109, 0x13 },
{ CR110, 0x2F }, { CR111, 0x27 }, { CR112, 0x27 }, { ZD_CR110, 0x2F }, { ZD_CR111, 0x27 }, { ZD_CR112, 0x27 },
{ CR113, 0x27 }, { CR114, 0x27 }, { CR115, 0x40 }, { ZD_CR113, 0x27 }, { ZD_CR114, 0x27 }, { ZD_CR115, 0x40 },
{ CR116, 0x40 }, { CR117, 0xF0 }, { CR118, 0xF0 }, { ZD_CR116, 0x40 }, { ZD_CR117, 0xF0 }, { ZD_CR118, 0xF0 },
{ CR119, 0x16 }, { ZD_CR119, 0x16 },
/* no TX continuation */ /* no TX continuation */
{ CR122, 0x00 }, { ZD_CR122, 0x00 },
/* { CR122, 0xff }, */ /* { ZD_CR122, 0xff }, */
{ CR127, 0x03 }, { CR131, 0x08 }, { CR138, 0x28 }, { ZD_CR127, 0x03 }, { ZD_CR131, 0x08 }, { ZD_CR138, 0x28 },
{ CR148, 0x44 }, { CR150, 0x10 }, { CR169, 0xBB }, { ZD_CR148, 0x44 }, { ZD_CR150, 0x10 }, { ZD_CR169, 0xBB },
{ CR170, 0xBB }, { ZD_CR170, 0xBB },
}; };
static const u32 rv[] = { static const u32 rv[] = {
...@@ -210,7 +210,7 @@ static int rf2959_init_hw(struct zd_rf *rf) ...@@ -210,7 +210,7 @@ static int rf2959_init_hw(struct zd_rf *rf)
*/ */
0x294128, /* internal power */ 0x294128, /* internal power */
/* 0x28252c, */ /* External control TX power */ /* 0x28252c, */ /* External control TX power */
/* CR31_CCK, CR51_6-36M, CR52_48M, CR53_54M */ /* ZD_CR31_CCK, ZD_CR51_6-36M, ZD_CR52_48M, ZD_CR53_54M */
0x2c0000, 0x2c0000,
0x300000, 0x300000,
0x340000, /* REG13(0xD) */ 0x340000, /* REG13(0xD) */
...@@ -245,8 +245,8 @@ static int rf2959_set_channel(struct zd_rf *rf, u8 channel) ...@@ -245,8 +245,8 @@ static int rf2959_set_channel(struct zd_rf *rf, u8 channel)
static int rf2959_switch_radio_on(struct zd_rf *rf) static int rf2959_switch_radio_on(struct zd_rf *rf)
{ {
static const struct zd_ioreq16 ioreqs[] = { static const struct zd_ioreq16 ioreqs[] = {
{ CR10, 0x89 }, { ZD_CR10, 0x89 },
{ CR11, 0x00 }, { ZD_CR11, 0x00 },
}; };
struct zd_chip *chip = zd_rf_to_chip(rf); struct zd_chip *chip = zd_rf_to_chip(rf);
...@@ -256,8 +256,8 @@ static int rf2959_switch_radio_on(struct zd_rf *rf) ...@@ -256,8 +256,8 @@ static int rf2959_switch_radio_on(struct zd_rf *rf)
static int rf2959_switch_radio_off(struct zd_rf *rf) static int rf2959_switch_radio_off(struct zd_rf *rf)
{ {
static const struct zd_ioreq16 ioreqs[] = { static const struct zd_ioreq16 ioreqs[] = {
{ CR10, 0x15 }, { ZD_CR10, 0x15 },
{ CR11, 0x81 }, { ZD_CR11, 0x81 },
}; };
struct zd_chip *chip = zd_rf_to_chip(rf); struct zd_chip *chip = zd_rf_to_chip(rf);
......
...@@ -314,42 +314,44 @@ static int uw2453_init_hw(struct zd_rf *rf) ...@@ -314,42 +314,44 @@ static int uw2453_init_hw(struct zd_rf *rf)
struct zd_chip *chip = zd_rf_to_chip(rf); struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs[] = { static const struct zd_ioreq16 ioreqs[] = {
{ CR10, 0x89 }, { CR15, 0x20 }, { ZD_CR10, 0x89 }, { ZD_CR15, 0x20 },
{ CR17, 0x28 }, /* 6112 no change */ { ZD_CR17, 0x28 }, /* 6112 no change */
{ CR23, 0x38 }, { CR24, 0x20 }, { CR26, 0x93 }, { ZD_CR23, 0x38 }, { ZD_CR24, 0x20 }, { ZD_CR26, 0x93 },
{ CR27, 0x15 }, { CR28, 0x3e }, { CR29, 0x00 }, { ZD_CR27, 0x15 }, { ZD_CR28, 0x3e }, { ZD_CR29, 0x00 },
{ CR33, 0x28 }, { CR34, 0x30 }, { ZD_CR33, 0x28 }, { ZD_CR34, 0x30 },
{ CR35, 0x43 }, /* 6112 3e->43 */ { ZD_CR35, 0x43 }, /* 6112 3e->43 */
{ CR41, 0x24 }, { CR44, 0x32 }, { ZD_CR41, 0x24 }, { ZD_CR44, 0x32 },
{ CR46, 0x92 }, /* 6112 96->92 */ { ZD_CR46, 0x92 }, /* 6112 96->92 */
{ CR47, 0x1e }, { ZD_CR47, 0x1e },
{ CR48, 0x04 }, /* 5602 Roger */ { ZD_CR48, 0x04 }, /* 5602 Roger */
{ CR49, 0xfa }, { CR79, 0x58 }, { CR80, 0x30 }, { ZD_CR49, 0xfa }, { ZD_CR79, 0x58 }, { ZD_CR80, 0x30 },
{ CR81, 0x30 }, { CR87, 0x0a }, { CR89, 0x04 }, { ZD_CR81, 0x30 }, { ZD_CR87, 0x0a }, { ZD_CR89, 0x04 },
{ CR91, 0x00 }, { CR92, 0x0a }, { CR98, 0x8d }, { ZD_CR91, 0x00 }, { ZD_CR92, 0x0a }, { ZD_CR98, 0x8d },
{ CR99, 0x28 }, { CR100, 0x02 }, { ZD_CR99, 0x28 }, { ZD_CR100, 0x02 },
{ CR101, 0x09 }, /* 6112 13->1f 6220 1f->13 6407 13->9 */ { ZD_CR101, 0x09 }, /* 6112 13->1f 6220 1f->13 6407 13->9 */
{ CR102, 0x27 }, { ZD_CR102, 0x27 },
{ CR106, 0x1c }, /* 5d07 5112 1f->1c 6220 1c->1f 6221 1f->1c */ { ZD_CR106, 0x1c }, /* 5d07 5112 1f->1c 6220 1c->1f
{ CR107, 0x1c }, /* 6220 1c->1a 5221 1a->1c */ * 6221 1f->1c
{ CR109, 0x13 }, */
{ CR110, 0x1f }, /* 6112 13->1f 6221 1f->13 6407 13->0x09 */ { ZD_CR107, 0x1c }, /* 6220 1c->1a 5221 1a->1c */
{ CR111, 0x13 }, { CR112, 0x1f }, { CR113, 0x27 }, { ZD_CR109, 0x13 },
{ CR114, 0x23 }, /* 6221 27->23 */ { ZD_CR110, 0x1f }, /* 6112 13->1f 6221 1f->13 6407 13->0x09 */
{ CR115, 0x24 }, /* 6112 24->1c 6220 1c->24 */ { ZD_CR111, 0x13 }, { ZD_CR112, 0x1f }, { ZD_CR113, 0x27 },
{ CR116, 0x24 }, /* 6220 1c->24 */ { ZD_CR114, 0x23 }, /* 6221 27->23 */
{ CR117, 0xfa }, /* 6112 fa->f8 6220 f8->f4 6220 f4->fa */ { ZD_CR115, 0x24 }, /* 6112 24->1c 6220 1c->24 */
{ CR118, 0xf0 }, /* 5d07 6112 f0->f2 6220 f2->f0 */ { ZD_CR116, 0x24 }, /* 6220 1c->24 */
{ CR119, 0x1a }, /* 6112 1a->10 6220 10->14 6220 14->1a */ { ZD_CR117, 0xfa }, /* 6112 fa->f8 6220 f8->f4 6220 f4->fa */
{ CR120, 0x4f }, { ZD_CR118, 0xf0 }, /* 5d07 6112 f0->f2 6220 f2->f0 */
{ CR121, 0x1f }, /* 6220 4f->1f */ { ZD_CR119, 0x1a }, /* 6112 1a->10 6220 10->14 6220 14->1a */
{ CR122, 0xf0 }, { CR123, 0x57 }, { CR125, 0xad }, { ZD_CR120, 0x4f },
{ CR126, 0x6c }, { CR127, 0x03 }, { ZD_CR121, 0x1f }, /* 6220 4f->1f */
{ CR128, 0x14 }, /* 6302 12->11 */ { ZD_CR122, 0xf0 }, { ZD_CR123, 0x57 }, { ZD_CR125, 0xad },
{ CR129, 0x12 }, /* 6301 10->0f */ { ZD_CR126, 0x6c }, { ZD_CR127, 0x03 },
{ CR130, 0x10 }, { CR137, 0x50 }, { CR138, 0xa8 }, { ZD_CR128, 0x14 }, /* 6302 12->11 */
{ CR144, 0xac }, { CR146, 0x20 }, { CR252, 0xff }, { ZD_CR129, 0x12 }, /* 6301 10->0f */
{ CR253, 0xff }, { ZD_CR130, 0x10 }, { ZD_CR137, 0x50 }, { ZD_CR138, 0xa8 },
{ ZD_CR144, 0xac }, { ZD_CR146, 0x20 }, { ZD_CR252, 0xff },
{ ZD_CR253, 0xff },
}; };
static const u32 rv[] = { static const u32 rv[] = {
...@@ -433,7 +435,7 @@ static int uw2453_init_hw(struct zd_rf *rf) ...@@ -433,7 +435,7 @@ static int uw2453_init_hw(struct zd_rf *rf)
* the one that produced a lock. */ * the one that produced a lock. */
UW2453_PRIV(rf)->config = found_config + 1; UW2453_PRIV(rf)->config = found_config + 1;
return zd_iowrite16_locked(chip, 0x06, CR203); return zd_iowrite16_locked(chip, 0x06, ZD_CR203);
} }
static int uw2453_set_channel(struct zd_rf *rf, u8 channel) static int uw2453_set_channel(struct zd_rf *rf, u8 channel)
...@@ -445,8 +447,8 @@ static int uw2453_set_channel(struct zd_rf *rf, u8 channel) ...@@ -445,8 +447,8 @@ static int uw2453_set_channel(struct zd_rf *rf, u8 channel)
struct zd_chip *chip = zd_rf_to_chip(rf); struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs[] = { static const struct zd_ioreq16 ioreqs[] = {
{ CR80, 0x30 }, { CR81, 0x30 }, { CR79, 0x58 }, { ZD_CR80, 0x30 }, { ZD_CR81, 0x30 }, { ZD_CR79, 0x58 },
{ CR12, 0xf0 }, { CR77, 0x1b }, { CR78, 0x58 }, { ZD_CR12, 0xf0 }, { ZD_CR77, 0x1b }, { ZD_CR78, 0x58 },
}; };
r = uw2453_synth_set_channel(chip, channel, autocal); r = uw2453_synth_set_channel(chip, channel, autocal);
...@@ -474,7 +476,7 @@ static int uw2453_set_channel(struct zd_rf *rf, u8 channel) ...@@ -474,7 +476,7 @@ static int uw2453_set_channel(struct zd_rf *rf, u8 channel)
if (r) if (r)
return r; return r;
return zd_iowrite16_locked(chip, 0x06, CR203); return zd_iowrite16_locked(chip, 0x06, ZD_CR203);
} }
static int uw2453_switch_radio_on(struct zd_rf *rf) static int uw2453_switch_radio_on(struct zd_rf *rf)
...@@ -482,7 +484,7 @@ static int uw2453_switch_radio_on(struct zd_rf *rf) ...@@ -482,7 +484,7 @@ static int uw2453_switch_radio_on(struct zd_rf *rf)
int r; int r;
struct zd_chip *chip = zd_rf_to_chip(rf); struct zd_chip *chip = zd_rf_to_chip(rf);
struct zd_ioreq16 ioreqs[] = { struct zd_ioreq16 ioreqs[] = {
{ CR11, 0x00 }, { CR251, 0x3f }, { ZD_CR11, 0x00 }, { ZD_CR251, 0x3f },
}; };
/* enter RXTX mode */ /* enter RXTX mode */
...@@ -501,7 +503,7 @@ static int uw2453_switch_radio_off(struct zd_rf *rf) ...@@ -501,7 +503,7 @@ static int uw2453_switch_radio_off(struct zd_rf *rf)
int r; int r;
struct zd_chip *chip = zd_rf_to_chip(rf); struct zd_chip *chip = zd_rf_to_chip(rf);
static const struct zd_ioreq16 ioreqs[] = { static const struct zd_ioreq16 ioreqs[] = {
{ CR11, 0x04 }, { CR251, 0x2f }, { ZD_CR11, 0x04 }, { ZD_CR251, 0x2f },
}; };
/* enter IDLE mode */ /* enter IDLE mode */
......
...@@ -1877,10 +1877,10 @@ int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits) ...@@ -1877,10 +1877,10 @@ int zd_usb_rfwrite(struct zd_usb *usb, u32 value, u8 bits)
dev_dbg_f(zd_usb_dev(usb), "value %#09x bits %d\n", value, bits); dev_dbg_f(zd_usb_dev(usb), "value %#09x bits %d\n", value, bits);
r = zd_usb_ioread16(usb, &bit_value_template, CR203); r = zd_usb_ioread16(usb, &bit_value_template, ZD_CR203);
if (r) { if (r) {
dev_dbg_f(zd_usb_dev(usb), dev_dbg_f(zd_usb_dev(usb),
"error %d: Couldn't read CR203\n", r); "error %d: Couldn't read ZD_CR203\n", r);
return r; return r;
} }
bit_value_template &= ~(RF_IF_LE|RF_CLK|RF_DATA); bit_value_template &= ~(RF_IF_LE|RF_CLK|RF_DATA);
......
...@@ -109,7 +109,7 @@ struct usb_req_rfwrite { ...@@ -109,7 +109,7 @@ struct usb_req_rfwrite {
__le16 bits; __le16 bits;
/* RF2595: 24 */ /* RF2595: 24 */
__le16 bit_values[0]; __le16 bit_values[0];
/* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */ /* (ZD_CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */
} __packed; } __packed;
/* USB interrupt */ /* USB interrupt */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment