[linux-dvb] dvb driver changes added by 2.6.11-bk5

[C.Y.M]

Kenneth Aafløy wrote:
> On Wednesday 09 March 2005 21:02, C.Y.M wrote:
> 
>>The following changes were committed to the dvb drivers by 2.6.11-bk5.
>>Attached is a patch for sync purposes.
> 
> 
> Rejected
> 
> This patch has other changes that are incorrect. For example
> schedule_delayed_work still wants it's parameter to be in jiffies.
> You also changed the calculations with jiffies in them to use
> msecs.
> 

Yes, I'm sorry for that.  Here is a fixed patch.

Best Regards,

-------------- next part --------------
--- dvb-kernel/linux/drivers/media/dvb/cinergyT2/cinergyT2.c.orig	2005-01-21 15:58:30.000000000 -0800
+++ dvb-kernel/linux/drivers/media/dvb/cinergyT2/cinergyT2.c	2005-03-09 11:26:15.000000000 -0800
@@ -212,7 +212,7 @@
 	int ret;
 
 	ret = usb_bulk_msg(cinergyt2->udev, usb_sndbulkpipe(cinergyt2->udev, 1),
-			   send_buf, send_buf_len, &actual_len, HZ);
+			   send_buf, send_buf_len, &actual_len, 1000);
 
 	if (ret)
 		dprintk(1, "usb_bulk_msg (send) failed, err %i\n", ret);
@@ -221,7 +221,7 @@
 		recv_buf = &dummy;
 
 	ret = usb_bulk_msg(cinergyt2->udev, usb_rcvbulkpipe(cinergyt2->udev, 1),
-			   recv_buf, recv_buf_len, &actual_len, HZ);
+			   recv_buf, recv_buf_len, &actual_len, 1000);
 
 	if (ret)
 		dprintk(1, "usb_bulk_msg (read) failed, err %i\n", ret);
--- dvb-kernel/linux/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c.orig	2005-02-19 01:16:42.000000000 -0800
+++ dvb-kernel/linux/drivers/media/dvb/dibusb/dvb-dibusb-firmware.c	2005-03-09 11:28:58.000000000 -0800
@@ -19,7 +19,7 @@
 static int dibusb_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 len)
 {
 	return usb_control_msg(udev, usb_sndctrlpipe(udev,0),
-			0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5*HZ);
+			0xa0, USB_TYPE_VENDOR, addr, 0x00, data, len, 5000);
 }
 
 int dibusb_loadfirmware(struct usb_device *udev, struct dibusb_usb_device *dibdev)
--- dvb-kernel/linux/drivers/media/dvb/dibusb/dvb-dibusb.h.orig	2005-03-02 21:15:19.000000000 -0800
+++ dvb-kernel/linux/drivers/media/dvb/dibusb/dvb-dibusb.h	2005-03-09 11:30:39.000000000 -0800
@@ -233,7 +233,7 @@
 int dibusb_urb_exit(struct usb_dibusb *);
 
 /* i2c and transfer stuff */
-#define DIBUSB_I2C_TIMEOUT				HZ*5
+#define DIBUSB_I2C_TIMEOUT				5000	
 
 /*
  * protocol of all dibusb related devices
--- dvb-kernel/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.orig	2005-03-09 11:15:05.000000000 -0800
+++ dvb-kernel/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2005-03-09 11:33:39.000000000 -0800
@@ -149,7 +149,7 @@
 		return -EAGAIN;
 
 	err = usb_bulk_msg(ttusb->dev, ttusb->bulk_out_pipe,
-			   (u8 *) data, len, &actual_len, HZ);
+			   (u8 *) data, len, &actual_len, 1000);
 	if (err != 0) {
 		dprintk("%s: usb_bulk_msg(send) failed, err == %i!\n",
 			__FUNCTION__, err);
@@ -164,7 +164,7 @@
 	}
 
 	err = usb_bulk_msg(ttusb->dev, ttusb->bulk_in_pipe,
-			   ttusb->last_result, 32, &actual_len, HZ);
+			   ttusb->last_result, 32, &actual_len, 1000);
 
 	if (err != 0) {
 		printk("%s: failed, receive error %d\n", __FUNCTION__,
--- dvb-kernel/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c.orig	2005-03-02 21:15:39.000000000 -0800
+++ dvb-kernel/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2005-03-09 11:36:21.000000000 -0800
@@ -295,7 +295,7 @@
 	}
 
 	result = usb_bulk_msg(dec->udev, dec->command_pipe, b,
-			      COMMAND_PACKET_SIZE + 4, &actual_len, HZ);
+			      COMMAND_PACKET_SIZE + 4, &actual_len, 1000);
 
 	if (result) {
 		printk("%s: command bulk message failed: error %d\n",
@@ -306,7 +306,7 @@
 	}
 
 	result = usb_bulk_msg(dec->udev, dec->result_pipe, b,
-			      COMMAND_PACKET_SIZE + 4, &actual_len, HZ);
+			      COMMAND_PACKET_SIZE + 4, &actual_len, 1000);
 
 	if (result) {
 		printk("%s: result bulk message failed: error %d\n",
@@ -1333,12 +1333,12 @@
 		if (j >= ARM_PACKET_SIZE) {
 			result = usb_bulk_msg(dec->udev, dec->command_pipe, b,
 					      ARM_PACKET_SIZE, &actual_len,
-					      HZ / 10);
+					      100);
 			j = 0;
 		} else if (size < COMMAND_PACKET_SIZE) {
 			result = usb_bulk_msg(dec->udev, dec->command_pipe, b,
 					      j - COMMAND_PACKET_SIZE + size,
-					      &actual_len, HZ / 10);
+					      &actual_len, 100);
 		}
 	}