pt1.oyama: driver/pt1_pci.c comparison

comparison driver/pt1_pci.c @ 9:07b2fc07ff48

updated to current driver to support signal strength.

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Mon, 23 Feb 2009 14:28:35 +0900
parents	67e8eca28a80
children	eb694d8e4c7e

comparison

equal deleted inserted replaced

-:6da603afd363
+:07b2fc07ff48
 };
 MODULE_DEVICE_TABLE(pci, pt1_pci_tbl);
 #define		DEV_NAME	"pt1video"
 #define		MAX_READ_BLOCK	4			// 1度に読み出す最大DMAバッファ数
-#define		MAX_PCI_DEVICE		64		// 最大64枚
+#define		MAX_PCI_DEVICE		128		// 最大64枚
 #define		DMA_SIZE	4096			// DMAバッファサイズ
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
-#define		DMA_RING_SIZE	64			// RINGサイズ
+#define		DMA_RING_SIZE	128			// RINGサイズ
 #define		DMA_RING_MAX	511			// 1RINGにいくつ詰めるか(1023はNGで511まで)
-#define		CHANEL_DMA_SIZE	(1*1024*1024)	// 地デジ用(16Mbps)
+#define		CHANEL_DMA_SIZE	(2*1024*1024)	// 地デジ用(16Mbps)
-#define		BS_CHANEL_DMA_SIZE	(1*1024*1024)	// BS用(32Mbps)
+#define		BS_CHANEL_DMA_SIZE	(4*1024*1024)	// BS用(32Mbps)
 #else
 #define		DMA_RING_SIZE	28			// RINGサイズ
 #define		DMA_RING_MAX	511			// 1RINGにいくつ詰めるか(1023はNGで511まで)
 #define		CHANEL_DMA_SIZE	(1*128*1024)	// 地デジ用(16Mbps)
 #define		BS_CHANEL_DMA_SIZE	(1*128*1024)	// BS用(32Mbps)
 int		real_chanel[MAX_CHANNEL] = {0, 2, 1, 3};
 int		channeltype[MAX_CHANNEL] = {CHANNEL_TYPE_ISDB_S, CHANNEL_TYPE_ISDB_S,
 									CHANNEL_TYPE_ISDB_T, CHANNEL_TYPE_ISDB_T};
 static	PT1_DEVICE	*device[MAX_PCI_DEVICE];
