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

Timestamp:

2011-01-28T12:43:07Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d93ff502

Parents:

45c4f5a

Message:

Used usbmem allocator

File:

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

uspace/drv/uhci/uhci.c

@@ -3 +3 @@
 #include <usb/usb.h>
 
-#include "translating_malloc.h"
+#include "utils/malloc32.h"
 
 #include "debug.h"
@@ -61 +61 @@
 
         instance->frame_list =
-          trans_malloc(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT);
+          malloc32(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT);
         if (instance->frame_list == NULL) {
                 uhci_print_error("Failed to allocate frame list pointer.\n");
@@ -200 +200 @@
                         callback_dispose(job); \
                 } \
-                if (td) { trans_free(td); } \
+                if (td) { free32(td); } \
                 return ret; \
         } else (void) 0
@@ -243 +243 @@
                                 uhci_print_verbose("Cleaning fibril found inactive transport.");
                                 instance->transfers[i].first = transfer->next_va;
-                                transfer_descriptor_fini(transfer);
-                                trans_free(transfer);
+                                transfer_descriptor_dispose(transfer);
                         }
                         if (!instance->transfers[i].first)