Changeset d03ade7 in mainline for uspace/drv/uhci/uhci.c

Timestamp:

2011-01-25T21:25:39Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9ee87f6

Parents:

b00163f

Message:

Enqueue transfers

Fix malloc check in uhci_add_transfer()

File:

• uspace/drv/uhci/uhci.c (modified) (3 diffs)

uspace/drv/uhci/uhci.c

@@ -13 +13 @@
 static inline int uhci_add_transfer(
   device_t *dev,
-        usb_target_t target,
-  usb_transfer_type_t transfer_type,
-        usb_packet_id pid,
+  usb_target_t target,
+  usb_transfer_type_t transfer_type,
+  usb_packet_id pid,
   void *buffer, size_t size,
   usbhc_iface_transfer_out_callback_t callback_out,
   usbhc_iface_transfer_in_callback_t callback_in,
-        void *arg );
+  void *arg );
 
 int uhci_init(device_t *device, void *regs)
@@ -164 +164 @@
 static inline int uhci_add_transfer(
   device_t *dev,
-        usb_target_t target,
-  usb_transfer_type_t transfer_type,
-        usb_packet_id pid,
+  usb_target_t target,
+  usb_transfer_type_t transfer_type,
+  usb_packet_id pid,
   void *buffer, size_t size,
   usbhc_iface_transfer_out_callback_t callback_out,
   usbhc_iface_transfer_in_callback_t callback_in,
-        void *arg )
+  void *arg )
 {
         // TODO: Add support for isochronous transfers
@@ -203 +203 @@
 
         td = trans_malloc(sizeof(transfer_descriptor_t));
-        ret = td ? ENOMEM : EOK;
-        CHECK_RET_TRANS_FREE_JOB_TD("Failed to allocate tranfer descriptor.\n");
+        ret = td ? EOK : ENOMEM;
+        CHECK_RET_TRANS_FREE_JOB_TD("Failed to allocate transfer descriptor.\n");
 
         ret = transfer_descriptor_init(td, 3, size, false, target, pid);