Imported FE_REFACTORING to HEAD

1 files changed, 73 insertions, 19 deletions

diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
index 3f8e4b59d..ad1aed31a 100644
--- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -94,7 +94,32 @@ struct dvbt_get_status_msg {
 	uint8_t prev_lock_bits;
 } __attribute__((packed));
 
-static struct dvb_frontend_info cinergyt2_fe_info = {
+struct dvbt_set_parameters_msg {
+	uint8_t cmd;
+	uint32_t freq;
+	uint8_t bandwidth;
+	uint16_t tps;
+	uint8_t flags;
+} __attribute__((packed));
+
+
+struct dvbt_get_status_msg {
+	uint32_t freq;
+	uint8_t bandwidth;
+	uint16_t tps;
+	uint8_t flags;
+	uint16_t gain;
+	uint8_t snr;
+	uint32_t viterbi_error_rate;
+	uint32_t rs_error_rate;
+	uint32_t uncorrected_block_count;
+	uint8_t lock_bits;
+	uint8_t prev_lock_bits;
+} __attribute__((packed));
+
+
+static
+struct dvb_frontend_info cinergyt2_fe_info = {
 	.name = DRIVER_NAME,
 	.type = FE_OFDM,
 	.frequency_min = 174000000,
@@ -330,7 +355,9 @@ static int cinergyt2_start_stream_xfer (struct cinergyt2 *cinergyt2)
 	return 0;
 }
 
-static int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
+
+static
+int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
 	struct dvb_demux *demux = dvbdmxfeed->demux;
 	struct cinergyt2 *cinergyt2 = demux->priv;
@@ -346,7 +373,9 @@ static int cinergyt2_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 	return 0;
 }
 
-static int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
+
+static
+int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
 	struct dvb_demux *demux = dvbdmxfeed->demux;
 	struct cinergyt2 *cinergyt2 = demux->priv;
@@ -370,7 +399,8 @@ static int cinergyt2_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
  *
  *  We replace errornous fields by default TPS fields (the ones with value 0).
  */
-static uint16_t compute_tps (struct dvb_frontend_parameters *p)
+static
+uint16_t compute_tps (struct dvb_frontend_parameters *p)
 {
 	struct dvb_ofdm_parameters *op = &p->u.ofdm;
 	uint16_t tps = 0;
@@ -467,7 +497,8 @@ static uint16_t compute_tps (struct dvb_frontend_parameters *p)
 	return tps;
 }
 
-static int cinergyt2_open (struct inode *inode, struct file *file)
+static
+int cinergyt2_open (struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -488,7 +519,8 @@ static int cinergyt2_open (struct inode *inode, struct file *file)
 	return 0;
 }
 
-static int cinergyt2_release (struct inode *inode, struct file *file)
+static
+int cinergyt2_release (struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -507,7 +539,9 @@ static int cinergyt2_release (struct inode *inode, struct file *file)
 	return dvb_generic_release(inode, file);
 }
 
-static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
+
+static
+unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct *wait)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -515,7 +549,10 @@ static unsigned int cinergyt2_poll (struct file *file, struct poll_table_struct
 	return (POLLIN | POLLRDNORM | POLLPRI);
 }
 
