- re-indent the source

- remove unnecessary blank lines
- remove #pragma stuff
- add 3 obviously missing break statements in nxt6000_dump_status()
- use c style comments instead of //
- remove bogus version history from header file
- remove Windoze style <cr> from header file

2 files changed, 573 insertions, 756 deletions

diff --git a/linux/drivers/media/dvb/frontends/nxt6000.c b/linux/drivers/media/dvb/frontends/nxt6000.c
index 711e19863..8bd4e6195 100644
--- a/linux/drivers/media/dvb/frontends/nxt6000.c
+++ b/linux/drivers/media/dvb/frontends/nxt6000.c
@@ -1,5 +1,4 @@
 /* 
-
 	NxtWave Communications - NXT6000 demodulator driver
 	
 	This driver currently supports:
@@ -24,8 +23,7 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/    
+*/
 
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -44,40 +42,26 @@ MODULE_LICENSE("GPL");
 MODULE_PARM(debug, "i");
 
 static struct dvb_frontend_info nxt6000_info = {
-
 	.name = "NxtWave NXT6000",
 	.type = FE_OFDM,
 	.frequency_min = 0,
 	.frequency_max = 863250000,
 	.frequency_stepsize = 62500,
-	/*.frequency_tolerance = */	/* FIXME: 12% of SR */
-	.symbol_rate_min = 0,		/* FIXME */
+	/*.frequency_tolerance = *//* FIXME: 12% of SR */
+	.symbol_rate_min = 0,	/* FIXME */
 	.symbol_rate_max = 9360000,	/* FIXME */
 	.symbol_rate_tolerance = 4000,
 	.notifier_delay = 0,
-	.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-			FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
-			FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
-			FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
-			FE_CAN_TRANSMISSION_MODE_AUTO |
-			FE_CAN_GUARD_INTERVAL_AUTO |
-			FE_CAN_HIERARCHY_AUTO,
-
+	.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 | FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO | FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO,
 };
 
-#pragma pack(1)
-
 struct nxt6000_config {
-
 	u8 demod_addr;
 	u8 tuner_addr;
 	u8 tuner_type;
 	u8 clock_inversion;
-
 };
 
-#pragma pack()
-
 #define TUNER_TYPE_ALP510	0
 #define TUNER_TYPE_SP5659	1
 #define TUNER_TYPE_SP5730	2
@@ -89,74 +73,65 @@ struct nxt6000_config {
 
 static int nxt6000_write(struct dvb_i2c_bus *i2c, u8 addr, u8 reg, u8 data)
 {
-
-	u8 buf[] = {reg, data};
-	struct i2c_msg msg = {.addr = addr >> 1, .flags = 0, .buf = buf, .len = 2};
+	u8 buf[] = { reg, data };
+	struct i2c_msg msg = {.addr = addr >> 1,.flags = 0,.buf = buf,.len = 2 };
 	int ret;
-	
+
 	if ((ret = i2c->xfer(i2c, &msg, 1)) != 1)
 		dprintk("nxt6000: nxt6000_write error (.addr = 0x%02X, reg: 0x%02X, data: 0x%02X, ret: %d)\n", addr, reg, data, ret);
 
 	return (ret != 1) ? -EFAULT : 0;
-	
 }
 
 static u8 nxt6000_writereg(struct dvb_frontend *fe, u8 reg, u8 data)
 {
-
 	struct nxt6000_config *nxt = FE2NXT(fe);
 
 	return nxt6000_write(fe->i2c, nxt->demod_addr, reg, data);
-
 }
 
 static u8 nxt6000_read(struct dvb_i2c_bus *i2c, u8 addr, u8 reg)
 {
-
 	int ret;
-	u8 b0[] = {reg};
-	u8 b1[] = {0};
-	struct i2c_msg msgs[] = {{.addr = addr >> 1, .flags = 0, .buf = b0, .len = 1},
-							{.addr = addr >> 1, .flags = I2C_M_RD, .buf = b1, .len = 1}};
+	u8 b0[] = { reg };
+	u8 b1[] = { 0 };
+	struct i2c_msg msgs[] = {
+		{.addr = addr >> 1,.flags = 0,.buf = b0,.len = 1},
+		{.addr = addr >> 1,.flags = I2C_M_RD,.buf = b1,.len = 1}
+	};
 
 	ret = i2c->xfer(i2c, msgs, 2);
-	
+
 	if (ret != 2)
 		dprintk("nxt6000: nxt6000_read error (.addr = 0x%02X, reg: 0x%02X, ret: %d)\n", addr, reg, ret);
-	
-	return b1[0];
 
+	return b1[0];
 }
 
 static u8 nxt6000_readreg(struct dvb_frontend *fe, u8 reg)
 {
-
 	struct nxt6000_config *nxt = FE2NXT(fe);
 
 	return nxt6000_read(fe->i2c, nxt->demod_addr, reg);
-
 }
 
-static int pll_write(struct dvb_i2c_bus *i2c, u8 demod_addr, u8 tuner_addr, u8 *buf, u8 len)
+static int pll_write(struct dvb_i2c_bus *i2c, u8 demod_addr, u8 tuner_addr, u8 * buf, u8 len)
 {
-
-	struct i2c_msg msg = {.addr = tuner_addr >> 1, .flags = 0, .buf = buf, .len = len};
+	struct i2c_msg msg = {.addr = tuner_addr >> 1,.flags = 0,.buf = buf,.len = len };
 	int ret;
-				
-	nxt6000_write(i2c, demod_addr, ENABLE_TUNER_IIC, 0x01);		/* open i2c bus switch */
+
+	nxt6000_write(i2c, demod_addr, ENABLE_TUNER_IIC, 0x01);	/* open i2c bus switch */
 	ret = i2c->xfer(i2c, &msg, 1);
-	nxt6000_write(i2c, demod_addr, ENABLE_TUNER_IIC, 0x00);		/* close i2c bus switch */
-										
+	nxt6000_write(i2c, demod_addr, ENABLE_TUNER_IIC, 0x00);	/* close i2c bus switch */
+
 	if (ret != 1)
 		dprintk("nxt6000: pll_write error %d\n", ret);
-																
-	return (ret != 1) ? -EFAULT : 0;
 
+	return (ret != 1) ? -EFAULT : 0;
 }
 
 static int sp5659_set_tv_freq(struct dvb_frontend *fe, u32 freq)
 {
-
 	u8 buf[4];
 	struct nxt6000_config *nxt = FE2NXT(fe);
 
@@ -174,12 +149,10 @@ static int sp5659_set_tv_freq(struct dvb_frontend *fe, u32 freq)
 		return -EINVAL;
 
 	return pll_write(fe->i2c, nxt->demod_addr, nxt->tuner_addr, buf, 4);
-	
 }
 
 static int alp510_set_tv_freq(struct dvb_frontend *fe, u32 freq)
 {
-
 	u8 buf[4];
 	struct nxt6000_config *nxt = FE2NXT(fe);
 
@@ -212,12 +185,10 @@ static int alp510_set_tv_freq(struct dvb_frontend *fe, u32 freq)
 #endif
 
 	return pll_write(fe->i2c, nxt->demod_addr, nxt->tuner_addr, buf, 4);
-	
 }
 
 static int sp5730_set_tv_freq(struct dvb_frontend *fe, u32 freq)
 {
-
 	u8 buf[4];
 	struct nxt6000_config *nxt = FE2NXT(fe);
 
@@ -245,148 +216,116 @@ static int sp5730_set_tv_freq(struct dvb_frontend *fe, u32 freq)
 		return -EINVAL;
 
 	return pll_write(fe->i2c, nxt->demod_addr, nxt->tuner_addr, buf, 4);
-	
 }
 
 static void nxt6000_reset(struct dvb_frontend *fe)
 {
-
 	u8 val;
 
 	val = nxt6000_readreg(fe, OFDM_COR_CTL);
-	
+
 	nxt6000_writereg(fe, OFDM_COR_CTL, val & ~COREACT);
 	nxt6000_writereg(fe, OFDM_COR_CTL, val | COREACT);
-	
 }
 
 static int nxt6000_set_bandwidth(struct dvb_frontend *fe, fe_bandwidth_t bandwidth)
 {
-
 	u16 nominal_rate;
 	int result;
 
-	switch(bandwidth) {
-	
-		case BANDWIDTH_6_MHZ:
-		
-			nominal_rate = 0x55B7;
-			
-			break;
+	switch (bandwidth) {
 
-		case BANDWIDTH_7_MHZ:
+	case BANDWIDTH_6_MHZ:
+		nominal_rate = 0x55B7;
+		break;
 
-			nominal_rate = 0x6400;
-			
-			break;
+	case BANDWIDTH_7_MHZ:
+		nominal_rate = 0x6400;
+		break;
 
-		case BANDWIDTH_8_MHZ:
+	case BANDWIDTH_8_MHZ:
+		nominal_rate = 0x7249;
+		break;
 
-			nominal_rate = 0x7249;
-			
-			break;
-
-		default:
-			
-			return -EINVAL;
-			
+	default:
+		return -EINVAL;
 	}
 
 	if ((result = nxt6000_writereg(fe, OFDM_TRL_NOMINALRATE_1, nominal_rate & 0xFF)) < 0)
 		return result;
-		
+
 	return nxt6000_writereg(fe, OFDM_TRL_NOMINALRATE_2, (nominal_rate >> 8) & 0xFF);
-		
 }
 
 static int nxt6000_set_guard_interval(struct dvb_frontend *fe, fe_guard_interval_t guard_interval)
 {
+	switch (guard_interval) {
 
-	switch(guard_interval) {
-	
-		case GUARD_INTERVAL_1_32:
-
-			return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x00 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
-
-		case GUARD_INTERVAL_1_16:
-
-			return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x01 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
+	case GUARD_INTERVAL_1_32:
+		return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x00 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
 
-		case GUARD_INTERVAL_AUTO:
-		case GUARD_INTERVAL_1_8:
+	case GUARD_INTERVAL_1_16:
+		return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x01 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
 
-			return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x02 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
+	case GUARD_INTERVAL_AUTO:
+	case GUARD_INTERVAL_1_8:
+		return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x02 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
 
-		case GUARD_INTERVAL_1_4:
-
-			return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x03 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
-			
-		default:
-		
-			return -EINVAL;
+	case GUARD_INTERVAL_1_4:
+		return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, 0x03 | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x03));
 
+	default:
+		return -EINVAL;
 	}
-
 }
 
 static int nxt6000_set_inversion(struct dvb_frontend *fe, fe_spectral_inversion_t inversion)
 {
+	switch (inversion) {
 
-	switch(inversion) {
-	
-		case INVERSION_OFF:
-		
-			return nxt6000_writereg(fe, OFDM_ITB_CTL, 0x00);
-			
-		case INVERSION_ON:
-		
-			return nxt6000_writereg(fe, OFDM_ITB_CTL, ITBINV);
-
-		default:
-		
-			return -EINVAL;	
-	
-	}
+	case INVERSION_OFF:
+		return nxt6000_writereg(fe, OFDM_ITB_CTL, 0x00);
 
+	case INVERSION_ON:
+		return nxt6000_writereg(fe, OFDM_ITB_CTL, ITBINV);
+
+	default:
+		return -EINVAL;
+
+	}
 }
 
 static int nxt6000_set_transmission_mode(struct dvb_frontend *fe, fe_transmit_mode_t transmission_mode)
 {
-
 	int result;
 
-	switch(transmission_mode) {
+	switch (transmission_mode) {
 
-		case TRANSMISSION_MODE_2K:	
+	case TRANSMISSION_MODE_2K:
+		if ((result = nxt6000_writereg(fe, EN_DMD_RACQ, 0x00 | (nxt6000_readreg(fe, EN_DMD_RACQ) & ~0x03))) < 0)
+			return result;
 
-			if ((result = nxt6000_writereg(fe, EN_DMD_RACQ, 0x00 | (nxt6000_readreg(fe, EN_DMD_RACQ) & ~0x03))) < 0)
-				return result;
-				
-			return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, (0x00 << 2) | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x04));
+		return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, (0x00 << 2) | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x04));
 
