Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87ad567e authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] staging: as102: Fix CodingStyle errors in file as102_fe.c



Fix Linux kernel coding style (whitespace and indentation) errors
in file as102_fe.c. No functional changes.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarPiotr Chmura <chmooreck@poczta.onet.pl>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 79848e9a
Loading
Loading
Loading
Loading
+252 −224
Original line number Original line Diff line number Diff line
/*
/*
 * Abilis Systems Single DVB-T Receiver
 * Abilis Systems Single DVB-T Receiver
 * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
 * Copyright (C) 2008 Pierrick Hascoet <pierrick.hascoet@abilis.com>
 * Copyright (C) 2010 Devin Heitmueller <dheitmueller@kernellabs.com>
 *
 *
 * This program is free software; you can redistribute it and/or modify
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * it under the terms of the GNU General Public License as published by
@@ -31,12 +32,14 @@ static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst,
static void as102_fe_copy_tune_parameters(struct as10x_tune_args *dst,
					  struct dvb_frontend_parameters *src);
					  struct dvb_frontend_parameters *src);


static void as102_fe_release(struct dvb_frontend *fe) {
static void as102_fe_release(struct dvb_frontend *fe)
{
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return;
		return;


#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
@@ -64,13 +67,15 @@ static void as102_fe_release(struct dvb_frontend *fe) {
}
}


#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19))
static int as102_fe_init(struct dvb_frontend *fe) {
static int as102_fe_init(struct dvb_frontend *fe)
{
	int ret = 0;
	int ret = 0;
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	if (mutex_lock_interruptible(&dev->bus_adap.lock))
	if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -90,14 +95,16 @@ static int as102_fe_init(struct dvb_frontend *fe) {
#endif
#endif


static int as102_fe_set_frontend(struct dvb_frontend *fe,
static int as102_fe_set_frontend(struct dvb_frontend *fe,
				 struct dvb_frontend_parameters *params) {
				 struct dvb_frontend_parameters *params)
{
	int ret = 0;
	int ret = 0;
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;
	struct as10x_tune_args tune_args = { 0 };
	struct as10x_tune_args tune_args = { 0 };


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	if (mutex_lock_interruptible(&dev->bus_adap.lock))
	if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -107,9 +114,8 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe,


	/* send abilis command: SET_TUNE */
	/* send abilis command: SET_TUNE */
	ret =  as10x_cmd_set_tune(&dev->bus_adap, &tune_args);
	ret =  as10x_cmd_set_tune(&dev->bus_adap, &tune_args);
	if(ret != 0) {
	if (ret != 0)
		dprintk(debug, "as10x_cmd_set_tune failed. (err = %d)\n", ret);
		dprintk(debug, "as10x_cmd_set_tune failed. (err = %d)\n", ret);
	}


	mutex_unlock(&dev->bus_adap.lock);
	mutex_unlock(&dev->bus_adap.lock);


@@ -125,7 +131,8 @@ static int as102_fe_get_frontend(struct dvb_frontend* fe,


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -EINVAL;
		return -EINVAL;


	if (mutex_lock_interruptible(&dev->bus_adap.lock))
	if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -150,7 +157,8 @@ static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
#if 0
#if 0
	dprintk(debug, "step_size    = %d\n", settings->step_size);
	dprintk(debug, "step_size    = %d\n", settings->step_size);
	dprintk(debug, "max_drift    = %d\n", settings->max_drift);
	dprintk(debug, "max_drift    = %d\n", settings->max_drift);
	dprintk(debug, "min_delay_ms = %d -> %d\n", settings->min_delay_ms, 1000);
	dprintk(debug, "min_delay_ms = %d -> %d\n", settings->min_delay_ms,
		1000);
#endif
#endif


	settings->min_delay_ms = 1000;
	settings->min_delay_ms = 1000;
@@ -160,14 +168,16 @@ static int as102_fe_get_tune_settings(struct dvb_frontend *fe,
}
}




