2011-03-21 14:53:29

by Daniel Trautmann

Subject: [PATCH v2] uio_netx: Add support for netPLC cards

This patch adds support for Hilscher / IBHsoftec netPLC cards to uio_netx userspace IO driver.

Changes from v1 -> v2:
Fixed whitespace errors reported by scripts/checkpatch.pl which were caused by email client.

Signed-off-by: Daniel Trautmann <[email protected]>
---
drivers/uio/uio_netx.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c
index 5ffdb48..a879fd5 100644
--- a/drivers/uio/uio_netx.c
+++ b/drivers/uio/uio_netx.c
@@ -18,6 +18,9 @@

#define PCI_VENDOR_ID_HILSCHER 0x15CF
#define PCI_DEVICE_ID_HILSCHER_NETX 0x0000
+#define PCI_DEVICE_ID_HILSCHER_NETPLC 0x0010
+#define PCI_SUBDEVICE_ID_NETPLC_RAM 0x0000
+#define PCI_SUBDEVICE_ID_NETPLC_FLASH 0x0001
#define PCI_SUBDEVICE_ID_NXSB_PCA 0x3235
#define PCI_SUBDEVICE_ID_NXPCA 0x3335

@@ -66,6 +69,10 @@ static int __devinit netx_pci_probe(struct pci_dev *dev,
bar = 0;
info->name = "netx";
break;
+ case PCI_DEVICE_ID_HILSCHER_NETPLC:
+ bar = 0;
+ info->name = "netplc";
+ break;
default:
bar = 2;
info->name = "netx_plx";
@@ -134,6 +141,18 @@ static struct pci_device_id netx_pci_ids[] = {
.subdevice = 0,
},
{
+ .vendor = PCI_VENDOR_ID_HILSCHER,
+ .device = PCI_DEVICE_ID_HILSCHER_NETPLC,
+ .subvendor = PCI_VENDOR_ID_HILSCHER,
+ .subdevice = PCI_SUBDEVICE_ID_NETPLC_RAM,
+ },
+ {
+ .vendor = PCI_VENDOR_ID_HILSCHER,
+ .device = PCI_DEVICE_ID_HILSCHER_NETPLC,
+ .subvendor = PCI_VENDOR_ID_HILSCHER,
+ .subdevice = PCI_SUBDEVICE_ID_NETPLC_FLASH,
+ },
+ {
.vendor = PCI_VENDOR_ID_PLX,
.device = PCI_DEVICE_ID_PLX_9030,
.subvendor = PCI_VENDOR_ID_PLX,

2011-03-21 17:06:54

by Hans J. Koch

Subject: Re: [PATCH v2] uio_netx: Add support for netPLC cards

On Mon, Mar 21, 2011 at 03:36:35PM +0100, Daniel Trautmann wrote:
> This patch adds support for Hilscher / IBHsoftec netPLC cards to uio_netx userspace IO driver.
>
> Changes from v1 -> v2:
> Fixed whitespace errors reported by scripts/checkpatch.pl which were caused by email client.

Looks OK to me.

Thanks for your contribution,
Hans

>
> Signed-off-by: Daniel Trautmann <[email protected]>

Signed-off-by: "Hans J. Koch" <[email protected]>

> ---
> drivers/uio/uio_netx.c | 19 +++++++++++++++++++
> 1 files changed, 19 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c
> index 5ffdb48..a879fd5 100644
> --- a/drivers/uio/uio_netx.c
> +++ b/drivers/uio/uio_netx.c
> @@ -18,6 +18,9 @@
>
> #define PCI_VENDOR_ID_HILSCHER 0x15CF
> #define PCI_DEVICE_ID_HILSCHER_NETX 0x0000
> +#define PCI_DEVICE_ID_HILSCHER_NETPLC 0x0010
> +#define PCI_SUBDEVICE_ID_NETPLC_RAM 0x0000
> +#define PCI_SUBDEVICE_ID_NETPLC_FLASH 0x0001
> #define PCI_SUBDEVICE_ID_NXSB_PCA 0x3235
> #define PCI_SUBDEVICE_ID_NXPCA 0x3335
>
> @@ -66,6 +69,10 @@ static int __devinit netx_pci_probe(struct pci_dev *dev,
> bar = 0;
> info->name = "netx";
> break;
> + case PCI_DEVICE_ID_HILSCHER_NETPLC:
> + bar = 0;
> + info->name = "netplc";
> + break;
> default:
> bar = 2;
> info->name = "netx_plx";
> @@ -134,6 +141,18 @@ static struct pci_device_id netx_pci_ids[] = {
> .subdevice = 0,
> },
> {
> + .vendor = PCI_VENDOR_ID_HILSCHER,
> + .device = PCI_DEVICE_ID_HILSCHER_NETPLC,
> + .subvendor = PCI_VENDOR_ID_HILSCHER,
> + .subdevice = PCI_SUBDEVICE_ID_NETPLC_RAM,
> + },
> + {
> + .vendor = PCI_VENDOR_ID_HILSCHER,
> + .device = PCI_DEVICE_ID_HILSCHER_NETPLC,
> + .subvendor = PCI_VENDOR_ID_HILSCHER,
> + .subdevice = PCI_SUBDEVICE_ID_NETPLC_FLASH,
> + },
> + {
> .vendor = PCI_VENDOR_ID_PLX,
> .device = PCI_DEVICE_ID_PLX_9030,
> .subvendor = PCI_VENDOR_ID_PLX,
>
>
>