[PATCH 10/10] mn88473: implement lock for all delivery systems

[Benjamin Larsson]

Signed-off-by: Benjamin Larsson <benja...@southpole.se>
---
 drivers/staging/media/mn88473/mn88473.c | 50 +++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/media/mn88473/mn88473.c 
b/drivers/staging/media/mn88473/mn88473.c
index a23e59e..ba39614 100644
--- a/drivers/staging/media/mn88473/mn88473.c
+++ b/drivers/staging/media/mn88473/mn88473.c
@@ -167,7 +167,10 @@ static int mn88473_read_status(struct dvb_frontend *fe, 
fe_status_t *status)
 {
        struct i2c_client *client = fe->demodulator_priv;
        struct mn88473_dev *dev = i2c_get_clientdata(client);
+       struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        int ret;
+       unsigned int utmp;
+       int lock = 0;
 
        *status = 0;
 
@@ -176,8 +179,51 @@ static int mn88473_read_status(struct dvb_frontend *fe, 
fe_status_t *status)
                goto err;
        }
 
-       *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
-                       FE_HAS_SYNC | FE_HAS_LOCK;
+       switch (c->delivery_system) {
+       case SYS_DVBT:
+               ret = regmap_read(dev->regmap[0], 0x62, &utmp);
+               if (ret)
+                       goto err;
+               if (utmp & 0xA0) {
+                       if ((utmp & 0xF) >= 0x03)
+                               *status |= FE_HAS_SIGNAL;
+                       if ((utmp & 0xF) >= 0x09)
+                               lock = 1;
+               }
+               break;
+       case SYS_DVBT2:
+               ret = regmap_read(dev->regmap[2], 0x8B, &utmp);
+               if (ret)
+                       goto err;
+               if (utmp & 0x40) {
+                       if ((utmp & 0xF) >= 0x07)
+                               *status |= FE_HAS_SIGNAL;
+                       if ((utmp & 0xF) >= 0x0a)
+                               *status |= FE_HAS_CARRIER;
+                       if ((utmp & 0xF) >= 0x0d)
+                               *status |= FE_HAS_VITERBI | FE_HAS_SYNC | 
FE_HAS_LOCK;
+               }
+               break;
+       case SYS_DVBC_ANNEX_A:
+               ret = regmap_read(dev->regmap[1], 0x85, &utmp);
+               if (ret)
+                       goto err;
+               if (utmp & 0x40) {
+                       ret = regmap_read(dev->regmap[1], 0x89, &utmp);
+                       if (ret)
+                               goto err;
+                       if (utmp & 0x01)
+                               lock = 1;
+               }
+               break;
+       default:
+               ret = -EINVAL;
+               goto err;
+       }
+
+       if (lock)
+               *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
+                               FE_HAS_SYNC | FE_HAS_LOCK;
 
        return 0;
 err:
-- 
2.1.0

--
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