Changeset 19a1800 in mainline for uspace/lib/usb/include/usb/request.h

Timestamp:

2011-03-01T22:20:56Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

e24e7b1

Parents:

976f546 (diff), ac8285d (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 with the current development

File:

• uspace/lib/usb/include/usb/request.h (moved) (moved from uspace/lib/usb/include/usb/devreq.h ) (5 diffs)

uspace/lib/usb/include/usb/request.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * @brief Standard USB device requests.
+ * Standard USB requests.
  */
-#ifndef LIBUSB_DEVREQ_H_
-#define LIBUSB_DEVREQ_H_
+#ifndef LIBUSB_REQUEST_H_
+#define LIBUSB_REQUEST_H_
 
-#include <ipc/ipc.h>
-#include <async.h>
+#include <sys/types.h>
+#include <l18n/langs.h>
 #include <usb/usb.h>
+#include <usb/pipes.h>
 #include <usb/descriptor.h>
 
@@ -70 +71 @@
         /** Main parameter to the request. */
         union {
+                uint16_t value;
                 /* FIXME: add #ifdefs according to host endianess */
                 struct {
@@ -75 +77 @@
                         uint8_t value_high;
                 };
-                uint16_t value;
         };
         /** Auxiliary parameter to the request.
@@ -85 +86 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
+int usb_control_request_set(usb_endpoint_pipe_t *,
+    usb_request_type_t, usb_request_recipient_t, uint8_t,
+    uint16_t, uint16_t, void *, size_t);
 
-int usb_drv_req_get_status(int, usb_address_t, usb_request_recipient_t,
-    uint16_t, uint16_t *);
-int usb_drv_req_clear_feature(int, usb_address_t, usb_request_recipient_t,
-    uint16_t, uint16_t);
-int usb_drv_req_set_feature(int, usb_address_t, usb_request_recipient_t,
-    uint16_t, uint16_t);
-int usb_drv_req_set_address(int, usb_address_t, usb_address_t);
-int usb_drv_req_get_descriptor(int, usb_address_t, usb_request_type_t,
-    uint8_t, uint8_t, uint16_t, void *, size_t, size_t *);
-int usb_drv_req_get_device_descriptor(int, usb_address_t,
+int usb_control_request_get(usb_endpoint_pipe_t *,
+    usb_request_type_t, usb_request_recipient_t, uint8_t,
+    uint16_t, uint16_t, void *, size_t, size_t *);
+
+int usb_request_set_address(usb_endpoint_pipe_t *, usb_address_t);
+int usb_request_get_descriptor(usb_endpoint_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t, 
+    size_t *);
+int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t *, usb_request_type_t,
+    usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void **, size_t *);
+int usb_request_get_device_descriptor(usb_endpoint_pipe_t *,
     usb_standard_device_descriptor_t *);
-int usb_drv_req_get_bare_configuration_descriptor(int, usb_address_t, int,
+int usb_request_get_bare_configuration_descriptor(usb_endpoint_pipe_t *, int,
     usb_standard_configuration_descriptor_t *);
-int usb_drv_req_get_full_configuration_descriptor(int, usb_address_t, int,
+int usb_request_get_full_configuration_descriptor(usb_endpoint_pipe_t *, int,
     void *, size_t, size_t *);
-int usb_drv_req_set_descriptor(int, usb_address_t, uint8_t, uint8_t, uint16_t,
-    void *, size_t);
-int usb_drv_req_get_configuration(int, usb_address_t, uint8_t *);
-int usb_drv_req_set_configuration(int, usb_address_t, uint8_t);
-int usb_drv_req_get_interface(int, usb_address_t, uint16_t, uint8_t *);
-int usb_drv_req_set_interface(int, usb_address_t, uint16_t, uint8_t);
+int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t);
+
+int usb_request_get_supported_languages(usb_endpoint_pipe_t *,
+    l18_win_locales_t **, size_t *);
+int usb_request_get_string(usb_endpoint_pipe_t *, size_t, l18_win_locales_t,
+    char **);
 
 #endif