[PATCH 3/3] dvb: nxt200x: Add function for nxt200x to change pll input

[PATCH 3/3] dvb: nxt200x: Add function for nxt200x to change pll input

[Michael Krufky]

[-- Attachment #1: Type: text/plain, Size: 2 bytes --]




[-- Attachment #2: dvb-nxt200x-set-pll-input.patch --]
[-- Type: text/x-patch, Size: 1592 bytes --]

From: Kirk Lapray <kirk.lapray@gmail.com>

- Added function for nxt200x to change pll input
- For VSB set to input 0, for QAM set to input 1
- will only be set for cards that have set_pll_input defined

Signed-off-by: Kirk Lapray <kirk.lapray@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>

 drivers/media/dvb/frontends/nxt200x.c |    9 +++++++--
 drivers/media/dvb/frontends/nxt200x.h |    3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

--- linux-2.6.14-git5.orig/drivers/media/dvb/frontends/nxt200x.c
+++ linux-2.6.14-git5/drivers/media/dvb/frontends/nxt200x.c
@@ -556,13 +556,18 @@ static int nxt200x_setup_frontend_parame
 			if (state->config->set_ts_params)
 				state->config->set_ts_params(fe, 1);
 
-			/* set to use cable input */
-			buf[3] |= 0x08;
+			/* set input */
+			if (state->config->set_pll_input)
+				state->config->set_pll_input(buf, 1);
 			break;
 		case VSB_8:
 			/* Set non-punctured clock for VSB */
 			if (state->config->set_ts_params)
 				state->config->set_ts_params(fe, 0);
+
+			/* set input */
+			if (state->config->set_pll_input)
+				state->config->set_pll_input(buf, 0);
 			break;
 		default:
 			return -EINVAL;
--- linux-2.6.14-git5.orig/drivers/media/dvb/frontends/nxt200x.h
+++ linux-2.6.14-git5/drivers/media/dvb/frontends/nxt200x.h
@@ -42,6 +42,9 @@ struct nxt200x_config
 	u8 pll_address;
 	struct dvb_pll_desc *pll_desc;
 
+	/* used to set pll input */
+	int (*set_pll_input)(u8* buf, int input);
+
 	/* need to set device param for start_dma */
 	int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
 };

Re: [PATCH 3/3] dvb: nxt200x: Add function for nxt200x to change pll input

[Michael Krufky]

Michael Krufky wrote:

>From: Kirk Lapray <kirk.lapray@gmail.com>
>
>- Added function for nxt200x to change pll input
>- For VSB set to input 0, for QAM set to input 1
>- will only be set for cards that have set_pll_input defined
>
>Signed-off-by: Kirk Lapray <kirk.lapray@gmail.com>
>Signed-off-by: Michael Krufky <mkrufky@m1k.net>
>
> drivers/media/dvb/frontends/nxt200x.c |    9 +++++++--
> drivers/media/dvb/frontends/nxt200x.h |    3 +++
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
>--- linux-2.6.14-git5.orig/drivers/media/dvb/frontends/nxt200x.c
>+++ linux-2.6.14-git5/drivers/media/dvb/frontends/nxt200x.c
>@@ -556,13 +556,18 @@ static int nxt200x_setup_frontend_parame
> 			if (state->config->set_ts_params)
> 				state->config->set_ts_params(fe, 1);
> 
>-			/* set to use cable input */
>-			buf[3] |= 0x08;
>+			/* set input */
>+			if (state->config->set_pll_input)
>+				state->config->set_pll_input(buf, 1);
> 			break;
> 		case VSB_8:
> 			/* Set non-punctured clock for VSB */
> 			if (state->config->set_ts_params)
> 				state->config->set_ts_params(fe, 0);
>+
>+			/* set input */
>+			if (state->config->set_pll_input)
>+				state->config->set_pll_input(buf, 0);
> 			break;
> 		default:
> 			return -EINVAL;
>--- linux-2.6.14-git5.orig/drivers/media/dvb/frontends/nxt200x.h
>+++ linux-2.6.14-git5/drivers/media/dvb/frontends/nxt200x.h
>@@ -42,6 +42,9 @@ struct nxt200x_config
> 	u8 pll_address;
> 	struct dvb_pll_desc *pll_desc;
> 
>+	/* used to set pll input */
>+	int (*set_pll_input)(u8* buf, int input);
>+
> 	/* need to set device param for start_dma */
> 	int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
> };
>
Before anybody says it, I am aware of the whitespace issue right here.  
It is all over dvb-kernel, and we will be fixing this all at once, in a 
later patch.

Thank you,

Michael Krufky