pt1: driver/pt1_pci.c comparison

comparison driver/pt1_pci.c @ 124:f2ae5ddeed7e

minor improvement: - extend yielding period - unroll loop where copying from micro-packet

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Thu, 16 Feb 2012 13:11:38 +0900
parents	3914cc1b2375
children	2dc994610477

comparison

equal deleted inserted replaced

-:313d8551b66c
+:f2ae5ddeed7e
 #define		PACKET_SIZE			188		// 1パケット長
 #define		MAX_READ_BLOCK	4			// 1度に読み出す最大DMAバッファ数
 #define		MAX_PCI_DEVICE		128		// 最大64枚
 #define		DMA_SIZE	4096			// DMAバッファサイズ
-#define		DMA_RING_SIZE	128			// RINGサイズ
+#define		DMA_RING_SIZE	128			// number of DMA RINGS
-#define		DMA_RING_MAX	511			// 1RINGにいくつ詰めるか(1023はNGで511まで)
+#define		DMA_RING_MAX	511			// number of DMA entries in a RING(1023はNGで511まで)
-#define		CHANEL_DMA_SIZE	(2*1024*1024)	// 地デジ用(16Mbps)
+#define		CHANNEL_DMA_SIZE	(2*1024*1024)	// 地デジ用(16Mbps)
-#define		BS_CHANEL_DMA_SIZE	(4*1024*1024)	// BS用(32Mbps)
+#define		BS_CHANNEL_DMA_SIZE	(4*1024*1024)	// BS用(32Mbps)
 #define		READ_SIZE	(16*DMA_SIZE)
 typedef	struct	_DMA_CONTROL{
 	dma_addr_t	ring_dma[DMA_RING_MAX] ;	// DMA情報
 	__u32		*data[DMA_RING_MAX];
 	PT1_CHANNEL	*channel ;
 	int		ring_pos = 0;
 	int		data_pos = 0 ;
 	int		lp ;
 	int		chno ;
-	int		lp2 ;
 	int		dma_channel ;
 	int		packet_pos ;
 	__u32	*dataptr ;
 	__u32	*curdataptr ;
 	__u32	val ;
 				// 先頭で、一時バッファに残っている場合
 				if((micro.packet.head & 0x02) &&  (channel->packet_size != 0)){
 					channel->packet_size = 0 ;
 				}
 				// データコピー
-				for(lp2 = 2 ; lp2 >= 0 ; lp2--){
+				channel->packet_buf[channel->packet_size]   = micro.packet.data[2];
-					channel->packet_buf[channel->packet_size] = micro.packet.data[lp2] ;
+				channel->packet_buf[channel->packet_size+1] = micro.packet.data[1];
-					channel->packet_size += 1 ;
+				channel->packet_buf[channel->packet_size+2] = micro.packet.data[0];
-				}
+				channel->packet_size += 3;
 				// パケットが出来たらコピーする
 				if(channel->packet_size >= PACKET_SIZE){
 					if (channel->pointer + channel->size >= channel->maxsize) {
 						// リングバッファの境界を越えていてリングバッファの先頭に戻っている場合
 				if((channel->size >= READ_SIZE) && (channel->valid == TRUE)){
 					wake_up(&channel->wait_q);
 				}
 			}
 		}
-		schedule_timeout_interruptible(msecs_to_jiffies(10));
+		schedule_timeout_interruptible(msecs_to_jiffies(100));
 	}
 	return 0 ;
 }
 static int pt1_open(struct inode *inode, struct file *file)
 {
 					/* wake tuner up */
 					set_sleepmode(channel->ptr->regs, &channel->lock,
 								  channel->address, channel->type,
 								  TYPE_WAKEUP);
-					schedule_timeout_interruptible(msecs_to_jiffies(50));
+					schedule_timeout_interruptible(msecs_to_jiffies(100));
 					channel->drop  = 0 ;
 					channel->valid = TRUE ;
 					channel->overflow = 0 ;
 					channel->counetererr = 0 ;
 	mutex_unlock(&channel->ptr->lock);
 	/* send tuner to sleep */
 	set_sleepmode(channel->ptr->regs, &channel->lock,
 				  channel->address, channel->type, TYPE_SLEEP);
-	schedule_timeout_interruptible(msecs_to_jiffies(50));
+	schedule_timeout_interruptible(msecs_to_jiffies(100));
 	return 0;
 }
 static ssize_t pt1_read(struct file *file, char __user *buf, size_t cnt, loff_t * ppos)
 		printk(KERN_ERR "Error xc3s_init\n");
 		goto out_err_fpga;
 	}
 	// チューナリセット
 	settuner_reset(dev_conf->regs, dev_conf->cardtype, LNB_OFF, TUNER_POWER_ON_RESET_ENABLE);
