Changeset 4c14b88 in mainline for uspace/drv

Timestamp:

2013-12-31T07:57:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

Location:

uspace/drv

Files:

• block/ata_bd/ata_bd.c (modified) (1 diff)
• bus/amba/Makefile (added)
• bus/amba/amba.c (added)
• bus/amba/amba.ma (added)
• bus/amba/ambapp.h (added)
• char/grlib_uart/Makefile (added)
• char/grlib_uart/cyclic_buffer.h (added)
• char/grlib_uart/grlib_uart.c (added)
• char/grlib_uart/grlib_uart.ma (added)
• infrastructure/rootleon3/Makefile (added)
• infrastructure/rootleon3/rootleon3.c (added)
• infrastructure/rootleon3/rootleon3.h (added)
• infrastructure/rootleon3/rootleon3.ma (added)

uspace/drv/block/ata_bd/ata_bd.c

@@ -1132 +1132 @@
         cnt = 100;
         while ((status & ~n_reset) != 0 || (status & set) != set) {
-                async_usleep(1);
                 --cnt;
                 if (cnt <= 0) break;