Changeset 7deca26 in mainline for uspace/srv


Ignore:
Timestamp:
2012-07-22T14:16:22Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7df0c2ff
Parents:
0b293a6 (diff), 76c07e4 (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 with mainline

Location:
uspace/srv
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hid/input/port/ns16550.c

    r0b293a6 r7deca26  
    8484        },
    8585        {
    86                 .cmd = CMD_BTEST,
     86                .cmd = CMD_AND,
    8787                .value = LSR_DATA_READY,
    8888                .srcarg = 1,

  • uspace/srv/hid/input/port/pl050.c

    r0b293a6 r7deca26  
    8080        },
    8181        {
    82                 .cmd = CMD_BTEST,
     82                .cmd = CMD_AND,
    8383                .value = PL050_STAT_RXFULL,
    8484                .srcarg = 1,

  • uspace/srv/hw/bus/cuda_adb/cuda_adb.c

    r0b293a6 r7deca26  
    116116        {
    117117                .cmd = CMD_PIO_READ_8,
    118                 .addr = NULL,   /* will be patched in run-time */
     118                .addr = NULL,
    119119                .dstarg = 1
    120120        },
    121121        {
    122                 .cmd = CMD_BTEST,
     122                .cmd = CMD_AND,
    123123                .value = SR_INT,
    124124                .srcarg = 1,
Note: See TracChangeset for help on using the changeset viewer.