Changeset 62ed5bc in mainline


Ignore:
Timestamp:
2011-03-21T22:47:36Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1c6a45f
Parents:
33fbe95
Message:

Rename hc.device_manager ⇒ hc.manager

Location:
uspace/drv/uhci-hcd
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci-hcd/hc.c

    r33fbe95 r62ed5bc  
    236236
    237237        /* Init device keeper*/
    238         usb_device_keeper_init(&instance->device_manager);
     238        usb_device_keeper_init(&instance->manager);
    239239        usb_log_debug("Initialized device manager.\n");
    240240

  • uspace/drv/uhci-hcd/hc.h

    r33fbe95 r62ed5bc  
    8383
    8484typedef struct hc {
    85         usb_device_keeper_t device_manager;
     85        usb_device_keeper_t manager;
    8686
    8787        regs_t *registers;

  • uspace/drv/uhci-hcd/iface.c

    r33fbe95 r62ed5bc  
    5555        assert(hc);
    5656        usb_log_debug("Default address request with speed %d.\n", speed);
    57         usb_device_keeper_reserve_default_address(&hc->device_manager, speed);
     57        usb_device_keeper_reserve_default_address(&hc->manager, speed);
    5858        return EOK;
    5959}
    … …  
    7070        assert(hc);
    7171        usb_log_debug("Default address release.\n");
    72         usb_device_keeper_release_default_address(&hc->device_manager);
     72        usb_device_keeper_release_default_address(&hc->manager);
    7373        return EOK;
    7474}
    … …  
    9090
    9191        usb_log_debug("Address request with speed %d.\n", speed);
    92         *address = device_keeper_get_free_address(&hc->device_manager, speed);
     92        *address = device_keeper_get_free_address(&hc->manager, speed);
    9393        usb_log_debug("Address request with result: %d.\n", *address);
    9494        if (*address <= 0)
    … …  
    111111        assert(hc);
    112112        usb_log_debug("Address bind %d-%d.\n", address, handle);
    113         usb_device_keeper_bind(&hc->device_manager, address, handle);
     113        usb_device_keeper_bind(&hc->manager, address, handle);
    114114        return EOK;
    115115}
    … …  
    127127        assert(hc);
    128128        usb_log_debug("Address release %d.\n", address);
    129         usb_device_keeper_release(&hc->device_manager, address);
     129        usb_device_keeper_release(&hc->manager, address);
    130130        return EOK;
    131131}
    … …  
    149149        hc_t *hc = fun_to_hc(fun);
    150150        assert(hc);
    151         usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
     151        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    152152
    153153        usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
    … …  
    156156        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
    157157            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
    158             &hc->device_manager);
     158            &hc->manager);
    159159        if (!batch)
    160160                return ENOMEM;
    … …  
    186186        hc_t *hc = fun_to_hc(fun);
    187187        assert(hc);
    188         usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
     188        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    189189        usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n",
    190190            target.address, target.endpoint, size, max_packet_size);
    … …  
    192192        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
    193193            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
    194                         &hc->device_manager);
     194                        &hc->manager);
    195195        if (!batch)
    196196                return ENOMEM;
    … …  
    222222        hc_t *hc = fun_to_hc(fun);
    223223        assert(hc);
    224         usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
     224        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    225225
    226226        usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
    … …  
    229229        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
    230230            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
    231             &hc->device_manager);
     231            &hc->manager);
    232232        if (!batch)
    233233                return ENOMEM;
    … …  
    259259        hc_t *hc = fun_to_hc(fun);
    260260        assert(hc);
    261         usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
     261        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    262262        usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
    263263            target.address, target.endpoint, size, max_packet_size);
    … …  
    265265        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
    266266            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
    267             &hc->device_manager);
     267            &hc->manager);
    268268        if (!batch)
    269269                return ENOMEM;
    … …  
    298298        hc_t *hc = fun_to_hc(fun);
    299299        assert(hc);
    300         usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
     300        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    301301        usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
    302302            speed, target.address, target.endpoint, size, max_packet_size);
    … …  
    307307        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
    308308            max_packet_size, speed, data, size, setup_data, setup_size,
    309             NULL, callback, arg, &hc->device_manager);
    310         if (!batch)
    311                 return ENOMEM;
    312         usb_device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
     309            NULL, callback, arg, &hc->manager);
     310        if (!batch)
     311                return ENOMEM;
     312        usb_device_keeper_reset_if_need(&hc->manager, target, setup_data);
    313313        batch_control_write(batch);
    314314        const int ret = hc_schedule(hc, batch);
    … …  
    341341        hc_t *hc = fun_to_hc(fun);
    342342        assert(hc);
    343         usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
     343        usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    344344
    345345        usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
    … …  
    347347        usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
    348348            max_packet_size, speed, data, size, setup_data, setup_size, callback,
    349             NULL, arg, &hc->device_manager);
     349            NULL, arg, &hc->manager);
    350350        if (!batch)
    351351                return ENOMEM;

  • uspace/drv/uhci-hcd/uhci.c

    r33fbe95 r62ed5bc  
    7070{
    7171        assert(fun);
    72         usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
     72        usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.manager;
    7373
    7474        usb_address_t addr = usb_device_keeper_find(manager, handle);
Note: See TracChangeset for help on using the changeset viewer.