Changeset 5a6cc679 in mainline for uspace/lib/usbhost/include

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

Location:

uspace/lib/usbhost/include/usb/host

Files:

• ddf_helpers.h (modified) (2 diffs)
• hcd.h (modified) (1 diff)
• usb_transfer_batch.h (modified) (1 diff)
• utils/malloc32.h (modified) (2 diffs)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -45 +45 @@
 
 
-int hcd_ddf_setup_hc(ddf_dev_t *, size_t);
+errno_t hcd_ddf_setup_hc(ddf_dev_t *, size_t);
 void hcd_ddf_clean_hc(hc_device_t *);
 
@@ -52 +52 @@
 void hcd_ddf_fun_destroy(device_t *);
 
-int hcd_ddf_setup_match_ids(device_t *, usb_standard_device_descriptor_t *);
+errno_t hcd_ddf_setup_match_ids(device_t *, usb_standard_device_descriptor_t *);
 
-int hcd_ddf_enable_interrupt(hc_device_t *hcd, int);
-int hcd_ddf_get_registers(hc_device_t *hcd, hw_res_list_parsed_t *hw_res);
+errno_t hcd_ddf_enable_interrupt(hc_device_t *hcd, int);
+errno_t hcd_ddf_get_registers(hc_device_t *hcd, hw_res_list_parsed_t *hw_res);
 
 void hcd_ddf_gen_irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev);

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -108 +108 @@
 }
 
-int hc_driver_main(const hc_driver_t *);
+extern errno_t hc_driver_main(const hc_driver_t *);
 
 #endif

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -83 +83 @@
 
         /** Indicates success/failure of the communication */
-        int error;
+        errno_t error;
 } usb_transfer_batch_t;
 

uspace/lib/usbhost/include/usb/host/utils/malloc32.h

@@ -59 +59 @@
 {
         uintptr_t result;
-        int ret = as_get_physical_mapping(addr, &result);
+        errno_t ret = as_get_physical_mapping(addr, &result);
         
         if (ret != EOK)
@@ -78 +78 @@
         size_t real_size = ALIGN_UP(size, PAGE_SIZE);
 
-        const int ret = dmamem_map_anonymous(real_size,
+        const errno_t ret = dmamem_map_anonymous(real_size,
             DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, &phys,
             &address);