nic_uio: fix thread structure compatibility for future FreeBSD

[dpdk.git] / lib / librte_eal / bsdapp / nic_uio / nic_uio.c

diff --git a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
index ce97dfc..5ae8560 100644 (file)
--- a/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
+++ b/lib/librte_eal/bsdapp/nic_uio/nic_uio.c
@@ -1,13 +1,13 @@
 /* -
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h> /* structs, prototypes for pci bus stuff and DEVMETHOD */
 #include <sys/rman.h>
 #include <sys/systm.h>
+#include <sys/rwlock.h>
 #include <sys/proc.h>
 
 #include <machine/bus.h>
@@ -108,7 +109,10 @@ struct pci_bdf {
 #define RTE_PCI_DEV_ID_DECL_IGBVF(vend, dev)   {vend, dev},
 #define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev)   {vend, dev},
 #define RTE_PCI_DEV_ID_DECL_IXGBEVF(vend, dev) {vend, dev},
+#define RTE_PCI_DEV_ID_DECL_I40E(vend, dev)    {vend, dev},
+#define RTE_PCI_DEV_ID_DECL_I40EVF(vend, dev)  {vend, dev},
 #define RTE_PCI_DEV_ID_DECL_VIRTIO(vend, dev)  {vend, dev},
+#define RTE_PCI_DEV_ID_DECL_VMXNET3(vend, dev) {vend, dev},
 
 const struct device devices[] = {
 #include <rte_pci_dev_ids.h>
@@ -171,13 +175,13 @@ nic_uio_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t size,
 
 
 int
-nic_uio_open(struct cdev *dev, int oflags, int devtype, d_thread_t *td)
+nic_uio_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 {
        return 0;
 }
 
 int
-nic_uio_close(struct cdev *dev, int fflag, int devtype, d_thread_t *td)
+nic_uio_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
        return 0;
 }
@@ -234,7 +238,7 @@ nic_uio_detach(device_t dev)
                        if (PCI_BAR_IO(pci_read_config(dev, sc->bar_id[i], 4)))
                                bus_release_resource(dev, SYS_RES_IOPORT, sc->bar_id[i],
                                                sc->bar_res[i]);
-                       else 
+                       else
                                bus_release_resource(dev, SYS_RES_MEMORY, sc->bar_id[i],
                                                sc->bar_res[i]);
                }
@@ -285,7 +289,7 @@ nic_uio_load(void)
 
                dev = pci_find_bsf(bus, device, function);
                if (dev != NULL)
-                       for (i = 0; i < NUM_DEVICES; i++) 
+                       for (i = 0; i < NUM_DEVICES; i++)
                                if (pci_get_vendor(dev) == devices[i].vend &&
                                                pci_get_device(dev) == devices[i].dev)
                                                        device_detach(dev);