Changeset 90478727 in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2012-08-12T11:46:44Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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:

• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (1 diff)

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

@@ -116 +116 @@
         {
                 .cmd = CMD_PIO_READ_8,
-                .addr = NULL,   /* will be patched in run-time */
+                .addr = NULL,
                 .dstarg = 1
         },
         {
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = SR_INT,
                 .srcarg = 1,