From: Manu Abraham <abraham.manu@gmail.com>
To: linux-kernel@vger.kernel.org, v4l-dvb-maintainer@linuxtv.org,
akpm@linux-foundation.org
Cc: Marco Schluessler <marco@lordzodiac.de>
Subject: DVB Update [PATCH 18/31] make DVBFE_GET_INFO backward compatible
Date: Fri, 05 Sep 2008 00:26:05 +0400 [thread overview]
Message-ID: <48C0445D.9000805@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
>From 2bffadf07b54a3ee47164b65687d673175f14bac Mon Sep 17 00:00:00 2001
From: Manu Abraham <manu@linuxtv.org>
Date: Thu, 4 Sep 2008 14:09:26 +0200
Subject: [PATCH] DVB Make DVBFE_GET_INFO as well backward compatible.
DVBFE_GET_INFO ioctl was not backward compatible. The patch
fixes the issue.
From: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
dvb_frontend.c | 64
++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 63 insertions(+), 1 deletion(-)
[-- Attachment #2: 18.patch --]
[-- Type: text/x-patch, Size: 4145 bytes --]
>From 2bffadf07b54a3ee47164b65687d673175f14bac Mon Sep 17 00:00:00 2001
From: Manu Abraham <manu@linuxtv.org>
Date: Thu, 4 Sep 2008 14:09:26 +0200
Subject: [PATCH] DVB Make DVBFE_GET_INFO as well backward compatible.
DVBFE_GET_INFO ioctl was not backward compatible. The patch
fixes the issue.
From: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Marco Schluessler <marco@lordzodiac.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index d8261b6..c451785 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1859,7 +1859,69 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
err = fe->ops.get_info(fe, &fepriv->fe_info);
memcpy((struct dvbfe_info *) parg, &fepriv->fe_info, sizeof (struct dvbfe_info));
} else {
- memcpy(&fepriv->fe_info, (struct dvbfe_info *) parg, sizeof (struct dvbfe_info));
+ memset(&fepriv->fe_info, 0, sizeof(struct dvbfe_info));
+ switch (fe->ops.info.type) {
+ case FE_QPSK:
+ fepriv->fe_info.delivery = DVBFE_DELSYS_DVBS;
+ fepriv->fe_info.delsys.dvbs.modulation = DVBFE_MOD_QPSK;
+ if (fe->ops.info.caps & FE_CAN_FEC_1_2)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_1_2;
+ if (fe->ops.info.caps & FE_CAN_FEC_2_3)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_2_3;
+ if (fe->ops.info.caps & FE_CAN_FEC_3_4)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_3_4;
+ if (fe->ops.info.caps & FE_CAN_FEC_4_5)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_4_5;
+ if (fe->ops.info.caps & FE_CAN_FEC_5_6)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_5_6;
+ if (fe->ops.info.caps & FE_CAN_FEC_6_7)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_6_7;
+ if (fe->ops.info.caps & FE_CAN_FEC_7_8)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_7_8;
+ if (fe->ops.info.caps & FE_CAN_FEC_8_9)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_8_9;
+ if (fe->ops.info.caps & FE_CAN_FEC_AUTO)
+ fepriv->fe_info.delsys.dvbs.fec |= DVBFE_FEC_AUTO;
+ break;
+ case FE_QAM:
+ fepriv->fe_info.delivery = DVBFE_DELSYS_DVBC;
+ if (fe->ops.info.caps & FE_CAN_QAM_16)
+ fepriv->fe_info.delsys.dvbc.modulation |= DVBFE_MOD_QAM16;
+ if (fe->ops.info.caps & FE_CAN_QAM_32)
+ fepriv->fe_info.delsys.dvbc.modulation |= DVBFE_MOD_QAM32;
+ if (fe->ops.info.caps & FE_CAN_QAM_64)
+ fepriv->fe_info.delsys.dvbc.modulation |= DVBFE_MOD_QAM64;
+ if (fe->ops.info.caps & FE_CAN_QAM_128)
+ fepriv->fe_info.delsys.dvbc.modulation |= DVBFE_MOD_QAM128;
+ if (fe->ops.info.caps & FE_CAN_QAM_256)
+ fepriv->fe_info.delsys.dvbc.modulation |= DVBFE_MOD_QAM256;
+ if (fe->ops.info.caps & FE_CAN_QAM_AUTO)
+ fepriv->fe_info.delsys.dvbc.modulation |= DVBFE_MOD_QAMAUTO;
+ break;
+ case FE_OFDM:
+ fepriv->fe_info.delivery = DVBFE_DELSYS_DVBT;
+ if (fe->ops.info.caps & FE_CAN_QPSK)
+ fepriv->fe_info.delsys.dvbt.modulation |= DVBFE_MOD_QPSK;
+ if (fe->ops.info.caps & FE_CAN_QAM_16)
+ fepriv->fe_info.delsys.dvbt.modulation |= DVBFE_MOD_QAM16;
+ if (fe->ops.info.caps & FE_CAN_QAM_64)
+ fepriv->fe_info.delsys.dvbt.modulation |= DVBFE_MOD_QAM64;
+ if (fe->ops.info.caps & FE_CAN_QAM_AUTO)
+ fepriv->fe_info.delsys.dvbt.modulation |= DVBFE_MOD_QAMAUTO;
+ break;
+ default:
+ up (&fepriv->sem);
+ return -EINVAL;
+ }
+ memcpy(&fepriv->fe_info.name, &fe->ops.info.name, 128);
+ fepriv->fe_info.frequency_min = fe->ops.info.frequency_min;
+ fepriv->fe_info.frequency_max = fe->ops.info.frequency_max;
+ fepriv->fe_info.frequency_step = fe->ops.info.frequency_stepsize;
+ fepriv->fe_info.symbol_rate_min = fe->ops.info.symbol_rate_min;
+ fepriv->fe_info.symbol_rate_max = fe->ops.info.symbol_rate_max;
+ fepriv->fe_info.symbol_rate_tolerance = fe->ops.info.symbol_rate_tolerance;
+
+ memcpy((struct dvbfe_info *) parg, &fepriv->fe_info, sizeof (struct dvbfe_info));
err = 0;
}
break;
reply other threads:[~2008-09-04 20:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48C0445D.9000805@gmail.com \
--to=abraham.manu@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marco@lordzodiac.de \
--cc=v4l-dvb-maintainer@linuxtv.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.