[PULL] http://udev.netup.ru/hg/v4l-dvb-aospan-ci_init-fix-new
Mauro, please pull fixed tree: http://udev.netup.ru/hg/v4l-dvb-aospan-ci_init-fix-new/ Thanks to Dan Carpentererro...@gmail.com. thanks ! On 05.06.2010 16:05, Dan Carpenter wrote: videobuf_dvb_register_bus() returns negative error codes on failure. This was introduced in e4425eab6b2: V4L/DVB: cx23885: Check register errors. Signed-off-by: Dan Carpentererro...@gmail.com --- I don't have the hardware to test this, but it looks reversed. diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 0a199d7..bf7c328 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c @@ -991,7 +991,7 @@ static int dvb_register(struct cx23885_tsport *port) ret = videobuf_dvb_register_bus(port-frontends, THIS_MODULE, port, dev-pci-dev, adapter_nr, 0, cx23885_dvb_fe_ioctl_override); - if (!ret) + if (ret 0) return ret; /* init CI MAC */ -- Abylai Ospanaos...@netup.ru NetUP Inc. -- 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] Re: [patch] V4L/DVB: cx23885: reversed condition in dvb_register()
Dear Dan, Yes, you are right. Mauro, please pull fixed tree: http://udev.netup.ru/hg/v4l-dvb-aospan-ci_init-fix-new/ thanks ! On 05.06.2010 16:05, Dan Carpenter wrote: videobuf_dvb_register_bus() returns negative error codes on failure. This was introduced in e4425eab6b2: V4L/DVB: cx23885: Check register errors. Signed-off-by: Dan Carpentererro...@gmail.com --- I don't have the hardware to test this, but it looks reversed. diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 0a199d7..bf7c328 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c @@ -991,7 +991,7 @@ static int dvb_register(struct cx23885_tsport *port) ret = videobuf_dvb_register_bus(port-frontends, THIS_MODULE, port, dev-pci-dev, adapter_nr, 0, cx23885_dvb_fe_ioctl_override); - if (!ret) + if (ret 0) return ret; /* init CI MAC */ -- Abylai Ospanaos...@netup.ru NetUP Inc. -- 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: [RESEND PULL] http://udev.netup.ru/hg/v4l-dvb-aospan
Hello Mauro,
Please pull fixed patch from:
http://udev.netup.ru/cgi-bin/hgwebdir.cgi/v4l-dvb-aospan/rev/1d956b581b02
I have fixed pointed issues. Strange that ./v4l/scripts/checkpatch.pl don't
show me this errors before. Now checkpatch shows 0 errors/warnings.
P.S.
In some stripped environments running additiona user-level programs is
difficult. In this case this debug possibility very useful.
On Saturday 31 October 2009 13:45:17 Mauro Carvalho Chehab wrote:
Em Sun, 11 Oct 2009 21:09:24 +0400
aos...@netup.ru aos...@netup.ru escreveu:
Hello Mauro,
On Friday 09 October 2009 16:01:58 Mauro Carvalho Chehab wrote:
Wouldn't be be better to just use dvbtraffic userspace apps for it?
this feature very usable for debugging. Please add it.
Also,
your patch has some coding style issues.
please point to this issues. I will fix.
# HG changeset patch
# User Abylay Ospan aos...@netup.ru
# Date 1253802277 -14400
# Node ID 711d9630876ffd81196c1032ce77825d5b433cc8
# Parent a798c751f06d60335fbbad9fdca8c41f1298d228
TS speed check. Logging transport stream speed in Kbits per second
Signed-off-by: Abylay Ospan aos...@netup.ru
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c Wed Sep 23 10:21:53
2009 +0200 +++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c Thu Sep
24
18:24:37 2009 +0400 @@ -42,6 +42,11 @@
module_param(dvb_demux_tscheck, int, 0644);
MODULE_PARM_DESC(dvb_demux_tscheck,
enable transport stream continuity and TEI check);
+
+static int dvb_demux_speedcheck;
+module_param(dvb_demux_speedcheck, int, 0644);
+MODULE_PARM_DESC(dvb_demux_speedcheck,
+ enable transport stream speed check);
#define dprintk_tscheck(x...) do { \
if (dvb_demux_tscheck printk_ratelimit())\
@@ -385,6 +390,37 @@
struct dvb_demux_feed *feed;
u16 pid = ts_pid(buf);
int dvr_done = 0;
+ struct timespec cur_time, delta_time;
+ u64 speed_bytes, speed_timedelta;
+
+ if (dvb_demux_speedcheck) {
+ demux-speed_pkts_cnt++;
+
+ /* show speed every SPEED_PKTS_INTERVAL packets */
+ if (!(demux-speed_pkts_cnt%SPEED_PKTS_INTERVAL)) {
You need to add spaces between each argument of the % operator
+ cur_time = current_kernel_time();
+
+ if (demux-speed_last_time.tv_sec != 0
+ demux-speed_last_time.tv_nsec != 0) {
+ delta_time = timespec_sub(cur_time,
+ demux-speed_last_time);
+ speed_bytes = (u64)demux-speed_pkts_cnt*188*8;
You need to add spaces between each argument of the * operator
+ /* convert to 1024 basis */
+ speed_bytes = 1000*div64_u64(speed_bytes,
+ 1024);
You need to add spaces between each argument of the * operator
+ speed_timedelta =
+ (u64)timespec_to_ns(delta_time);
+ speed_timedelta = div64_u64(speed_timedelta,
+ 100); /* nsec - usec */
+ printk(KERN_INFO TS speed %llu Kbits/sec \n,
+ div64_u64(speed_bytes,
+ speed_timedelta));
+ };
+
+ demux-speed_last_time = cur_time;
+ demux-speed_pkts_cnt = 0;
+ };
+ };
if (dvb_demux_tscheck) {
if (!demux-cnt_storage)
--- a/linux/drivers/media/dvb/dvb-core/dvb_demux.h Wed Sep 23 10:21:53
2009 +0200 +++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.h Thu Sep
24
18:24:37 2009 +0400 @@ -44,6 +44,7 @@
#define DVB_DEMUX_MASK_MAX 18
#define MAX_PID 0x1fff
+#define SPEED_PKTS_INTERVAL 5
struct dvb_demux_filter {
struct dmx_section_filter filter;
@@ -132,6 +133,9 @@
spinlock_t lock;
uint8_t *cnt_storage; /* for TS continuity check */
+
+ struct timespec speed_last_time; /* for TS speed check */
+ uint32_t speed_pkts_cnt; /* for TS speed check */
};
int dvb_dmx_init(struct dvb_demux *dvbdemux);
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
--
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: [RESEND PULL] http://udev.netup.ru/hg/v4l-dvb-aospan
Hello Mauro, On Friday 09 October 2009 16:01:58 Mauro Carvalho Chehab wrote: Wouldn't be be better to just use dvbtraffic userspace apps for it? this feature very usable for debugging. Please add it. Also, your patch has some coding style issues. please point to this issues. I will fix. Em Thu, 24 Sep 2009 18:41:08 +0400 Abylai Ospan aos...@netup.ru escreveu: Mauro, Please pulll changes from: http://udev.netup.ru/hg/v4l-dvb-aospan/rev/711d9630876f Show speed of transport stream in Kbit/sec: for example, data obtained from DVB-S2 transponder from Eutelsat W4: Jun 27 12:06:01 udev TS speed 58608 Kbits/sec Jun 27 12:06:03 udev TS speed 58422 Kbits/sec Jun 27 12:06:04 udev TS speed 58608 Kbits/sec for DVB-S1 transponder from the same satellite: Jun 27 12:07:00 udev TS speed 37108 Kbits/sec Jun 27 12:07:02 udev TS speed 37089 Kbits/sec Jun 27 12:07:04 udev TS speed 37202 Kbits/sec this feature can be enabled using following command: echo 1 /sys/module/dvb_core/parameters/dvb_demux_speedcheck and disabled by following command: echo 0 /sys/module/dvb_core/parameters/dvb_demux_speedcheck 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 -- 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
