Changes in uspace/lib/block/block.h [3abf70c7:062d900] in mainline

File:

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

uspace/lib/block/block.h

@@ -29 +29 @@
  */
 
-/** @addtogroup libblock
+/** @addtogroup libblock 
  * @{
- */
+ */ 
 /**
  * @file
@@ -41 +41 @@
 #include <stdint.h>
 #include <async.h>
+#include "../../srv/vfs/vfs.h"
 #include <fibril_synch.h>
 #include <adt/hash_table.h>
 #include <adt/list.h>
-#include <loc.h>
 
 /*
@@ -50 +50 @@
  */
 
-/**
+/** 
  * This macro is a symbolic value for situations where no special flags are
  * needed.
@@ -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;
@@ -98 +96 @@
         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);
@@ -116 +127 @@
 extern int block_get_bsize(service_id_t, size_t *);
 extern int block_get_nblocks(service_id_t, aoff64_t *);
-extern int block_read_toc(service_id_t, uint8_t, void *, size_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 *);