+static struct class	*pt1video_class;
 #define		PT1MAJOR	251
 #define		DRIVERNAME	"pt1video"
 static	void	reset_dma(PT1_DEVICE *dev_conf)
 	// データ初期化
 	for(ring_pos = 0 ; ring_pos < DMA_RING_SIZE ; ring_pos++){
 		for(data_pos = 0 ; data_pos < DMA_RING_MAX ; data_pos++){
 			dataptr = dev_conf->dmactl[ring_pos].data[data_pos];
-			// データあり？
+			dataptr[(DMA_SIZE / sizeof(__u32)) - 2] = 0;
-			if(dataptr[(DMA_SIZE / sizeof(__u32)) - 2] == 0){
-				break ;
-			}
 		}
 	}
 	// 転送カウンタをリセット
 	writel(0x00000010, dev_conf->regs);
 	// 転送カウンタをインクリメント
 	for(lp = 0 ; lp < MAX_PCI_DEVICE ; lp++){
 		if(device[lp] == NULL){
 			return -EIO ;
 		}
-		printk(KERN_INFO "(%d)base_minor=%d: MAX=%d(%d)\n",
-				lp, device[lp]->base_minor,
-				(device[lp]->base_minor + MAX_CHANNEL), minor);
 		if((device[lp]->base_minor <= minor) &&
 			((device[lp]->base_minor + MAX_CHANNEL) > minor)){
 			mutex_lock(&device[lp]->lock);
 			for(lp2 = 0 ; lp2 < MAX_CHANNEL ; lp2++){
 				channel = device[lp]->channel[lp2] ;
-				printk(KERN_INFO "Minor(%d:%d)\n", channel->minor, minor);
 				if(channel->minor == minor){
 					if(channel->valid == TRUE){
 						mutex_unlock(&device[lp]->lock);
 						return -EIO ;
 					}
 			copy_to_user(buf, channel->buf, size);
 			channel->size = 0 ;
 		}
 	}
 	// 読み終わったかつ使用しているのがが4K以下
-	if((channel->req_dma == TRUE) && (channel->size < DMA_SIZE)){
+	if(channel->req_dma == TRUE){
 		channel->req_dma = FALSE ;
 		wake_up(&channel->ptr->dma_wait_q);
 	}
 	mutex_unlock(&channel->lock);
 	return size ;
 	switch(channel->type){
 		case CHANNEL_TYPE_ISDB_S:
 			{
 				ISDB_S_TMCC		tmcc ;
-				int				lp ;
 				if(bs_tune(channel->ptr->regs,
 						&channel->ptr->lock,
 						channel->address,
 						freq->frequencyno,
 						&tmcc) < 0){
 					return -EIO ;
 				}
-				printk(KERN_INFO "cn = (%x:%x)\n", (tmcc.cn[0] & 0xFF),
-						(tmcc.cn[1] & 0xFF));
-				printk(KERN_INFO "agc = (%x)\n", (tmcc.agc & 0xFF));
 #if 0
 				printk(KERN_INFO "clockmargin = (%x)\n", (tmcc.clockmargin & 0xFF));
 				printk(KERN_INFO "carriermargin  = (%x)\n", (tmcc.carriermargin & 0xFF));
 	return 0 ;
 }
 static	int	pt1_ioctl(struct inode *inode, struct file  *file, unsigned int cmd, void *arg)
 {
 	PT1_CHANNEL	*channel = file->private_data;
+	int			signal ;
 	switch(cmd){
 		case SET_CHANNEL:
 			{
 				FREQUENCY	freq ;
 		case START_REC:
 			SetStream(channel->ptr->regs, channel->channel, TRUE);
 			return 0 ;
 		case STOP_REC:
 			SetStream(channel->ptr->regs, channel->channel, FALSE);
+			return 0 ;
+		case GET_SIGNAL_STRENGTH:
+			switch(channel->type){
+				case CHANNEL_TYPE_ISDB_S:
+					{
+						signal = isdb_s_read_signal_strength(channel->ptr->regs,
+													&channel->ptr->lock,
+													channel->address);
+					}
+					break ;
+				case CHANNEL_TYPE_ISDB_T:
+	// calc C/N
+					signal = isdb_t_read_signal_strength(channel->ptr->regs,
+												&channel->ptr->lock, channel->address);
+					break ;
+			}
+			copy_to_user(arg, &signal, sizeof(int));
+			return 0 ;
+		case LNB_ENABLE:
+			if(lnb){
+				settuner_reset(channel->ptr->regs, lnb, TUNER_POWER_ON_RESET_DISABLE);
+			}
+			return 0 ;
+		case LNB_DISABLE:
+			if(lnb){
+				settuner_reset(channel->ptr->regs, LNB_OFF, TUNER_POWER_ON_RESET_DISABLE);
+			}
 			return 0 ;
 	}
 	return -EINVAL;
 }
 	}
 	// チューナリセット
 	settuner_reset(dev_conf->regs, LNB_OFF, TUNER_POWER_ON_RESET_ENABLE);
 	schedule_timeout_interruptible(msecs_to_jiffies(50));
-	settuner_reset(dev_conf->regs, lnb, TUNER_POWER_ON_RESET_DISABLE);
+	settuner_reset(dev_conf->regs, LNB_OFF, TUNER_POWER_ON_RESET_DISABLE);
 	schedule_timeout_interruptible(msecs_to_jiffies(10));
 	mutex_init(&dev_conf->lock);
 	// Tuner 初期化処理
 	for(lp = 0 ; lp < MAX_TUNER ; lp++){
 	minor = MINOR(dev_conf->dev) ;
 	dev_conf->base_minor = minor ;
 	for(lp = 0 ; lp < MAX_PCI_DEVICE ; lp++){
 		if(device[lp] == NULL){
 			device[lp] = dev_conf ;
-			printk(KERN_INFO "Alloc[%d]\n", lp);
 			break ;
 		}
 	}
 	for(lp = 0 ; lp < MAX_CHANNEL ; lp++){
 		cdev_init(&dev_conf->cdev[lp], &pt1_fops);
 		mutex_init(&channel->lock);
 		// 待ち状態を解除
 		channel->req_dma = FALSE ;
 		// マイナー番号設定
 		channel->minor = MINOR(dev_conf->dev) + lp ;
-		printk(KERN_INFO "Minor[%d]\n", channel->minor);
 		// 対象のI2Cデバイス
 		channel->address = i2c_address[lp] ;
 		channel->type = channeltype[lp] ;
 		// 実際のチューナ番号
 		channel->channel = real_chanel[lp] ;
 				break ;
 		}
 		if(channel->buf == NULL){
 			goto out_err_v4l;
 		}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+		device_create(pt1video_class, NULL, MKDEV(MAJOR(dev_conf->dev),
+						(MINOR(dev_conf->dev) + lp)), NULL,
+						"pt1video%u", MINOR(dev_conf->dev) + lp);
+#else
+		device_create(pt1video_class, NULL, MKDEV(MAJOR(dev_conf->dev),
+						(MINOR(dev_conf->dev) + lp)),
+						"pt1video%u", MINOR(dev_conf->dev) + lp);
+#endif
 #if 0
 		dev_conf->vdev[lp] = video_device_alloc();
 		memcpy(dev_conf->vdev[lp], &pt1_template, sizeof(pt1_template));
 		video_set_drvdata(dev_conf->vdev[lp], channel);
 		video_register_device(dev_conf->vdev[lp], VFL_TYPE_GRABBER, -1);
 			if(dev_conf->channel[lp] != NULL){
 				cdev_del(&dev_conf->cdev[lp]);
 				kfree(dev_conf->channel[lp]->buf);
 				kfree(dev_conf->channel[lp]);
 			}
+			device_destroy(pt1video_class,
+							MKDEV(MAJOR(dev_conf->dev), (MINOR(dev_conf->dev) + lp)));
 		}
 		unregister_chrdev_region(dev_conf->dev, MAX_CHANNEL);
 		writel(0xb0b0000, dev_conf->regs);
 		writel(0, dev_conf->regs + 4);
 		settuner_reset(dev_conf->regs, LNB_OFF, TUNER_POWER_OFF);
 };
 static int __init pt1_pci_init(void)
 {
+	pt1video_class = class_create(THIS_MODULE, DRIVERNAME);
+	if (IS_ERR(pt1video_class))
+		return PTR_ERR(pt1video_class);
 	return pci_register_driver(&pt1_driver);
 }
 static void __exit pt1_pci_cleanup(void)
 {
+	class_destroy(pt1video_class);
 	pci_unregister_driver (&pt1_driver);
 }
 module_init(pt1_pci_init);
 module_exit(pt1_pci_cleanup);

Mercurial > pt1.oyama

comparison driver/pt1_pci.c @ 9:07b2fc07ff48