Changeset f37f811 in mainline for uspace/drv/vhc/hub/virthub.h

Timestamp:

2010-12-15T22:25:01Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

cea3fca

Parents:

ea5dbaf (diff), e63a4e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge usbvirt clean-up branch

File:

• uspace/drv/vhc/hub/virthub.h (moved) (moved from uspace/drv/vhc/hubintern.h ) (3 diffs)

uspace/drv/vhc/hub/virthub.h

@@ -33 +33 @@
  * @brief
  */
-#ifndef VHCD_HUBINTERN_H_
-#define VHCD_HUBINTERN_H_
+#ifndef VHC_HUB_VIRTHUB_H_
+#define VHC_HUB_VIRTHUB_H_
 
+#include <usbvirt/device.h>
+#include "../devices.h"
 #include "hub.h"
-#include <fibril_synch.h>
 
 /** Endpoint number for status change pipe. */
@@ -43 +44 @@
 /** Configuration value for hub configuration. */
 #define HUB_CONFIGURATION_ID 1
+
 
 /** Hub descriptor.
@@ -69 +71 @@
 } __attribute__ ((packed)) hub_descriptor_t;
 
-/** Hub port internal state.
- * Some states (e.g. port over current) are not covered as they are not
- * simulated at all.
- */
-typedef enum {
-        HUB_PORT_STATE_NOT_CONFIGURED,
-        HUB_PORT_STATE_POWERED_OFF,
-        HUB_PORT_STATE_DISCONNECTED,
-        HUB_PORT_STATE_DISABLED,
-        HUB_PORT_STATE_RESETTING,
-        HUB_PORT_STATE_ENABLED,
-        HUB_PORT_STATE_SUSPENDED,
-        HUB_PORT_STATE_RESUMING,
-        /* HUB_PORT_STATE_, */
-} hub_port_state_t;
-
-/** Convert hub port state to a char. */
-static inline char hub_port_state_as_char(hub_port_state_t state) {
-        switch (state) {
-                case HUB_PORT_STATE_NOT_CONFIGURED:
-                        return '-';
-                case HUB_PORT_STATE_POWERED_OFF:
-                        return 'O';
-                case HUB_PORT_STATE_DISCONNECTED:
-                        return 'X';
-                case HUB_PORT_STATE_DISABLED:
-                        return 'D';
-                case HUB_PORT_STATE_RESETTING:
-                        return 'R';
-                case HUB_PORT_STATE_ENABLED:
-                        return 'E';
-                case HUB_PORT_STATE_SUSPENDED:
-                        return 'S';
-                case HUB_PORT_STATE_RESUMING:
-                        return 'F';
-                default:
-                        return '?';
-        }
-}
-
-/** Hub status change mask bits. */
-typedef enum {
-        HUB_STATUS_C_PORT_CONNECTION = (1 << 0),
-        HUB_STATUS_C_PORT_ENABLE = (1 << 1),
-        HUB_STATUS_C_PORT_SUSPEND = (1 << 2),
-        HUB_STATUS_C_PORT_OVER_CURRENT = (1 << 3),
-        HUB_STATUS_C_PORT_RESET = (1 << 4),
-        /* HUB_STATUS_C_ = (1 << ), */
-} hub_status_change_t;
-
-/** Hub port information. */
-typedef struct {
-        virtdev_connection_t *device;
-        int index;
-        hub_port_state_t state;
-        uint16_t status_change;
-        fibril_mutex_t guard;
-} hub_port_t;
-
-/** Hub device type. */
-typedef struct {
-        hub_port_t ports[HUB_PORT_COUNT];
-} hub_device_t;
-
-extern hub_device_t hub_dev;
-
+extern usbvirt_device_ops_t hub_ops;
 extern hub_descriptor_t hub_descriptor;
 
-extern usbvirt_device_ops_t hub_ops;
-
-void clear_port_status_change(hub_port_t *, uint16_t);
-void set_port_status_change(hub_port_t *, uint16_t);
-void set_port_status_change_nl(hub_port_t *, uint16_t);
-
+int virthub_init(usbvirt_device_t *);
+int virthub_connect_device(usbvirt_device_t *, virtdev_connection_t *);
+int virthub_disconnect_device(usbvirt_device_t *, virtdev_connection_t *);
+bool virthub_is_device_enabled(usbvirt_device_t *, virtdev_connection_t *);
+void virthub_get_status(usbvirt_device_t *, char *, size_t);
 
 #endif