Changeset 68b5ed6e in mainline for uspace/drv/ohci


Ignore:
Timestamp:
2011-03-21T14:27:47Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
e34e77a
Parents:
3954a63b
Message:

Rename device_keeper* ⇒ usb_device_keeper*

Also extended some device keeper functions names to be more descriptive.

No change in functionality.

Location:
uspace/drv/ohci
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/ohci/batch.c

    r3954a63b r68b5ed6e  
    5858    usbhc_iface_transfer_out_callback_t func_out,
    5959                void *arg,
    60                 device_keeper_t *manager
     60                usb_device_keeper_t *manager
    6161                )
    6262{

  • uspace/drv/ohci/batch.h

    r3954a63b r68b5ed6e  
    5454    usbhc_iface_transfer_out_callback_t func_out,
    5555                void *arg,
    56                 device_keeper_t *manager
     56                usb_device_keeper_t *manager
    5757                );
    5858

  • uspace/drv/ohci/hc.c

    r3954a63b r68b5ed6e  
    6565        }
    6666        instance->ddf_instance = fun;
    67         device_keeper_init(&instance->manager);
     67        usb_device_keeper_init(&instance->manager);
    6868
    6969

  • uspace/drv/ohci/hc.h

    r3954a63b r68b5ed6e  
    5353        rh_t rh;
    5454        ddf_fun_t *ddf_instance;
    55         device_keeper_t manager;
     55        usb_device_keeper_t manager;
    5656} hc_t;
    5757

  • uspace/drv/ohci/iface.c

    r3954a63b r68b5ed6e  
    6464  assert(hc);
    6565  usb_log_debug("Default address request with speed %d.\n", speed);
    66   device_keeper_reserve_default(&hc->manager, speed);
     66  usb_device_keeper_reserve_default_address(&hc->manager, speed);
    6767  return EOK;
    6868}
    … …  
    7979  assert(hc);
    8080  usb_log_debug("Default address release.\n");
    81   device_keeper_release_default(&hc->manager);
     81  usb_device_keeper_release_default_address(&hc->manager);
    8282  return EOK;
    8383}
    … …  
    9999
    100100  usb_log_debug("Address request with speed %d.\n", speed);
    101   *address = device_keeper_request(&hc->manager, speed);
     101  *address = device_keeper_get_free_address(&hc->manager, speed);
    102102  usb_log_debug("Address request with result: %d.\n", *address);
    103103  if (*address <= 0)
    … …  
    120120  assert(hc);
    121121  usb_log_debug("Address bind %d-%d.\n", address, handle);
    122   device_keeper_bind(&hc->manager, address, handle);
     122  usb_device_keeper_bind(&hc->manager, address, handle);
    123123  return EOK;
    124124}
    … …  
    136136  assert(hc);
    137137  usb_log_debug("Address release %d.\n", address);
    138   device_keeper_release(&hc->manager, address);
     138  usb_device_keeper_release(&hc->manager, address);
    139139  return EOK;
    140140}
    … …  
    200200  hc_t *hc = fun_to_hc(fun);
    201201  assert(hc);
    202   usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
     202  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    203203
    204204  usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
    … …  
    243243  hc_t *hc = fun_to_hc(fun);
    244244  assert(hc);
    245   usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
     245  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    246246  usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n",
    247247      target.address, target.endpoint, size, max_packet_size);
    … …  
    285285  hc_t *hc = fun_to_hc(fun);
    286286  assert(hc);
    287   usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
     287  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    288288
    289289  usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
    … …  
    329329  hc_t *hc = fun_to_hc(fun);
    330330  assert(hc);
    331   usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
     331  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    332332  usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
    333333      target.address, target.endpoint, size, max_packet_size);
    … …  
    376376  hc_t *hc = fun_to_hc(fun);
    377377  assert(hc);
    378   usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
     378  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    379379  usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
    380380      speed, target.address, target.endpoint, size, max_packet_size);
    … …  
    388388  if (!batch)
    389389    return ENOMEM;
    390   device_keeper_reset_if_need(&hc->manager, target, setup_data);
     390  usb_device_keeper_reset_if_need(&hc->manager, target, setup_data);
    391391  batch_control_write(batch);
    392392  const int ret = hc_schedule(hc, batch);
    … …  
    427427  hc_t *hc = fun_to_hc(fun);
    428428  assert(hc);
    429   usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
     429  usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
    430430
    431431  usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",

  • uspace/drv/ohci/main.c

    r3954a63b r68b5ed6e  
    6161{
    6262        assert(fun);
    63         device_keeper_t *manager = &fun_to_hc(fun)->manager;
    64   usb_address_t addr = device_keeper_find(manager, handle);
     63        usb_device_keeper_t *manager = &fun_to_hc(fun)->manager;
     64  usb_address_t addr = usb_device_keeper_find(manager, handle);
    6565  if (addr < 0) {
    6666    return addr;
Note: See TracChangeset for help on using the changeset viewer.