- introduce dvb_functions.h in order to make the dvb subsystem

  less dependent on the linux kernel. here is the place to store
  additional dvb_* functions, which encapsulate linux kernel functionality
  which cannot be expressed as a one-liner
- rename ddelay() to dvb_delay(), move it to dvb_functions.h
- change all files to include dvb_functions.h instead of dvb_compat.h
- compile fix for the saa7111 driver

3 files changed, 18 insertions, 18 deletions

diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index 4f87b6a0b..6a0d2878c 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -75,7 +75,7 @@
 
 #include "dvb_i2c.h"
 #include "dvb_frontend.h"
-#include "dvb_compat.h"
+#include "dvb_functions.h"
 
 
 #if 1 
@@ -317,7 +317,7 @@ recover_arm(av7110_t *av7110)
                 reset_arm(av7110);
         }
 
-        ddelay(100); 
+        dvb_delay(100); 
         restart_feeds(av7110);
         outcom(av7110, COMTYPE_PIDFILTER, SetIR, 1, av7110->ir_config);
 }
@@ -1120,7 +1120,7 @@ static int OutCommand(av7110_t *av7110, u16* buf, int length)
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 ) )
         {
-                ddelay(1);
+                dvb_delay(1);
                 if ((jiffies - start) > ARM_WAIT_FREE) {
 			printk(KERN_ERR "%s: timeout waiting for COMMAND idle\n", __FUNCTION__);
                         return -1;
@@ -1131,7 +1131,7 @@ static int OutCommand(av7110_t *av7110, u16* buf, int length)
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 ) )
         {
-                ddelay(1);
+                dvb_delay(1);
                 if ((jiffies - start) > ARM_WAIT_SHAKE) {
 			printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
                         return -1;
@@ -1142,7 +1142,7 @@ static int OutCommand(av7110_t *av7110, u16* buf, int length)
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2) & OSDQFull )
         {
-                ddelay(1);
+                dvb_delay(1);
                 if ((jiffies - start) > ARM_WAIT_OSD) {
 			printk(KERN_ERR "%s: timeout waiting for !OSDQFull\n", __FUNCTION__);
 			return -1;
@@ -1162,7 +1162,7 @@ static int OutCommand(av7110_t *av7110, u16* buf, int length)
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 ) )
         {
-                ddelay(1);
+                dvb_delay(1);
                 if ((jiffies - start) > ARM_WAIT_FREE) {
                         printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
                         return -1;
@@ -1282,7 +1282,7 @@ static int CommandRequest(av7110_t *av7110, u16 *Buff, int length, u16 *buf, int
         while ( rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) )
         {
 #ifdef _NOHANDSHAKE
-                ddelay(1);
+                dvb_delay(1);
 #endif
                 if ((jiffies - start) > ARM_WAIT_FREE) {
 			printk("%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
@@ -1294,7 +1294,7 @@ static int CommandRequest(av7110_t *av7110, u16 *Buff, int length, u16 *buf, int
 #ifndef _NOHANDSHAKE
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 ) ) {
-                ddelay(1);
+                dvb_delay(1);
                 if ((jiffies - start) > ARM_WAIT_SHAKE) {
 			printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
                         up(&av7110->dcomlock);
@@ -1453,7 +1453,7 @@ static int FlushText(av7110_t *av7110)
 		return -ERESTARTSYS;
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2 ) ) {
-                ddelay(1); 
+                dvb_delay(1); 
                 if ((jiffies - start) > ARM_WAIT_OSD) {
                         printk(KERN_ERR "%s: timeout waiting for BUFF1_BASE == 0\n", __FUNCTION__);
                         up(&av7110->dcomlock);
@@ -1476,7 +1476,7 @@ static int WriteText(av7110_t *av7110, u8 win, u16 x, u16 y, u8* buf)
 
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2 ) ) {
-                ddelay(1);
+                dvb_delay(1);
                 if ((jiffies - start) > ARM_WAIT_OSD) {
                         printk(KERN_ERR "%s: timeout waiting for BUFF1_BASE == 0\n", __FUNCTION__);
                         up(&av7110->dcomlock);
@@ -1486,7 +1486,7 @@ static int WriteText(av7110_t *av7110, u8 win, u16 x, u16 y, u8* buf)
 #ifndef _NOHANDSHAKE
         start = jiffies;
         while ( rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 ) ) {
-                ddelay(1);
+                dvb_delay(1);
                 if ((jiffies - start) > ARM_WAIT_SHAKE) {
                         printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
                         up(&av7110->dcomlock);
@@ -4302,7 +4302,7 @@ int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *p
 			printk ("av7110: DVB-C analog module detected, "
 				"initializing MSP3400\n");
                         av7110->adac_type = DVB_ADAC_MSP;
-			ddelay(100);
+			dvb_delay(100);
 			msp_writereg(av7110, 0x12, 0x0013, 0x0c00);
 			msp_writereg(av7110, 0x12, 0x0000, 0x7f00); // loudspeaker + headphone
 			msp_writereg(av7110, 0x12, 0x0008, 0x0220); // loudspeaker source
@@ -4357,7 +4357,7 @@ int av7110_detach (struct saa7146_dev* saa)
 	wake_up_interruptible(&av7110->arm_wait);
 
 	while (av7110->arm_thread)
-		ddelay(1);
+		dvb_delay(1);
 
 	dvb_unregister(av7110);
 	
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index 6ab987f8e..3b7c386b0 100644
--- a/linux/drivers/media/dvb/ttpci/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c
@@ -33,7 +33,7 @@
 #include <media/saa7146_vv.h>
 
 #include "budget.h"
-#include "dvb_compat.h"
+#include "dvb_functions.h"
 
 struct budget_av {
 	struct budget budget;
@@ -165,7 +165,7 @@ int budget_av_detach (struct saa7146_dev *dev)
 
 	saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTLO);
 
-	ddelay(200);
+	dvb_delay(200);
 
 	saa7146_unregister_device (&budget_av->vd, dev);
 
@@ -211,7 +211,7 @@ int budget_av_attach (struct saa7146_dev* dev,
 	//test_knc_ci(av7110);
 
 	saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTHI);
-	ddelay(500);
+	dvb_delay(500);
 
 	if ((err = saa7113_init (budget_av))) {
 		budget_av_detach(dev);
diff --git a/linux/drivers/media/dvb/ttpci/budget.c b/linux/drivers/media/dvb/ttpci/budget.c
index 6291a71c8..9143989c8 100644
--- a/linux/drivers/media/dvb/ttpci/budget.c
+++ b/linux/drivers/media/dvb/ttpci/budget.c
@@ -30,7 +30,7 @@
  */
 
 #include "budget.h"
-#include "dvb_compat.h"
+#include "dvb_functions.h"
 
 static
 void Set22K (struct budget *budget, int state)
@@ -99,7 +99,7 @@ int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, int burst)
 			udelay(12500);
 			saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
 		}
-		ddelay(20);
+		dvb_delay(20);
 	}
 
 	return 0;