summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2020-12-31 00:38:13 +0100
committerHeinrich Schuchardt <xypron.glpk@gmx.de>2020-12-31 14:32:27 +0100
commitc0029e4e25c10d627f4bff62cdb4074bb2c7eaf7 (patch)
treea7383efef0e84fc0eac5386eadd10c2fd8ee0c09
parentd0be67657d64523b4499d385390c08c2bafab1bc (diff)
downloadu-boot-c0029e4e25c10d627f4bff62cdb4074bb2c7eaf7.tar.gz
fs/fat: implement fsuuid command
The FAT file system does not have a UUID but a 4 byte volume ID. Let the fsuuid command show it in XXXX-XXXX format. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
-rw-r--r--fs/fat/fat.c18
-rw-r--r--fs/fs.c2
-rw-r--r--include/fat.h12
3 files changed, 31 insertions, 1 deletions
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index c9742d534b..157dad60a4 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -1377,3 +1377,21 @@ void fat_closedir(struct fs_dir_stream *dirs)
void fat_close(void)
{
}
+
+int fat_uuid(char *uuid_str)
+{
+ boot_sector bs;
+ volume_info volinfo;
+ int fatsize;
+ int ret;
+ u8 *id;
+
+ ret = read_bootsectandvi(&bs, &volinfo, &fatsize);
+ if (ret)
+ return ret;
+
+ id = volinfo.volume_id;
+ sprintf(uuid_str, "%02X%02X-%02X%02X", id[3], id[2], id[1], id[0]);
+
+ return 0;
+}
diff --git a/fs/fs.c b/fs/fs.c
index 7a4020607a..5e80648b5b 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -194,7 +194,7 @@ static struct fstype_info fstypes[] = {
.unlink = fs_unlink_unsupported,
.mkdir = fs_mkdir_unsupported,
#endif
- .uuid = fs_uuid_unsupported,
+ .uuid = fat_uuid,
.opendir = fat_opendir,
.readdir = fat_readdir,
.closedir = fat_closedir,
diff --git a/include/fat.h b/include/fat.h
index 8cae283030..b9f273f381 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -212,4 +212,16 @@ int fat_unlink(const char *filename);
int fat_mkdir(const char *dirname);
void fat_close(void);
void *fat_next_cluster(fat_itr *itr, unsigned int *nbytes);
+
+/**
+ * fat_uuid() - get FAT volume ID
+ *
+ * The FAT volume ID returned in @uuid_str as hexadecimal number in XXXX-XXXX
+ * format.
+ *
+ * @uuid_str: caller allocated buffer of at least 10 bytes for the volume ID
+ * Return: 0 on success
+ */
+int fat_uuid(char *uuid_str);
+
#endif /* _FAT_H_ */