-		case TRANSMISSION_MODE_8K:	
-		case TRANSMISSION_MODE_AUTO:	
+	case TRANSMISSION_MODE_8K:
+	case TRANSMISSION_MODE_AUTO:
+		if ((result = nxt6000_writereg(fe, EN_DMD_RACQ, 0x02 | (nxt6000_readreg(fe, EN_DMD_RACQ) & ~0x03))) < 0)
+			return result;
 
-			if ((result = nxt6000_writereg(fe, EN_DMD_RACQ, 0x02 | (nxt6000_readreg(fe, EN_DMD_RACQ) & ~0x03))) < 0)
-				return result;
+		return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, (0x01 << 2) | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x04));
 
-			return nxt6000_writereg(fe, OFDM_COR_MODEGUARD, (0x01 << 2) | (nxt6000_readreg(fe, OFDM_COR_MODEGUARD) & ~0x04));
+	default:
+		return -EINVAL;
 
-		default:
-			
-			return -EINVAL;
-	
 	}
-
 }
 
 static void nxt6000_setup(struct dvb_frontend *fe)
 {
-
 	struct nxt6000_config *nxt = FE2NXT(fe);
 
 	nxt6000_writereg(fe, RS_COR_SYNC_PARAM, SYNC_PARAM);
-	nxt6000_writereg(fe, BER_CTRL, /*(1 << 2) |*/ (0x01 << 1) | 0x01);
+	nxt6000_writereg(fe, BER_CTRL, /*(1 << 2) | */ (0x01 << 1) | 0x01);
 	nxt6000_writereg(fe, VIT_COR_CTL, VIT_COR_RESYNC);
 	nxt6000_writereg(fe, OFDM_COR_CTL, (0x01 << 5) | (nxt6000_readreg(fe, OFDM_COR_CTL) & 0x0F));
 	nxt6000_writereg(fe, OFDM_COR_MODEGUARD, FORCEMODE8K | 0x02);
@@ -394,7 +333,7 @@ static void nxt6000_setup(struct dvb_frontend *fe)
 	nxt6000_writereg(fe, OFDM_ITB_FREQ_1, 0x06);
 	nxt6000_writereg(fe, OFDM_ITB_FREQ_2, 0x31);
 	nxt6000_writereg(fe, OFDM_CAS_CTL, (0x01 << 7) | (0x02 << 3) | 0x04);
-	nxt6000_writereg(fe, CAS_FREQ, 0xBB);	// CHECKME
+	nxt6000_writereg(fe, CAS_FREQ, 0xBB);	/* CHECKME */
 	nxt6000_writereg(fe, OFDM_SYR_CTL, 1 << 2);
 	nxt6000_writereg(fe, OFDM_PPM_CTL_1, PPM256);
 	nxt6000_writereg(fe, OFDM_TRL_NOMINALRATE_1, 0x49);
@@ -402,36 +341,35 @@ static void nxt6000_setup(struct dvb_frontend *fe)
 	nxt6000_writereg(fe, ANALOG_CONTROL_0, 1 << 5);
 	nxt6000_writereg(fe, EN_DMD_RACQ, (1 << 7) | (3 << 4) | 2);
 	nxt6000_writereg(fe, DIAG_CONFIG, TB_SET);
-	
+
 	if (nxt->clock_inversion)
 		nxt6000_writereg(fe, SUB_DIAG_MODE_SEL, CLKINVERSION);
 	else
 		nxt6000_writereg(fe, SUB_DIAG_MODE_SEL, 0);
-		
-	nxt6000_writereg(fe, TS_FORMAT, 0);
 
+	nxt6000_writereg(fe, TS_FORMAT, 0);
 }
 
 static void nxt6000_dump_status(struct dvb_frontend *fe)
 {
-
 	u8 val;
 
-//	printk("RS_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, RS_COR_STAT));
-//	printk("VIT_SYNC_STATUS: 0x%02X\n", nxt6000_readreg(fe, VIT_SYNC_STATUS));
-//	printk("OFDM_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_COR_STAT));
-//	printk("OFDM_SYR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_SYR_STAT));
-//	printk("OFDM_TPS_RCVD_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_1));
-//	printk("OFDM_TPS_RCVD_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_2));
-//	printk("OFDM_TPS_RCVD_3: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_3));
-//	printk("OFDM_TPS_RCVD_4: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_4));
-//	printk("OFDM_TPS_RESERVED_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_1));
-//	printk("OFDM_TPS_RESERVED_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_2));
-
+/*
+	printk("RS_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, RS_COR_STAT));
+	printk("VIT_SYNC_STATUS: 0x%02X\n", nxt6000_readreg(fe, VIT_SYNC_STATUS));
+	printk("OFDM_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_COR_STAT));
+	printk("OFDM_SYR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_SYR_STAT));
+	printk("OFDM_TPS_RCVD_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_1));
+	printk("OFDM_TPS_RCVD_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_2));
+	printk("OFDM_TPS_RCVD_3: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_3));
+	printk("OFDM_TPS_RCVD_4: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_4));
+	printk("OFDM_TPS_RESERVED_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_1));
+	printk("OFDM_TPS_RESERVED_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_2));
+*/
 	printk("NXT6000 status:");
 
 	val = nxt6000_readreg(fe, RS_COR_STAT);
-	
+
 	printk(" DATA DESCR LOCK: %d,", val & 0x01);
 	printk(" DATA SYNC LOCK: %d,", (val >> 1) & 0x01);
 
@@ -439,95 +377,73 @@ static void nxt6000_dump_status(struct dvb_frontend *fe)
 
 	printk(" VITERBI LOCK: %d,", (val >> 7) & 0x01);
 
-	switch((val >> 4) & 0x07) {
-	
-		case 0x00: 
-		
-			printk(" VITERBI CODERATE: 1/2,");
-			
-			break;
-	
-		case 0x01: 
-		
-			printk(" VITERBI CODERATE: 2/3,");
-			
-			break;
-	
-		case 0x02: 
-		
-			printk(" VITERBI CODERATE: 3/4,");
-			
-			break;
-	
-		case 0x03: 
-		
-			printk(" VITERBI CODERATE: 5/6,");
-
-		case 0x04: 
-		
-			printk(" VITERBI CODERATE: 7/8,");
-			
-			break;
+	switch ((val >> 4) & 0x07) {
+
+	case 0x00:
+		printk(" VITERBI CODERATE: 1/2,");
+		break;
+
+	case 0x01:
+		printk(" VITERBI CODERATE: 2/3,");
+		break;
+
+	case 0x02:
+		printk(" VITERBI CODERATE: 3/4,");
+		break;
+
+	case 0x03:
+		printk(" VITERBI CODERATE: 5/6,");
+		break;
+
+	case 0x04:
+		printk(" VITERBI CODERATE: 7/8,");
+		break;
+
+	default:
+		printk(" VITERBI CODERATE: Reserved,");
 
-		default: 
-		
-			printk(" VITERBI CODERATE: Reserved,");
-			
 	}
 
 	val = nxt6000_readreg(fe, OFDM_COR_STAT);
-	
+
 	printk(" CHCTrack: %d,", (val >> 7) & 0x01);
 	printk(" TPSLock: %d,", (val >> 6) & 0x01);
 	printk(" SYRLock: %d,", (val >> 5) & 0x01);
 	printk(" AGCLock: %d,", (val >> 4) & 0x01);
 
-	switch(val & 0x0F) {
-	
-		case 0x00:
-		
-			printk(" CoreState: IDLE,");
-			
-			break;
-	
-		case 0x02:
-		
-			printk(" CoreState: WAIT_AGC,");
-			
-			break;
-	
-		case 0x03:
-		
-			printk(" CoreState: WAIT_SYR,");
-			
-			break;
-	
-		case 0x04:
-		
-			printk(" CoreState: WAIT_PPM,");
-
-		case 0x01:
-		
-			printk(" CoreState: WAIT_TRL,");
-			
-			break;
+	switch (val & 0x0F) {
 
-		case 0x05:
-		
-			printk(" CoreState: WAIT_TPS,");
-			
-			break;
+	case 0x00:
+		printk(" CoreState: IDLE,");
+		break;
 
-		case 0x06:
-		
-			printk(" CoreState: MONITOR_TPS,");
-			
-			break;
+	case 0x02:
+		printk(" CoreState: WAIT_AGC,");
+		break;
+
+	case 0x03:
+		printk(" CoreState: WAIT_SYR,");
+		break;
+
+	case 0x04:
+		printk(" CoreState: WAIT_PPM,");
+		break;
+
+	case 0x01:
+		printk(" CoreState: WAIT_TRL,");
+		break;
+
+	case 0x05:
+		printk(" CoreState: WAIT_TPS,");
+		break;
+
+	case 0x06:
+		printk(" CoreState: MONITOR_TPS,");
+		break;
+
+	default:
+		printk(" CoreState: Reserved,");
 
-		default: 
-		
-			printk(" CoreState: Reserved,");
-			
 	}
 
 	val = nxt6000_readreg(fe, OFDM_SYR_STAT);
@@ -535,170 +451,130 @@ static void nxt6000_dump_status(struct dvb_frontend *fe)
 	printk(" SYRLock: %d,", (val >> 4) & 0x01);
 	printk(" SYRMode: %s,", (val >> 2) & 0x01 ? "8K" : "2K");
 
-	switch((val >> 4) & 0x03) {
-	
-		case 0x00: 
-		
-			printk(" SYRGuard: 1/32,");
-			
-			break;
-	
-		case 0x01: 
-		
-			printk(" SYRGuard: 1/16,");
-			
-			break;
-	
-		case 0x02: 
-		
-			printk(" SYRGuard: 1/8,");
-			
-			break;
-	
-		case 0x03: 
-		
-			printk(" SYRGuard: 1/4,");
-			
-			break;
-			
+	switch ((val >> 4) & 0x03) {
+
+	case 0x00:
+		printk(" SYRGuard: 1/32,");
+		break;
+
+	case 0x01:
+		printk(" SYRGuard: 1/16,");
+		break;
+
+	case 0x02:
+		printk(" SYRGuard: 1/8,");
+		break;
+
+	case 0x03:
+		printk(" SYRGuard: 1/4,");
+		break;
 	}
 
 	val = nxt6000_readreg(fe, OFDM_TPS_RCVD_3);
-	
-	switch((val >> 4) & 0x07) {
-	
-		case 0x00: 
-		
-			printk(" TPSLP: 1/2,");
-			
-			break;
-	
-		case 0x01: 
-		
-			printk(" TPSLP: 2/3,");
-			
-			break;
-	
-		case 0x02: 
-		
-			printk(" TPSLP: 3/4,");
-			
-			break;
-	
-		case 0x03: 
-		
-			printk(" TPSLP: 5/6,");
-
-		case 0x04: 
-		
-			printk(" TPSLP: 7/8,");
-			
-			break;
 
-		default: 
-		
-			printk(" TPSLP: Reserved,");
-			
+	switch ((val >> 4) & 0x07) {
+
+	case 0x00:
+		printk(" TPSLP: 1/2,");
+		break;
+
+	case 0x01:
+		printk(" TPSLP: 2/3,");
+		break;
+
+	case 0x02:
+		printk(" TPSLP: 3/4,");
+		break;
+
+	case 0x03:
+		printk(" TPSLP: 5/6,");
+		break;
+
+	case 0x04:
+		printk(" TPSLP: 7/8,");
+		break;
+
+	default:
+		printk(" TPSLP: Reserved,");
+
 	}
 
-	switch(val & 0x07) {
-	
-		case 0x00: 
-		
-			printk(" TPSHP: 1/2,");
-			
-			break;
-	
-		case 0x01: 
-		
-			printk(" TPSHP: 2/3,");
-			
-			break;
-	
-		case 0x02: 
-		
-			printk(" TPSHP: 3/4,");
-			
-			break;
-	
-		case 0x03: 
-		
-			printk(" TPSHP: 5/6,");
-
-		case 0x04: 
-		
-			printk(" TPSHP: 7/8,");
-			
-			break;
+	switch (val & 0x07) {
+
+	case 0x00:
+		printk(" TPSHP: 1/2,");
+		break;
+
+	case 0x01:
+		printk(" TPSHP: 2/3,");
+		break;
+
+	case 0x02:
+		printk(" TPSHP: 3/4,");
+		break;
+
+	case 0x03:
+		printk(" TPSHP: 5/6,");
+		break;
+
+	case 0x04:
+		printk(" TPSHP: 7/8,");
+		break;
+
+	default:
+		printk(" TPSHP: Reserved,");
 
-		default: 
-		
-			printk(" TPSHP: Reserved,");
-			
 	}
 
 	val = nxt6000_readreg(fe, OFDM_TPS_RCVD_4);
-	
+
 	printk(" TPSMode: %s,", val & 0x01 ? "8K" : "2K");
-	
-	switch((val >> 4) & 0x03) {
-	
-		case 0x00: 
-		
-			printk(" TPSGuard: 1/32,");
-			
-			break;
-	
-		case 0x01: 
-		
-			printk(" TPSGuard: 1/16,");
-			
-			break;
-	
-		case 0x02: 
-		
-			printk(" TPSGuard: 1/8,");
-			
-			break;
-	
-		case 0x03: 
-		
-			printk(" TPSGuard: 1/4,");
-			
-			break;
-			
+
+	switch ((val >> 4) & 0x03) {
+
+	case 0x00:
+		printk(" TPSGuard: 1/32,");
+		break;
+
+	case 0x01:
+		printk(" TPSGuard: 1/16,");
+		break;
+
+	case 0x02:
+		printk(" TPSGuard: 1/8,");
+		break;
+
+	case 0x03:
+		printk(" TPSGuard: 1/4,");
+		break;
+
 	}
-	
-	// Strange magic required to gain access to RF_AGC_STATUS
+
+	/* Strange magic required to gain access to RF_AGC_STATUS */
 	nxt6000_readreg(fe, RF_AGC_VAL_1);
 	val = nxt6000_readreg(fe, RF_AGC_STATUS);
 	val = nxt6000_readreg(fe, RF_AGC_STATUS);
 
 	printk(" RF AGC LOCK: %d,", (val >> 4) & 0x01);
-
 	printk("\n");
-	
 }
 
 static int nxt6000_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
 {
-
 	switch (cmd) {
 
-		case FE_GET_INFO:
-
-			memcpy(arg, &nxt6000_info, sizeof (struct dvb_frontend_info));
-
-			return 0;
+	case FE_GET_INFO:
+		memcpy(arg, &nxt6000_info, sizeof(struct dvb_frontend_info));
+		return 0;
 
-		case FE_READ_STATUS:
+	case FE_READ_STATUS:
 		{
-			fe_status_t *status = (fe_status_t *)arg;
+			fe_status_t *status = (fe_status_t *) arg;
 
 			u8 core_status;
 
 			*status = 0;
-			
+
 			core_status = nxt6000_readreg(fe, OFDM_COR_STAT);
 
 			if (core_status & AGCLOCKED)
@@ -712,97 +588,91 @@ static int nxt6000_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
 
 			if (nxt6000_readreg(fe, RS_COR_STAT) & RSCORESTATUS)
 				*status |= FE_HAS_SYNC;
-				
+
 			if ((core_status & TPSLOCKED) && (*status == (FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)))
 				*status |= FE_HAS_LOCK;
-				
+
 			if (debug)
 				nxt6000_dump_status(fe);
 
 			return 0;
-			
-		}
-	
-		case FE_READ_BER:
-		{
-			u32 *ber = (u32 *)arg;
-
-			*ber=0;
 
-			return 0;
-			
 		}
-	
-		case FE_READ_SIGNAL_STRENGTH:
+
+	case FE_READ_BER:
 		{
-//			s16 *signal = (s16 *)arg;
+			u32 *ber = (u32 *) arg;
 
-//		*signal=(((signed char)readreg(client, 0x16))+128)<<8;
+			*ber = 0;
 
 			return 0;
-			
+
 		}
-	
-		case FE_READ_SNR:
+
+	case FE_READ_SIGNAL_STRENGTH:
 		{
-//			s16 *snr = (s16 *)arg;
+			s16 *signal = (s16 *) arg;
+/*
+			*signal=(((signed char)readreg(client, 0x16))+128)<<8;
+*/
+			*signal = 0;
+			return 0;
 
-//		*snr=readreg(client, 0x24)<<8;
-//		*snr|=readreg(client, 0x25);
+		}
 
+	case FE_READ_SNR:
+		{
+			s16 *snr = (s16 *) arg;
+/*
+			*snr=readreg(client, 0x24)<<8;
+			*snr|=readreg(client, 0x25);
+*/
+			*snr = 0;
 			break;
 		}
-	
-		case FE_READ_UNCORRECTED_BLOCKS: 
+
+	case FE_READ_UNCORRECTED_BLOCKS:
 		{
-			u32 *ublocks = (u32 *)arg;
+			u32 *ublocks = (u32 *) arg;
 
 			*ublocks = 0;
-
 			break;
 		}
-	
-		case FE_INIT:
-		case FE_RESET:
-		
-			nxt6000_reset(fe);
-			nxt6000_setup(fe);
 
-			break;
-		
-		case FE_SET_FRONTEND:
+	case FE_INIT:
+	case FE_RESET:
+
+		nxt6000_reset(fe);
+		nxt6000_setup(fe);
+
+		break;
+
+	case FE_SET_FRONTEND:
 		{
 			struct nxt6000_config *nxt = FE2NXT(fe);
-			struct dvb_frontend_parameters *param = (struct dvb_frontend_parameters *)arg;
+			struct dvb_frontend_parameters *param = (struct dvb_frontend_parameters *) arg;
 			int result;
 
-			switch(nxt->tuner_type) {
-			
-				case TUNER_TYPE_ALP510:
+			switch (nxt->tuner_type) {
 
-					if ((result = alp510_set_tv_freq(fe, param->frequency)) < 0)
-						return result;
-						
-					break;
+			case TUNER_TYPE_ALP510:
+				if ((result = alp510_set_tv_freq(fe, param->frequency)) < 0)
+					return result;
+				break;
 
-				case TUNER_TYPE_SP5659:
+			case TUNER_TYPE_SP5659:
+				if ((result = sp5659_set_tv_freq(fe, param->frequency)) < 0)
+					return result;
+				break;
 
-					if ((result = sp5659_set_tv_freq(fe, param->frequency)) < 0)
-						return result;
-						
-					break;
-					
-				case TUNER_TYPE_SP5730:
+			case TUNER_TYPE_SP5730:
+				if ((result = sp5730_set_tv_freq(fe, param->frequency)) < 0)
+					return result;
+				break;
 
-					if ((result = sp5730_set_tv_freq(fe, param->frequency)) < 0)
-						return result;
+			default:
+				return -EFAULT;
 
-					break;
-
-				default:
-				
-					return -EFAULT;
-					
 			}
 
 			if ((result = nxt6000_set_bandwidth(fe, param->u.ofdm.bandwidth)) < 0)
@@ -813,106 +683,86 @@ static int nxt6000_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
 				return result;
 			if ((result = nxt6000_set_inversion(fe, param->inversion)) < 0)
 				return result;
-			
+
 			break;
 		}
 
-		default:
-
-			return -EOPNOTSUPP;
-
+	default:
+		return -EOPNOTSUPP;
 	}
 
 	return 0;
-	
-} 
+}
 
-static u8 demod_addr_tbl[] = {0x14, 0x18, 0x24, 0x28};
+static u8 demod_addr_tbl[] = { 0x14, 0x18, 0x24, 0x28 };
 
 static int nxt6000_attach(struct dvb_i2c_bus *i2c, void **data)
 {
-
 	u8 addr_nr;
 	u8 fe_count = 0;
 	struct nxt6000_config nxt;
 
 	dprintk("nxt6000: attach\n");
-	
+
 	for (addr_nr = 0; addr_nr < sizeof(demod_addr_tbl); addr_nr++) {
-	
+
 		if (nxt6000_read(i2c, demod_addr_tbl[addr_nr], OFDM_MSC_REV) != NXT6000ASICDEVICE)
 			continue;
 
 		if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC0, NULL, 0) == 0) {
-	
 			nxt.tuner_addr = 0xC0;
 			nxt.tuner_type = TUNER_TYPE_ALP510;
 			nxt.clock_inversion = 1;
-			
+
 			dprintk("nxt6000: detected TI ALP510 tuner at 0x%02X\n", nxt.tuner_addr);
-		
-		} else if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC2, NULL, 0) == 0) {
 
+		} else if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC2, NULL, 0) == 0) {
 			nxt.tuner_addr = 0xC2;
 			nxt.tuner_type = TUNER_TYPE_SP5659;
 			nxt.clock_inversion = 0;
-	
+
 			dprintk("nxt6000: detected MITEL SP5659 tuner at 0x%02X\n", nxt.tuner_addr);
-		
-		} else if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC0, NULL, 0) == 0) {
 
+		} else if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC0, NULL, 0) == 0) {
 			nxt.tuner_addr = 0xC0;
 			nxt.tuner_type = TUNER_TYPE_SP5730;
 			nxt.clock_inversion = 0;
-	
+
 			dprintk("nxt6000: detected SP5730 tuner at 0x%02X\n", nxt.tuner_addr);
-		
-		} else {
 
+		} else {
 			printk("nxt6000: unable to detect tuner\n");
-
-			continue;	
-		
+			continue;
 		}
