Changeset 15401 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 12, 2008 10:05:34 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40850

Message:

Main: added USB to HostHardwareLinux.cpp

Location:

trunk/src/VBox/Main/include

Files:

• HostHardwareLinux.h (modified) (3 diffs)
• vbox-dbus.h (modified) (3 diffs)

trunk/src/VBox/Main/include/HostHardwareLinux.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  * additional information or have any questions.
  */
+
+#ifndef ____H_HOSTHARDWARELINUX
+# define ____H_HOSTHARDWARELINUX
 
 #include <iprt/err.h>
@@ -111 +114 @@
 typedef VBoxMainDriveInfo::DriveInfo DriveInfo;
 
+/**
+ * Class for probing and returning information about host USB devices
+ */
+class VBoxMainUSBDeviceInfo
+{
+public:
+    /** Structure describing a host USB device */
+    struct USBDeviceInfo
+    {
+        /** The device node of the device. */
+        std::string mDevice;
+        /** The sysfs path of the device. */
+        std::string mSysfsPath;
+        /** Type for the list of interfaces. */
+        typedef std::vector <std::string> InterfaceList;
+        /** The sysfs paths of the device's interfaces. */
+        InterfaceList mInterfaces;
+
+        /** Constructors */
+        USBDeviceInfo (std::string aDevice, std::string aSysfsPath)
+            : mDevice (aDevice), mSysfsPath (aSysfsPath) {}
+        USBDeviceInfo () {}
+    };
+    
+    /** List (resp vector) holding drive information */
+    typedef std::vector <USBDeviceInfo> DeviceInfoList;
+
+    /**
+     * Search for host USB devices and rebuild the list, which remains empty
+     * until the first time it is called.
+     * @returns iprt status code
+     */
+    int UpdateDevices ();
+
+    /** Get the first element in the list of USB devices. */
+    DeviceInfoList::const_iterator DevicesBegin()
+    {
+        return mDeviceList.begin();
+    }
+
+    /** Get the last element in the list of USB devices. */
+    DeviceInfoList::const_iterator DevicesEnd()
+    {
+        return mDeviceList.end();
+    }
+
+private:
+    /** The list of currently available USB devices */
+    DeviceInfoList mDeviceList;
+};
+
+typedef VBoxMainUSBDeviceInfo::DeviceInfoList USBDeviceInfoList;
+typedef VBoxMainUSBDeviceInfo::USBDeviceInfo USBDeviceInfo;
+typedef VBoxMainUSBDeviceInfo::USBDeviceInfo::InterfaceList USBInterfaceList;
+
+class VBoxMainHotplugWaiter
+{
+    /** Opaque context struct. */
+    struct Context;
+
+    /** Opaque waiter context. */
+    Context *mContext;
+public:
+    /** Constructor */
+    VBoxMainHotplugWaiter (void);
+    /** Destructor. */
+    ~VBoxMainHotplugWaiter (void);
+    /**
+     * Wait for a hotplug event.
+     *
+     * @returns  VINF_SUCCESS if an event occurred or if Interrupt() was called.
+     * @returns  VERR_TRY_AGAIN if the wait failed but this might (!) be a
+     *           temporary failure.
+     * @returns  VERR_NOT_SUPPORTED if the wait failed and will definitely not
+     *           succeed if retried.
+     * @returns  Possibly other iprt status codes otherwise.
+     */
+    int Wait (void);
+    /** Interrupts an active wait. */
+    void Interrupt (void);
+};
+
+#endif /* ____H_HOSTHARDWARELINUX */
+

trunk/src/VBox/Main/include/vbox-dbus.h

@@ -29 +29 @@
 #define LIB_DBUS_1_3 "libdbus-1.so.3"
 
-/** Types from the dbus header files which we need.  These are taken more or less
-    verbatim from the DBus public interface header files. */
+/** Types and defines from the dbus header files which we need.  These are
+ * taken more or less verbatim from the DBus public interface header files. */
 struct DBusError
 {
@@ -68 +68 @@
 typedef struct DBusMessageIter DBusMessageIter;
 
-/** Defines from the dbus header files which we need.  These are taken more or less
-    verbatim from the DBus public interface header files. */
 #define DBUS_ERROR_NO_MEMORY                  "org.freedesktop.DBus.Error.NoMemory"
 #define DBUS_TYPE_STRING        ((int) 's')
 #define DBUS_TYPE_ARRAY         ((int) 'a')
 #define DBUS_TYPE_DICT_ENTRY    ((int) 'e')
+
+typedef enum
+{
+  DBUS_HANDLER_RESULT_HANDLED,         /**< Message has had its effect - no need
+ to run more handlers. */ 
+  DBUS_HANDLER_RESULT_NOT_YET_HANDLED, /**< Message has not had any effect - see
+ if other handlers want it. */
+  DBUS_HANDLER_RESULT_NEED_MEMORY      /**< Need more memory in order to return 
+#DBUS_HANDLER_RESULT_HANDLED or #DBUS_HANDLER_RESULT_NOT_YET_HANDLED. Please try
+ again later with more memory. */
+} DBusHandlerResult;
+
+typedef DBusHandlerResult (*DBusHandleMessageFunction) (DBusConnection *,
+                                                        DBusMessage *, void *);
+typedef void (*DBusFreeFunction) (void *);
 
 /** The following are the symbols which we need from libdbus-1. */
@@ -100 +113 @@
 extern void (*dbus_message_iter_get_basic) (DBusMessageIter *, void *);
 extern dbus_bool_t (*dbus_message_iter_next) (DBusMessageIter *);
+extern dbus_bool_t (*dbus_connection_add_filter) (DBusConnection *, DBusHandleMessageFunction,
+                                                  void *, DBusFreeFunction);
+extern void (*dbus_connection_remove_filter) (DBusConnection *, DBusHandleMessageFunction,
+                                              void *);
+extern dbus_bool_t (*dbus_connection_read_write_dispatch) (DBusConnection *, int);
+extern dbus_bool_t (*dbus_message_is_signal) (DBusMessage *, const char *, const char *);
 
 extern bool VBoxDBusCheckPresence(void);