Changeset 8e7c9fe in mainline for uspace/lib/block/block.h

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/block/block.h (modified) (3 diffs)

uspace/lib/block/block.h

@@ -81 +81 @@
         /** Size of the block. */
         size_t size;
+        /** Number of write failures. */
+        int write_failures;
         /** Link for placing the block into the free block list. */
         link_t free_link;
@@ -96 +98 @@
         CACHE_MODE_WB
 };
-
-typedef struct {
-        uint16_t size;
-        uint8_t first_session;
-        uint8_t last_session;
-        
-        uint8_t res0;
-        uint8_t adr_ctrl;
-        uint8_t first_track;
-        uint8_t res1;
-        
-        uint32_t first_lba;
-} __attribute__((packed)) toc_block_t;
 
 extern int block_init(exch_mgmt_t, service_id_t, size_t);
@@ -127 +116 @@
 extern int block_get_bsize(service_id_t, size_t *);
 extern int block_get_nblocks(service_id_t, aoff64_t *);
-extern toc_block_t *block_get_toc(service_id_t, uint8_t);
+extern int block_read_toc(service_id_t, uint8_t, void *, size_t);
 extern int block_read_direct(service_id_t, aoff64_t, size_t, void *);
 extern int block_read_bytes_direct(service_id_t, aoff64_t, size_t, void *);