-		
+
 		nxt.demod_addr = demod_addr_tbl[addr_nr];
-	  
+
 		dprintk("nxt6000: attached at %d:%d\n", i2c->adapter->num, i2c->id);
-	
-		dvb_register_frontend(nxt6000_ioctl, i2c, (void *)(*((u32 *)&nxt)), &nxt6000_info);
-	
+
+		dvb_register_frontend(nxt6000_ioctl, i2c, (void *) (*((u32 *) & nxt)), &nxt6000_info);
+
 		fe_count++;
 	}
-	
+
 	return (fe_count > 0) ? 0 : -ENODEV;
-	
 }
 
 static void nxt6000_detach(struct dvb_i2c_bus *i2c, void *data)
 {
-
 	dprintk("nxt6000: detach\n");
-
 	dvb_unregister_frontend(nxt6000_ioctl, i2c);
-	
 }
 
 static __init int nxt6000_init(void)
 {
-
 	dprintk("nxt6000: init\n");
-	
-	return dvb_register_i2c_device(THIS_MODULE, nxt6000_attach, nxt6000_detach);
-	
+      return dvb_register_i2c_device(THIS_MODULE, nxt6000_attach, nxt6000_detach):
 }
 
 static __exit void nxt6000_exit(void)
 {
-
 	dprintk("nxt6000: cleanup\n");
-
 	dvb_unregister_i2c_device(nxt6000_attach);
-
 }
 
 module_init(nxt6000_init);