-static int cinergyt2_ioctl (struct inode *inode, struct file *file,
+
+
+static
+int cinergyt2_ioctl (struct inode *inode, struct file *file,
 		     unsigned cmd, unsigned long arg)
 {
 	struct dvb_device *dvbdev = file->private_data;
@@ -600,7 +637,9 @@ static int cinergyt2_ioctl (struct inode *inode, struct file *file,
 	return -EINVAL;
 }
 
-static int cinergyt2_mmap(struct file *file, struct vm_area_struct *vma)
+
+static
+int cinergyt2_mmap(struct file *file, struct vm_area_struct *vma)
 {
 	struct dvb_device *dvbdev = file->private_data;
 	struct cinergyt2 *cinergyt2 = dvbdev->priv;
@@ -630,7 +669,9 @@ bailout:
 	return ret;
 }
 
-static struct file_operations cinergyt2_fops = {
+
+static
+struct file_operations cinergyt2_fops = {
 	.owner          = THIS_MODULE,
 	.ioctl		= cinergyt2_ioctl,
 	.poll           = cinergyt2_poll,
@@ -646,6 +687,7 @@ static struct dvb_device cinergyt2_fe_template = {
 	.fops = &cinergyt2_fops
 };
 
+
 #ifdef ENABLE_RC
 static void cinergyt2_query_rc (void *data)
 {
@@ -728,7 +770,8 @@ static void cinergyt2_query (void *data)
 	up(&cinergyt2->sem);
 }
 
-static int cinergyt2_probe (struct usb_interface *intf,
+static
+int cinergyt2_probe (struct usb_interface *intf,
 		  const struct usb_device_id *id)
 {
 	struct cinergyt2 *cinergyt2;
@@ -766,7 +809,8 @@ static int cinergyt2_probe (struct usb_interface *intf,
 					    DMX_MEMORY_BASED_FILTERING;
 
 	if ((err = dvb_dmx_init(&cinergyt2->demux)) < 0) {
-		dprintk(1, "dvb_dmx_init() failed (err = %d)\n", err);
+		printk("%s: dvb_dmx_init() failed (err = %d)\n",
+		       __FUNCTION__, err);
 		goto bailout;
 	}
 
@@ -775,12 +819,13 @@ static int cinergyt2_probe (struct usb_interface *intf,
 	cinergyt2->dmxdev.capabilities = 0;
 
 	if ((err = dvb_dmxdev_init(&cinergyt2->dmxdev, cinergyt2->adapter)) < 0) {
-		dprintk(1, "dvb_dmxdev_init() failed (err = %d)\n", err);
+		printk("%s: dvb_dmxdev_init() failed (err = %d)\n",
+		       __FUNCTION__, err);
 		goto bailout;
 	}
 
 	if (dvb_net_init(cinergyt2->adapter, &cinergyt2->dvbnet, &cinergyt2->demux.dmx))
-		dprintk(1, "dvb_net_init() failed!\n");
+		printk("%s: dvb_net_init failed!\n", __FUNCTION__);
 
 	dvb_register_device(cinergyt2->adapter, &cinergyt2->fedev,
 			    &cinergyt2_fe_template, cinergyt2,
@@ -840,7 +885,8 @@ static void cinergyt2_disconnect (struct usb_interface *intf)
 	kfree(cinergyt2);
 }
 
-static int cinergyt2_suspend (struct usb_interface *intf, u32 state)
+static
+int cinergyt2_suspend (struct usb_interface *intf, u32 state)
 {
 	struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
 
@@ -863,7 +909,9 @@ static int cinergyt2_suspend (struct usb_interface *intf, u32 state)
 	return 0;
 }
 
-static int cinergyt2_resume (struct usb_interface *intf)
+
+static
+int cinergyt2_resume (struct usb_interface *intf)
 {
 	struct cinergyt2 *cinergyt2 = usb_get_intfdata (intf);
 	struct dvbt_set_parameters_msg *param = &cinergyt2->param;
@@ -886,11 +934,14 @@ static int cinergyt2_resume (struct usb_interface *intf)
 	return 0;
 }
 
-static const struct usb_device_id cinergyt2_table [] __devinitdata = {
+
+static const
+struct usb_device_id cinergyt2_table [] __devinitdata = {
 	{ USB_DEVICE(0x0ccd, 0x0038) },
 	{ 0 }
 };
 
+
 MODULE_DEVICE_TABLE(usb, cinergyt2_table);
 
 static struct usb_driver cinergyt2_driver = {
@@ -903,12 +954,15 @@ static struct usb_driver cinergyt2_driver = {
 	.id_table = cinergyt2_table
 };
 
-static int __init cinergyt2_init (void)
+
+static
+int __init cinergyt2_init (void)
 {
 	int err;
 
 	if ((err = usb_register(&cinergyt2_driver)) < 0)
-		dprintk(1, "usb_register() failed! (err %i)\n", err);
+		printk("%s: usb_register() failed! (err %i)\n",
+		       __FUNCTION__, err);
 
 	return err;
 }