static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status) {
static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status)
{
	int ret = 0;
	int ret = 0;
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;
	struct as10x_tune_status tstate = { 0 };
	struct as10x_tune_status tstate = { 0 };


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	if (mutex_lock_interruptible(&dev->bus_adap.lock))
	if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -176,7 +186,8 @@ static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status) {
	/* send abilis command: GET_TUNE_STATUS */
	/* send abilis command: GET_TUNE_STATUS */
	ret = as10x_cmd_get_tune_status(&dev->bus_adap, &tstate);
	ret = as10x_cmd_get_tune_status(&dev->bus_adap, &tstate);
	if (ret < 0) {
	if (ret < 0) {
		dprintk(debug, "as10x_cmd_get_tune_status failed (err = %d)\n", ret);
		dprintk(debug, "as10x_cmd_get_tune_status failed (err = %d)\n",
			ret);
		goto out;
		goto out;
	}
	}


@@ -185,18 +196,13 @@ static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status) {


	switch (tstate.tune_state) {
	switch (tstate.tune_state) {
	case TUNE_STATUS_SIGNAL_DVB_OK:
	case TUNE_STATUS_SIGNAL_DVB_OK:
			*status = FE_HAS_SIGNAL |
		*status = FE_HAS_SIGNAL | FE_HAS_CARRIER;
				  FE_HAS_CARRIER;
		break;
		break;
	case TUNE_STATUS_STREAM_DETECTED:
	case TUNE_STATUS_STREAM_DETECTED:
			*status = FE_HAS_SIGNAL  |
		*status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_SYNC;
				  FE_HAS_CARRIER |
				  FE_HAS_SYNC;
		break;
		break;
	case TUNE_STATUS_STREAM_TUNED:
	case TUNE_STATUS_STREAM_TUNED:
			*status = FE_HAS_SIGNAL  |
		*status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_SYNC |
				  FE_HAS_CARRIER |
				  FE_HAS_SYNC	 |
			FE_HAS_LOCK;
			FE_HAS_LOCK;
		break;
		break;
	default:
	default:
@@ -211,9 +217,12 @@ static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status) {
		if (as10x_cmd_get_demod_stats(&dev->bus_adap,
		if (as10x_cmd_get_demod_stats(&dev->bus_adap,
			(struct as10x_demod_stats *) &dev->demod_stats) < 0) {
			(struct as10x_demod_stats *) &dev->demod_stats) < 0) {
			memset(&dev->demod_stats, 0, sizeof(dev->demod_stats));
			memset(&dev->demod_stats, 0, sizeof(dev->demod_stats));
			dprintk(debug, "as10x_cmd_get_demod_stats failed (probably not tuned)\n");
			dprintk(debug, "as10x_cmd_get_demod_stats failed "
				"(probably not tuned)\n");
		} else {
		} else {
			dprintk(debug, "demod status: fc: 0x%08x , bad fc: 0x%08x , bytes corrected: 0x%08x , MER: 0x%04x\n",
			dprintk(debug,
				"demod status: fc: 0x%08x, bad fc: 0x%08x, "
				"bytes corrected: 0x%08x , MER: 0x%04x\n",
				dev->demod_stats.frame_count,
				dev->demod_stats.frame_count,
				dev->demod_stats.bad_frame_count,
				dev->demod_stats.bad_frame_count,
				dev->demod_stats.bytes_fixed_by_rs,
				dev->demod_stats.bytes_fixed_by_rs,
@@ -236,12 +245,14 @@ static int as102_fe_read_status(struct dvb_frontend *fe, fe_status_t *status) {
 *   - the accuracy equals ±2dB for a SNR range from 4dB to 30dB
 *   - the accuracy equals ±2dB for a SNR range from 4dB to 30dB
 *   - the accuracy is >2dB for SNR values outside this range
 *   - the accuracy is >2dB for SNR values outside this range
 */
 */
static int as102_fe_read_snr(struct dvb_frontend* fe, u16* snr) {
static int as102_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
{
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	*snr = dev->demod_stats.mer;
	*snr = dev->demod_stats.mer;
@@ -250,12 +261,14 @@ static int as102_fe_read_snr(struct dvb_frontend* fe, u16* snr) {
	return 0;
	return 0;
}
}


static int as102_fe_read_ber(struct dvb_frontend* fe, u32* ber) {
static int as102_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
{
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	*ber = dev->ber;
	*ber = dev->ber;
@@ -264,12 +277,15 @@ static int as102_fe_read_ber(struct dvb_frontend* fe, u32* ber) {
	return 0;
	return 0;
}
}


static int as102_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength) {
static int as102_fe_read_signal_strength(struct dvb_frontend *fe,
					 u16 *strength)
{
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	*strength = (((0xffff * 400) * dev->signal_strength + 41000) * 2);
	*strength = (((0xffff * 400) * dev->signal_strength + 41000) * 2);
@@ -278,12 +294,14 @@ static int as102_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)
	return 0;
	return 0;
}
}


static int as102_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) {
static int as102_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	if (dev->demod_stats.has_started)
	if (dev->demod_stats.has_started)
@@ -296,13 +314,15 @@ static int as102_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) {
}
}


#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
static int as102_fe_ts_bus_ctrl(struct dvb_frontend* fe, int acquire) {
static int as102_fe_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
{
	struct as102_dev_t *dev;
	struct as102_dev_t *dev;
	int ret;
	int ret;


	ENTER();
	ENTER();


	if ((dev = (struct as102_dev_t *) fe->tuner_priv) == NULL)
	dev = (struct as102_dev_t *) fe->tuner_priv;
	if (dev == NULL)
		return -ENODEV;
		return -ENODEV;


	if (mutex_lock_interruptible(&dev->bus_adap.lock))
	if (mutex_lock_interruptible(&dev->bus_adap.lock))
@@ -362,8 +382,8 @@ static struct dvb_frontend_ops as102_fe_ops = {
#endif
#endif
};
};


int as102_dvb_unregister_fe(struct dvb_frontend *fe) {
int as102_dvb_unregister_fe(struct dvb_frontend *fe)

{
	/* unregister frontend */
	/* unregister frontend */
	dvb_unregister_frontend(fe);
	dvb_unregister_frontend(fe);


@@ -374,7 +394,9 @@ int as102_dvb_unregister_fe(struct dvb_frontend *fe) {
	return 0;
	return 0;
}
}


int as102_dvb_register_fe(struct as102_dev_t *as102_dev, struct dvb_frontend *dvb_fe) {
int as102_dvb_register_fe(struct as102_dev_t *as102_dev,
			  struct dvb_frontend *dvb_fe)
{
	int errno;
	int errno;
	struct dvb_adapter *dvb_adap;
	struct dvb_adapter *dvb_adap;


@@ -396,7 +418,8 @@ int as102_dvb_register_fe(struct as102_dev_t *as102_dev, struct dvb_frontend *dv
}
}


static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
					 struct as10x_tps *as10x_tps) {
					 struct as10x_tps *as10x_tps)
{


	struct dvb_ofdm_parameters *fe_tps = &dst->u.ofdm;
	struct dvb_ofdm_parameters *fe_tps = &dst->u.ofdm;


@@ -494,7 +517,8 @@ static void as10x_fe_copy_tps_parameters(struct dvb_frontend_parameters *dst,
	}
	}
}
}


static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg) {
static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg)
{
	uint8_t c;
	uint8_t c;


	switch (arg) {
	switch (arg) {
@@ -522,7 +546,8 @@ static uint8_t as102_fe_get_code_rate(fe_code_rate_t arg) {
}
}


static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args,
static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args,
					  struct dvb_frontend_parameters *params) {
			  struct dvb_frontend_parameters *params)
{


	/* set frequency */
	/* set frequency */
	tune_args->freq = params->frequency / 1000;
	tune_args->freq = params->frequency / 1000;
@@ -635,11 +660,14 @@ static void as102_fe_copy_tune_parameters(struct as10x_tune_args *tune_args,
		dprintk(debug, "\thierarchy: 0x%02x  "
		dprintk(debug, "\thierarchy: 0x%02x  "
				"selected: %s  code_rate_%s: 0x%02x\n",
				"selected: %s  code_rate_%s: 0x%02x\n",
			tune_args->hierarchy,
			tune_args->hierarchy,
			tune_args->hier_select == HIER_HIGH_PRIORITY ? "HP" : "LP",
			tune_args->hier_select == HIER_HIGH_PRIORITY ?
			tune_args->hier_select == HIER_HIGH_PRIORITY ? "HP" : "LP",
			"HP" : "LP",
			tune_args->hier_select == HIER_HIGH_PRIORITY ?
			"HP" : "LP",
			tune_args->code_rate);
			tune_args->code_rate);
	} else {
	} else {
		tune_args->code_rate = as102_fe_get_code_rate(params->u.ofdm.code_rate_HP);
		tune_args->code_rate =
			as102_fe_get_code_rate(params->u.ofdm.code_rate_HP);
	}
	}
}
}
#endif
#endif