diff --git a/linux/drivers/media/dvb/frontends/nxt6000.h b/linux/drivers/media/dvb/frontends/nxt6000.h
index 849c5de81..64b1a89b2 100644
--- a/linux/drivers/media/dvb/frontends/nxt6000.h
+++ b/linux/drivers/media/dvb/frontends/nxt6000.h
@@ -1,298 +1,265 @@
-/**********************************************************************
/
- * DRV6000reg.H

- * Public Include File for DRV6000 users

- *

- * Copyright (C) 2001 NxtWave Communications, Inc.

- *

- * $Log: nxt6000.h,v $
- * Revision 1.1  2003/01/21 18:43:09  fschirmer
- * Nxt6000 based frontend driver
+/*
+ * Public Include File for DRV6000 users
+ * (ie. NxtWave Communications - NXT6000 demodulator driver)
  *
- * Revision 1.1  2003/01/03 02:25:45  obi
- * alps tdme7 driver
- *

- * 

- *    Rev 1.10   Jun 12 2002 11:28:02   dkoeger

- * Updated for SA in GUi work

- * 

- *    Rev 1.9   Apr 01 2002 10:38:46   dkoeger

- * Updated for 1.0.31 GUI

- * 

- *    Rev 1.8   Mar 11 2002 10:04:56   dkoeger

- * Updated for 1.0.31 GUI version

- * 

- *    Rev 1.5   Dec 07 2001 14:40:40   dkoeger

- * Updated for 1.0.28 GUI

- * 

- *    Rev 1.4   Nov 13 2001 11:09:00   dkoeger

- * No change.

- * 

- *    Rev 1.3   Aug 23 2001 14:21:02   dkoeger

- * Updated for driver version 2.1.9

- * 

- *    Rev 1.2   Jul 09 2001 09:20:04   dkoeger

- * Updated for 1.0.18

- * 

- *    Rev 1.1   Jun 13 2001 16:14:24   dkoeger

- * Updated to reflect NXT6000 GUI BETA 1.0.11 6/13/2001

- **********************************************************************/

