Changes in uspace/lib/label/src/mbr.c [d8513177:9f64c1e] in mainline

File:

• uspace/lib/label/src/mbr.c (modified) (19 diffs)

uspace/lib/label/src/mbr.c

@@ -34 +34 @@
  */
 
-#include <block.h>
 #include <byteorder.h>
 #include <errno.h>
@@ -40 +39 @@
 #include <stdlib.h>
 
+#include "std/fat.h"
 #include "std/mbr.h"
 #include "mbr.h"
 
-static int mbr_open(service_id_t, label_t **);
+static int mbr_open(label_bd_t *, label_t **);
 static int mbr_open_ext(label_t *);
-static int mbr_create(service_id_t, label_t **);
+static int mbr_create(label_bd_t *, label_t **);
 static void mbr_close(label_t *);
 static int mbr_destroy(label_t *);
@@ -86 +86 @@
 };
 
-static int mbr_open(service_id_t sid, label_t **rlabel)
+static int mbr_open(label_bd_t *bd, label_t **rlabel)
 {
         label_t *label = NULL;
         mbr_br_block_t *mbr = NULL;
+        fat_bs_t *bs;
         mbr_pte_t *eptr;
         uint16_t sgn;
@@ -97 +98 @@
         int rc;
 
-        rc = block_get_bsize(sid, &bsize);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
-
-        rc = block_get_nblocks(sid, &nblocks);
+        rc = bd->ops->get_bsize(bd->arg, &bsize);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
+        rc = bd->ops->get_nblocks(bd->arg, &nblocks);
         if (rc != EOK) {
                 rc = EIO;
@@ -125 +126 @@
         }
 
-        rc = block_read_direct(sid, mbr_ba, 1, mbr);
+        bs = (fat_bs_t *)mbr;
+
+        rc = bd->ops->read(bd->arg, mbr_ba, 1, mbr);
         if (rc != EOK) {
                 rc = EIO;
@@ -146 +149 @@
         }
 
+        /*
+         * We can't really tell whether this is an MBR. Make sure
+         * this is not actually the BR of a 12/16-bit FAT file system
+         */
+        if (bs->type[0] == 'F' && bs->type[1] == 'A' && bs->type[2] == 'T') {
+                rc = EIO;
+                goto error;
+        }
+
+        /*
+         * Or a 32-bit FAT file system
+         */
+        if (bs->fat32.type[0] == 'F' && bs->fat32.type[1] == 'A' &&
+            bs->fat32.type[2] == 'T') {
+                rc = EIO;
+                goto error;
+        }
 
         label->ext_part = NULL;
@@ -160 +180 @@
         label->ops = &mbr_label_ops;
         label->ltype = lt_mbr;
-        label->svc_id = sid;
+        label->bd = *bd;
         label->block_size = bsize;
         label->ablock0 = mbr_ablock0;
@@ -219 +239 @@
         while (true) {
                 /* Read EBR */
-                rc = block_read_direct(label->svc_id, ebr_b0, 1, ebr);
+                rc = label->bd.ops->read(label->bd.arg, ebr_b0, 1, ebr);
                 if (rc != EOK) {
                         rc = EIO;
@@ -280 +300 @@
 }
 
-static int mbr_create(service_id_t sid, label_t **rlabel)
+static int mbr_create(label_bd_t *bd, label_t **rlabel)
 {
         label_t *label = NULL;
@@ -289 +309 @@
         int rc;
 
-        rc = block_get_bsize(sid, &bsize);
-        if (rc != EOK) {
-                rc = EIO;
-                goto error;
-        }
-
-        rc = block_get_nblocks(sid, &nblocks);
+        rc = bd->ops->get_bsize(bd->arg, &bsize);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
+        rc = bd->ops->get_nblocks(bd->arg, &nblocks);
         if (rc != EOK) {
                 rc = EIO;
@@ -321 +341 @@
         mbr->signature = host2uint16_t_le(mbr_br_signature);
 
-        rc = block_write_direct(sid, mbr_ba, 1, mbr);
+        rc = bd->ops->write(bd->arg, mbr_ba, 1, mbr);
         if (rc != EOK) {
                 rc = EIO;
@@ -333 +353 @@
         label->ltype = lt_mbr;
         label->block_size = bsize;
-        label->svc_id = sid;
+        label->bd = *bd;
         label->ablock0 = mbr_ablock0;
         label->anblocks = nblocks - mbr_ablock0;
@@ -387 +407 @@
         }
 
-        rc = block_write_direct(label->svc_id, mbr_ba, 1, mbr);
+        rc = label->bd.ops->write(label->bd.arg, mbr_ba, 1, mbr);
         if (rc != EOK) {
                 rc = EIO;
@@ -998 +1018 @@
                 return ENOMEM;
 
-        rc = block_read_direct(label->svc_id, mbr_ba, 1, br);
+        rc = label->bd.ops->read(label->bd.arg, mbr_ba, 1, br);
         if (rc != EOK) {
                 rc = EIO;
@@ -1006 +1026 @@
         br->pte[index] = *pte;
 
-        rc = block_write_direct(label->svc_id, mbr_ba, 1, br);
+        rc = label->bd.ops->write(label->bd.arg, mbr_ba, 1, br);
         if (rc != EOK) {
                 rc = EIO;
@@ -1066 +1086 @@
         br->signature = host2uint16_t_le(mbr_br_signature);
 
-        rc = block_write_direct(label->svc_id, ba, 1, br);
+        rc = label->bd.ops->write(label->bd.arg, ba, 1, br);
         if (rc != EOK) {
                 rc = EIO;
@@ -1091 +1111 @@
         ba = part->block0 - part->hdr_blocks;
 
-        rc = block_write_direct(label->svc_id, ba, 1, br);
+        rc = label->bd.ops->write(label->bd.arg, ba, 1, br);
         if (rc != EOK) {
                 rc = EIO;
@@ -1118 +1138 @@
                 return ENOMEM;
 
-        rc = block_read_direct(label->svc_id, ba, 1, br);
+        rc = label->bd.ops->read(label->bd.arg, ba, 1, br);
         if (rc != EOK) {
                 rc = EIO;
@@ -1133 +1153 @@
         mbr_log_part_to_ptes(part, NULL, &br->pte[mbr_ebr_pte_next]);
 
-        rc = block_write_direct(label->svc_id, ba, 1, br);
+        rc = label->bd.ops->write(label->bd.arg, ba, 1, br);
         if (rc != EOK) {
                 rc = EIO;