| From: Chris Kennedy <[EMAIL PROTECTED]>
| These add most of the recent patches, if not then please resubmit patches
| to these versions, either they didn't apply clean or fell through the
| cracks...
Thanks for accepting my patch to Unstable to support 64-bit machines.
Is there a reason that you rejected the parallel changes to Stable?
I noticed that you made one correction to my changes to
ivtv-kthreads.c. I thought that the initial value of "then" in
dec_work_handler was unused. That's because I'm not used to taking
gotos into account.
In fact, the initial value used is meaningless but I presume it
shuts up a warning from gcc.
Here is a diff that eliminates the need for that meaningless
initialization. Note that the indentation shown in the diff is
confusing due to the mixing of tabs and spaces for indentation.
===================================================================
RCS file: ivtv-0.3.2e/driver/RCS/ivtv-kthreads.c,v
retrieving revision 1.1
diff -u -r1.1 ivtv-0.3.2e/driver/ivtv-kthreads.c
--- ivtv-0.3.2e/driver/ivtv-kthreads.c 2005/02/22 23:01:07 1.1
+++ ivtv-0.3.2e/driver/ivtv-kthreads.c 2005/02/22 23:01:34
@@ -373,7 +373,7 @@
int type = IVTV_DEC_STREAM_TYPE_MPG;
struct ivtv_stream *stream= &itv->streams[type];
int ret = -1;
- unsigned long then = 0;
+ unsigned long then;
int rc = 0;
int x=0, bytes_written=0;
struct ivtv_buffer *buf;
@@ -420,6 +420,8 @@
ret = ivtv_api_getresult_nosleep(&itv->dec_mbox[9],
&result, &data[0]);
+ then = jiffies;
+
/* Did xfer status fail? */
if (ret) {
IVTV_DEBUG(IVTV_DEBUG_ERR,
@@ -431,7 +433,6 @@
data[2] = ivtv_round_dma(data[2]);
- then = jiffies;
add_wait_queue(&stream->waitq, &wait);
do {
set_current_state(TASK_INTERRUPTIBLE);
================ end ================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
ivtv-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ivtv-devel
