Allow specifying cdev's filetype explicitly to support the cases where the type of a cdev is known apriori, yet cannot be determined by reading the cdev's content.
Signed-off-by: Andrey Smirnov <[email protected]> --- common/filetype.c | 6 ++++++ include/driver.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/common/filetype.c b/common/filetype.c index 429911533..e4c8005b5 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -425,6 +425,11 @@ enum filetype cdev_detect_type(const char *name) if (!cdev) return type; + if (cdev->filetype != filetype_unknown) { + type = cdev->filetype; + goto cdev_close; + } + buf = xzalloc(FILE_TYPE_SAFE_BUFSIZE); ret = cdev_read(cdev, buf, FILE_TYPE_SAFE_BUFSIZE, 0, 0); if (ret < 0) @@ -434,6 +439,7 @@ enum filetype cdev_detect_type(const char *name) err_out: free(buf); +cdev_close: cdev_close(cdev); return type; } diff --git a/include/driver.h b/include/driver.h index 26ec413bd..fe2d30ab5 100644 --- a/include/driver.h +++ b/include/driver.h @@ -22,6 +22,7 @@ #include <linux/list.h> #include <linux/ioport.h> #include <of.h> +#include <filetype.h> #define FORMAT_DRIVER_NAME_ID "%s%d" @@ -464,6 +465,7 @@ struct cdev { struct list_head link_entry, links; struct list_head partition_entry, partitions; struct cdev *master; + enum filetype filetype; }; int devfs_create(struct cdev *); -- 2.21.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