-

-

-/*  Nxt6000 Register Addresses and Bit Masks */

-

-/* Maximum Register Number */

-#define MAXNXT6000REG          (0x9A)

-

-/* 0x1B A_VIT_BER_0  aka 0x3A */

-#define A_VIT_BER_0            (0x1B)

-

-/* 0x1D A_VIT_BER_TIMER_0 aka 0x38 */

-#define A_VIT_BER_TIMER_0      (0x1D)

-

-/* 0x21 RS_COR_STAT */

-#define RS_COR_STAT            (0x21)

-#define RSCORESTATUS           (0x03)

-

-/* 0x22 RS_COR_INTEN */

-#define RS_COR_INTEN           (0x22)

-

-/* 0x23 RS_COR_INSTAT */

-#define RS_COR_INSTAT          (0x23)

-#define INSTAT_ERROR           (0x04)

-#define LOCK_LOSS_BITS         (0x03)

-

-/* 0x24 RS_COR_SYNC_PARAM */

-#define RS_COR_SYNC_PARAM      (0x24)

-#define SYNC_PARAM             (0x03)

-

-/* 0x25 BER_CTRL */

-#define BER_CTRL               (0x25)

-#define BER_ENABLE             (0x02)

-#define BER_RESET              (0x01)

-

-/* 0x26 BER_PAY */

