Changeset b4b534ac in mainline for uspace/lib/usbvirt/include/usbvirt/virthub_base.h

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/lib/usbvirt/include/usbvirt/virthub_base.h (moved) (moved from uspace/drv/bus/usb/vhc/hub.h ) (2 diffs)

uspace/lib/usbvirt/include/usbvirt/virthub_base.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbvhc
+/** @addtogroup libusbvirt
  * @{
  */
 /** @file
- * @brief Virtual USB hub.
+ * Virtual USB device.
  */
 
-#ifndef VHCD_HUB_H_
-#define VHCD_HUB_H_
+#ifndef LIBUSBVIRT_VIRTHUB_BASE_H_
+#define LIBUSBVIRT_VIRTHUB_BASE_H_
 
 #include <usbvirt/device.h>
-#include <ddf/driver.h>
+#include <usb/classes/hub.h>
 
-#include "hub/hub.h"
-#include "hub/virthub.h"
+enum {
+        VIRTHUB_EXTR_DESC = 3,
+};
 
-extern usbvirt_device_t virtual_hub_device;
+typedef struct {
+        usb_standard_configuration_descriptor_t config_descriptor;
+        usb_standard_endpoint_descriptor_t endpoint_descriptor;
+        usbvirt_device_configuration_extras_t extra[VIRTHUB_EXTR_DESC];
+        usbvirt_device_configuration_t configuration;
+        usbvirt_descriptors_t descriptors;
+        usbvirt_device_t device;
+        void *data;
+} virthub_base_t;
 
-void virtual_hub_device_init(ddf_fun_t *);
+void *virthub_get_data(usbvirt_device_t *dev);
+
+int virthub_base_init(virthub_base_t *instance,
+    const char *name, usbvirt_device_ops_t *ops, void *data,
+    const usb_standard_device_descriptor_t *device_desc,
+    const usb_hub_descriptor_header_t *hub_desc, usb_endpoint_t ep);
+
+usb_address_t virthub_base_get_address(virthub_base_t *instance);
+
+int virthub_base_request(virthub_base_t *instance, usb_target_t target,
+    usb_direction_t dir, const usb_device_request_setup_packet_t *setup,
+    void *buffer, size_t buffer_size, size_t *real_size);
+
+int virthub_base_get_hub_descriptor(usbvirt_device_t *dev,
+    const usb_device_request_setup_packet_t *request, uint8_t *data,
+    size_t *act_size);
+int virthub_base_get_null_status(usbvirt_device_t *dev,
+    const usb_device_request_setup_packet_t *request, uint8_t *data,
+    size_t *act_size);
+
 
 #endif
+
 /**
  * @}