Changeset 2578199 in mainline


Ignore:
Timestamp:
2012-02-24T18:15:09Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5837c7a
Parents:
0a208110
Message:

ohci: Merge conflict leftover.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r0a208110 r2578199  
    5656static const irq_cmd_t ohci_irq_commands[] = {
    5757        { .cmd = CMD_PIO_READ_32, .dstarg = 1, .addr = NULL /* filled later */ },
    58         { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = OHCI_USED_INTERRUPTS },
     58        { .cmd = CMD_BTEST, .srcarg = 1, .dstarg = 2, .value = 0 /* filled later */ },
    5959        { .cmd = CMD_PREDICATE, .srcarg = 2, .value = 2 },
    6060        { .cmd = CMD_PIO_WRITE_A_32, .srcarg = 1, .addr = NULL /* filled later */ },
Note: See TracChangeset for help on using the changeset viewer.