From: Antti Palosaari <crope@iki.fi>
To: Thomas Mair <thomas.mair86@googlemail.com>
Cc: pomidorabelisima@gmail.com,
Linux Media Mailing List <linux-media@vger.kernel.org>
Subject: Re: [PATCH v4 3/5] rtl28xxu: renamed rtl2831_rd/rtl2831_wr to rtl28xx_rd/rtl28xx_wr
Date: Thu, 17 May 2012 17:43:06 +0300 [thread overview]
Message-ID: <4FB50E7A.6020209@iki.fi> (raw)
In-Reply-To: <1337206420-23810-4-git-send-email-thomas.mair86@googlemail.com>
On 17.05.2012 01:13, Thomas Mair wrote:
> Signed-off-by: Thomas Mair<thomas.mair86@googlemail.com>
Acked-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/dvb/dvb-usb/rtl28xxu.c | 102 +++++++++++++++++-----------------
> 1 files changed, 51 insertions(+), 51 deletions(-)
>
> diff --git a/drivers/media/dvb/dvb-usb/rtl28xxu.c b/drivers/media/dvb/dvb-usb/rtl28xxu.c
> index bb66771..6817ef7 100644
> --- a/drivers/media/dvb/dvb-usb/rtl28xxu.c
> +++ b/drivers/media/dvb/dvb-usb/rtl28xxu.c
> @@ -83,7 +83,7 @@ err:
> return ret;
> }
>
> -static int rtl2831_wr_regs(struct dvb_usb_device *d, u16 reg, u8 *val, int len)
> +static int rtl28xx_wr_regs(struct dvb_usb_device *d, u16 reg, u8 *val, int len)
> {
> struct rtl28xxu_req req;
>
> @@ -119,12 +119,12 @@ static int rtl2831_rd_regs(struct dvb_usb_device *d, u16 reg, u8 *val, int len)
> return rtl28xxu_ctrl_msg(d,&req);
> }
>
> -static int rtl2831_wr_reg(struct dvb_usb_device *d, u16 reg, u8 val)
> +static int rtl28xx_wr_reg(struct dvb_usb_device *d, u16 reg, u8 val)
> {
> - return rtl2831_wr_regs(d, reg,&val, 1);
> + return rtl28xx_wr_regs(d, reg,&val, 1);
> }
>
> -static int rtl2831_rd_reg(struct dvb_usb_device *d, u16 reg, u8 *val)
> +static int rtl28xx_rd_reg(struct dvb_usb_device *d, u16 reg, u8 *val)
> {
> return rtl2831_rd_regs(d, reg, val, 1);
> }
> @@ -311,12 +311,12 @@ static int rtl2831u_frontend_attach(struct dvb_usb_adapter *adap)
> */
>
> /* GPIO direction */
> - ret = rtl2831_wr_reg(adap->dev, SYS_GPIO_DIR, 0x0a);
> + ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_DIR, 0x0a);
> if (ret)
> goto err;
>
> /* enable as output GPIO0, GPIO2, GPIO4 */
> - ret = rtl2831_wr_reg(adap->dev, SYS_GPIO_OUT_EN, 0x15);
> + ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_OUT_EN, 0x15);
> if (ret)
> goto err;
>
> @@ -399,7 +399,7 @@ static int rtl2832u_fc0012_tuner_callback(struct dvb_usb_device *d,
> switch (cmd) {
> case FC_FE_CALLBACK_VHF_ENABLE:
> /* set output values */
> - ret = rtl2831_rd_reg(d, SYS_GPIO_OUT_VAL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL,&val);
> if (ret)
> goto err;
>
> @@ -409,7 +409,7 @@ static int rtl2832u_fc0012_tuner_callback(struct dvb_usb_device *d,
> val |= 0x40; /* set GPIO6 high */
>
>
> - ret = rtl2831_wr_reg(d, SYS_GPIO_OUT_VAL, val);
> + ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
> if (ret)
> goto err;
> break;
> @@ -504,25 +504,25 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
> deb_info("%s:\n", __func__);
>
>
> - ret = rtl2831_rd_reg(adap->dev, SYS_GPIO_DIR,&val);
> + ret = rtl28xx_rd_reg(adap->dev, SYS_GPIO_DIR,&val);
> if (ret)
> goto err;
>
> val&= 0xbf;
>
> - ret = rtl2831_wr_reg(adap->dev, SYS_GPIO_DIR, val);
> + ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_DIR, val);
> if (ret)
> goto err;
>
>
> /* enable as output GPIO3 and GPIO6*/
> - ret = rtl2831_rd_reg(adap->dev, SYS_GPIO_OUT_EN,&val);
> + ret = rtl28xx_rd_reg(adap->dev, SYS_GPIO_OUT_EN,&val);
> if (ret)
> goto err;
>
> val |= 0x48;
>
> - ret = rtl2831_wr_reg(adap->dev, SYS_GPIO_OUT_EN, val);
> + ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_OUT_EN, val);
> if (ret)
> goto err;
>
> @@ -773,7 +773,7 @@ static int rtl2831u_streaming_ctrl(struct dvb_usb_adapter *adap , int onoff)
>
> deb_info("%s: onoff=%d\n", __func__, onoff);
>
> - ret = rtl2831_rd_reg(adap->dev, SYS_GPIO_OUT_VAL,&gpio);
> + ret = rtl28xx_rd_reg(adap->dev, SYS_GPIO_OUT_VAL,&gpio);
> if (ret)
> goto err;
>
> @@ -787,11 +787,11 @@ static int rtl2831u_streaming_ctrl(struct dvb_usb_adapter *adap , int onoff)
> gpio&= (~0x04); /* LED off */
> }
>
> - ret = rtl2831_wr_reg(adap->dev, SYS_GPIO_OUT_VAL, gpio);
> + ret = rtl28xx_wr_reg(adap->dev, SYS_GPIO_OUT_VAL, gpio);
> if (ret)
> goto err;
>
> - ret = rtl2831_wr_regs(adap->dev, USB_EPA_CTL, buf, 2);
> + ret = rtl28xx_wr_regs(adap->dev, USB_EPA_CTL, buf, 2);
> if (ret)
> goto err;
>
> @@ -817,7 +817,7 @@ static int rtl2832u_streaming_ctrl(struct dvb_usb_adapter *adap , int onoff)
> buf[1] = 0x02; /* reset EPA */
> }
>
> - ret = rtl2831_wr_regs(adap->dev, USB_EPA_CTL, buf, 2);
> + ret = rtl28xx_wr_regs(adap->dev, USB_EPA_CTL, buf, 2);
> if (ret)
> goto err;
>
> @@ -835,12 +835,12 @@ static int rtl2831u_power_ctrl(struct dvb_usb_device *d, int onoff)
> deb_info("%s: onoff=%d\n", __func__, onoff);
>
> /* demod adc */
> - ret = rtl2831_rd_reg(d, SYS_SYS0,&sys0);
> + ret = rtl28xx_rd_reg(d, SYS_SYS0,&sys0);
> if (ret)
> goto err;
>
> /* tuner power, read GPIOs */
> - ret = rtl2831_rd_reg(d, SYS_GPIO_OUT_VAL,&gpio);
> + ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL,&gpio);
> if (ret)
> goto err;
>
> @@ -860,12 +860,12 @@ static int rtl2831u_power_ctrl(struct dvb_usb_device *d, int onoff)
> deb_info("%s: WR SYS0=%02x GPIO_OUT_VAL=%02x\n", __func__, sys0, gpio);
>
> /* demod adc */
> - ret = rtl2831_wr_reg(d, SYS_SYS0, sys0);
> + ret = rtl28xx_wr_reg(d, SYS_SYS0, sys0);
> if (ret)
> goto err;
>
> /* tuner power, write GPIOs */
> - ret = rtl2831_wr_reg(d, SYS_GPIO_OUT_VAL, gpio);
> + ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, gpio);
> if (ret)
> goto err;
>
> @@ -884,107 +884,107 @@ static int rtl2832u_power_ctrl(struct dvb_usb_device *d, int onoff)
>
> if (onoff) {
> /* set output values */
> - ret = rtl2831_rd_reg(d, SYS_GPIO_OUT_VAL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL,&val);
> if (ret)
> goto err;
>
> val |= 0x08;
> val&= 0xef;
>
> - ret = rtl2831_wr_reg(d, SYS_GPIO_OUT_VAL, val);
> + ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
> if (ret)
> goto err;
>
> /* demod_ctl_1 */
> - ret = rtl2831_rd_reg(d, SYS_DEMOD_CTL1,&val);
> + ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL1,&val);
> if (ret)
> goto err;
>
> val&= 0xef;
>
> - ret = rtl2831_wr_reg(d, SYS_DEMOD_CTL1, val);
> + ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL1, val);
> if (ret)
> goto err;
>
> /* demod control */
> /* PLL enable */
> - ret = rtl2831_rd_reg(d, SYS_DEMOD_CTL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL,&val);
> if (ret)
> goto err;
>
> /* bit 7 to 1 */
> val |= 0x80;
>
> - ret = rtl2831_wr_reg(d, SYS_DEMOD_CTL, val);
> + ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
> if (ret)
> goto err;
>
> /* demod HW reset */
> - ret = rtl2831_rd_reg(d, SYS_DEMOD_CTL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL,&val);
> if (ret)
> goto err;
> /* bit 5 to 0 */
> val&= 0xdf;
>
> - ret = rtl2831_wr_reg(d, SYS_DEMOD_CTL, val);
> + ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
> if (ret)
> goto err;
>
> - ret = rtl2831_rd_reg(d, SYS_DEMOD_CTL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL,&val);
> if (ret)
> goto err;
>
> val |= 0x20;
>
> - ret = rtl2831_wr_reg(d, SYS_DEMOD_CTL, val);
> + ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
> if (ret)
> goto err;
>
> mdelay(5);
>
> /*enable ADC_Q and ADC_I */
> - ret = rtl2831_rd_reg(d, SYS_DEMOD_CTL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL,&val);
> if (ret)
> goto err;
>
> val |= 0x48;
>
> - ret = rtl2831_wr_reg(d, SYS_DEMOD_CTL, val);
> + ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
> if (ret)
> goto err;
>
>
> } else {
> /* demod_ctl_1 */
> - ret = rtl2831_rd_reg(d, SYS_DEMOD_CTL1,&val);
> + ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL1,&val);
> if (ret)
> goto err;
>
> val |= 0x0c;
>
> - ret = rtl2831_wr_reg(d, SYS_DEMOD_CTL1, val);
> + ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL1, val);
> if (ret)
> goto err;
>
> /* set output values */
> - ret = rtl2831_rd_reg(d, SYS_GPIO_OUT_VAL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_GPIO_OUT_VAL,&val);
> if (ret)
> goto err;
>
> val |= 0x10;
>
> - ret = rtl2831_wr_reg(d, SYS_GPIO_OUT_VAL, val);
> + ret = rtl28xx_wr_reg(d, SYS_GPIO_OUT_VAL, val);
> if (ret)
> goto err;
>
> /* demod control */
> - ret = rtl2831_rd_reg(d, SYS_DEMOD_CTL,&val);
> + ret = rtl28xx_rd_reg(d, SYS_DEMOD_CTL,&val);
> if (ret)
> goto err;
>
> val&= 0x37;
>
> - ret = rtl2831_wr_reg(d, SYS_DEMOD_CTL, val);
> + ret = rtl28xx_wr_reg(d, SYS_DEMOD_CTL, val);
> if (ret)
> goto err;
>
> @@ -1023,7 +1023,7 @@ static int rtl2831u_rc_query(struct dvb_usb_device *d)
> /* init remote controller */
> if (!priv->rc_active) {
> for (i = 0; i< ARRAY_SIZE(rc_nec_tab); i++) {
> - ret = rtl2831_wr_reg(d, rc_nec_tab[i].reg,
> + ret = rtl28xx_wr_reg(d, rc_nec_tab[i].reg,
> rc_nec_tab[i].val);
> if (ret)
> goto err;
> @@ -1053,12 +1053,12 @@ static int rtl2831u_rc_query(struct dvb_usb_device *d)
>
> rc_keydown(d->rc_dev, rc_code, 0);
>
> - ret = rtl2831_wr_reg(d, SYS_IRRC_SR, 1);
> + ret = rtl28xx_wr_reg(d, SYS_IRRC_SR, 1);
> if (ret)
> goto err;
>
> /* repeated intentionally to avoid extra keypress */
> - ret = rtl2831_wr_reg(d, SYS_IRRC_SR, 1);
> + ret = rtl28xx_wr_reg(d, SYS_IRRC_SR, 1);
> if (ret)
> goto err;
> }
> @@ -1095,7 +1095,7 @@ static int rtl2832u_rc_query(struct dvb_usb_device *d)
> /* init remote controller */
> if (!priv->rc_active) {
> for (i = 0; i< ARRAY_SIZE(rc_nec_tab); i++) {
> - ret = rtl2831_wr_reg(d, rc_nec_tab[i].reg,
> + ret = rtl28xx_wr_reg(d, rc_nec_tab[i].reg,
> rc_nec_tab[i].val);
> if (ret)
> goto err;
> @@ -1103,14 +1103,14 @@ static int rtl2832u_rc_query(struct dvb_usb_device *d)
> priv->rc_active = true;
> }
>
> - ret = rtl2831_rd_reg(d, IR_RX_IF,&buf[0]);
> + ret = rtl28xx_rd_reg(d, IR_RX_IF,&buf[0]);
> if (ret)
> goto err;
>
> if (buf[0] != 0x83)
> goto exit;
>
> - ret = rtl2831_rd_reg(d, IR_RX_BC,&buf[0]);
> + ret = rtl28xx_rd_reg(d, IR_RX_BC,&buf[0]);
> if (ret)
> goto err;
>
> @@ -1119,9 +1119,9 @@ static int rtl2832u_rc_query(struct dvb_usb_device *d)
>
> /* TODO: pass raw IR to Kernel IR decoder */
>
> - ret = rtl2831_wr_reg(d, IR_RX_IF, 0x03);
> - ret = rtl2831_wr_reg(d, IR_RX_BUF_CTRL, 0x80);
> - ret = rtl2831_wr_reg(d, IR_RX_CTRL, 0x80);
> + ret = rtl28xx_wr_reg(d, IR_RX_IF, 0x03);
> + ret = rtl28xx_wr_reg(d, IR_RX_BUF_CTRL, 0x80);
> + ret = rtl28xx_wr_reg(d, IR_RX_CTRL, 0x80);
>
> exit:
> return ret;
> @@ -1301,23 +1301,23 @@ static int rtl28xxu_probe(struct usb_interface *intf,
>
>
> /* init USB endpoints */
> - ret = rtl2831_rd_reg(d, USB_SYSCTL_0,&val);
> + ret = rtl28xx_rd_reg(d, USB_SYSCTL_0,&val);
> if (ret)
> goto err;
>
> /* enable DMA and Full Packet Mode*/
> val |= 0x09;
> - ret = rtl2831_wr_reg(d, USB_SYSCTL_0, val);
> + ret = rtl28xx_wr_reg(d, USB_SYSCTL_0, val);
> if (ret)
> goto err;
>
> /* set EPA maximum packet size to 0x0200 */
> - ret = rtl2831_wr_regs(d, USB_EPA_MAXPKT, "\x00\x02\x00\x00", 4);
> + ret = rtl28xx_wr_regs(d, USB_EPA_MAXPKT, "\x00\x02\x00\x00", 4);
> if (ret)
> goto err;
>
> /* change EPA FIFO length */
> - ret = rtl2831_wr_regs(d, USB_EPA_FIFO_CFG, "\x14\x00\x00\x00", 4);
> + ret = rtl28xx_wr_regs(d, USB_EPA_FIFO_CFG, "\x14\x00\x00\x00", 4);
> if (ret)
> goto err;
>
--
http://palosaari.fi/
next prev parent reply other threads:[~2012-05-17 14:43 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1>
2012-05-16 22:13 ` [PATCH v4 0/5] support for rtl2832 Thomas Mair
2012-05-16 22:13 ` [PATCH v4 1/5] rtl2832 ver. 0.4: removed signal statistics Thomas Mair
2012-05-17 3:36 ` poma
2012-05-17 3:40 ` poma
2012-05-17 8:04 ` Thomas Mair
2012-05-17 14:19 ` Antti Palosaari
2012-05-17 20:27 ` poma
2012-05-17 20:41 ` Antti Palosaari
2012-05-17 20:45 ` Thomas Mair
2012-05-17 20:49 ` Antti Palosaari
2012-05-17 21:03 ` poma
2012-05-17 21:08 ` poma
2012-05-17 21:19 ` Thomas Mair
2012-05-17 21:30 ` poma
2012-05-18 0:55 ` poma
[not found] ` <CAKZ=SG_mvvFae9ZE2H3ci_3HosLmQ1kihyGx6QCdyQGgQro52Q@mail.gmail.com>
2012-05-18 9:15 ` poma
2012-05-18 10:38 ` poma
2012-05-18 12:38 ` Antti Palosaari
2012-05-18 13:26 ` poma
2012-05-18 17:46 ` Thomas Mair
2012-05-18 17:51 ` Antti Palosaari
2012-05-16 22:13 ` [PATCH v4 2/5] rtl28xxu: support for the rtl2832 demod driver Thomas Mair
2012-05-17 14:41 ` Antti Palosaari
2012-05-16 22:13 ` [PATCH v4 3/5] rtl28xxu: renamed rtl2831_rd/rtl2831_wr to rtl28xx_rd/rtl28xx_wr Thomas Mair
2012-05-17 14:43 ` Antti Palosaari [this message]
2012-05-16 22:13 ` [PATCH v4 4/5] rtl28xxu: support G-Tek Electronics Group Lifeview LV5TDLX DVB-T Thomas Mair
2012-05-17 14:47 ` Antti Palosaari
2012-05-17 20:43 ` poma
2012-05-16 22:13 ` [PATCH v4 5/5] rtl28xxu: support Terratec Noxon DAB/DAB+ stick Thomas Mair
2012-05-17 14:50 ` Antti Palosaari
2012-05-17 14:53 ` [PATCH v4 0/5] support for rtl2832 Antti Palosaari
2012-05-18 18:47 ` [PATCH v5 " Thomas Mair
2012-05-18 18:47 ` [PATCH v5 1/5] rtl2832 ver. 0.5: support for RTL2832 demod Thomas Mair
2012-05-18 20:21 ` Antti Palosaari
2012-07-05 14:32 ` Mauro Carvalho Chehab
2012-07-05 14:35 ` Antti Palosaari
2012-07-05 15:54 ` Mauro Carvalho Chehab
2012-07-07 15:45 ` poma
2012-07-05 14:41 ` Antti Palosaari
2012-07-05 15:53 ` Mauro Carvalho Chehab
2012-05-18 18:47 ` [PATCH v5 2/5] rtl28xxu: support for the rtl2832 demod driver Thomas Mair
2012-05-18 20:28 ` Antti Palosaari
2012-05-18 18:47 ` [PATCH v5 3/5] rtl28xxu: renamed rtl2831_rd/rtl2831_wr to rtl28xx_rd/rtl28xx_wr Thomas Mair
2012-05-18 20:30 ` Antti Palosaari
2012-05-18 18:47 ` [PATCH v5 4/5] rtl28xxu: support Delock USB 2.0 DVB-T Thomas Mair
2012-05-18 20:31 ` Antti Palosaari
2012-05-18 18:47 ` [PATCH v5 5/5] rtl28xxu: support Terratec Noxon DAB/DAB+ stick Thomas Mair
2012-05-18 20:32 ` Antti Palosaari
2012-05-18 20:47 ` [PATCH v5 0/5] support for rtl2832 Antti Palosaari
2012-05-18 23:35 ` poma
2012-05-20 9:56 ` Thomas Mair
2012-05-20 10:14 ` Antti Palosaari
2012-05-18 23:39 ` poma
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FB50E7A.6020209@iki.fi \
--to=crope@iki.fi \
--cc=linux-media@vger.kernel.org \
--cc=pomidorabelisima@gmail.com \
--cc=thomas.mair86@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).