-#define BER_PAY                (0x26)

-

-/* 0x27 BER_PKT_L */

-#define BER_PKT_L              (0x27)

-#define BER_PKTOVERFLOW        (0x80)

-

-/* 0x30 VIT_COR_CTL */

-#define VIT_COR_CTL            (0x30)

-#define BER_CONTROL            (0x02)

-#define VIT_COR_MASK           (0x82)

-#define VIT_COR_RESYNC         (0x80)

-

-

-/* 0x32 VIT_SYNC_STATUS */

-#define VIT_SYNC_STATUS        (0x32)

-#define VITINSYNC              (0x80)

-

-/* 0x33 VIT_COR_INTEN */

-#define VIT_COR_INTEN          (0x33)

-#define GLOBAL_ENABLE          (0x80)

-

-/* 0x34 VIT_COR_INTSTAT */

-#define VIT_COR_INTSTAT        (0x34)

-#define BER_DONE               (0x08)

-#define BER_OVERFLOW           (0x10)

-

-/* 0x38 OFDM_BERTimer */     /* Use the alias registers */

-#define A_VIT_BER_TIMER_0      (0x1D)

-

-/* 0x3A VIT_BER_TIMER_0 */   /* Use the alias registers */

-#define A_VIT_BER_0            (0x1B)

-

-/* 0x40 OFDM_COR_CTL */

-#define OFDM_COR_CTL           (0x40)

-#define COREACT                (0x20)

-#define HOLDSM                 (0x10)

-#define WAIT_AGC               (0x02)

-#define WAIT_SYR               (0x03)

-

-/* 0x41 OFDM_COR_STAT */

-#define OFDM_COR_STAT          (0x41)

-#define COR_STATUS             (0x0F)

-#define MONITOR_TPS            (0x06)

-#define TPSLOCKED              (0x40)

-#define AGCLOCKED              (0x10)

-

-/* 0x42 OFDM_COR_INTEN */

-#define OFDM_COR_INTEN         (0x42)

-#define TPSRCVBAD              (0x04)

-#define TPSRCVCHANGED         (0x02)

-#define TPSRCVUPDATE           (0x01)

-

-/* 0x43 OFDM_COR_INSTAT */

-#define OFDM_COR_INSTAT        (0x43)

-

-/* 0x44 OFDM_COR_MODEGUARD */

-#define OFDM_COR_MODEGUARD     (0x44)

-#define FORCEMODE              (0x08)

-#define FORCEMODE8K			   (0x04)

-

-/* 0x45 OFDM_AGC_CTL */

-#define OFDM_AGC_CTL           (0x45)

-#define INITIAL_AGC_BW		   (0x08)

-#define AGCNEG                 (0x02)

-#define AGCLAST				   (0x10)

-

-/* 0x48 OFDM_AGC_TARGET */

-#define OFDM_AGC_TARGET		   (0x48)

-#define OFDM_AGC_TARGET_DEFAULT (0x28)

-#define OFDM_AGC_TARGET_IMPULSE (0x38)

-

-/* 0x49 OFDM_AGC_GAIN_1 */

-#define OFDM_AGC_GAIN_1        (0x49)

-

-/* 0x4B OFDM_ITB_CTL */

-#define OFDM_ITB_CTL           (0x4B)

-#define ITBINV                 (0x01)

-

-/* 0x4C OFDM_ITB_FREQ_1 */

-#define OFDM_ITB_FREQ_1        (0x4C)

-

-/* 0x4D OFDM_ITB_FREQ_2 */

-#define OFDM_ITB_FREQ_2        (0x4D)

-

-/* 0x4E  OFDM_CAS_CTL */       

-#define OFDM_CAS_CTL           (0x4E)

-#define ACSDIS                 (0x40)

-#define CCSEN                  (0x80)

-

-/* 0x4F CAS_FREQ */

-#define CAS_FREQ               (0x4F)

-

-/* 0x51 OFDM_SYR_CTL */

-#define OFDM_SYR_CTL           (0x51)

-#define SIXTH_ENABLE           (0x80)

-#define SYR_TRACKING_DISABLE   (0x01)

-

-/* 0x52 OFDM_SYR_STAT */

-#define OFDM_SYR_STAT		   (0x52)

-#define GI14_2K_SYR_LOCK	   (0x13)

-#define GI14_8K_SYR_LOCK	   (0x17)

-#define GI14_SYR_LOCK		   (0x10)

-

-/* 0x55 OFDM_SYR_OFFSET_1 */

-#define OFDM_SYR_OFFSET_1      (0x55)

-

-/* 0x56 OFDM_SYR_OFFSET_2 */

-#define OFDM_SYR_OFFSET_2      (0x56)

-

-/* 0x58 OFDM_SCR_CTL */

-#define OFDM_SCR_CTL           (0x58)

-#define SYR_ADJ_DECAY_MASK     (0x70)

-#define SYR_ADJ_DECAY          (0x30)

- 

-/* 0x59 OFDM_PPM_CTL_1 */

-#define OFDM_PPM_CTL_1         (0x59)

-#define PPMMAX_MASK            (0x30)

-#define PPM256				   (0x30)

-

-/* 0x5B OFDM_TRL_NOMINALRATE_1 */

-#define OFDM_TRL_NOMINALRATE_1 (0x5B)

-

-/* 0x5C OFDM_TRL_NOMINALRATE_2 */

-#define OFDM_TRL_NOMINALRATE_2 (0x5C)

-

-/* 0x5D OFDM_TRL_TIME_1 */

-#define OFDM_TRL_TIME_1        (0x5D)

-

-/* 0x60 OFDM_CRL_FREQ_1 */

-#define OFDM_CRL_FREQ_1        (0x60)

-

-/* 0x63 OFDM_CHC_CTL_1 */

-#define OFDM_CHC_CTL_1         (0x63)

-#define MANMEAN1               (0xF0);

-#define CHCFIR                 (0x01)

-

