Changeset 5f70118 in mainline for uspace/lib/libblock

Timestamp:

2010-01-10T12:16:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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.

Location:

uspace/lib/libblock

Files:

• Makefile (modified) (1 diff)
• Makefile.build (added)
• Makefile.common (added)
• libblock.c (modified) (6 diffs)
• libblock.h (modified) (3 diffs)

uspace/lib/libblock/Makefile

@@ -28 +28 @@
 #
 
-## Common compiler flags
-#
+include Makefile.common
 
-LIBC_PREFIX = ../libc
+.PHONY: all clean
 
-## Setup toolchain
-#
-
-include $(LIBC_PREFIX)/Makefile.toolchain
-
-CFLAGS += -Iinclude
-
-## Sources
-#
-
-SOURCES = \
-        libblock.c
-
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-
-.PHONY: all clean depend
-
-all: libblock.a
-
--include Makefile.depend
+all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBC_PREFIX)/libc.a
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
-        -rm -f libblock.a Makefile.depend
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(LIBBLOCK)
         find . -name '*.o' -follow -exec rm \{\} \;
-
-depend:
-        -makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > Makefile.depend 2> /dev/null
-
-libblock.a: depend $(OBJECTS)
-        $(AR) rc libblock.a $(OBJECTS)
-
-%.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@

uspace/lib/libblock/libblock.c

@@ -47 +47 @@
 #include <as.h>
 #include <assert.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <adt/list.h>
 #include <adt/hash_table.h>
@@ -87 +87 @@
 static int write_blocks(devcon_t *devcon, bn_t ba, size_t cnt);
 static int get_block_size(int dev_phone, size_t *bsize);
+static int get_num_blocks(int dev_phone, bn_t *nblocks);
 
 static devcon_t *devcon_search(dev_handle_t dev_handle)
@@ -168 +169 @@
         }
 
-        rc = ipc_share_out_start(dev_phone, comm_area,
+        rc = async_share_out_start(dev_phone, comm_area,
             AS_AREA_READ | AS_AREA_WRITE);
         if (rc != EOK) {
@@ -714 +715 @@
 
         memcpy(devcon->comm_area, data, devcon->pblock_size * cnt);
-        rc = read_blocks(devcon, ba, cnt);
+        rc = write_blocks(devcon, ba, cnt);
 
         fibril_mutex_unlock(&devcon->comm_area_lock);
@@ -736 +737 @@
         
         return get_block_size(devcon->dev_phone, bsize);
+}
+
+/** Get number of blocks on device.
+ *
+ * @param dev_handle    Device handle of the block device.
+ * @param nblocks       Output number of blocks.
+ *
+ * @return              EOK on success or negative error code on failure.
+ */
+int block_get_nblocks(dev_handle_t dev_handle, bn_t *nblocks)
+{
+        devcon_t *devcon;
+
+        devcon = devcon_search(dev_handle);
+        assert(devcon);
+        
+        return get_num_blocks(devcon->dev_phone, nblocks);
 }
 
@@ -789 +807 @@
 }
 
+/** Get total number of blocks on block device. */
+static int get_num_blocks(int dev_phone, bn_t *nblocks)
+{
+        ipcarg_t nb_l, nb_h;
+        int rc;
+
+        rc = async_req_0_2(dev_phone, BD_GET_NUM_BLOCKS, &nb_l, &nb_h);
+        if (rc == EOK) {
+                *nblocks = (bn_t) MERGE_LOUP32(nb_l, nb_h);
+        }
+
+        return rc;
+}
+
 /** @}
  */

uspace/lib/libblock/libblock.h

@@ -36 +36 @@
 
 #ifndef LIBBLOCK_LIBBLOCK_H_
-#define LIBBLOCK_LIBBLOCK_H_ 
+#define LIBBLOCK_LIBBLOCK_H_
 
 #include <stdint.h>
 #include "../../srv/vfs/vfs.h"
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <adt/hash_table.h>
 #include <adt/list.h>
@@ -59 +59 @@
  */
 #define BLOCK_FLAGS_NOREAD      1
-
-typedef uint64_t bn_t;  /**< Block number type. */
 
 typedef struct block {
@@ -110 +108 @@
 
 extern int block_get_bsize(dev_handle_t, size_t *);
+extern int block_get_nblocks(dev_handle_t, bn_t *);
 extern int block_read_direct(dev_handle_t, bn_t, size_t, void *);
 extern int block_write_direct(dev_handle_t, bn_t, size_t, const void *);