Mercurial > pt1.oyama

diff driver/pt1_pci.c @ 79:3c2123189edf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve PT2 support. - update read check in initialization - PT2 specific RAM phase initialization
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 07 Dec 2009 15:01:57 +0900
parents 272a8fba970b
children f336fd2dcf28
line wrap: on
line diff
--- a/driver/pt1_pci.c	Tue Dec 01 20:24:22 2009 +0900
+++ b/driver/pt1_pci.c	Mon Dec 07 15:01:57 2009 +0900
@@ -686,17 +686,17 @@
 	dev_conf->mmio_len = pci_resource_len(pdev, 0);
 	dummy = request_mem_region(dev_conf->mmio_start, dev_conf->mmio_len, DEV_NAME);
 	if (!dummy) {
-		printk(KERN_ERR "PT1: cannot request iomem  (0x%llx).\n", (unsigned long long) dev_conf->mmio_start);
+		printk(KERN_ERR "PT1:cannot request iomem  (0x%llx).\n", (unsigned long long) dev_conf->mmio_start);
 		goto out_err_regbase;
 	}
 
 	dev_conf->regs = ioremap(dev_conf->mmio_start, dev_conf->mmio_len);
 	if (!dev_conf->regs){
-		printk(KERN_ERR "pt1: Can't remap register area.\n");
+		printk(KERN_ERR "pt1:Can't remap register area.\n");
 		goto out_err_regbase;
 	}
 	// 初期化処理
-	if(xc3s_init(dev_conf->regs)){
+	if(xc3s_init(dev_conf->regs, dev_conf->cardtype)){
 		printk(KERN_ERR "Error xc3s_init\n");
 		goto out_err_fpga;
 	}
@@ -734,7 +734,7 @@
 	minor = MINOR(dev_conf->dev) ;
 	dev_conf->base_minor = minor ;
 	for(lp = 0 ; lp < MAX_PCI_DEVICE ; lp++){
-		printk(KERN_INFO "PT1: device[%d]=%p\n", lp, device[lp]);
+		printk(KERN_INFO "PT1:device[%d]=%p\n", lp, device[lp]);
 		if(device[lp] == NULL){
 			device[lp] = dev_conf ;
 			dev_conf->card_number = lp;
@@ -785,7 +785,7 @@
 			goto out_err_v4l;
 		}
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
-		printk(KERN_INFO "PT1: card_number = %d\n",
+		printk(KERN_INFO "PT1:card_number = %d\n",
 		       dev_conf->card_number);
 		device_create(pt1video_class,
 			      NULL,