udev: hwdb - search parents for 'modalias' and data

[elogind.git] / src / udev / udev.h

diff --git a/src/udev/udev.h b/src/udev/udev.h
index e229faaa4a8671c58d4c6718c773b521f9bb67eb..a361c653fefafd2ed18f321467d16e6da8c9089e 100644 (file)
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -26,6 +26,8 @@
 #include "libudev.h"
 #include "libudev-private.h"
 #include "util.h"
 #include "libudev.h"
 #include "libudev-private.h"
 #include "util.h"

+#include "label.h"
+#include "strv.h"

 
 struct udev_event {
         struct udev *udev;
 
 struct udev_event {
         struct udev *udev;


@@ -133,12 +135,12 @@ int udev_ctrl_get_set_children_max(struct udev_ctrl_msg *ctrl_msg);
 /* built-in commands */
 enum udev_builtin_cmd {
         UDEV_BUILTIN_BLKID,
 /* built-in commands */
 enum udev_builtin_cmd {
         UDEV_BUILTIN_BLKID,

+        UDEV_BUILTIN_BTRFS,

         UDEV_BUILTIN_FIRMWARE,
         UDEV_BUILTIN_FIRMWARE,

+        UDEV_BUILTIN_HWDB,

         UDEV_BUILTIN_INPUT_ID,
         UDEV_BUILTIN_KMOD,
         UDEV_BUILTIN_PATH_ID,
         UDEV_BUILTIN_INPUT_ID,
         UDEV_BUILTIN_KMOD,
         UDEV_BUILTIN_PATH_ID,

-        UDEV_BUILTIN_PCI_DB,
-        UDEV_BUILTIN_USB_DB,

         UDEV_BUILTIN_USB_ID,
 #ifdef HAVE_ACL
         UDEV_BUILTIN_UACCESS,
         UDEV_BUILTIN_USB_ID,
 #ifdef HAVE_ACL
         UDEV_BUILTIN_UACCESS,


@@ -155,15 +157,15 @@ struct udev_builtin {
         bool run_once;
 };
 extern const struct udev_builtin udev_builtin_blkid;
         bool run_once;
 };
 extern const struct udev_builtin udev_builtin_blkid;

+extern const struct udev_builtin udev_builtin_btrfs;

 extern const struct udev_builtin udev_builtin_firmware;
 extern const struct udev_builtin udev_builtin_firmware;

+extern const struct udev_builtin udev_builtin_hwdb;

 extern const struct udev_builtin udev_builtin_input_id;
 extern const struct udev_builtin udev_builtin_kmod;
 extern const struct udev_builtin udev_builtin_path_id;
 extern const struct udev_builtin udev_builtin_input_id;
 extern const struct udev_builtin udev_builtin_kmod;
 extern const struct udev_builtin udev_builtin_path_id;

-extern const struct udev_builtin udev_builtin_pci_db;
-extern const struct udev_builtin udev_builtin_usb_db;

 extern const struct udev_builtin udev_builtin_usb_id;
 extern const struct udev_builtin udev_builtin_uaccess;
 extern const struct udev_builtin udev_builtin_usb_id;
 extern const struct udev_builtin udev_builtin_uaccess;

-int udev_builtin_init(struct udev *udev);
+void udev_builtin_init(struct udev *udev);

 void udev_builtin_exit(struct udev *udev);
 enum udev_builtin_cmd udev_builtin_lookup(const char *command);
 const char *udev_builtin_name(enum udev_builtin_cmd cmd);
 void udev_builtin_exit(struct udev *udev);
 enum udev_builtin_cmd udev_builtin_lookup(const char *command);
 const char *udev_builtin_name(enum udev_builtin_cmd cmd);


@@ -172,6 +174,7 @@ int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
 void udev_builtin_list(struct udev *udev);
 bool udev_builtin_validate(struct udev *udev);
 int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val);
 void udev_builtin_list(struct udev *udev);
 bool udev_builtin_validate(struct udev *udev);
 int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val);

+int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *modalias, bool test);

 
 /* udev logging */
 void udev_main_log(struct udev *udev, int priority,
 
 /* udev logging */
 void udev_main_log(struct udev *udev, int priority,


@@ -190,6 +193,7 @@ extern const struct udevadm_cmd udevadm_trigger;
 extern const struct udevadm_cmd udevadm_settle;
 extern const struct udevadm_cmd udevadm_control;
 extern const struct udevadm_cmd udevadm_monitor;
 extern const struct udevadm_cmd udevadm_settle;
 extern const struct udevadm_cmd udevadm_control;
 extern const struct udevadm_cmd udevadm_monitor;

+extern const struct udevadm_cmd udevadm_hwdb;

 extern const struct udevadm_cmd udevadm_test;
 extern const struct udevadm_cmd udevadm_test_builtin;
 #endif
 extern const struct udevadm_cmd udevadm_test;
 extern const struct udevadm_cmd udevadm_test_builtin;
 #endif