Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / media / dvb / frontends / lnbp21.h

diff --git a/drivers/media/dvb/frontends/lnbp21.h b/drivers/media/dvb/frontends/lnbp21.h
index 0dcbe61..047a4ab 100644 (file)
--- a/drivers/media/dvb/frontends/lnbp21.h
+++ b/drivers/media/dvb/frontends/lnbp21.h
@@ -27,7 +27,7 @@
 #ifndef _LNBP21_H
 #define _LNBP21_H
 
-/* system register */
+/* system register bits */
 #define LNBP21_OLF     0x01
 #define LNBP21_OTF     0x02
 #define LNBP21_EN      0x04
@@ -37,103 +37,9 @@
 #define LNBP21_ISEL    0x40
 #define LNBP21_PCL     0x80
 
-struct lnbp21 {
-       u8                      config;
-       u8                      override_or;
-       u8                      override_and;
-       struct i2c_adapter      *i2c;
-       void                    (*release_chain)(struct dvb_frontend* fe);
-};
+#include <linux/dvb/frontend.h>
 
-static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
-{
-       struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;
-       struct i2c_msg msg = {  .addr = 0x08, .flags = 0,
-                               .buf = &lnbp21->config,
-                               .len = sizeof(lnbp21->config) };
-
-       lnbp21->config &= ~(LNBP21_VSEL | LNBP21_EN);
-
-       switch(voltage) {
-       case SEC_VOLTAGE_OFF:
-               break;
-       case SEC_VOLTAGE_13:
-               lnbp21->config |= LNBP21_EN;
-               break;
-       case SEC_VOLTAGE_18:
-               lnbp21->config |= (LNBP21_EN | LNBP21_VSEL);
-               break;
-       default:
-               return -EINVAL;
-       };
-
-       lnbp21->config |= lnbp21->override_or;
-       lnbp21->config &= lnbp21->override_and;
-
-       return (i2c_transfer(lnbp21->i2c, &msg, 1) == 1) ? 0 : -EIO;
-}
-
-static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)
-{
-       struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;
-       struct i2c_msg msg = {  .addr = 0x08, .flags = 0,
-                               .buf = &lnbp21->config,
-                               .len = sizeof(lnbp21->config) };
-
-       if (arg)
-               lnbp21->config |= LNBP21_LLC;
-       else
-               lnbp21->config &= ~LNBP21_LLC;
-
-       lnbp21->config |= lnbp21->override_or;
-       lnbp21->config &= lnbp21->override_and;
-
-       return (i2c_transfer(lnbp21->i2c, &msg, 1) == 1) ? 0 : -EIO;
-}
-
-static void lnbp21_exit(struct dvb_frontend *fe)
-{
-       struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;
-
-       /* LNBP power off */
-       lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);
-
-       /* free data & call next release routine */
-       fe->ops->release = lnbp21->release_chain;
-       kfree(fe->misc_priv);
-       fe->misc_priv = NULL;
-       if (fe->ops->release)
-               fe->ops->release(fe);
-}
-
-static int lnbp21_init(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)
-{
-       struct lnbp21 *lnbp21 = kmalloc(sizeof(struct lnbp21), GFP_KERNEL);
-
-       if (!lnbp21)
-               return -ENOMEM;
-
-       /* default configuration */
-       lnbp21->config = LNBP21_ISEL;
-
-       /* bits which should be forced to '1' */
-       lnbp21->override_or = override_set;
-
-       /* bits which should be forced to '0' */
-       lnbp21->override_and = ~override_clear;
-
-       /* install release callback */
-       lnbp21->release_chain = fe->ops->release;
-       fe->ops->release = lnbp21_exit;
-
-       /* override frontend ops */
-       fe->ops->set_voltage = lnbp21_set_voltage;
-       fe->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
-
-       lnbp21->i2c = i2c;
-       fe->misc_priv = lnbp21;
-
-       return lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);
-}
+/* override_set and override_clear control which system register bits (above) to always set & clear */
+extern int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear);
 
 #endif