Skip to contentSkip to conversation

UIO: Add a driver for Hilscher netX-based fieldbus cards

PATCH In review Hans J. Koch 2 participants 2 messages Feb 9, 2010 – Feb 18, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 UIO: Add a driver for Hilscher netX-based fieldbus cards

This patch adds a Userspace IO driver for netX-based fieldbus cards by Hilscher (see http://www.hilscher.com). ATM, cifX and comX cards are supported. The userspace part for this driver is provided by Hilscher and should come with the card.
The driver is in use for several months now and has been tested by people at Hilscher and Linutronix.

---
 drivers/uio/Kconfig     |   11 +++
 drivers/uio/Makefile    |    1 
 drivers/uio/uio_netx.c  |  167 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/pci_ids.h |    5 +
 4 files changed, 184 insertions(+)
drivers/uio/Kconfig +11 -0
Index: linux-2.6.33-rc/drivers/uio/Kconfig
===================================================================
@@ -94,4 +94,15 @@
 	  primarily, for virtualization scenarios.
 	  If you compile this as a module, it will be called uio_pci_generic.
 
+config UIO_NETX
+	tristate "Hilscher NetX Card driver"
+	depends on PCI
+	help
+	  Driver for Hilscher NetX based fieldbus cards (cifX, comX).
+	  This driver requires a userspace component that comes with the card
+	  or is available from Hilscher (http://www.hilscher.com).
+
+	  To compile this driver as a module, choose M here; the module
+	  will be called uio_netx.
+
 endif
drivers/uio/Makefile +1 -0
Index: linux-2.6.33-rc/drivers/uio/Makefile
===================================================================
@@ -6,3 +6,4 @@
 obj-$(CONFIG_UIO_AEC)	+= uio_aec.o
 obj-$(CONFIG_UIO_SERCOS3)	+= uio_sercos3.o
 obj-$(CONFIG_UIO_PCI_GENERIC)	+= uio_pci_generic.o
+obj-$(CONFIG_UIO_NETX)	+= uio_netx.o
drivers/uio/uio_netx.c new file +167 -0

167 lines not on this page · raw message

include/linux/pci_ids.h +5 -0
Index: linux-2.6.33-rc/include/linux/pci_ids.h
===================================================================
@@ -137,6 +137,11 @@
 
 /* Vendors and devices.  Sort key: vendor first, device next. */
 
+#define PCI_VENDOR_ID_HILSCHER		0x15CF
+#define PCI_DEVICE_ID_HILSCHER_NETX	0x0000
+#define PCI_SUBDEVICE_ID_NXSB_PCA	0x3235
+#define PCI_SUBDEVICE_ID_NXPCA		0x3335
+
 #define PCI_VENDOR_ID_TTTECH		0x0357
 #define PCI_DEVICE_ID_TTTECH_MC322	0x000a
 
#1 lore raw

include/linux/pci_ids.h line 143

Quoted 10 lines
include/linux/pci_ids.h +4 -0
@@ -137,6 +137,11 @@
 
 /* Vendors and devices.  Sort key: vendor first, device next. */
 
+#define PCI_VENDOR_ID_HILSCHER		0x15CF
+#define PCI_DEVICE_ID_HILSCHER_NETX	0x0000
+#define PCI_SUBDEVICE_ID_NXSB_PCA	0x3235
+#define PCI_SUBDEVICE_ID_NXPCA		0x3335

This isn't needed, we don't add new device ids to the file, unless they are used by more than one driver (see the comment at the top of the file.)

I've fixed up the patch to not include this anymore.

thanks,

greg k-h