Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 171e668 in mainline


Ignore:
Timestamp:
2013-02-08T23:15:24Z (9 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
39339378
Parents:
c91db2a
Message:

ohci: Use new root hub implementation.

Location:
uspace/drv/bus/usb/ohci
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/ohci/hc.c

    rc91db2a r171e668  
    175175        }
    176176
    177         rh_init(&instance->rh, instance->registers);
     177        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
    178178        hc_start(instance);
    179179
     
    262262
    263263        /* Check for root hub communication */
    264         if (batch->ep->address == instance->rh.address) {
     264        if (batch->ep->address == ohci_rh_get_address(&instance->rh)) {
    265265                usb_log_debug("OHCI root hub request.\n");
    266                 rh_request(&instance->rh, batch);
    267                 return EOK;
     266                return ohci_rh_schedule(&instance->rh, batch);
    268267        }
    269268        ohci_transfer_batch_t *ohci_batch = ohci_transfer_batch_get(batch);
     
    304303        usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
    305304        if (status & I_RHSC)
    306                 rh_interrupt(&instance->rh);
     305                ohci_rh_interrupt(&instance->rh);
    307306
    308307        if (status & I_WDH) {
  • uspace/drv/bus/usb/ohci/hc.h

    rc91db2a r171e668  
    4545#include "ohci_batch.h"
    4646#include "ohci_regs.h"
    47 #include "root_hub.h"
     47#include "ohci_rh.h"
    4848#include "endpoint_list.h"
    4949#include "hw_struct/hcca.h"
     
    6868
    6969        /** USB hub emulation structure */
    70         rh_t rh;
     70        ohci_rh_t rh;
    7171} hc_t;
    7272
Note: See TracChangeset for help on using the changeset viewer.