Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 331071
b: refs/heads/master
c: 119f7a8
h: refs/heads/master
i:
  331069: efe63cd
  331067: 47778d3
  331063: ea21463
  331055: 2e7307c
  331039: dfc98a2
  331007: 52eba67
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Sep 23, 2012
1 parent 4569d5e commit aad044f
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e1e9e510bb8639ace59dcd1f8e6b5754dfbb9b44
refs/heads/master: 119f7a8c5ded2789defdccc6dfe50d9934ea156e
90 changes: 49 additions & 41 deletions trunk/drivers/media/usb/dvb-usb-v2/af9035.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ static int af9035_ctrl_msg(struct dvb_usb_device *d, struct usb_req *req)

/* buffer overflow check */
if (req->wlen > (BUF_LEN - REQ_HDR_LEN - CHECKSUM_LEN) ||
req->rlen > (BUF_LEN - ACK_HDR_LEN - CHECKSUM_LEN)) {
pr_debug("%s: too much data wlen=%d rlen=%d\n", __func__,
req->wlen, req->rlen);
req->rlen > (BUF_LEN - ACK_HDR_LEN - CHECKSUM_LEN)) {
dev_err(&d->udev->dev, "%s: too much data wlen=%d rlen=%d\n",
__func__, req->wlen, req->rlen);
return -EINVAL;
}

Expand Down Expand Up @@ -89,17 +89,17 @@ static int af9035_ctrl_msg(struct dvb_usb_device *d, struct usb_req *req)
checksum = af9035_checksum(buf, rlen - 2);
tmp_checksum = (buf[rlen - 2] << 8) | buf[rlen - 1];
if (tmp_checksum != checksum) {
pr_err("%s: command=%02x checksum mismatch (%04x != %04x)\n",
KBUILD_MODNAME, req->cmd, tmp_checksum,
checksum);
dev_err(&d->udev->dev, "%s: command=%02x checksum mismatch " \
"(%04x != %04x)\n", KBUILD_MODNAME, req->cmd,
tmp_checksum, checksum);
ret = -EIO;
goto err;
}

/* check status */
if (buf[2]) {
pr_debug("%s: command=%02x failed fw error=%d\n", __func__,
req->cmd, buf[2]);
dev_dbg(&d->udev->dev, "%s: command=%02x failed fw error=%d\n",
__func__, req->cmd, buf[2]);
ret = -EIO;
goto err;
}
Expand All @@ -112,7 +112,7 @@ static int af9035_ctrl_msg(struct dvb_usb_device *d, struct usb_req *req)
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -290,7 +290,7 @@ static int af9035_identify_state(struct dvb_usb_device *d, const char **name)
if (ret < 0)
goto err;

