Changeset 8850690 in mainline


Ignore:
Timestamp:
2011-03-13T16:18:09Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9351353
Parents:
6143ce3
Message:

Rename uhci_t ⇒ uhci_hc_t, start of bigger HC ↔ RH cleanup

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

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci-hcd/Makefile

    r6143ce3 r8850690  
    3535        iface.c \
    3636        main.c \
    37         root_hub.c \
    3837        transfer_list.c \
    39         uhci.c \
     38        uhci_hc.c \
     39        uhci_rh.c \
    4040        uhci_struct/transfer_descriptor.c \
    4141        utils/device_keeper.c \

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

    r6143ce3 r8850690  
    4040#include "batch.h"
    4141#include "transfer_list.h"
    42 #include "uhci.h"
     42#include "uhci_hc.h"
    4343#include "utils/malloc32.h"
    4444
    … …  
    450450{
    451451        assert(instance);
    452         uhci_t *hc = fun_to_uhci(instance->fun);
     452        uhci_hc_t *hc = fun_to_uhci(instance->fun);
    453453        assert(hc);
    454454        return uhci_schedule(hc, instance);

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

    r6143ce3 r8850690  
    4040
    4141#include "iface.h"
    42 #include "uhci.h"
     42#include "uhci_hc.h"
    4343#include "utils/device_keeper.h"
    4444
    … …  
    5353{
    5454        assert(fun);
    55         uhci_t *hc = fun_to_uhci(fun);
     55        uhci_hc_t *hc = fun_to_uhci(fun);
    5656        assert(hc);
    5757        usb_log_debug("Default address request with speed %d.\n", speed);
    … …  
    6868{
    6969        assert(fun);
    70         uhci_t *hc = fun_to_uhci(fun);
     70        uhci_hc_t *hc = fun_to_uhci(fun);
    7171        assert(hc);
    7272        usb_log_debug("Default address release.\n");
    … …  
    8686{
    8787        assert(fun);
    88         uhci_t *hc = fun_to_uhci(fun);
     88        uhci_hc_t *hc = fun_to_uhci(fun);
    8989        assert(hc);
    9090        assert(address);
    … …  
    109109{
    110110        assert(fun);
    111         uhci_t *hc = fun_to_uhci(fun);
     111        uhci_hc_t *hc = fun_to_uhci(fun);
    112112        assert(hc);
    113113        usb_log_debug("Address bind %d-%d.\n", address, handle);
    … …  
    125125{
    126126        assert(fun);
    127         uhci_t *hc = fun_to_uhci(fun);
     127        uhci_hc_t *hc = fun_to_uhci(fun);
    128128        assert(hc);
    129129        usb_log_debug("Address release %d.\n", address);
    … …  
    148148{
    149149        assert(fun);
    150         uhci_t *hc = fun_to_uhci(fun);
     150        uhci_hc_t *hc = fun_to_uhci(fun);
    151151        assert(hc);
    152152        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
    … …  
    180180{
    181181        assert(fun);
    182         uhci_t *hc = fun_to_uhci(fun);
     182        uhci_hc_t *hc = fun_to_uhci(fun);
    183183        assert(hc);
    184184        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
    … …  
    211211{
    212212        assert(fun);
    213         uhci_t *hc = fun_to_uhci(fun);
     213        uhci_hc_t *hc = fun_to_uhci(fun);
    214214        assert(hc);
    215215        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
    … …  
    243243{
    244244        assert(fun);
    245         uhci_t *hc = fun_to_uhci(fun);
     245        uhci_hc_t *hc = fun_to_uhci(fun);
    246246        assert(hc);
    247247        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
    … …  
    277277{
    278278        assert(fun);
    279         uhci_t *hc = fun_to_uhci(fun);
     279        uhci_hc_t *hc = fun_to_uhci(fun);
    280280        assert(hc);
    281281        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
    … …  
    315315{
    316316        assert(fun);
    317         uhci_t *hc = fun_to_uhci(fun);
     317        uhci_hc_t *hc = fun_to_uhci(fun);
    318318        assert(hc);
    319319        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);

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

    r6143ce3 r8850690  
    4444#include "iface.h"
    4545#include "pci.h"
    46 #include "root_hub.h"
    47 #include "uhci.h"
     46#include "uhci_hc.h"
     47#include "uhci_rh.h"
    4848
    4949#define NAME "uhci-hcd"
    … …  
    6969{
    7070        assert(dev);
    71         uhci_t *hc = dev_to_uhci(dev);
     71        uhci_hc_t *hc = dev_to_uhci(dev);
    7272        uint16_t status = IPC_GET_ARG1(*call);
    7373        assert(hc);
    … …  
    8686{
    8787        assert(device);
    88         uhci_t *hcd = NULL;
     88        uhci_hc_t *hcd = NULL;
    8989#define CHECK_RET_FREE_HC_RETURN(ret, message...) \
    9090if (ret != EOK) { \
    … …  
    121121#endif
    122122
    123         hcd = malloc(sizeof(uhci_t));
     123        hcd = malloc(sizeof(uhci_hc_t));
    124124        ret = (hcd != NULL) ? EOK : ENOMEM;
    125125        CHECK_RET_FREE_HC_RETURN(ret,
Note: See TracChangeset for help on using the changeset viewer.