-	schedule_timeout_interruptible(msecs_to_jiffies(50));
+	schedule_timeout_interruptible(msecs_to_jiffies(100));
 	settuner_reset(dev_conf->regs, dev_conf->cardtype, LNB_OFF, TUNER_POWER_ON_RESET_DISABLE);
-	schedule_timeout_interruptible(msecs_to_jiffies(10));
+	schedule_timeout_interruptible(msecs_to_jiffies(100));
 	mutex_init(&dev_conf->lock);
 	// Tuner 初期化処理
 	for(lp = 0 ; lp < MAX_TUNER ; lp++){
 		rc = tuner_init(dev_conf->regs, dev_conf->cardtype, &dev_conf->lock, lp);
 	// 初期化完了
 	for(lp = 0 ; lp < MAX_CHANNEL ; lp++){
 		set_sleepmode(dev_conf->regs, &dev_conf->lock,
 						i2c_address[lp], channeltype[lp], TYPE_SLEEP);
-		schedule_timeout_interruptible(msecs_to_jiffies(50));
+		schedule_timeout_interruptible(msecs_to_jiffies(100));
 	}
 	rc = alloc_chrdev_region(&dev_conf->dev, 0, MAX_CHANNEL, DEV_NAME);
 	if(rc < 0){
 		goto out_err_fpga;
 	}
 		init_waitqueue_head(&channel->wait_q);
 		switch(channel->type){
 			case CHANNEL_TYPE_ISDB_T:
-				channel->maxsize = CHANEL_DMA_SIZE ;
+				channel->maxsize = CHANNEL_DMA_SIZE ;
-				channel->buf = vmalloc(CHANEL_DMA_SIZE);
+				channel->buf = vmalloc(CHANNEL_DMA_SIZE);
 				channel->pointer = 0;
 				break ;
 			case CHANNEL_TYPE_ISDB_S:
-				channel->maxsize = BS_CHANEL_DMA_SIZE ;
+				channel->maxsize = BS_CHANNEL_DMA_SIZE ;
-				channel->buf = vmalloc(BS_CHANEL_DMA_SIZE);
+				channel->buf = vmalloc(BS_CHANNEL_DMA_SIZE);
 				channel->pointer = 0;
 				break ;
 		}
 		if(channel->buf == NULL){
 			goto out_err_v4l;
 		for(lp = 0 ; lp < 10 ; lp++){
 			val = readl(dev_conf->regs);
 			if(!(val & (1 << 6))){
 				break ;
 			}
-			schedule_timeout_interruptible(msecs_to_jiffies(1));
+			schedule_timeout_interruptible(msecs_to_jiffies(100));
 		}
 		pt1_dma_free(pdev, dev_conf);
 		for(lp = 0 ; lp < MAX_CHANNEL ; lp++){
 			if(dev_conf->channel[lp] != NULL){
 				cdev_del(&dev_conf->cdev[lp]);

Mercurial > pt1

comparison driver/pt1_pci.c @ 124:f2ae5ddeed7e