pr_debug("%s: reply=%*ph\n", __func__, 4, rbuf);
dev_dbg(&d->udev->dev, "%s: reply=%*ph\n", __func__, 4, rbuf);
if (rbuf[0] || rbuf[1] || rbuf[2] || rbuf[3])
ret = WARM;
else
Expand All @@ -299,7 +299,7 @@ static int af9035_identify_state(struct dvb_usb_device *d, const char **name)
return ret;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -339,13 +339,13 @@ static int af9035_download_firmware(struct dvb_usb_device *d,
hdr_checksum = fw->data[fw->size - i + 5] << 8;
hdr_checksum |= fw->data[fw->size - i + 6] << 0;

pr_debug("%s: core=%d addr=%04x data_len=%d checksum=%04x\n",
__func__, hdr_core, hdr_addr, hdr_data_len,
hdr_checksum);
dev_dbg(&d->udev->dev, "%s: core=%d addr=%04x data_len=%d " \
"checksum=%04x\n", __func__, hdr_core, hdr_addr,
hdr_data_len, hdr_checksum);

if (((hdr_core != 1) && (hdr_core != 2)) ||
(hdr_data_len > i)) {
pr_debug("%s: bad firmware\n", __func__);
dev_dbg(&d->udev->dev, "%s: bad firmware\n", __func__);
break;
}

Expand Down Expand Up @@ -376,7 +376,8 @@ static int af9035_download_firmware(struct dvb_usb_device *d,

i -= hdr_data_len + HDR_SIZE;

pr_debug("%s: data uploaded=%zu\n", __func__, fw->size - i);
dev_dbg(&d->udev->dev, "%s: data uploaded=%zu\n",
__func__, fw->size - i);
}

/* firmware loaded, request boot */
Expand All @@ -392,18 +393,19 @@ static int af9035_download_firmware(struct dvb_usb_device *d,
goto err;

if (!(rbuf[0] || rbuf[1] || rbuf[2] || rbuf[3])) {
pr_err("%s: firmware did not run\n", KBUILD_MODNAME);
dev_err(&d->udev->dev, "%s: firmware did not run\n",
KBUILD_MODNAME);
ret = -ENODEV;
goto err;
}

pr_info("%s: firmware version=%d.%d.%d.%d", KBUILD_MODNAME,
rbuf[0], rbuf[1], rbuf[2], rbuf[3]);
dev_info(&d->udev->dev, "%s: firmware version=%d.%d.%d.%d",
KBUILD_MODNAME, rbuf[0], rbuf[1], rbuf[2], rbuf[3]);

return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -445,7 +447,8 @@ static int af9035_download_firmware_it9135(struct dvb_usb_device *d,
if (ret < 0)
goto err;

pr_debug("%s: data uploaded=%d\n", __func__, i);
dev_dbg(&d->udev->dev, "%s: data uploaded=%d\n",
__func__, i);
}
}

Expand All @@ -462,18 +465,19 @@ static int af9035_download_firmware_it9135(struct dvb_usb_device *d,
goto err;

if (!(rbuf[0] || rbuf[1] || rbuf[2] || rbuf[3])) {
pr_err("%s: firmware did not run\n", KBUILD_MODNAME);
dev_err(&d->udev->dev, "%s: firmware did not run\n",
KBUILD_MODNAME);
ret = -ENODEV;
goto err;
}

pr_info("%s: firmware version=%d.%d.%d.%d", KBUILD_MODNAME,
rbuf[0], rbuf[1], rbuf[2], rbuf[3]);
dev_info(&d->udev->dev, "%s: firmware version=%d.%d.%d.%d",
KBUILD_MODNAME, rbuf[0], rbuf[1], rbuf[2], rbuf[3]);

return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand All @@ -491,7 +495,8 @@ static int af9035_read_config(struct dvb_usb_device *d)
goto err;

state->dual_mode = tmp;
pr_debug("%s: dual mode=%d\n", __func__, state->dual_mode);
dev_dbg(&d->udev->dev, "%s: dual mode=%d\n",
__func__, state->dual_mode);

for (i = 0; i < state->dual_mode + 1; i++) {
/* tuner */
Expand All @@ -500,7 +505,8 @@ static int af9035_read_config(struct dvb_usb_device *d)
goto err;

state->af9033_config[i].tuner = tmp;
pr_debug("%s: [%d]tuner=%02x\n", __func__, i, tmp);
dev_dbg(&d->udev->dev, "%s: [%d]tuner=%02x\n",
__func__, i, tmp);

switch (tmp) {
case AF9033_TUNER_TUA9001:
Expand All @@ -510,8 +516,9 @@ static int af9035_read_config(struct dvb_usb_device *d)
state->af9033_config[i].spec_inv = 1;
break;
default:
pr_info("%s: tuner ID=%02x not supported, please " \
"report!", KBUILD_MODNAME, tmp);
dev_warn(&d->udev->dev, "%s: tuner id=%02x not " \
"supported, please report!",
KBUILD_MODNAME, tmp);
};

/* tuner IF frequency */
Expand All @@ -527,7 +534,7 @@ static int af9035_read_config(struct dvb_usb_device *d)

tmp16 |= tmp << 8;

pr_debug("%s: [%d]IF=%d\n", __func__, i, tmp16);
dev_dbg(&d->udev->dev, "%s: [%d]IF=%d\n", __func__, i, tmp16);

eeprom_shift = 0x10; /* shift for the 2nd tuner params */
}
Expand All @@ -545,7 +552,7 @@ static int af9035_read_config(struct dvb_usb_device *d)
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand All @@ -571,7 +578,7 @@ static int af9035_read_config_it9135(struct dvb_usb_device *d)
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -636,7 +643,7 @@ static int af9035_fc0011_tuner_callback(struct dvb_usb_device *d,
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -716,7 +723,7 @@ static int af9035_frontend_attach(struct dvb_usb_adapter *adap)
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -856,7 +863,7 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -888,8 +895,9 @@ static int af9035_init(struct dvb_usb_device *d)
{ 0x80f9a4, 0x00, 0x01 },
};

pr_debug("%s: USB speed=%d frame_size=%04x packet_size=%02x\n",
__func__, d->udev->speed, frame_size, packet_size);
dev_dbg(&d->udev->dev, "%s: USB speed=%d frame_size=%04x " \
"packet_size=%02x\n", __func__,
d->udev->speed, frame_size, packet_size);

/* init endpoints */
for (i = 0; i < ARRAY_SIZE(tab); i++) {
Expand All @@ -902,7 +910,7 @@ static int af9035_init(struct dvb_usb_device *d)
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down Expand Up @@ -946,15 +954,15 @@ static int af9035_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
if (ret < 0)
goto err;

pr_debug("%s: ir_mode=%02x\n", __func__, tmp);
dev_dbg(&d->udev->dev, "%s: ir_mode=%02x\n", __func__, tmp);

/* don't activate rc if in HID mode or if not available */
if (tmp == 5) {
ret = af9035_rd_reg(d, EEPROM_IR_TYPE, &tmp);
if (ret < 0)
goto err;

pr_debug("%s: ir_type=%02x\n", __func__, tmp);
dev_dbg(&d->udev->dev, "%s: ir_type=%02x\n", __func__, tmp);

switch (tmp) {
case 0: /* NEC */
Expand All @@ -977,7 +985,7 @@ static int af9035_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
return 0;

err:
pr_debug("%s: failed=%d\n", __func__, ret);
dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);

return ret;
}
Expand Down

0 comments on commit aad044f

Please sign in to comment.