Changeset a9f91cd in mainline


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

Refactoring final touches

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

Legend:

Unmodified
Added
Removed

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

    r9351353 ra9f91cd  
    450450{
    451451        assert(instance);
    452         uhci_hc_t *hc = fun_to_uhci(instance->fun);
     452        uhci_hc_t *hc = fun_to_uhci_hc(instance->fun);
    453453        assert(hc);
    454         return uhci_schedule(hc, instance);
     454        return uhci_hc_schedule(hc, instance);
    455455}
    456456/**

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

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

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

    r9351353 ra9f91cd  
    5454{
    5555        assert(dev);
    56         uhci_hc_t *hc = dev_to_uhci(dev);
     56        uhci_hc_t *hc = &((uhci_t*)dev->driver_data)->hc;
    5757        uint16_t status = IPC_GET_ARG1(*call);
    5858        assert(hc);
    59         uhci_interrupt(hc, status);
     59        uhci_hc_interrupt(hc, status);
    6060}
    6161/*----------------------------------------------------------------------------*/
    … …  
    188188        if (instance->rh_fun) \
    189189                ddf_fun_destroy(instance->rh_fun); \
    190         uhci_fini(&instance->hc); \
     190        uhci_hc_fini(&instance->hc); \
    191191        return ret; \
    192192}

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

    r9351353 ra9f91cd  
    6868 */
    6969/*----------------------------------------------------------------------------*/
    70 static int uhci_init_transfer_lists(uhci_hc_t *instance);
    71 static int uhci_init_mem_structures(uhci_hc_t *instance);
    72 static void uhci_init_hw(uhci_hc_t *instance);
    73 
    74 static int uhci_interrupt_emulator(void *arg);
    75 static int uhci_debug_checker(void *arg);
     70static int uhci_hc_init_transfer_lists(uhci_hc_t *instance);
     71static int uhci_hc_init_mem_structures(uhci_hc_t *instance);
     72static void uhci_hc_init_hw(uhci_hc_t *instance);
     73
     74static int uhci_hc_interrupt_emulator(void *arg);
     75static int uhci_hc_debug_checker(void *arg);
    7676
    7777static bool allowed_usb_packet(
    … …  
    113113            io, reg_size);
    114114
    115         ret = uhci_init_mem_structures(instance);
     115        ret = uhci_hc_init_mem_structures(instance);
    116116        CHECK_RET_DEST_FUN_RETURN(ret,
    117117            "Failed to initialize UHCI memory structures.\n");
    118118
    119         uhci_init_hw(instance);
     119        uhci_hc_init_hw(instance);
    120120        instance->cleaner =
    121             fibril_create(uhci_interrupt_emulator, instance);
     121            fibril_create(uhci_hc_interrupt_emulator, instance);
    122122        fibril_add_ready(instance->cleaner);
    123123
    124         instance->debug_checker = fibril_create(uhci_debug_checker, instance);
     124        instance->debug_checker = fibril_create(uhci_hc_debug_checker, instance);
    125125        fibril_add_ready(instance->debug_checker);
    126126
    … …  
    134134 * @param[in] instance UHCI structure to use.
    135135 */
    136 void uhci_init_hw(uhci_hc_t *instance)
     136void uhci_hc_init_hw(uhci_hc_t *instance)
    137137{
    138138        assert(instance);
    … …  
    172172 * @note Should be called only once on any structure.
    173173 */
    174 int uhci_init_mem_structures(uhci_hc_t *instance)
     174int uhci_hc_init_mem_structures(uhci_hc_t *instance)
    175175{
    176176        assert(instance);
    … …  
    201201
    202202        /* Init transfer lists */
    203         ret = uhci_init_transfer_lists(instance);
     203        ret = uhci_hc_init_transfer_lists(instance);
    204204        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to init transfer lists.\n");
    205205        usb_log_debug("Initialized transfer lists.\n");
    … …  
    235235 * @note Should be called only once on any structure.
    236236 */
    237 int uhci_init_transfer_lists(uhci_hc_t *instance)
     237int uhci_hc_init_transfer_lists(uhci_hc_t *instance)
    238238{
    239239        assert(instance);
    … …  
    299299 * @return Error code
    300300 */
    301 int uhci_schedule(uhci_hc_t *instance, batch_t *batch)
     301int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch)
    302302{
    303303        assert(instance);
    … …  
    327327 * @param[in] status Value of the stsatus regiser at the time of interrupt.
    328328 */
    329 void uhci_interrupt(uhci_hc_t *instance, uint16_t status)
     329void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status)
    330330{
    331331        assert(instance);
    … …  
    345345 * @return EOK
    346346 */
    347 int uhci_interrupt_emulator(void* arg)
     347int uhci_hc_interrupt_emulator(void* arg)
    348348{
    349349        usb_log_debug("Started interrupt emulator.\n");
    … …  
    357357                if (status != 0)
    358358                        usb_log_debug2("UHCI status: %x.\n", status);
    359                 uhci_interrupt(instance, status);
     359                uhci_hc_interrupt(instance, status);
    360360                async_usleep(UHCI_CLEANER_TIMEOUT);
    361361        }
    … …  
    368368 * @return EOK
    369369 */
    370 int uhci_debug_checker(void *arg)
     370int uhci_hc_debug_checker(void *arg)
    371371{
    372372        uhci_hc_t *instance = (uhci_hc_t*)arg;

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

    r9351353 ra9f91cd  
    11/*
    2  * Copyright (c) 2010 Jan Vesely
     2 * Copyright (c) 2011 Jan Vesely
    33 * All rights reserved.
    44 *
    … …  
    106106int uhci_hc_init(uhci_hc_t *instance, ddf_fun_t *fun, void *regs, size_t reg_size);
    107107
    108 static inline void uhci_fini(uhci_hc_t *instance) {};
     108static inline void uhci_hc_fini(uhci_hc_t *instance) { /* TODO: implement*/ };
    109109
    110 int uhci_schedule(uhci_hc_t *instance, batch_t *batch);
     110int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch);
    111111
    112 void uhci_interrupt(uhci_hc_t *instance, uint16_t status);
     112void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status);
    113113
    114 static inline uhci_hc_t * dev_to_uhci(ddf_dev_t *dev)
    115         { return (uhci_hc_t*)dev->driver_data; }
    116 
    117 static inline uhci_hc_t * fun_to_uhci(ddf_fun_t *fun)
     114static inline uhci_hc_t * fun_to_uhci_hc(ddf_fun_t *fun)
    118115        { return (uhci_hc_t*)fun->driver_data; }
    119 
    120 
    121116#endif
    122117/**
Note: See TracChangeset for help on using the changeset viewer.