From: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Date: Sat, 1 Oct 2011 15:43:17 +0000 (+0200)
Subject: Merge branch 'master' into can-usb1
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/fe719367cdb25978d42261513dd9810c22481960?hp=da0a5082dd75e429f78593e7bdec0fb87ae9e2a5

Merge branch 'master' into can-usb1
---

diff --git a/lincan/include/can_sysdep.h b/lincan/include/can_sysdep.h
index 5ade341..60c76de 100644
--- a/lincan/include/can_sysdep.h
+++ b/lincan/include/can_sysdep.h
@@ -222,6 +222,18 @@
   #endif
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+  #define can_pci_dev_get(_M_pdev) (_M_pdev)
+  #define can_pci_dev_put(_M_pdev) do {} while(0)
+  #define can_pci_get_device pci_find_device
+  #define can_pci_get_subsys pci_find_subsys
+#else /* > 2.6.0 */
+  #define can_pci_dev_get pci_dev_get
+  #define can_pci_dev_put pci_dev_put
+  #define can_pci_get_device pci_get_device
+  #define can_pci_get_subsys pci_get_subsys
+#endif
+
 #ifndef CAN_WITH_RTL
 /* Standard LINUX kernel */
 
diff --git a/lincan/include/main.h b/lincan/include/main.h
index 22fb92f..d827594 100644
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -325,6 +325,7 @@ struct hwspecops_t {
 	int (*release_io)(struct candevice_t *candev);
 	int (*reset)(struct candevice_t *candev);
 	int (*init_hw_data)(struct candevice_t *candev);
+	void (*done_hw_data)(struct candevice_t *candev);
 	int (*init_chip_data)(struct candevice_t *candev, int chipnr);
 	int (*init_obj_data)(struct canchip_t *chip, int objnr);
 	int (*program_irq)(struct candevice_t *candev);
@@ -513,6 +514,12 @@ void can_release_io_region(unsigned long start, unsigned long n);
 int can_request_mem_region(unsigned long start, unsigned long n, const char *name);
 void can_release_mem_region(unsigned long start, unsigned long n);
 
+#ifdef CAN_ENABLE_PCI_SUPPORT
+struct pci_dev *can_pci_get_next_untaken_device(unsigned int vendor, unsigned int device);
+struct pci_dev *can_pci_get_next_untaken_subsyst(unsigned int vendor, unsigned int device,
+			unsigned int ss_vendor, unsigned int ss_device);
+#endif /*CAN_ENABLE_PCI_SUPPORT*/
+
 struct boardtype_t {
 	const char *boardtype;
 	int (*board_register)(struct hwspecops_t *hwspecops);
diff --git a/lincan/src/adlink7841.c b/lincan/src/adlink7841.c
index 18266b8..5385332 100644
--- a/lincan/src/adlink7841.c
+++ b/lincan/src/adlink7841.c
@@ -176,16 +176,16 @@ int adlink7841_reset(struct candevice_t *candev)
 
 int adlink7841_init_hw_data(struct candevice_t *candev)
 {
-	struct pci_dev *pcidev = NULL;
+	struct pci_dev *pcidev;
 	int i;
 
-	do {
-		pcidev = pci_find_device(ADLINK7841_PCI_VENDOR_ID, ADLINK7841_PCI_PRODUCT_ID, pcidev);
-		if(pcidev == NULL) return -ENODEV;
-	} while(can_check_dev_taken(pcidev));
+	pcidev = can_pci_get_next_untaken_device(ADLINK7841_PCI_VENDOR_ID, ADLINK7841_PCI_PRODUCT_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
 	
 	if (pci_enable_device (pcidev)){
 		printk(KERN_CRIT "Setup of ADLINK7841 failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
@@ -193,6 +193,7 @@ int adlink7841_init_hw_data(struct candevice_t *candev)
 	for(i=1;i<3;i++){
 		if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
 			printk(KERN_CRIT "ADLINK7841 region %d is not IO\n",i);
+			can_pci_dev_put(pcidev);
 			return -EIO;
 		}
 	}
@@ -209,6 +210,12 @@ int adlink7841_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
+void adlink7841_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int adlink7841_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 
@@ -250,6 +257,7 @@ int adlink7841_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = adlink7841_release_io;
 	hwspecops->reset = adlink7841_reset;
 	hwspecops->init_hw_data = adlink7841_init_hw_data;
+	hwspecops->done_hw_data = adlink7841_done_hw_data;
 	hwspecops->init_chip_data = adlink7841_init_chip_data;
 	hwspecops->init_obj_data = adlink7841_init_obj_data;
 	hwspecops->write_register = adlink7841_write_register;
diff --git a/lincan/src/ems_cpcpci.c b/lincan/src/ems_cpcpci.c
index ffd1418..55c4d98 100644
--- a/lincan/src/ems_cpcpci.c
+++ b/lincan/src/ems_cpcpci.c
@@ -287,15 +287,17 @@ int ems_cpcpci_reset(struct candevice_t *candev)
 
 int ems_cpcpci_init_hw_data(struct candevice_t *candev)
 {
-	struct pci_dev *pcidev = NULL;
+	struct pci_dev *pcidev;
 	int i;
 	unsigned long l;
 
-	pcidev = pci_find_device(EMS_CPCPCI_PCICAN_VENDOR, EMS_CPCPCI_PCICAN_ID, pcidev);
-	if(pcidev == NULL) return -ENODEV;
+	pcidev = can_pci_get_next_untaken_device(EMS_CPCPCI_PCICAN_VENDOR, EMS_CPCPCI_PCICAN_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
 	
 	if (pci_enable_device (pcidev)){
 		printk(KERN_CRIT "Setup of EMS_CPCPCI failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
@@ -303,13 +305,16 @@ int ems_cpcpci_init_hw_data(struct candevice_t *candev)
 	for(i=0;i<2;i++){
 		if(!(pci_resource_flags(pcidev,0)&IORESOURCE_MEM)){
 			printk(KERN_CRIT "EMS_CPCPCI region %d is not memory\n",i);
+			can_pci_dev_put(pcidev);
 			return -EIO;
 		}
 	}
 
 	/*request IO access temporarily to check card presence*/
-	if(ems_cpcpci_request_io(candev)<0)
+	if(ems_cpcpci_request_io(candev)<0) {
+		can_pci_dev_put(pcidev);
 		return -ENODEV;
+	}
 
 	/*** candev->aux_base_addr=pci_resource_start(pcidev,0); ***/
 	/* some control registers */
@@ -340,10 +345,16 @@ int ems_cpcpci_init_hw_data(struct candevice_t *candev)
 	candev->nr_all_chips=2;
 
 	ems_cpcpci_release_io(candev);
-        
+
 	return 0;
 }
 
+void ems_cpcpci_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int ems_cpcpci_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	if(candev->sysdevptr.pcidev==NULL)
@@ -390,6 +401,7 @@ int ems_cpcpci_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = ems_cpcpci_release_io;
 	hwspecops->reset = ems_cpcpci_reset;
 	hwspecops->init_hw_data = ems_cpcpci_init_hw_data;
+	hwspecops->done_hw_data = ems_cpcpci_done_hw_data;
 	hwspecops->init_chip_data = ems_cpcpci_init_chip_data;
 	hwspecops->init_obj_data = ems_cpcpci_init_obj_data;
 	hwspecops->write_register = ems_cpcpci_write_register;
diff --git a/lincan/src/esdpci200.c b/lincan/src/esdpci200.c
index 718db1e..292ae90 100644
--- a/lincan/src/esdpci200.c
+++ b/lincan/src/esdpci200.c
@@ -290,15 +290,15 @@ int esdpci200_reset(struct candevice_t *candev)
 
 int esdpci200_init_hw_data(struct candevice_t *candev)
 {
-	struct pci_dev *pcidev = NULL;
+	struct pci_dev *pcidev;
+
+	pcidev = can_pci_get_next_untaken_device(ESDPCI200_PCI_VENDOR_ID, ESDPCI200_PCI_PRODUCT_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
 
-	do {
-		pcidev = pci_find_device(ESDPCI200_PCI_VENDOR_ID, ESDPCI200_PCI_PRODUCT_ID, pcidev);
-		if(pcidev == NULL) return -ENODEV;
-	} while(can_check_dev_taken(pcidev));
-	
 	if (pci_enable_device (pcidev)){
 		printk(KERN_CRIT "Setup of ESDPCI200 failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
@@ -308,17 +308,20 @@ int esdpci200_init_hw_data(struct candevice_t *candev)
 	if(!(pci_resource_flags(pcidev, 0)&IORESOURCE_MEM))
 	{
 	   printk(KERN_CRIT "PCI200 region %d is not MEM\n",0);
+	   can_pci_dev_put(pcidev);
 	   return -EIO;
 	}
 	if(!(pci_resource_flags(pcidev, 1)&IORESOURCE_IO))
 	{
 	   printk(KERN_CRIT "PCI200 region %d is not IO\n",1);
+	   can_pci_dev_put(pcidev);
 	   return -EIO;
 	}
 
 	if(!(pci_resource_flags(pcidev,2)&IORESOURCE_MEM))
 	{
 	   printk(KERN_CRIT "PCI200 region %d is not MEM\n",2);
+	   can_pci_dev_put(pcidev);
 	   return -EIO;
 	}
 
@@ -339,6 +342,12 @@ int esdpci200_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
+void esdpci200_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int esdpci200_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 
@@ -389,6 +398,7 @@ int esdpci200_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = esdpci200_release_io;
 	hwspecops->reset = esdpci200_reset;
 	hwspecops->init_hw_data = esdpci200_init_hw_data;
+	hwspecops->done_hw_data = esdpci200_done_hw_data;
 	hwspecops->init_chip_data = esdpci200_init_chip_data;
 	hwspecops->init_obj_data = esdpci200_init_obj_data;
 	hwspecops->write_register = esdpci200_write_register;
diff --git a/lincan/src/esdpci266.c b/lincan/src/esdpci266.c
index 770ffd8..fc043bc 100644
--- a/lincan/src/esdpci266.c
+++ b/lincan/src/esdpci266.c
@@ -203,28 +203,18 @@ int esdpci266_reset(struct candevice_t *candev)
 
 int esdpci266_init_hw_data(struct candevice_t *candev)
 {
-	struct pci_dev *pcidev = NULL;
+	struct pci_dev *pcidev;
 
 	printk("lincan: search for ESD PCI/PMC 266 board ...\n");
 
-	do {
-		pcidev =
-		    pci_find_device(PLX_9056_VENDOR_ID, PLX_9056_DEVICE_ID,
-				    pcidev);
-		if (pcidev == NULL)
-			return -ENODEV;
-		if (pcidev->subsystem_vendor != ESDPCI266_PCI_VENDOR_ID
-		    || pcidev->subsystem_device != ESDPCI266_PCI_PRODUCT_ID) {
-			printk
-			    ("PLX9056 found, subvendor/subdevice mismatch (%04d:%04d)\n",
-			     pcidev->subsystem_vendor,
-			     pcidev->subsystem_device);
-			continue;
-		}
-	} while (can_check_dev_taken(pcidev));
+	pcidev = can_pci_get_next_untaken_subsyst(PLX_9056_VENDOR_ID, PLX_9056_DEVICE_ID,
+						ESDPCI266_PCI_VENDOR_ID, ESDPCI266_PCI_PRODUCT_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
 
 	if (pci_enable_device(pcidev)) {
 		printk("lincan: pci_enable_device() failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 
@@ -242,6 +232,12 @@ int esdpci266_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
+void esdpci266_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int esdpci266_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 	if (candev->sysdevptr.pcidev == NULL)
@@ -277,6 +273,7 @@ int esdpci266_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = esdpci266_release_io;
 	hwspecops->reset = esdpci266_reset;
 	hwspecops->init_hw_data = esdpci266_init_hw_data;
+	hwspecops->done_hw_data = esdpci266_done_hw_data;
 	hwspecops->init_chip_data = esdpci266_init_chip_data;
 	hwspecops->init_obj_data = esdpci266_init_obj_data;
 	hwspecops->write_register = esdpci266_write_register;
diff --git a/lincan/src/finish.c b/lincan/src/finish.c
index 6a69222..d1f6a87 100644
--- a/lincan/src/finish.c
+++ b/lincan/src/finish.c
@@ -146,6 +146,9 @@ void candevice_done(struct candevice_t *candev)
 		candev->hwspecops->release_io(candev);
 		candev->flags &= ~CANDEV_IO_RESERVED;
 	}
+	if(candev->hwspecops->done_hw_data != NULL)
+		candev->hwspecops->done_hw_data(candev);
+
 	can_checked_free(candev->hwspecops);
 	candev->hwspecops=NULL;
 }
diff --git a/lincan/src/ipci165.c b/lincan/src/ipci165.c
index dcbfdad..6b90ed0 100644
--- a/lincan/src/ipci165.c
+++ b/lincan/src/ipci165.c
@@ -1383,21 +1383,20 @@ int ipci165_reset(struct candevice_t *candev)
 int ipci165_init_hw_data(struct candevice_t *candev)
 {
   struct pci_dev *pcidev = NULL;
-  unsigned short SubsystemID;
 
   DEBUGMSG ("ipci165_init_hw_data\n");
 
   /* find iPC-I 165 on PCI bus */
   do
   {
-    pcidev = pci_find_device(IPCI165_VENDOR_ID, IPCI165_DEVICE_ID, pcidev);
-    if(pcidev == NULL) return -ENODEV;
+    pcidev = can_pci_get_device(IPCI165_VENDOR_ID, IPCI165_DEVICE_ID, pcidev);
+    if(pcidev == NULL)
+      return -ENODEV;
 
     /* check subvendor ID */
-    pci_read_config_word (pcidev, PCI_SUBSYSTEM_ID, &SubsystemID);
-    if ((SubsystemID != IPCI165_SUBSYSTEM_ID) &&
-        (SubsystemID != CP350_SUBSYSTEM_ID))
-      break;
+    if ((pcidev->subsystem_vendor != IPCI165_SUBSYSTEM_ID) &&
+        (pcidev->subsystem_vendor != CP350_SUBSYSTEM_ID))
+      continue;
   }
   while(can_check_dev_taken(pcidev));
 
@@ -1405,6 +1404,7 @@ int ipci165_init_hw_data(struct candevice_t *candev)
   if (pci_enable_device (pcidev))
   {
     CANMSG ("Cannot enable PCI device\n");
+    can_pci_dev_put(pcidev);
     return -EIO;
   }
 
@@ -1423,6 +1423,12 @@ int ipci165_init_hw_data(struct candevice_t *candev)
   return 0;
 }
 
+void ipci165_done_hw_data(struct candevice_t *candev)
+{
+  struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+  can_pci_dev_put(pcidev);
+}
+
 #define CHIP_TYPE "ipci165"
 
 /**
@@ -1547,6 +1553,7 @@ int ipci165_register(struct hwspecops_t *hwspecops)
   hwspecops->release_io = ipci165_release_io;
   hwspecops->reset = ipci165_reset;
   hwspecops->init_hw_data = ipci165_init_hw_data;
+  hwspecops->done_hw_data = ipci165_done_hw_data;
   hwspecops->init_chip_data = ipci165_init_chip_data;
   hwspecops->init_obj_data = ipci165_init_obj_data;
   hwspecops->write_register = NULL;
diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index 758b8fb..30ac377 100644
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -205,16 +205,16 @@ int kv_pcican_reset(struct candevice_t *candev)
 
 int kv_pcican_init_hw_data(struct candevice_t *candev)
 {
-	struct pci_dev *pcidev = NULL;
+	struct pci_dev *pcidev;
 	int i;
 
-	do {
-		pcidev = pci_find_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID, pcidev);
-		if(pcidev == NULL) return -ENODEV;
-	} while(can_check_dev_taken(pcidev));
+	pcidev = can_pci_get_next_untaken_device(KV_PCICAN_PCICAN_VENDOR, KV_PCICAN_PCICAN_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
 	
 	if (pci_enable_device (pcidev)){
 		printk(KERN_CRIT "Setup of PCICAN failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
@@ -222,6 +222,7 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
 	for(i=0;i<3;i++){
 		if(!(pci_resource_flags(pcidev,i)&IORESOURCE_IO)){
 			printk(KERN_CRIT "PCICAN region %d is not IO\n",i);
+			can_pci_dev_put(pcidev);
 			return -EIO;
 		}
 	}
@@ -250,6 +251,12 @@ int kv_pcican_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
+void kv_pcican_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int kv_pcican_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 
@@ -291,6 +298,7 @@ int kv_pcican_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = kv_pcican_release_io;
 	hwspecops->reset = kv_pcican_reset;
 	hwspecops->init_hw_data = kv_pcican_init_hw_data;
+	hwspecops->done_hw_data = kv_pcican_done_hw_data;
 	hwspecops->init_chip_data = kv_pcican_init_chip_data;
 	hwspecops->init_obj_data = kv_pcican_init_obj_data;
 	hwspecops->write_register = kv_pcican_write_register;
diff --git a/lincan/src/nsi_canpci.c b/lincan/src/nsi_canpci.c
index d8194be..1fee227 100644
--- a/lincan/src/nsi_canpci.c
+++ b/lincan/src/nsi_canpci.c
@@ -375,43 +375,25 @@ int nsi_canpci_reset(struct candevice_t *candev)
  */
 
 int nsi_canpci_init_hw_data(struct candevice_t *candev) 
-     {
-  struct pci_dev *pcidev = NULL;
+{
+	struct pci_dev *pcidev;
 
-  /* looking for NSI CANPCI ident on the pci bus*/
-  do
-  {
-    pcidev = pci_find_device(NSI_VENDOR_ID, NSI_CANPCI_DEVICE_ID, pcidev);
-  }
-  while(can_check_dev_taken(pcidev));
-  
-  if(pcidev == NULL) 
-  {
-	do
-	{
-	pcidev = pci_find_device(NSI_VENDOR_ID, NSI_CANPCI_DEVICE_ID+1, pcidev);
-	}
-	while(can_check_dev_taken(pcidev));
-	if(pcidev == NULL) 
-	{
+	/* looking for NSI CANPCI ident on the pci bus*/
+	pcidev = can_pci_get_next_untaken_device(NSI_VENDOR_ID, NSI_CANPCI_DEVICE_ID);
+	if(pcidev == NULL)
+		pcidev = can_pci_get_next_untaken_device(NSI_VENDOR_ID, NSI_CANPCI_DEVICE_ID+1);
+	if(pcidev == NULL) {
 		CANMSG ("Error : NSI CAN PCI device not found\n");
 		return -ENODEV;
 	}
-	else
-	{
-		CANMSG ("NSI CANPCI OPTO device found\n");
-	}
-  }
-  else
-  {
+
 	CANMSG ("NSI CANPCI device found\n");  
-  }
-    
+
   /* enable it */
   if (pci_enable_device (pcidev))
   {
     CANMSG ("Cannot enable PCI device\n");
-    return -EIO;
+    goto error_io;
   }
   CANMSG ("NSI CANPCI device started\n");
   candev->sysdevptr.pcidev = pcidev;
@@ -436,30 +418,30 @@ int nsi_canpci_init_hw_data(struct candevice_t *candev)
 			pci_release_region(pcidev,0);
 			pci_release_region(pcidev,1);
 			pci_release_region(pcidev,2);			
-			return -EIO;
+			goto error_io;
 			}
 		}
 		else
 		{
 		pci_release_region(pcidev,0);
 		pci_release_region(pcidev,1);
-		return -EIO;
+		goto error_io;
 		}
 	}
 	else
 	{
 	pci_release_region(pcidev,0);
-	return -EIO;
+	goto error_io;
 	}
   }  
   else
   {
-	return -EIO;
+	goto error_io;
   }
   candev->dev_base_addr=(unsigned long)(kmalloc(sizeof(t_CardArray),GFP_ATOMIC));  
   
   if((unsigned long)candev->dev_base_addr==0)
-  	return -EIO;
+	goto error_io;
   //PLX register 
   ((t_CardArray*)(candev->dev_base_addr))->addr_BAR_remap[0]=ioremap(pci_resource_start(pcidev,0),pci_resource_len(pcidev,0) );
   //PLX IO
@@ -472,8 +454,20 @@ int nsi_canpci_init_hw_data(struct candevice_t *candev)
   //Short acces to plx register
   candev->io_addr=(unsigned long)(((t_CardArray*)(candev->dev_base_addr))->addr_BAR_remap[0]);
   return 0;  
+
+error_io:
+	can_pci_dev_put(pcidev);
+	return -EIO;
 }
 
+
+void nsi_canpci_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
+
 /* The function template_init_chip_data is used to initialize the hardware
  * structure containing information about the CAN chips.
  * CHIP_TYPE represents the type of CAN chip. CHIP_TYPE can be "i82527" or
@@ -564,6 +558,7 @@ int nsi_canpci_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = nsi_canpci_release_io;
 	hwspecops->reset = nsi_canpci_reset;
 	hwspecops->init_hw_data = nsi_canpci_init_hw_data;
+	hwspecops->done_hw_data = nsi_canpci_done_hw_data;
 	hwspecops->init_chip_data = nsi_canpci_init_chip_data;
 	hwspecops->init_obj_data = nsi_canpci_init_obj_data;
 	hwspecops->write_register = nsi_canpci_write_register;
diff --git a/lincan/src/pcan_pci.c b/lincan/src/pcan_pci.c
index e40db7c..95ac94f 100644
--- a/lincan/src/pcan_pci.c
+++ b/lincan/src/pcan_pci.c
@@ -270,18 +270,15 @@ int pcan_pci_init_hw_data(struct candevice_t *candev)
 	int nr_chips;
 	u16 subsysid;
 
-	i = 0;
-	do {
-		pcidev = pci_find_device(PCAN_PCI_VENDOR_ID, PCAN_PCI_PRODUCT_ID, pcidev);
-		if(pcidev == NULL) {
-			printk(KERN_ERR "No unused PCAN_PCI #%d card found\n", i);
-			return -ENODEV;
-		}
-		i++;
-	} while(can_check_dev_taken(pcidev));
+	pcidev = can_pci_get_next_untaken_device(PCAN_PCI_VENDOR_ID, PCAN_PCI_PRODUCT_ID);
+	if(pcidev == NULL) {
+		printk(KERN_ERR "No unused PCAN_PCI card found\n");
+		return -ENODEV;
+	}
 
 	if (pci_enable_device (pcidev)){
 		printk(KERN_ERR "Enable PCAN_PCI failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
@@ -331,9 +328,16 @@ error_ret:
 
 	printk(KERN_CRIT "Setup of PCAN_PCI failed\n");
 	pci_disable_device (pcidev);
+	can_pci_dev_put(pcidev);
 	return -EIO;
 }
 
+void pcan_pci_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
+
 int pcan_pci_init_chip_data(struct candevice_t *candev, int chipnr)
 {
 
@@ -379,6 +383,7 @@ int pcan_pci_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = pcan_pci_release_io;
 	hwspecops->reset = pcan_pci_reset;
 	hwspecops->init_hw_data = pcan_pci_init_hw_data;
+	hwspecops->done_hw_data = pcan_pci_done_hw_data;
 	hwspecops->init_chip_data = pcan_pci_init_chip_data;
 	hwspecops->init_obj_data = pcan_pci_init_obj_data;
 	hwspecops->write_register = pcan_pci_write_register;
diff --git a/lincan/src/sysdep_lnx.c b/lincan/src/sysdep_lnx.c
index 2220890..1033a5f 100644
--- a/lincan/src/sysdep_lnx.c
+++ b/lincan/src/sysdep_lnx.c
@@ -214,6 +214,37 @@ void can_release_mem_region(unsigned long start, unsigned long n)
     #endif
 }
 
+#ifdef CAN_ENABLE_PCI_SUPPORT
+
+struct pci_dev *can_pci_get_next_untaken_device(unsigned int vendor, unsigned int device)
+{
+	struct pci_dev *pcidev = NULL;
+
+	do {
+		pcidev = can_pci_get_device(vendor, device, pcidev);
+		if(pcidev == NULL)
+			return NULL;
+	} while(can_check_dev_taken(pcidev));
+
+	return pcidev;
+}
+
+struct pci_dev *can_pci_get_next_untaken_subsyst(unsigned int vendor, unsigned int device,
+			unsigned int ss_vendor, unsigned int ss_device)
+{
+	struct pci_dev *pcidev = NULL;
+
+	do {
+		pcidev = can_pci_get_subsys(vendor, device, ss_vendor, ss_device, pcidev);
+		if(pcidev == NULL)
+			return NULL;
+	} while(can_check_dev_taken(pcidev));
+
+	return pcidev;
+}
+
+#endif /*CAN_ENABLE_PCI_SUPPORT*/
+
 #ifndef CAN_WITH_RTL
 
 /**
diff --git a/lincan/src/unican.c b/lincan/src/unican.c
index 2ec2aaa..10cc185 100644
--- a/lincan/src/unican.c
+++ b/lincan/src/unican.c
@@ -970,19 +970,20 @@ int unican_pci_init_hw_data(struct candevice_t *candev)
 {
 	struct pci_dev *pcidev = NULL;
 
-	do {
-		pcidev = pci_find_device(UNICAN_PCI_VENDOR, UNICAN_PCI_ID, pcidev);
-		if(pcidev == NULL) return -ENODEV;
-	} while(can_check_dev_taken(pcidev));
-	
+	pcidev = can_pci_get_next_untaken_device(UNICAN_PCI_VENDOR, UNICAN_PCI_ID);
+	if(pcidev == NULL)
+		return -ENODEV;
+
 	if (pci_enable_device (pcidev)){
 		printk(KERN_CRIT "Setup of Unican PCI failed\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->sysdevptr.pcidev=pcidev;
 	
 	if(!(pci_resource_flags(pcidev,0)&IORESOURCE_MEM)){
 		printk(KERN_CRIT "Unican PCI region 0 is not MEM\n");
+		can_pci_dev_put(pcidev);
 		return -EIO;
 	}
 	candev->io_addr=pci_resource_start(pcidev,0);
@@ -998,6 +999,11 @@ int unican_pci_init_hw_data(struct candevice_t *candev)
 	return 0;
 }
 
+void unican_pci_done_hw_data(struct candevice_t *candev)
+{
+	struct pci_dev *pcidev = candev->sysdevptr.pcidev;
+	can_pci_dev_put(pcidev);
+}
 
 int unican_pci_init_chip_data(struct candevice_t *candev, int chipnr)
 {
@@ -1014,6 +1020,7 @@ int unican_pci_register(struct hwspecops_t *hwspecops)
 	hwspecops->release_io = unican_pci_release_io;
 	hwspecops->reset = unican_reset;
 	hwspecops->init_hw_data = unican_pci_init_hw_data;
+	hwspecops->done_hw_data = unican_pci_done_hw_data;
 	hwspecops->init_chip_data = unican_pci_init_chip_data;
 	hwspecops->init_obj_data = unican_init_obj_data;
 	hwspecops->write_register = NULL;
diff --git a/omk/rules/linux/Makefile.rules b/omk/rules/linux/Makefile.rules
index a887fa2..1458619 100644
--- a/omk/rules/linux/Makefile.rules
+++ b/omk/rules/linux/Makefile.rules
@@ -1,10 +1,10 @@
 #  Makefile.rules - OCERA make framework common project rules -*- makefile-gmake -*- #OMK:base.omk
 #
 #  (C) Copyright 2003, 2006, 2007, 2008, 2009  by Pavel Pisa - OCERA team member
-#  (C) Copyright 2006, 2007, 2008, 2009, 2010 by Michal Sojka - Czech Technical University, FEE, DCE
+#  (C) Copyright 2006, 2007, 2008, 2009, 2010, 2011 by Michal Sojka - Czech Technical University, FEE, DCE
 #
 #  Homepage: http://rtime.felk.cvut.cz/omk/
-#  Version:  0.2-27-g254fd61
+#  Version:  0.2-97-g532aeb1
 #
 # The OMK build system is distributed under the GNU General Public
 # License.  See file COPYING for details.
@@ -18,6 +18,8 @@
 # W                .. whole tree - if set to 1, make is always called from the top-level directory
 # SUBDIRS          .. list of subdirectories intended for make from actual directory
 # default_CONFIG   .. list of default config assignments CONFIG_XXX=y/n ...
+# wvtest_SCRIPTS    .. list of scripts producing wvtest output                   #OMK:wvtest.omk
+# wvtest_PROGRAMS   .. list of the testing programs producing wvtest output
 # LN_HEADERS       .. if "y", header files are symbolicaly linked instead of copied. #OMK:include.omk
 # input variables                                                                #OMK:linux.omk
 # lib_LIBRARIES    .. list of the user-space libraries
@@ -32,6 +34,7 @@
 # bin_PROGRAMS     .. list of the require binary programs
 # utils_PROGRAMS   .. list of the development utility programs
 # test_PROGRAMS    .. list of the testing programs
+# bin_SCRIPTS      .. list of scripts to be copied to _compiled/bin
 # kernel_MODULES   .. list of the kernel side modules/applications
 # rtlinux_MODULES  .. list of RT-Linux the kernel side modules/applications
 # xxx_SOURCES      .. list of specific target sources
@@ -68,6 +71,23 @@ ifndef MAKERULES_DIR
 MAKERULES_DIR := $(abspath $(dir $(filter %Makefile.rules,$(MAKEFILE_LIST))))
 endif
 
+# The $(SED4OMK) command for BSD based systems requires -E option to allow
+# extended regular expressions
+
+SED4OMK ?= sed
+ifneq ($(shell ( echo A | $(SED4OMK) -n -e 's/A\|B/y/p' )),y)
+  SED4OMK := $(SED4OMK) -E
+  ifneq ($(shell ( echo A | $(SED4OMK) -n -e 's/A\|B/y/p' )),y)
+    SED4OMK := gsed
+  endif
+  ifneq ($(shell ( echo A | $(SED4OMK) -n -e 's/A\|B/y/p' )),y)
+    SED4OMK := gsed -E
+  endif
+  ifneq ($(shell ( echo A | $(SED4OMK) -n -e 's/A\|B/y/p' )),y)
+    $(error No SED program suitable for OMK found)
+  endif
+endif
+
 # OUTPUT_DIR is the place where _compiled, _build and possible other
 # files/directories are created. By default is the same as
 # $(MAKERULES_DIR).
@@ -104,16 +124,11 @@ all:
 	@$(MAKE) -C $(MAKERULES_DIR) OMK_SERIALIZE_INCLUDED=n SOURCES_DIR=$(MAKERULES_DIR) RELATIVE_DIR="" $(MAKECMDGOALS) W=0
 endif
 
-ifdef OMK_TESTSROOT
-# Usage: $(call canttest,<error message>)
-define canttest
-	( echo "$(1)" > $(OUTPUT_DIR)/_canttest; echo "$(1)"; exit 1 )
-endef
-else
-define canttest
-	echo "$(1)"
-endef
-endif
+# omk-get-var target allows external scripts/programs to determine the
+# values of OMK variables such as RELATIVE_DIR etc.
+.PHONY: omk-get-var
+omk-get-var:
+	@$(foreach var,$(VAR),echo $(var)=$($(var));)
 
 #=========================
 # Include the config file
@@ -143,7 +158,7 @@ endif
 CONFIG_FILES ?= $(wildcard $(CONFIG_FILE)-default) $(wildcard $(OUTPUT_DIR)/config.target) $(wildcard $(CONFIG_FILE))
 
 
-export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR INVOCATION_DIR
+export SED4OMK SOURCES_DIR MAKERULES_DIR RELATIVE_DIR INVOCATION_DIR
 export CONFIG_FILE CONFIG_FILES OMK_SERIALIZE_INCLUDED OMK_VERBOSE OMK_SILENT
 # OMK_SERIALIZE_INCLUDED has to be exported to submakes because passes
 # must to be serialized only in the toplevel make.
@@ -155,7 +170,7 @@ endif
 override RELATIVE_DIR := $(RELATIVE_DIR:/%=%)
 override RELATIVE_DIR := $(RELATIVE_DIR:\\%=%)
 #$(warning  RELATIVE_DIR = "$(RELATIVE_DIR)")
-#override BACK2TOP_DIR := $(shell echo $(RELATIVE_DIR)/ | sed -e 's_//_/_g' -e 's_/\./_/_g' -e 's_^\./__g'  -e 's_\([^/][^/]*\)_.._g' -e 's_/$$__')
+#override BACK2TOP_DIR := $(shell echo $(RELATIVE_DIR)/ | $(SED4OMK) -e 's_//_/_g' -e 's_/\./_/_g' -e 's_^\./__g'  -e 's_\([^/][^/]*\)_.._g' -e 's_/$$__')
 #$(warning  BACK2TOP_DIR = "$(BACK2TOP_DIR)")
 
 #$(warning SOURCES_DIR = "$(SOURCES_DIR)")
@@ -214,9 +229,9 @@ print-hints:
 	@echo 'Use "make V=1" to see the verbose compile lines.'
 
 check-make-ver:
-	@GOOD_MAKE_VERSION=`echo $(MAKE_VERSION) | sed -n -e 's/^[4-9]\..*\|^3\.9[0-9].*\|^3\.8[1-9].*/y/p'` ; \
+	@GOOD_MAKE_VERSION=`echo $(MAKE_VERSION) | $(SED4OMK) -n -e 's/^[4-9]\..*\|^3\.9[0-9].*\|^3\.8[1-9].*/y/p'` ; \
 	if [ x$$GOOD_MAKE_VERSION != xy ] ; then \
-		echo "Your make program version is too old and does not support OMK system." ; \
+		echo "Your make program version ($(MAKE_VERSION)) is too old and does not support OMK system." ; \
 		echo "Please update to make program 3.81beta1 or newer." ; exit 1 ; \
 	fi
 
@@ -257,7 +272,7 @@ $(pass)-submakes: $(pass)-$(3)-subdir
 $(pass)-$(3)-subdir: MAKEOVERRIDES:=$(filter-out SUBDIRS=%,$(MAKEOVERRIDES))
 $(pass)-$(3)-subdir:
 	@$(call mkdir_def,$(2)/$(3))
-	+@$(MAKE) SOURCES_DIR=$(SOURCES_DIR)/$(3) $(NO_PRINT_DIRECTORY) \
+	+@$(MAKE) --no-builtin-rules SOURCES_DIR=$(SOURCES_DIR)/$(3) $(NO_PRINT_DIRECTORY) \
 		RELATIVE_DIR=$(RELATIVE_PREFIX)$(3) -C $(2)/$(3) \
 		-f $(SUBDIR_MAKEFILE) $(pass)-submakes
 # In subdirectories we can call submakes directly since passes are
@@ -289,7 +304,7 @@ $(foreach subdir,$(SUBDIRS),$(eval $(call omk_pass_subdir_template,$(pass),$(2),
 $(pass):
 # Submakes have to be called this way and not as dependecies for pass
 # serialization to work
-	+@$(MAKE) SOURCES_DIR=$(SOURCES_DIR) $(NO_PRINT_DIRECTORY) \
+	+@$(MAKE) --no-builtin-rules SOURCES_DIR=$(SOURCES_DIR) $(NO_PRINT_DIRECTORY) \
 		RELATIVE_DIR=$(RELATIVE_DIR) \
 		-f $(SOURCESDIR_MAKEFILE) $(pass)-submakes
 $(pass)-submakes:
@@ -300,7 +315,7 @@ $(pass)-submakes: $(pass)-this-dir
 $(pass)-this-dir: $(foreach subdir,$(SUBDIRS),$(pass)-$(subdir)-subdir)
 	+@echo "make[omk]: $(pass) in $(RELATIVE_DIR)"
 	@$(call mkdir_def,$(2))
-	+@$(MAKE) $(NO_PRINT_DIRECTORY) SOURCES_DIR=$(SOURCES_DIR) RELATIVE_DIR=$(RELATIVE_DIR) -C $(2) \
+	+@$(MAKE) --no-builtin-rules $(NO_PRINT_DIRECTORY) SOURCES_DIR=$(SOURCES_DIR) RELATIVE_DIR=$(RELATIVE_DIR) -C $(2) \
 	        -f $(SOURCESDIR_MAKEFILE) $(3) $(check-target) $(1:%=%-local)
 $(pass)-local: $($(pass)_HOOKS)
 endif
@@ -324,7 +339,7 @@ default-config-pass-local:
 #	@echo Default config for $(RELATIVE_DIR)
 	@echo "# Config for $(RELATIVE_DIR)" >> "$(CONFIG_FILE)-default"
 	@$(foreach x, $(default_CONFIG), echo '$(x)' | \
-		sed -e 's/^[^=]*=x$$/#\0/' >> "$(CONFIG_FILE)-default" ; )
+		$(SED4OMK) -e 's/^[^=]*=x$$/#\0/' >> "$(CONFIG_FILE)-default" ; )
 
 
 omkize:
@@ -338,6 +353,48 @@ omkize:
 	      cp -v Makefile "$${d}/Makefile"; \
 	   fi \
 	done
+                                                                                 #OMK:wvtest.omk@Makefile.rules.linux
+ifndef WVTEST_LIBRARY
+WVTEST_LIBRARY = wvtest
+endif
+
+# Documentation: wvtest_PROGRAMS is amost equivalent to test_PROGRAMS.
+# The two differences are that the program is automatically linked
+# with $(WVTEST_LIBRARY) and it is run during "make wvtest".
+test_PROGRAMS += $(wvtest_PROGRAMS)
+
+# Documentation: If your project uses wvtest, it is recomended to put
+# the "test: wvtest" rule to config.target.
+wvtest:
+	$(Q)$(MAKERULES_DIR)/wvtestrun $(MAKE) wvtest-pass
+
+.PHONY: wvtest
+
+$(eval $(call omk_pass_template,wvtest-pass,$$(LOCAL_BUILD_DIR),,$(wvtest_SCRIPTS)$(wvtest_PROGRAMS)))
+
+# Usage: $(call wvtest_template,<shell command>)
+define wvtest_template
+wvtest-pass-local: wvtest-run-$(1)
+.PHONY: wvtest-run-$(1)
+wvtest-run-$(1):
+	$(Q)echo "Testing \"Run $(1)\" in Makefile.rules:"
+	$(Q)mkdir -p $(1).wvtest
+	$(Q)cd $(1).wvtest && \
+	  PATH=$$(USER_BIN_DIR):$$$$PATH LD_LIBRARY_PATH=$$(USER_LIB_DIR):$$$$LD_LIBRARY_PATH \
+	  $(1)
+$(notdir $(1))_LIBS += $$(WVTEST_LIBRARY)
+endef
+
+# Documentation: Write the test so, that it can be run from arbitrary
+# directory, i.e. in case of a script ensure that the wvtest library
+# is sourced like this:
+#
+# . $(dirname $0)/wvtest.sh
+
+$(foreach script,$(wvtest_SCRIPTS),$(eval $(call wvtest_template,$(SOURCES_DIR)/$(script))))
+# Hack!!!
+USER_TESTS_DIR := $(OUTPUT_DIR)/_compiled/bin-tests
+$(foreach prog,$(wvtest_PROGRAMS),$(eval $(call wvtest_template,$(USER_TESTS_DIR)/$(prog))))
 ifeq ($(OMK_VERBOSE),1)                                                          #OMK:include.omk@Makefile.rules.linux
 CPHEADER_FLAGS += -v
 LNHEADER_FLAGS += -v
@@ -347,7 +404,7 @@ ifneq ($(LN_HEADERS),y)
 define cp_cmd
 if ! cmp --quiet $(1) $(2); then \
     echo "  CP      $(1:$(OUTPUT_DIR)/%=%) -> $(2:$(OUTPUT_DIR)/%=%)"; \
-    install -C -D $(CPHEADER_FLAGS) $(1) $(2) || exit 1; \
+    install -D $(CPHEADER_FLAGS) $(1) $(2) || exit 1; \
 fi
 endef
 else
@@ -506,13 +563,6 @@ override OMK_SERIALIZE_INCLUDED = y
 MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
-# Checks for OMK tester
-ifdef OMK_TESTSROOT
-default-config-pass-check include-pass-check:
-library-pass-check binary-pass-check:
-	@[ -x "$(shell which $(CC))" ] || $(call canttest,Cannot find compiler: $(CC))
-endif
-
 #=====================================================================
 # User-space rules and templates to compile programs, libraries etc.
 
@@ -538,7 +588,7 @@ idl_COMPILE = $(IDL_COMPILER)
 
 # Check GCC version for user build
 ifndef CC_MAJOR_VERSION
-CC_MAJOR_VERSION := $(shell $(CC) -dumpversion | sed -e 's/\([^.]\)\..*/\1/')
+CC_MAJOR_VERSION := $(shell $(CC) -dumpversion | $(SED4OMK) -e 's/\([^.]\)\..*/\1/')
 endif
 # Prepare suitable define for dependency building
 ifeq ($(CC_MAJOR_VERSION),2)
@@ -594,15 +644,15 @@ $(2): $(1)
 # Bellow, the tricks with redirection are for shells without set -o pipefail
 # (see http://www.mail-archive.com/dash@vger.kernel.org/msg00149.html)
 	$(Q)exec 3>&1; status=`exec 4>&1 >&3; { $(NM) $$<; echo $$$$? >&4; }\
-		| sed -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2cond_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \
+		| $(SED4OMK) -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2cond_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \
 		| sort >>$$@.tmp` && exit $$$$status
 	$(Q)echo >>$$@.tmp '/* Defines from the values defined to symbols in hexadecimal format */'
 	$(Q)exec 3>&1; status=`exec 4>&1 >&3; { $(NM) $$<; echo $$$$? >&4; }\
-		| sed -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2def_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \
+		| $(SED4OMK) -n 's/^ *0*\(0[0-9A-Fa-f]*\) *A *_cmetric2def_\([A-Za-z_0-9]*\) */#define \2 0x\1/p' \
 		| sort >>$$@.tmp` && exit $$$$status
 	$(Q)echo >>$$@.tmp '/* Defines from the values defined to symbols in decimal format */'
 	$(Q)exec 3>&1; status=`exec 4>&1 >&3; { $(NM) -td $$<; echo $$$$? >&4; }\
-		| sed -n 's/^ *0*\(0\|[1-9][0-9]*\) *A *_cmetric2defdec_\([A-Za-z_0-9]*\) */#define \2 \1/p' \
+		| $(SED4OMK) -n 's/^ *0*\(0\|[1-9][0-9]*\) *A *_cmetric2defdec_\([A-Za-z_0-9]*\) */#define \2 \1/p' \
 		| sort >>$$@.tmp` && exit $$$$status
 	$(Q)mv $$@.tmp $$@
 endef
@@ -642,10 +692,17 @@ $(2)/$(1)$(3): $$($(1)_OBJS)
 	$(Q) $$(if $$(filter %.cc,$$($(1)_SOURCES:%.cxx=%.cc)),$$(CXX),$$(CC)) \
 	  $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(LDFLAGS) $$($(1)_LDFLAGS) -Wl,-rpath-link,$(USER_LIB_DIR) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $$@
 	@echo "$(2)/$(1)$(3): \\" >$(USER_OBJS_DIR)/$(1).exe.d
-	@sed -n -e 's|^LOAD \(.*\)$$$$|  \1  \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134'  >>$(USER_OBJS_DIR)/$(1).exe.d
+	@$(SED4OMK) -n -e 's|^LOAD \(.*\)$$$$|  \1  \&|p' $(USER_OBJS_DIR)/$(1).exe.map|tr '&' '\134'  >>$(USER_OBJS_DIR)/$(1).exe.d
 	@echo >>$(USER_OBJS_DIR)/$(1).exe.d
 endef
 
+# Usage: $(call SCRIPT_template,<target-directory>,<script-name>)
+define SCRIPT_template
+$(2)/$(1): $$(SOURCES_DIR)/$(1)
+	@$(QUIET_CMD_ECHO) "  CP      $$@"
+	$(Q)cp $$^ $$@
+endef
+
 
 # Syntax: $(call LIBRARY_template,<library-name>)
 define LIBRARY_template
@@ -705,7 +762,10 @@ endef
 library-pass-local: $(addprefix $(USER_INCLUDE_DIR)/,$(cmetric_include_HEADERS)) \
 		    $(lib_LIBRARIES:%=$(USER_LIB_DIR)/lib%.a) $(shared_LIBRARIES:%=$(OMK_WORK_DIR)/lib%.$(SOLIB_EXT).omkvar)
 
-binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%$(EXE_SUFFIX)) $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%$(EXE_SUFFIX)) $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%$(EXE_SUFFIX))
+binary-pass-local: $(bin_PROGRAMS:%=$(USER_BIN_DIR)/%$(EXE_SUFFIX)) \
+		   $(utils_PROGRAMS:%=$(USER_UTILS_DIR)/%$(EXE_SUFFIX)) \
+		   $(test_PROGRAMS:%=$(USER_TESTS_DIR)/%$(EXE_SUFFIX)) \
+		   $(bin_SCRIPTS:%=$(USER_BIN_DIR)/%)
 
 # Special rules for CMETRIC generated headers
 
@@ -728,6 +788,9 @@ $(foreach prog,$(test_PROGRAMS),$(eval $(call PROGRAM_template,$(prog),$(USER_TE
 
 $(foreach prog,$(bin_PROGRAMS),$(eval $(call PROGRAM_template,$(prog),$(USER_BIN_DIR),$(EXE_SUFFIX))))
 
+$(foreach script,$(bin_SCRIPTS),$(eval $(call SCRIPT_template,$(script),$(USER_BIN_DIR))))
+
+
 $(foreach lib,$(lib_LIBRARIES),$(eval $(call LIBRARY_template,$(lib))))
 
 $(foreach lib,$(shared_LIBRARIES),$(eval $(call SOLIB_template,$(lib))))
@@ -775,7 +838,7 @@ ifeq ($(CONFIG_RTLINUX),y)
 include $(RTL_DIR)/rtl.mk
 
 KERN_CC = $(CC)
-kern_GCCLIB_DIR=$(shell LANG=C LC_ALL=C LC_MESSAGES=C $(CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )
+kern_GCCLIB_DIR=$(shell LANG=C LC_ALL=C LC_MESSAGES=C $(CC) -print-search-dirs | $(SED4OMK) -n -e 's/^install: \(.*\)$$/\1/p' )
 INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES)
 #-DEXPORT_NO_SYMBOLS
 c_o_kern_COMPILE = $(KERN_CC) -idirafter $(kern_GCCLIB_DIR)/include $(INCLUDES)  $(CFLAGS) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
@@ -796,15 +859,15 @@ kernel_INCLUDES += -I $(KERN_INCLUDE_DIR) -I $(LINUX_DIR) -idirafter $(LINUX_SRC
 
 ifdef LINUX_CC
 KERN_CC = $(LINUX_CC)
-kern_GCCLIB_DIR=$(shell LANG=C LC_ALL=C LC_MESSAGES=C $(LINUX_CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )
+kern_GCCLIB_DIR=$(shell LANG=C LC_ALL=C LC_MESSAGES=C $(LINUX_CC) -print-search-dirs | $(SED4OMK) -n -e 's/^install: \(.*\)$$/\1/p' )
 else
 KERN_CC = echo KERN_CC not defined - compilation skipped
 endif
 c_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
 cc_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_CFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB
-S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_CFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
+S_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -idirafter $(kern_GCCLIB_DIR)/include $(LINUX_CPPFLAGS) $(LINUX_AFLAGS) $(LINUX_AFLAGS_MODULE) -DOMK_FOR_KERNEL -DEXPORT_SYMTAB -nostdinc
 KERN_EXE_SUFFIX := $(LINUX_MODULE_EXT)
-KERN_LDFLAGS = $(LINUX_LDFLAGS)
+KERN_LDFLAGS = $(LINUX_LDFLAGS) $(LINUX_LDFLAGS_MODULE)
 ifdef LINUX_ARCH
 KERN_ARCH = $(LINUX_ARCH)
 else
@@ -835,7 +898,7 @@ KERN_LOADLIBES += $(kernel_LOADLIBES:%=-l%)
 
 # Check GCC version for kernel part of build
 ifndef kern_CC_MAJOR_VERSION
-kern_CC_MAJOR_VERSION := $(shell $(KERN_CC) -dumpversion | sed -e 's/\([^.]\)\..*/\1/')
+kern_CC_MAJOR_VERSION := $(shell $(KERN_CC) -dumpversion | $(SED4OMK) -e 's/\([^.]\)\..*/\1/')
 endif
 # Prepare suitable define for dependency building
 ifeq ($(kern_CC_MAJOR_VERSION),2)
@@ -968,7 +1031,7 @@ $(2)/$(1)$(KERN_LINK_SUFFIX): $$($(1)_OBJS)
 	@$(QUIET_CMD_ECHO) "  LD [K]  $$@"
 	$(Q) $$(KERN_LD) $$(KERN_LDFLAGS) -r $$($(1)_OBJS) -L$$(kern_GCCLIB_DIR) $$($(1)_LIBS:%=-l%) $$(KERN_LOADLIBES) -Map $(KERN_OBJS_DIR)/$(1).mod.map -o $$@
 	@echo "$(2)/$(1)$(KERN_LINK_SUFFIX): \\" >$(KERN_OBJS_DIR)/$(1).mod.d
-	@sed -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(KERN_OBJS_DIR)/$(1).mod.map  >>$(KERN_OBJS_DIR)/$(1).mod.d
+	@$(SED4OMK) -n -e 's/^LOAD \(.*\)$$$$/  \1  \\/p' $(KERN_OBJS_DIR)/$(1).mod.map  >>$(KERN_OBJS_DIR)/$(1).mod.d
 	@echo >>$(KERN_OBJS_DIR)/$(1).mod.d
 	@if [ "$(KERN_EXE_SUFFIX)" = ".ko" ] ; then \
 	  echo $(1) >>$(KERN_MODPOST_DIR)/module-changes ; \
@@ -1070,7 +1133,7 @@ kernel-modpost-pass:
 	fi
 
 $(eval $(call omk_pass_template, library-pass,$(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(lib_LIBRARIES)$(shared_LIBRARIES)))
-$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)$(test_PROGRAMS)))
+$(eval $(call omk_pass_template, binary-pass, $(USER_OBJS_DIR),USER_RULE_TEMPLATES=y,$(bin_PROGRAMS)$(utils_PROGRAMS)$(test_PROGRAMS)$(bin_SCRIPTS)))
 
 $(eval $(call omk_pass_template,clean,$(USER_OBJS_DIR),,always))
 $(eval $(call omk_pass_template,install,$(USER_OBJS_DIR),,always))
@@ -1204,10 +1267,10 @@ $(addprefix $(1)/,$(notdir $(addsuffix .stamp,$(2)))) : $(CONFIG_FILES)
 	$(if $(DOXYGEN),@echo "/** @file */" >> "$(2).tmp")
 	@echo "#ifndef $(4)" >> "$(2).tmp"
 	@echo "#define $(4)" >> "$(2).tmp"
-	@( $(foreach x, $(shell echo '$($(3))' | tr 'x\t ' 'x\n\n' | sed -e 's/^\([^ =]*\)\(=[^ ]\+\|\)$$/\1/' ), \
+	@( $(foreach x, $(shell echo '$($(3))' | tr 'x\t ' 'x\n\n' | $(SED4OMK) -e 's/^\([^ =]*\)\(=[^ ]\+\|\)$$/\1/' ), \
 		echo '$(x).$($(x))' ; ) echo ; ) | \
-		sed -e '/^[^.]*\.n$$$$/d' -e '/^[^.]*\.$$$$/d' -e 's/^\([^.]*\)\.[ym]$$$$/\1.1/' | \
-		sed -n -e 's/^\([^.]*\)\.\(.*\)$$$$/#define \1 \2/p' \
+		$(SED4OMK) -e '/^[^.]*\.n$$$$/d' -e '/^[^.]*\.$$$$/d' -e 's/^\([^.]*\)\.[ym]$$$$/\1.1/' | \
+		$(SED4OMK) -n -e 's/^\([^.]*\)\.\(.*\)$$$$/#define \1 \2/p' \
 		  >> "$(2).tmp"
 	@echo "#endif /*$(4)*/" >> "$(2).tmp"
 	@touch "$$@"
@@ -1279,6 +1342,7 @@ $(LOCAL_BUILD_DIR)/$(dir $(1))Makefile: $(SOURCES_DIR)/$(1)
 	     $(QTDIR:%=QTDIR=%) CC=$(CC) CXX=$(CXX)			\
 	     LIBS+="-L$(USER_LIB_DIR)" DESTDIR=$(USER_BIN_DIR)		\
 	     INCLUDEPATH+="$(USER_INCLUDE_DIR)"				\
+	     DEPENDPATH+="$(USER_INCLUDE_DIR)"				\
 	     QMAKE_LFLAGS="-Wl,-rpath-link,$(USER_LIB_DIR) $$(QMAKE_LFLAGS)" \
 	     $(SOURCES_DIR)/$(1)
 
@@ -1339,7 +1403,7 @@ $(SOURCES_LIST): $(CONFIG_FILES) $(shell find -name $(MAKEFILE_OMK))
 	@mv "$(SOURCES_LIST).tmp2" "$(SOURCES_LIST)"
 	@echo "$(SOURCES_LIST): \\" > "$(SOURCES_LIST_D).tmp2"
 	@cat "$(SOURCES_LIST_D).tmp"|grep -v "$(SOURCES_LIST_D).tmp"|sort|uniq|\
-		sed -e 's/$$/\\/' >> "$(SOURCES_LIST_D).tmp2"
+		$(SED4OMK) -e 's/$$/\\/' >> "$(SOURCES_LIST_D).tmp2"
 	@rm "$(SOURCES_LIST_D).tmp"
 	@mv "$(SOURCES_LIST_D).tmp2" "$(SOURCES_LIST_D)"
 endif
@@ -1352,7 +1416,7 @@ sources-list-pass-local:
 	  echo "$(addsuffix /,$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%))$(h)" >> "$(SOURCES_LIST).tmp";)
 	@$(foreach ch,$(config_include_HEADERS), \
 	  echo "$(USER_INCLUDE_DIR:$(OUTPUT_DIR)/$(addsuffix /,$(SOURCES_LIST_DIR))%=%)/$(ch)" >> "$(SOURCES_LIST).tmp";)
-	@$(foreach h,$(renamed_include_HEADERS),echo '$(h)'|sed -e 's|\(.*\)->.*|$(addsuffix /,$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%))\1|' >> "$(SOURCES_LIST).tmp";)
+	@$(foreach h,$(renamed_include_HEADERS),echo '$(h)'|$(SED4OMK) -e 's|\(.*\)->.*|$(addsuffix /,$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%))\1|' >> "$(SOURCES_LIST).tmp";)
 	@$(foreach bin,$(lib_LIBRARIES) $(shared_LIBRARIES) $(bin_PROGRAMS) $(test_PROGRAMS) $(utils_PROGRAMS) \
 	  $(kernel_LIBRARIES) $(rtlinux_LIBRARIES) $(kernel_MODULES),\
 	  $(foreach src,$(filter-out %.o,$($(bin)_SOURCES)),echo "$(addsuffix /,$(RELATIVE_DIR:$(SOURCES_LIST_DIR)/%=%))$(src)" >> "$(SOURCES_LIST).tmp";))
@@ -1375,7 +1439,7 @@ export TAGS_CMD
 
 ifeq ($(MAKECMDGOALS),do-tags)
 .PHONY: do-tags
-do-tags: $(shell sed -e '/^\#/d' $(SOURCES_LIST))
+do-tags: $(shell $(SED4OMK) -e '/^\#/d' $(SOURCES_LIST))
 	@$(QUIET_CMD_ECHO) "  TAGS    $(SOURCES_LIST_FN)"
 	$(Q)$(TAGS_CMD) $^
 endif
@@ -1384,6 +1448,6 @@ endif
 
 cscope: $(SOURCES_LIST)
 	@$(QUIET_CMD_ECHO) "  CSCOPE  < $(SOURCES_LIST_FN)"
-	$(Q)sed -e '/^#/d' $(SOURCES_LIST) > cscope.files
+	$(Q)$(SED4OMK) -e '/^#/d' $(SOURCES_LIST) > cscope.files
 	$(Q)cscope -b -icscope.files
 #FIXME: see doc to -i in cscope(1)
diff --git a/omk/rules/linux/kernelcfg2mk b/omk/rules/linux/kernelcfg2mk
index 3fd50d2..9636241 100755
--- a/omk/rules/linux/kernelcfg2mk
+++ b/omk/rules/linux/kernelcfg2mk
@@ -119,9 +119,9 @@ EOF
 	;;
 
 #=====================================================================
-# test for 2.6.x kernels
+# test for 2.6.x and 3.x kernels
 
-    2.6)
+    2.6 | 3.* )
 
 	rm -f ${KERN_BUILD_DIR}/kernel.mk
 	rm -rf ${KERN_TEST_DIR}
@@ -163,7 +163,14 @@ else
 	@echo LINUX_AFLAGS="\$(AFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags
 	@echo LINUX_CFLAGS="\$(CFLAGS)" | sed 's#Iinclude#I"\$(OMK_LINUX_SRC)/include"#g'>>\$(obj)/flags
 endif
+ifdef KBUILD_CFLAGS_MODULE
+	@echo LINUX_CFLAGS_MODULE="\$(KBUILD_CFLAGS_MODULE)" >>\$(obj)/flags
+	@echo LINUX_AFLAGS_MODULE="\$(KBUILD_AFLAGS_MODULE)" >>\$(obj)/flags
+	@echo LINUX_LDFLAGS_MODULE="\$(KBUILD_LDFLAGS_MODULE)" >>\$(obj)/flags
+else
 	@echo LINUX_CFLAGS_MODULE="\$(CFLAGS_MODULE)" >>\$(obj)/flags
+	@echo LINUX_AFLAGS_MODULE="\$(CFLAGS_MODULE)" >>\$(obj)/flags
+endif
 	@echo LINUX_CC="\$(CC)" >>\$(obj)/flags
 	@echo LINUX_LD="\$(LD) \$(LDFLAGS) \$(LDFLAGS_MODULE)" | sed 's#\(\<arch/[^ ]*\.o\>\)#"\$(LINUXDIR)/\1"#g' >>\$(obj)/flags
 	@echo LINUX_AS="\$(AS)" >>\$(obj)/flags