Changes in uspace/lib/usbdev/src/request.c [33b8d024:58563585] in mainline

File:

• uspace/lib/usbdev/src/request.c (modified) (29 diffs)

uspace/lib/usbdev/src/request.c

@@ -68 +68 @@
  *
  */
-errno_t usb_control_request_set(usb_pipe_t *pipe,
+int usb_control_request_set(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t request, uint16_t value, uint16_t index,
@@ -127 +127 @@
  *
  */
-errno_t usb_control_request_get(usb_pipe_t *pipe,
+int usb_control_request_get(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t request, uint16_t value, uint16_t index,
@@ -170 +170 @@
  * @return Error code.
  */
-errno_t usb_request_get_status(usb_pipe_t *pipe,
+int usb_request_get_status(usb_pipe_t *pipe,
     usb_request_recipient_t recipient, uint16_t index,
     uint16_t *status)
@@ -184 +184 @@
         uint16_t status_usb_endianess;
         size_t data_transfered_size;
-        errno_t rc = usb_control_request_get(pipe, USB_REQUEST_TYPE_STANDARD,
+        int rc = usb_control_request_get(pipe, USB_REQUEST_TYPE_STANDARD,
             recipient, USB_DEVREQ_GET_STATUS, 0, uint16_host2usb(index),
             &status_usb_endianess, 2, &data_transfered_size);
@@ -208 +208 @@
  * @return Error code.
  */
-errno_t usb_request_clear_feature(usb_pipe_t *pipe,
+int usb_request_clear_feature(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint16_t feature_selector, uint16_t index)
@@ -232 +232 @@
  * @return Error code.
  */
-errno_t usb_request_set_feature(usb_pipe_t *pipe,
+int usb_request_set_feature(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint16_t feature_selector, uint16_t index)
@@ -260 +260 @@
  * @return Error code.
  */
-errno_t usb_request_get_descriptor(usb_pipe_t *pipe,
+int usb_request_get_descriptor(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
@@ -298 +298 @@
  * @return
  */
-errno_t usb_request_get_descriptor_alloc(usb_pipe_t * pipe,
+int usb_request_get_descriptor_alloc(usb_pipe_t * pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
@@ -308 +308 @@
         }
 
-        errno_t rc;
+        int rc;
 
         /*
@@ -364 +364 @@
  * @return Error code.
  */
-errno_t usb_request_get_device_descriptor(usb_pipe_t *pipe,
+int usb_request_get_device_descriptor(usb_pipe_t *pipe,
     usb_standard_device_descriptor_t *descriptor)
 {
@@ -373 +373 @@
         size_t actually_transferred = 0;
         usb_standard_device_descriptor_t descriptor_tmp;
-        errno_t rc = usb_request_get_descriptor(pipe,
+        int rc = usb_request_get_descriptor(pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_DEVICE, 0, 0, &descriptor_tmp, sizeof(descriptor_tmp),
@@ -404 +404 @@
  * @return Error code.
  */
-errno_t usb_request_get_bare_configuration_descriptor(usb_pipe_t *pipe,
+int usb_request_get_bare_configuration_descriptor(usb_pipe_t *pipe,
     int index, usb_standard_configuration_descriptor_t *descriptor)
 {
@@ -417 +417 @@
         size_t actually_transferred = 0;
         usb_standard_configuration_descriptor_t descriptor_tmp;
-        const errno_t rc = usb_request_get_descriptor(pipe,
+        const int rc = usb_request_get_descriptor(pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_CONFIGURATION, index, 0,
@@ -448 +448 @@
  * @return Error code.
  */
-errno_t usb_request_get_full_configuration_descriptor(usb_pipe_t *pipe,
+int usb_request_get_full_configuration_descriptor(usb_pipe_t *pipe,
     int index, void *descriptor, size_t descriptor_size, size_t *actual_size)
 {
@@ -473 +473 @@
  * @return Error code.
  */
-errno_t usb_request_get_full_configuration_descriptor_alloc(
+int usb_request_get_full_configuration_descriptor_alloc(
     usb_pipe_t *pipe, int index,
-    void **descriptor_ptr, size_t *descriptor_size)
-{
-        errno_t rc;
+    const void **descriptor_ptr, size_t *descriptor_size)
+{
+        int rc;
 
         if (descriptor_ptr == NULL) {
@@ -539 +539 @@
  * @return Error code.
  */
-errno_t usb_request_set_descriptor(usb_pipe_t *pipe,
+int usb_request_set_descriptor(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
@@ -565 +565 @@
  * @return Error code.
  */
-errno_t usb_request_get_configuration(usb_pipe_t *pipe,
+int usb_request_get_configuration(usb_pipe_t *pipe,
     uint8_t *configuration_value)
 {
@@ -571 +571 @@
         size_t actual_size;
 
-        const errno_t rc = usb_control_request_get(pipe,
+        const int rc = usb_control_request_get(pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DEVREQ_GET_CONFIGURATION, 0, 0, &value, 1, &actual_size);
@@ -595 +595 @@
  * @return Error code.
  */
-errno_t usb_request_set_configuration(usb_pipe_t *pipe,
+int usb_request_set_configuration(usb_pipe_t *pipe,
     uint8_t configuration_value)
 {
@@ -614 +614 @@
  * @return Error code.
  */
-errno_t usb_request_get_interface(usb_pipe_t *pipe,
+int usb_request_get_interface(usb_pipe_t *pipe,
     uint8_t interface_index, uint8_t *alternate_setting)
 {
@@ -620 +620 @@
         size_t actual_size;
 
-        const errno_t rc = usb_control_request_get(pipe,
+        const int rc = usb_control_request_get(pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE,
             USB_DEVREQ_GET_INTERFACE,
@@ -647 +647 @@
  * @return Error code.
  */
-errno_t usb_request_set_interface(usb_pipe_t *pipe,
+int usb_request_set_interface(usb_pipe_t *pipe,
     uint8_t interface_index, uint8_t alternate_setting)
 {
@@ -666 +666 @@
  * @return Error code.
  */
-errno_t usb_request_get_supported_languages(usb_pipe_t *pipe,
+int usb_request_get_supported_languages(usb_pipe_t *pipe,
     l18_win_locales_t **languages_ptr, size_t *languages_count)
 {
@@ -675 +675 @@
         uint8_t *string_descriptor = NULL;
         size_t string_descriptor_size = 0;
-        const errno_t rc = usb_request_get_descriptor_alloc(pipe,
+        const int rc = usb_request_get_descriptor_alloc(pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_STRING, 0, 0,
@@ -733 +733 @@
  * @return Error code.
  */
-errno_t usb_request_get_string(usb_pipe_t *pipe,
+int usb_request_get_string(usb_pipe_t *pipe,
     size_t index, l18_win_locales_t lang, char **string_ptr)
 {
@@ -751 +751 @@
         }
 
-        errno_t rc;
+        int rc;
 
         /* Prepare dynamically allocated variables. */
@@ -824 +824 @@
  * @return Error code.
  */
-errno_t usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
+int usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
 {
         return usb_request_clear_feature(pipe,
@@ -838 +838 @@
  * @return Error code.
  */
-errno_t usb_pipe_clear_halt(usb_pipe_t *ctrl_pipe, usb_pipe_t *target_pipe)
+int usb_pipe_clear_halt(usb_pipe_t *ctrl_pipe, usb_pipe_t *target_pipe)
 {
         if ((ctrl_pipe == NULL) || (target_pipe == NULL)) {
@@ -854 +854 @@
  * @return Error code.
  */
-errno_t usb_request_get_endpoint_status(usb_pipe_t *ctrl_pipe, usb_pipe_t *pipe,
+int usb_request_get_endpoint_status(usb_pipe_t *ctrl_pipe, usb_pipe_t *pipe,
     uint16_t *status)
 {
         uint16_t status_tmp;
         uint16_t pipe_index = (uint16_t) pipe->endpoint_no;
-        errno_t rc = usb_request_get_status(ctrl_pipe,
+        int rc = usb_request_get_status(ctrl_pipe,
             USB_REQUEST_RECIPIENT_ENDPOINT, uint16_host2usb(pipe_index),
             &status_tmp);