Re: [PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Em Tue, 27 Oct 2009 21:09:14 +0200
Igor M. Liplianin liplia...@me.by escreveu:
Mauro,
Please pull from http://udev.netup.ru/hg/v4l-dvb-commits
for the following 5 changesets:
01/05: stv6110: add configurable gain
http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=655c21f61eb3
02/05: stv0900: fix diseqc support for NetUP card
http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=7682b35a0526
03/05: stv0900: config definition for single/dual mode
http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=71fb9ae3e3f7
04/05: stv0900 cut3.0 additions
http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=958ba6f1a1f8
05/05: Change str snr scale for stv0900/903 and Netup Dual DVB-S2 card.
http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=5d0eb726d7cd
Igor,
Patchset 04/05 introduces lots of CodingStyle errors/warnings, making harder to
analise it. While on a few cases, it is ok to use more than 80 columns, on
several cases it means that the logic is very complex and it would be better to
reorganize the logic to be simpler (for example, creating some additional static
functions.
Please fix for me to better analise it.
...
WARNING: line over 80 characters
#166: FILE: linux/drivers/media/dvb/frontends/stv0900_core.c:1173:
+ stv0900_write_reg(i_params, R0900_P2_RTCS2, 0x44
);
WARNING: braces {} are not necessary for any arm of this statement
#170: FILE: linux/drivers/media/dvb/frontends/stv0900_core.c:1177:
+ if (i_params-dmd2_symbol_rate = 500) {
[...]
+ } else {
[...]
WARNING: line over 80 characters
#171: FILE: linux/drivers/media/dvb/frontends/stv0900_core.c:1178:
+ stv0900_write_reg(i_params, R0900_P2_RTCS2, 0x68
);
WARNING: line over 80 characters
#173: FILE: linux/drivers/media/dvb/frontends/stv0900_core.c:1180:
+ stv0900_write_reg(i_params, R0900_P2_RTCS2, 0x44
);
WARNING: line over 80 characters
#183: FILE: linux/drivers/media/dvb/frontends/stv0900_core.c:1190:
+ freq = (i_params-dmd2_srch_range / 2000
) + 80;
...
ERROR: Missing Signed-off-by: line(s)
total: 1 errors, 219 warnings, 3303 lines checked
Btw, you also missed to sign this patch.
dvb/frontends/stv0900.h |1
dvb/frontends/stv0900_core.c | 306 -
dvb/frontends/stv0900_init.h | 63 +++
dvb/frontends/stv0900_priv.h |7
dvb/frontends/stv0900_reg.h | 769
---
dvb/frontends/stv0900_sw.c | 669 ++---
dvb/frontends/stv6110.c | 13
dvb/frontends/stv6110.h |1
video/cx23885/cx23885-dvb.c | 11
9 files changed, 999 insertions(+), 841 deletions(-)
Thanks,
Igor
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers,
Mauro
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following 4 changesets: 01/04: stv6110: add configurable gain http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=655c21f61eb3 02/04: stv0900: fix diseqc support for NetUP card http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=7682b35a0526 03/04: stv0900: config definition for single/dual mode http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=71fb9ae3e3f7 04/04: stv0900 cut3.0 additions http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=958ba6f1a1f8 dvb/frontends/stv0900.h |1 dvb/frontends/stv0900_core.c | 281 +++ dvb/frontends/stv0900_init.h | 63 +++ dvb/frontends/stv0900_priv.h |7 dvb/frontends/stv0900_reg.h | 769 --- dvb/frontends/stv0900_sw.c | 669 ++--- dvb/frontends/stv6110.c | 13 dvb/frontends/stv6110.h |1 video/cx23885/cx23885-dvb.c | 11 9 files changed, 978 insertions(+), 837 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following 5 changesets: 01/05: stv6110: add configurable gain http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=655c21f61eb3 02/05: stv0900: fix diseqc support for NetUP card http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=7682b35a0526 03/05: stv0900: config definition for single/dual mode http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=71fb9ae3e3f7 04/05: stv0900 cut3.0 additions http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=958ba6f1a1f8 05/05: Change str snr scale for stv0900/903 and Netup Dual DVB-S2 card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=5d0eb726d7cd dvb/frontends/stv0900.h |1 dvb/frontends/stv0900_core.c | 306 - dvb/frontends/stv0900_init.h | 63 +++ dvb/frontends/stv0900_priv.h |7 dvb/frontends/stv0900_reg.h | 769 --- dvb/frontends/stv0900_sw.c | 669 ++--- dvb/frontends/stv6110.c | 13 dvb/frontends/stv6110.h |1 video/cx23885/cx23885-dvb.c | 11 9 files changed, 999 insertions(+), 841 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following 3 changesets: 01/03: stv6110: add configurable gain http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=655c21f61eb3 02/03: stv0900: fix diseqc support for NetUP card http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=7682b35a0526 03/03: stv0900: config definition for single/dual mode http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=71fb9ae3e3f7 dvb/frontends/stv0900.h |1 + dvb/frontends/stv0900_core.c | 35 ++- dvb/frontends/stv6110.c | 13 - dvb/frontends/stv6110.h |1 + video/cx23885/cx23885-dvb.c | 11 +++ 5 files changed, 35 insertions(+), 26 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following changeset: 01/01: Fix debug messaging for stv0900 demod. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=bb1363f48e9e stv0900_core.c | 58 - stv0900_priv.h |2 - stv0900_sw.c | 31 +++--- 3 files changed, 46 insertions(+), 45 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following 2 changesets: 01/02: Fix gpio mutex in NetUP Dual DVB-S2 CI card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=31c6bdddb84e 02/02: Fix MAC address reading from EEPROM in NetUP Dual DVB-S2 CI card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=4624a4bad999 cimax2.c | 12 ++-- cx23885-core.c |1 + cx23885.h |1 + netup-eeprom.c |6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Em Mon, 14 Sep 2009 16:29:58 +0400
aos...@netup.ru aos...@netup.ru escreveu:
Hello,
Fixed. Try again please.
# HG changeset patch
# User Abylay Ospan aos...@netup.ru
# Date 1252176678 -14400
# Node ID 2f1119c624ebafde8332fb7a0c8a9315e50e9d51
# Parent 2b49813f84822a1c0d88875ac590a455d93e9225
Fix gpio mutex in NetUP Dual DVB-S2 CI card.
From: Abylay Ospan aos...@netup.ru
The card uses the same cx23885 gpio lines for two adapters.
In case of there is several cards in system we must implement
gpio mutex per cx23885 chip.
Signed-off-by: Abylay Ospan aos...@netup.ru
--- a/linux/drivers/media/video/cx23885/cimax2.c Thu Sep 03 09:06:34
2009 -0300
+++ b/linux/drivers/media/video/cx23885/cimax2.c Sat Sep 05 22:51:18
2009 +0400
@@ -75,7 +75,6 @@
void *priv;
};
-struct mutex gpio_mutex;/* Two CiMax's uses same GPIO lines */
int netup_read_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg,
u8 *buf, int len)
@@ -183,10 +182,11 @@
if (ret != 0)
return ret;
- mutex_lock(gpio_mutex);
+ mutex_lock(dev-gpio_lock);
/* write addr */
cx_write(MC417_OEN, NETUP_EN_ALL);
+ udelay(2000);
udelay is not nice to the processor, since it won't handle any other task while
waiting. In general, it is better to use usleep().
cx_write(MC417_RWD, NETUP_CTRL_OFF |
NETUP_ADLO | (0xff addr));
cx_clear(MC417_RWD, NETUP_ADLO);
@@ -194,9 +194,10 @@
NETUP_ADHI | (0xff (addr 8)));
cx_clear(MC417_RWD, NETUP_ADHI);
- if (read) /* data in */
+ if (read) { /* data in */
cx_write(MC417_OEN, NETUP_EN_ALL | NETUP_DATA);
- else /* data out */
+ udelay(2000);
Same issue here.
+ } else /* data out */
cx_write(MC417_RWD, NETUP_CTRL_OFF | data);
/* choose chip */
@@ -206,7 +207,7 @@
cx_clear(MC417_RWD, (read) ? NETUP_RD : NETUP_WR);
mem = netup_ci_get_mem(dev);
- mutex_unlock(gpio_mutex);
+ mutex_unlock(dev-gpio_lock);
if (!read)
if (mem 0)
@@ -411,7 +412,6 @@
switch (port-nr) {
case 1:
state-ci_i2c_addr = 0x40;
- mutex_init(gpio_mutex);
break;
case 2:
state-ci_i2c_addr = 0x41;
--- a/linux/drivers/media/video/cx23885/cx23885-core.cThu Sep 03
09:06:34 2009 -0300
+++ b/linux/drivers/media/video/cx23885/cx23885-core.cSat Sep 05
22:51:18 2009 +0400
@@ -759,6 +759,7 @@
int i;
mutex_init(dev-lock);
+ mutex_init(dev-gpio_lock);
atomic_inc(dev-refcount);
--- a/linux/drivers/media/video/cx23885/cx23885.h Thu Sep 03 09:06:34
2009 -0300
+++ b/linux/drivers/media/video/cx23885/cx23885.h Sat Sep 05 22:51:18
2009 +0400
@@ -326,6 +326,7 @@
intnr;
struct mutex lock;
+ struct mutex gpio_lock;
/* board details */
unsigned int board;
Cheers,
Mauro
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Em Wed, 9 Sep 2009 19:21:12 +0300 Igor M. Liplianin liplia...@me.by escreveu: Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits I can't reach the server. the connection dies at utm.netup.ru. traceroute -n udev.netup.ru traceroute to udev.netup.ru (77.72.80.20), 30 hops max, 40 byte packets 1 * * * 2 * * * 3 * * * 4 201.0.87.225 70.096 ms 70.345 ms 77.659 ms 5 201.0.5.69 125.153 ms 201.0.5.65 77.956 ms 201.0.5.69 125.311 ms 6 201.63.253.110 85.516 ms 200.100.98.97 63.072 ms 200.100.98.173 63.234 ms 7 84.16.6.193 63.207 ms 84.16.9.109 70.806 ms 84.16.6.141 63.449 ms 8 213.140.36.13 173.869 ms 213.140.43.109 181.653 ms 213.140.36.69 174.597 ms 9 84.16.13.53 213.031 ms 84.16.12.221 197.664 ms 84.16.13.53 205.391 ms 10 213.140.55.90 228.586 ms 229.547 ms 228.847 ms 11 207.138.94.70 339.372 ms 347.711 ms 340.608 ms 12 62.140.245.174 340.202 ms 332.198 ms 339.701 ms 13 193.203.36.250 348.137 ms 347.738 ms 348.086 ms 14 193.203.36.250 3140.511 ms !H 3037.629 ms !H 2998.439 ms !H for the following changeset: 01/01: Fix gpio mutex in NetUP Dual DVB-S2 CI card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=2f1119c624eb cimax2.c | 12 ++-- cx23885-core.c |1 + cx23885.h |1 + 3 files changed, 8 insertions(+), 6 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Cheers, Mauro -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following changeset: 01/01: Fix gpio mutex in NetUP Dual DVB-S2 CI card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=2f1119c624eb cimax2.c | 12 ++-- cx23885-core.c |1 + cx23885.h |1 + 3 files changed, 8 insertions(+), 6 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following 5 changesets: 01/05: Add output clock configuration for stv6110 tuner. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=40ce22ad38a6 02/05: stv6110 tuner: remove unused iq_wiring configuration parameter. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=e10cd6e771b3 03/05: Change clocking configuration and frequency for NetUP card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=740f39d7bcb2 04/05: Bug fix: stv0900 i2c repeater configuration must be set to manual. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=df4abaea655b 05/05: stv6110 tuner: Read registers through one time i2c_transfer calling. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=84c452df4faa dvb/frontends/stv0900_core.c | 8 +++ dvb/frontends/stv6110.c | 48 +-- dvb/frontends/stv6110.h | 2 - video/cx23885/cx23885-dvb.c | 10 4 files changed, 34 insertions(+), 34 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, I added one more patch. Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following 6 changesets: 01/06: Add output clock configuration for stv6110 tuner. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=40ce22ad38a6 02/06: stv6110 tuner: remove unused iq_wiring configuration parameter. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=e10cd6e771b3 03/06: Change clocking configuration and frequency for NetUP card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=740f39d7bcb2 04/06: Bug fix: stv0900 i2c repeater configuration must be set to manual. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=df4abaea655b 05/06: stv6110 tuner: Read registers through one time i2c_transfer calling. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=84c452df4faa 06/06: Add CAM presence checkout during CiMax init for NetUP card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=cd41a5354fc5 dvb/frontends/stv0900_core.c |8 +++ dvb/frontends/stv6110.c | 48 +-- dvb/frontends/stv6110.h |2 - video/cx23885/cimax2.c |1 video/cx23885/cx23885-dvb.c | 10 5 files changed, 35 insertions(+), 34 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PULL] http://udev.netup.ru/hg/v4l-dvb-commits
Mauro, Please pull from http://udev.netup.ru/hg/v4l-dvb-commits for the following 4 changesets: 01/04: Change lnbh24 configure bits for NetUP card. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=c8916f9693c7 02/04: Bug fix: stv0900 register read must using i2c in one transaction http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=b6475886d913 03/04: Implement reading uncorrected blocks for stv0900 http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=d9a197533972 04/04: Create table for customize stv0900 ts registers. http://udev.netup.ru/hg/v4l-dvb-commits?cmd=changeset;node=08bc59505548 dvb/frontends/stv0900.h | 7 ++- dvb/frontends/stv0900_core.c | 100 +-- dvb/frontends/stv0900_priv.h | 2 video/cx23885/cx23885-dvb.c | 23 - 4 files changed, 105 insertions(+), 27 deletions(-) Thanks, Igor -- To unsubscribe from this list: send the line unsubscribe linux-media in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