-/* 0x64 OFDM_CHC_SNR */

-#define OFDM_CHC_SNR           (0x64)

-

-/* 0x65 OFDM_BDI_CTL */

-#define OFDM_BDI_CTL           (0x65)

-#define LP_SELECT              (0x02)

-

-/* 0x67 OFDM_TPS_RCVD_1 */

-#define OFDM_TPS_RCVD_1        (0x67)

-#define TPSFRAME               (0x03)

-

-/* 0x68 OFDM_TPS_RCVD_2 */

-#define OFDM_TPS_RCVD_2        (0x68)

-

-/* 0x69 OFDM_TPS_RCVD_3 */

-#define OFDM_TPS_RCVD_3        (0x69)

-

-/* 0x6A OFDM_TPS_RCVD_4 */

-#define OFDM_TPS_RCVD_4        (0x6A)

-

-/* 0x6B OFDM_TPS_RESERVED_1 */

-#define OFDM_TPS_RESERVED_1    (0x6B)

-

-/* 0x6C OFDM_TPS_RESERVED_2 */

-#define OFDM_TPS_RESERVED_2    (0x6C)

-

-/* 0x73 OFDM_MSC_REV */

-#define OFDM_MSC_REV           (0x73)

-

-/* 0x76 OFDM_SNR_CARRIER_2 */

-#define OFDM_SNR_CARRIER_2     (0x76)

-#define MEAN_MASK              (0x80)

-#define MEANBIT                (0x80)

-

-/* 0x80 ANALOG_CONTROL_0 */

-#define ANALOG_CONTROL_0       (0x80)

-#define POWER_DOWN_ADC         (0x40)

-

-/* 0x81 ENABLE_TUNER_IIC */

-#define ENABLE_TUNER_IIC       (0x81)

-#define ENABLE_TUNER_BIT       (0x01)

-

-/* 0x82 EN_DMD_RACQ */

-#define EN_DMD_RACQ            (0x82)

-#define EN_DMD_RACQ_REG_VAL    (0x81) 

-#define EN_DMD_RACQ_REG_VAL_14 (0x01)

-

-/* 0x84 SNR_COMMAND */

-#define SNR_COMMAND            (0x84)

-#define SNRStat                (0x80)

-

-/* 0x85 SNRCARRIERNUMBER_LSB */

-#define SNRCARRIERNUMBER_LSB   (0x85)

-

-/* 0x87 SNRMINTHRESHOLD_LSB */

-#define SNRMINTHRESHOLD_LSB    (0x87)

-

-/* 0x89 SNR_PER_CARRIER_LSB */

-#define SNR_PER_CARRIER_LSB    (0x89)

-

-/* 0x8B SNRBELOWTHRESHOLD_LSB */

-#define SNRBELOWTHRESHOLD_LSB  (0x8B)

-

-/* 0x91 RF_AGC_VAL_1 */

-#define RF_AGC_VAL_1           (0x91)

-
-/* 0x92 RF_AGC_STATUS */

-#define RF_AGC_STATUS          (0x92)

-

-/* 0x98 DIAG_CONFIG */

-#define DIAG_CONFIG            (0x98)

-#define DIAG_MASK              (0x70)

-#define TB_SET                 (0x10)

-#define TRAN_SELECT            (0x07)

-#define SERIAL_SELECT          (0x01)

-

-/* 0x99 SUB_DIAG_MODE_SEL */

-#define SUB_DIAG_MODE_SEL      (0x99)

-#define CLKINVERSION           (0x01)

-

-/* 0x9A TS_FORMAT */

-#define TS_FORMAT              (0x9A)

-#define ERROR_SENSE            (0x08)

-#define VALID_SENSE            (0x04)

-#define SYNC_SENSE             (0x02)

-#define GATED_CLOCK            (0x01)

-

-#define NXT6000ASICDEVICE      (0x0b)

-

