Changeset de0e6b3 in mainline


Ignore:
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

Location:
uspace/drv/uhci
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci/callback.c

    r45c4f5a rde0e6b3  
    99        assert(instance);
    1010        assert(func_in == NULL || func_out == NULL);
    11         instance->new_buffer = trans_malloc(size);
     11        instance->new_buffer = malloc32(size);
    1212        if (!instance->new_buffer) {
    1313                uhci_print_error("Failed to allocate device acessible buffer.\n");
    … …  
    3434        if (instance->new_buffer) {
    3535                memcpy(instance->new_buffer, instance->old_buffer, instance->buffer_size);
    36                 trans_free(instance->new_buffer);
     36                free32(instance->new_buffer);
    3737                instance->new_buffer = NULL;
    3838        }

  • uspace/drv/uhci/callback.h

    r45c4f5a rde0e6b3  
    3939
    4040#include "debug.h"
    41 #include "translating_malloc.h"
     41#include "utils/malloc32.h"
    4242
    4343typedef struct callback
    … …  
    8080        assert(instance);
    8181        if (instance->new_buffer)
    82                 trans_free(instance->new_buffer);
     82                free32(instance->new_buffer);
    8383}
    8484

  • uspace/drv/uhci/transfer_list.c

    r45c4f5a rde0e6b3  
    88        instance->first = NULL;
    99        instance->last = NULL;
    10         instance->queue_head = trans_malloc(sizeof(queue_head_t));
     10        instance->queue_head = malloc32(sizeof(queue_head_t));
    1111        if (!instance->queue_head) {
    1212                uhci_print_error("Failed to allocate queue head.\n");

  • uspace/drv/uhci/transfer_list.h

    r45c4f5a rde0e6b3  
    3636
    3737#include "debug.h"
    38 #include "translating_malloc.h"
    3938#include "uhci_struct/queue_head.h"
    4039#include "uhci_struct/transfer_descriptor.h"
     40#include "utils/malloc32.h"
    4141
    4242typedef struct transfer_list
    … …  
    5454        assert(instance);
    5555        if (instance->queue_head)
    56                 trans_free(instance->queue_head);
     56                free32(instance->queue_head);
    5757}
    5858

  • uspace/drv/uhci/uhci.c

    r45c4f5a rde0e6b3  
    33#include <usb/usb.h>
    44
    5 #include "translating_malloc.h"
     5#include "utils/malloc32.h"
    66
    77#include "debug.h"
    … …  
    6161
    6262        instance->frame_list =
    63           trans_malloc(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT);
     63          malloc32(sizeof(link_pointer_t) * UHCI_FRAME_LIST_COUNT);
    6464        if (instance->frame_list == NULL) {
    6565                uhci_print_error("Failed to allocate frame list pointer.\n");
    … …  
    200200                        callback_dispose(job); \
    201201                } \
    202                 if (td) { trans_free(td); } \
     202                if (td) { free32(td); } \
    203203                return ret; \
    204204        } else (void) 0
    … …  
    243243                                uhci_print_verbose("Cleaning fibril found inactive transport.");
    244244                                instance->transfers[i].first = transfer->next_va;
    245                                 transfer_descriptor_fini(transfer);
    246                                 trans_free(transfer);
     245                                transfer_descriptor_dispose(transfer);
    247246                        }
    248247                        if (!instance->transfers[i].first)

  • uspace/drv/uhci/uhci_struct/transfer_descriptor.h

    r45c4f5a rde0e6b3  
    3838#include <usb/usb.h>
    3939
    40 #include "translating_malloc.h"
     40#include "utils/malloc32.h"
    4141#include "callback.h"
    4242#include "link_pointer.h"
    … …  
    104104{
    105105        transfer_descriptor_t * instance =
    106           trans_malloc(sizeof(transfer_descriptor_t));
     106          malloc32(sizeof(transfer_descriptor_t));
    107107
    108108        if (instance)
    … …  
    118118        assert(instance);
    119119        transfer_descriptor_fini(instance);
    120         trans_free(instance);
     120        free32(instance);
    121121}
    122122

  • uspace/drv/uhci/utils/malloc32.h

    r45c4f5a rde0e6b3  
    3535#define DRV_UHCI_TRANSLATOR_H
    3636
    37 #include <malloc.h>
     37#include <usb/usbmem.h>
    3838
    39 static inline void * addr_to_phys( void *addr )
    40         { return addr; }
     39static inline void * addr_to_phys(void *addr)
     40        { return mman_getPA(addr); }
    4141
    42 static inline void * addr_to_virt( void *addr )
    43         { return addr; }
     42static inline void * malloc32(size_t size)
     43/* TODO: tis is ugly */
     44        { return mman_malloc(size, 128, 0xffffffff); }
    4445
    45 static inline void * trans_malloc( size_t size )
    46         { return malloc( size ); }
    47 
    48 static inline void trans_free( void * addr )
    49         { free( addr ); }
     46static inline void free32(void * addr)
     47        { mman_free(addr); }
    5048
    5149#endif
Note: See TracChangeset for help on using the changeset viewer.