Changeset efdfebc in mainline for uspace/drv/bus/usb/uhci/hc.c


Ignore:
Timestamp:
2012-11-06T21:03:44Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
338810f
Parents:
de73242 (diff), 94795812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/uhci/hc.c

    rde73242 refdfebc  
    5050static const irq_pio_range_t uhci_irq_pio_ranges[] = {
    5151        {
    52                 .base = 0,      /* filled later */
     52                .base = 0,
    5353                .size = sizeof(uhci_regs_t)
    5454        }
    … …  
    5656
    5757static const irq_cmd_t uhci_irq_commands[] = {
    58         { .cmd = CMD_PIO_READ_16, .dstarg = 1, .addr = NULL/*filled later*/},
    59         { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2,
    60           .value = UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS },
    61         { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
    62         { .cmd = CMD_PIO_WRITE_A_16, .srcarg = 1, .addr = NULL/*filled later*/},
    63         { .cmd = CMD_ACCEPT },
     58        {
     59                .cmd = CMD_PIO_READ_16,
     60                .dstarg = 1,
     61                .addr = NULL
     62        },
     63        {
     64                .cmd = CMD_AND,
     65                .srcarg = 1,
     66                .dstarg = 2,
     67                .value = UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS
     68        },
     69        {
     70                .cmd = CMD_PREDICATE,
     71                .srcarg = 2,
     72                .value = 2
     73        },
     74        {
     75                .cmd = CMD_PIO_WRITE_A_16,
     76                .srcarg = 1,
     77                .addr = NULL
     78        },
     79        {
     80                .cmd = CMD_ACCEPT
     81        }
    6482};
    6583
    … …  
    7290static int hc_debug_checker(void *arg);
    7391
    74 /*----------------------------------------------------------------------------*/
     92
    7593/** Get number of PIO ranges used in IRQ code.
    7694 * @return Number of ranges.
    … …  
    8098        return sizeof(uhci_irq_pio_ranges) / sizeof(irq_pio_range_t);
    8199}
    82 /*----------------------------------------------------------------------------*/
     100
    83101/** Get number of commands used in IRQ code.
    84102 * @return Number of commands.
    … …  
    88106        return sizeof(uhci_irq_commands) / sizeof(irq_cmd_t);
    89107}
    90 /*----------------------------------------------------------------------------*/
     108
    91109/** Generate IRQ code.
    92110 * @param[out] ranges PIO ranges buffer.
    … …  
    118136        return EOK;
    119137}
    120 /*----------------------------------------------------------------------------*/
     138
    121139/** Take action based on the interrupt cause.
    122140 *
    … …  
    175193        }
    176194}
    177 /*----------------------------------------------------------------------------*/
     195
    178196/** Initialize UHCI hc driver structure
    179197 *
    … …  
    235253        return EOK;
    236254}
    237 /*----------------------------------------------------------------------------*/
     255
    238256/** Initialize UHCI hc hw resources.
    239257 *
    … …  
    277295            UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET | UHCI_CMD_CONFIGURE);
    278296}
    279 /*----------------------------------------------------------------------------*/
     297
    280298/** Initialize UHCI hc memory structures.
    281299 *
    … …  
    319337        return EOK;
    320338}
    321 /*----------------------------------------------------------------------------*/
     339
    322340/** Initialize UHCI hc transfer lists.
    323341 *
    … …  
    381399#undef CHECK_RET_CLEAR_RETURN
    382400}
    383 /*----------------------------------------------------------------------------*/
     401
    384402/** Schedule batch for execution.
    385403 *
    … …  
    409427        return EOK;
    410428}
    411 /*----------------------------------------------------------------------------*/
     429
    412430/** Polling function, emulates interrupts.
    413431 *
    … …  
    432450        return EOK;
    433451}
    434 /*----------------------------------------------------------------------------*/
     452
    435453/** Debug function, checks consistency of memory structures.
    436454 *
Note: See TracChangeset for help on using the changeset viewer.