Changeset 078e0e6 in mainline

Timestamp:

2017-10-05T16:21:02Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

e9e24f2

Parents:

4930b15

Message:

Removed unnecessary calls to malloc32 and free32.

Location:

uspace/drv/bus/usb/xhci

Files:

• commands.c (modified) (2 diffs)
• hc.c (modified) (1 diff)
• rh.c (modified) (5 diffs)

uspace/drv/bus/usb/xhci/commands.c

@@ -95 +95 @@
 xhci_cmd_t *xhci_cmd_alloc(void)
 {
-        xhci_cmd_t *cmd = malloc32(sizeof(xhci_cmd_t));
+        xhci_cmd_t *cmd = malloc(sizeof(xhci_cmd_t));
         xhci_cmd_init(cmd);
 
@@ -120 +120 @@
 {
         xhci_cmd_fini(cmd);
-        free32(cmd);
+        free(cmd);
 }
 

uspace/drv/bus/usb/xhci/hc.c

@@ -193 +193 @@
                 return ENOMEM;
 
-        hc->dcbaa_virt = malloc32((1 + hc->max_slots) * sizeof(xhci_virt_device_ctx_t));
+        hc->dcbaa_virt = malloc((1 + hc->max_slots) * sizeof(xhci_virt_device_ctx_t));
         if (!hc->dcbaa_virt) {
                 err = ENOMEM;

uspace/drv/bus/usb/xhci/rh.c

@@ -103 +103 @@
 //      xhci_cmd_fini(&cmd);
 //
-//      xhci_input_ctx_t *ictx = malloc32(sizeof(xhci_input_ctx_t));
+//      xhci_input_ctx_t *ictx = malloc(sizeof(xhci_input_ctx_t));
 //      if (!ictx) {
 //              return ENOMEM;
@@ -119 +119 @@
 //      XHCI_SLOT_ROUTE_STRING_SET(ictx->slot_ctx, route_str);
 //
-//      xhci_trb_ring_t *ep_ring = malloc32(sizeof(xhci_trb_ring_t));
+//      xhci_trb_ring_t *ep_ring = malloc(sizeof(xhci_trb_ring_t));
 //      if (!ep_ring) {
 //              err = ENOMEM;
@@ -144 +144 @@
 //
 //      // TODO: What's the alignment?
-//      xhci_device_ctx_t *dctx = malloc32(sizeof(xhci_device_ctx_t));
+//      xhci_device_ctx_t *dctx = malloc(sizeof(xhci_device_ctx_t));
 //      if (!dctx) {
 //              err = ENOMEM;
@@ -171 +171 @@
 // err_dctx:
 //      if (dctx) {
-//              free32(dctx);
+//              free(dctx);
 //              hc->dcbaa[slot_id] = 0;
 //              memset(&hc->dcbaa_virt[slot_id], 0, sizeof(xhci_virt_device_ctx_t));
@@ -178 +178 @@
 //      if (ep_ring) {
 //              xhci_trb_ring_fini(ep_ring);
-//              free32(ep_ring);
+//              free(ep_ring);
 //      }
 // err_ictx:
-//      free32(ictx);
+//      free(ictx);
 //      return err;
 // }