+ * Copyright (C) 2001 NxtWave Communications, Inc.
+ *
+ */
+
+/*  Nxt6000 Register Addresses and Bit Masks */
+
+/* Maximum Register Number */
+#define MAXNXT6000REG          (0x9A)
+
+/* 0x1B A_VIT_BER_0  aka 0x3A */
+#define A_VIT_BER_0            (0x1B)
+
+/* 0x1D A_VIT_BER_TIMER_0 aka 0x38 */
+#define A_VIT_BER_TIMER_0      (0x1D)
+
+/* 0x21 RS_COR_STAT */
+#define RS_COR_STAT            (0x21)
+#define RSCORESTATUS           (0x03)
+
+/* 0x22 RS_COR_INTEN */
+#define RS_COR_INTEN           (0x22)
+
+/* 0x23 RS_COR_INSTAT */
+#define RS_COR_INSTAT          (0x23)
+#define INSTAT_ERROR           (0x04)
+#define LOCK_LOSS_BITS         (0x03)
+
+/* 0x24 RS_COR_SYNC_PARAM */
+#define RS_COR_SYNC_PARAM      (0x24)
+#define SYNC_PARAM             (0x03)
+
+/* 0x25 BER_CTRL */
+#define BER_CTRL               (0x25)
+#define BER_ENABLE             (0x02)
+#define BER_RESET              (0x01)
+
+/* 0x26 BER_PAY */
+#define BER_PAY                (0x26)
+
+/* 0x27 BER_PKT_L */
+#define BER_PKT_L              (0x27)
+#define BER_PKTOVERFLOW        (0x80)
+
+/* 0x30 VIT_COR_CTL */
+#define VIT_COR_CTL            (0x30)
+#define BER_CONTROL            (0x02)
+#define VIT_COR_MASK           (0x82)
+#define VIT_COR_RESYNC         (0x80)
+
+
+/* 0x32 VIT_SYNC_STATUS */
+#define VIT_SYNC_STATUS        (0x32)
+#define VITINSYNC              (0x80)
+
+/* 0x33 VIT_COR_INTEN */
+#define VIT_COR_INTEN          (0x33)
+#define GLOBAL_ENABLE          (0x80)
+
+/* 0x34 VIT_COR_INTSTAT */
+#define VIT_COR_INTSTAT        (0x34)
+#define BER_DONE               (0x08)
+#define BER_OVERFLOW           (0x10)
+
+			     /* 0x38 OFDM_BERTimer *//* Use the alias registers */
+#define A_VIT_BER_TIMER_0      (0x1D)
+
+			     /* 0x3A VIT_BER_TIMER_0 *//* Use the alias registers */
+#define A_VIT_BER_0            (0x1B)
+
+/* 0x40 OFDM_COR_CTL */
+#define OFDM_COR_CTL           (0x40)
+#define COREACT                (0x20)
+#define HOLDSM                 (0x10)
+#define WAIT_AGC               (0x02)
+#define WAIT_SYR               (0x03)
+
+/* 0x41 OFDM_COR_STAT */
+#define OFDM_COR_STAT          (0x41)
+#define COR_STATUS             (0x0F)
+#define MONITOR_TPS            (0x06)
+#define TPSLOCKED              (0x40)
+#define AGCLOCKED              (0x10)
+
+/* 0x42 OFDM_COR_INTEN */
+#define OFDM_COR_INTEN         (0x42)
+#define TPSRCVBAD              (0x04)
+#define TPSRCVCHANGED         (0x02)
+#define TPSRCVUPDATE           (0x01)
+
+/* 0x43 OFDM_COR_INSTAT */
+#define OFDM_COR_INSTAT        (0x43)
+
+/* 0x44 OFDM_COR_MODEGUARD */
+#define OFDM_COR_MODEGUARD     (0x44)
+#define FORCEMODE              (0x08)
+#define FORCEMODE8K			   (0x04)
+
+/* 0x45 OFDM_AGC_CTL */
+#define OFDM_AGC_CTL           (0x45)
+#define INITIAL_AGC_BW		   (0x08)
+#define AGCNEG                 (0x02)
+#define AGCLAST				   (0x10)
+
+/* 0x48 OFDM_AGC_TARGET */
+#define OFDM_AGC_TARGET		   (0x48)
+#define OFDM_AGC_TARGET_DEFAULT (0x28)
+#define OFDM_AGC_TARGET_IMPULSE (0x38)
+
+/* 0x49 OFDM_AGC_GAIN_1 */
+#define OFDM_AGC_GAIN_1        (0x49)
+
+/* 0x4B OFDM_ITB_CTL */
+#define OFDM_ITB_CTL           (0x4B)
+#define ITBINV                 (0x01)
+
+/* 0x4C OFDM_ITB_FREQ_1 */
+#define OFDM_ITB_FREQ_1        (0x4C)
+
+/* 0x4D OFDM_ITB_FREQ_2 */
+#define OFDM_ITB_FREQ_2        (0x4D)
+
+/* 0x4E  OFDM_CAS_CTL */
+#define OFDM_CAS_CTL           (0x4E)
+#define ACSDIS                 (0x40)
+#define CCSEN                  (0x80)
+
+/* 0x4F CAS_FREQ */
+#define CAS_FREQ               (0x4F)
+
+/* 0x51 OFDM_SYR_CTL */
+#define OFDM_SYR_CTL           (0x51)
+#define SIXTH_ENABLE           (0x80)
+#define SYR_TRACKING_DISABLE   (0x01)
+
+/* 0x52 OFDM_SYR_STAT */
+#define OFDM_SYR_STAT		   (0x52)
+#define GI14_2K_SYR_LOCK	   (0x13)
+#define GI14_8K_SYR_LOCK	   (0x17)
+#define GI14_SYR_LOCK		   (0x10)
+
+/* 0x55 OFDM_SYR_OFFSET_1 */
+#define OFDM_SYR_OFFSET_1      (0x55)
+
+/* 0x56 OFDM_SYR_OFFSET_2 */
+#define OFDM_SYR_OFFSET_2      (0x56)
+
+/* 0x58 OFDM_SCR_CTL */
+#define OFDM_SCR_CTL           (0x58)
+#define SYR_ADJ_DECAY_MASK     (0x70)
+#define SYR_ADJ_DECAY          (0x30)
+
+/* 0x59 OFDM_PPM_CTL_1 */
+#define OFDM_PPM_CTL_1         (0x59)
+#define PPMMAX_MASK            (0x30)
+#define PPM256				   (0x30)
+
+/* 0x5B OFDM_TRL_NOMINALRATE_1 */
+#define OFDM_TRL_NOMINALRATE_1 (0x5B)
+
+/* 0x5C OFDM_TRL_NOMINALRATE_2 */
+#define OFDM_TRL_NOMINALRATE_2 (0x5C)
+
+/* 0x5D OFDM_TRL_TIME_1 */
+#define OFDM_TRL_TIME_1        (0x5D)
+
+/* 0x60 OFDM_CRL_FREQ_1 */
+#define OFDM_CRL_FREQ_1        (0x60)
+
+/* 0x63 OFDM_CHC_CTL_1 */
+#define OFDM_CHC_CTL_1         (0x63)
+#define MANMEAN1               (0xF0);
+#define CHCFIR                 (0x01)
+
+/* 0x64 OFDM_CHC_SNR */
+#define OFDM_CHC_SNR           (0x64)
+
+/* 0x65 OFDM_BDI_CTL */
+#define OFDM_BDI_CTL           (0x65)
+#define LP_SELECT              (0x02)
+
+/* 0x67 OFDM_TPS_RCVD_1 */
+#define OFDM_TPS_RCVD_1        (0x67)
+#define TPSFRAME               (0x03)
+
+/* 0x68 OFDM_TPS_RCVD_2 */
+#define OFDM_TPS_RCVD_2        (0x68)
+
+/* 0x69 OFDM_TPS_RCVD_3 */
+#define OFDM_TPS_RCVD_3        (0x69)
+
+/* 0x6A OFDM_TPS_RCVD_4 */
+#define OFDM_TPS_RCVD_4        (0x6A)
+
+/* 0x6B OFDM_TPS_RESERVED_1 */
+#define OFDM_TPS_RESERVED_1    (0x6B)
+
+/* 0x6C OFDM_TPS_RESERVED_2 */
+#define OFDM_TPS_RESERVED_2    (0x6C)
+
+/* 0x73 OFDM_MSC_REV */
+#define OFDM_MSC_REV           (0x73)
+
+/* 0x76 OFDM_SNR_CARRIER_2 */
+#define OFDM_SNR_CARRIER_2     (0x76)
+#define MEAN_MASK              (0x80)
+#define MEANBIT                (0x80)
+
+/* 0x80 ANALOG_CONTROL_0 */
+#define ANALOG_CONTROL_0       (0x80)
+#define POWER_DOWN_ADC         (0x40)
+
+/* 0x81 ENABLE_TUNER_IIC */
+#define ENABLE_TUNER_IIC       (0x81)
+#define ENABLE_TUNER_BIT       (0x01)
+
+/* 0x82 EN_DMD_RACQ */
+#define EN_DMD_RACQ            (0x82)
+#define EN_DMD_RACQ_REG_VAL    (0x81)
+#define EN_DMD_RACQ_REG_VAL_14 (0x01)
+
+/* 0x84 SNR_COMMAND */
+#define SNR_COMMAND            (0x84)
+#define SNRStat                (0x80)
+
+/* 0x85 SNRCARRIERNUMBER_LSB */
+#define SNRCARRIERNUMBER_LSB   (0x85)
+
+/* 0x87 SNRMINTHRESHOLD_LSB */
+#define SNRMINTHRESHOLD_LSB    (0x87)
+
+/* 0x89 SNR_PER_CARRIER_LSB */
+#define SNR_PER_CARRIER_LSB    (0x89)
+
+/* 0x8B SNRBELOWTHRESHOLD_LSB */
+#define SNRBELOWTHRESHOLD_LSB  (0x8B)
+
+/* 0x91 RF_AGC_VAL_1 */
+#define RF_AGC_VAL_1           (0x91)
+
+/* 0x92 RF_AGC_STATUS */
+#define RF_AGC_STATUS          (0x92)
+
+/* 0x98 DIAG_CONFIG */
+#define DIAG_CONFIG            (0x98)
+#define DIAG_MASK              (0x70)
+#define TB_SET                 (0x10)
+#define TRAN_SELECT            (0x07)
+#define SERIAL_SELECT          (0x01)
+
+/* 0x99 SUB_DIAG_MODE_SEL */
+#define SUB_DIAG_MODE_SEL      (0x99)
+#define CLKINVERSION           (0x01)
+
+/* 0x9A TS_FORMAT */
+#define TS_FORMAT              (0x9A)
+#define ERROR_SENSE            (0x08)
+#define VALID_SENSE            (0x04)
+#define SYNC_SENSE             (0x02)
+#define GATED_CLOCK            (0x01)
+
+#define NXT6000ASICDEVICE      (0x0b)