Changeset 234e39e in mainline for uspace/srv

Timestamp:

2010-01-09T22:12:40Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4702798

Parents:

40d4c1d (diff), 9245413 (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 mkfile and mkfat.

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (1 diff)
• bd/file_bd/file_bd.c (modified) (5 diffs)
• bd/gxe_bd/gxe_bd.c (modified) (1 diff)
• bd/part/mbr_part/mbr_part.c (modified) (1 diff)
• bd/rd/rd.c (modified) (1 diff)
• vfs/vfs_ops.c (modified) (1 diff)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -296 +296 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(disk[disk_id].blocks),
+                            UPPER32(disk[disk_id].blocks));
+                        continue;
                 default:
                         retval = EINVAL;

uspace/srv/bd/file_bd/file_bd.c

@@ -56 +56 @@
 
 static const size_t block_size = 512;
+static bn_t num_blocks;
 static FILE *img;
 
@@ -99 +100 @@
 {
         int rc;
+        long img_size;
 
         rc = devmap_driver_register(NAME, file_bd_connection);
@@ -109 +111 @@
         if (img == NULL)
                 return EINVAL;
+
+        if (fseek(img, 0, SEEK_END) != 0) {
+                fclose(img);
+                return EIO;
+        }
+
+        img_size = ftell(img);
+        if (img_size < 0) {
+                fclose(img);
+                return EIO;
+        }
+
+        num_blocks = img_size / block_size;
 
         fibril_mutex_initialize(&dev_lock);
@@ -174 +189 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(num_blocks),
+                            UPPER32(num_blocks));
+                        continue;
                 default:
                         retval = EINVAL;
@@ -213 +232 @@
 
         fseek(img, ba * block_size, SEEK_SET);
-        n_wr = fread(buf, block_size, cnt, img);
+        n_wr = fwrite(buf, block_size, cnt, img);
 
         if (ferror(img) || n_wr < cnt) {

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -234 +234 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
+                case BD_GET_NUM_BLOCKS:
+                        retval = ENOTSUP;
+                        break;
                 default:
                         retval = EINVAL;

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -463 +463 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
-
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(part->length),
+                            UPPER32(part->length));
+                        continue;
                 default:
                         retval = EINVAL;

uspace/srv/bd/rd/rd.c

@@ -153 +153 @@
                         ipc_answer_1(callid, EOK, block_size);
                         continue;
+                case BD_GET_NUM_BLOCKS:
+                        ipc_answer_2(callid, EOK, LOWER32(rd_size / block_size),
+                            UPPER32(rd_size / block_size));
+                        continue;
                 default:
                         /*

uspace/srv/vfs/vfs_ops.c

@@ -900 +900 @@
                 }
                 newpos = size + off;
+                file->pos = newpos;
                 fibril_mutex_unlock(&file->lock);
                 ipc_answer_1(rid, EOK, newpos);