Changeset 00aece0 in mainline for uspace/lib/block/libblock.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/lib/block/libblock.h (modified) (3 diffs)

uspace/lib/block/libblock.h

@@ -97 +97 @@
 };
 
+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);
 extern void block_fini(service_id_t);
@@ -114 +127 @@
 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_direct(service_id_t, aoff64_t, size_t, void *);
 extern int block_read_bytes_direct(service_id_t, aoff64_t, size_t, void *);
@@ -122 +136 @@
 /** @}
  */
-