bus: fix driver registration

[dpdk.git] / lib / librte_eal / common / include / rte_bus.h

diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h
index 509292d..773b0d7 100644 (file)
--- a/lib/librte_eal/common/include/rte_bus.h
+++ b/lib/librte_eal/common/include/rte_bus.h
@@ -107,6 +107,36 @@ typedef struct rte_device *
 (*rte_bus_find_device_t)(const struct rte_device *start, rte_dev_cmp_t cmp,
                         const void *data);
 
+/**
+ * Implementation specific probe function which is responsible for linking
+ * devices on that bus with applicable drivers.
+ *
+ * @param dev
+ *     Device pointer that was returned by a previous call to find_device.
+ *
+ * @param devargs
+ *     Device declaration.
+ *
+ * @return
+ *     0 on success.
+ *     !0 on error.
+ */
+typedef int (*rte_bus_plug_t)(struct rte_device *dev,
+                             const char *devargs);
+
+/**
+ * Implementation specific remove function which is responsible for unlinking
+ * devices on that bus from assigned driver.
+ *
+ * @param dev
+ *     Device pointer that was returned by a previous call to find_device.
+ *
+ * @return
+ *     0 on success.
+ *     !0 on error.
+ */
+typedef int (*rte_bus_unplug_t)(struct rte_device *dev);
+
 /**
  * A structure describing a generic bus.
  */
@@ -116,6 +146,8 @@ struct rte_bus {
        rte_bus_scan_t scan;         /**< Scan for devices attached to bus */
        rte_bus_probe_t probe;       /**< Probe devices on bus */
        rte_bus_find_device_t find_device; /**< Find a device on the bus */
+       rte_bus_plug_t plug;         /**< Probe single device for drivers */
+       rte_bus_unplug_t unplug;     /**< Remove single device from driver */
 };
 
 /**
@@ -224,7 +256,8 @@ struct rte_bus *rte_bus_find_by_name(const char *busname);
  * The constructor has higher priority than PMD constructors.
  */
 #define RTE_REGISTER_BUS(nm, bus) \
-static void __attribute__((constructor(101), used)) businitfn_ ##nm(void) \
+RTE_INIT_PRIO(businitfn_ ##nm, 101); \
+static void businitfn_ ##nm(void) \
 {\
        (bus).name = RTE_STR(nm);\
        rte_bus_register(&bus); \