summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-02-29 15:25:40 -0700
committerSimon Glass <sjg@chromium.org>2016-03-14 15:34:50 -0600
commit5ec4f1a5f35dc71881f88c84176c568308133640 (patch)
tree568dfc65217bd2241301461b1dafd0c2929479a4
parent1a73661bc7a7ad2d741f7d7519872ca18231598c (diff)
downloadtalos-obmc-uboot-5ec4f1a5f35dc71881f88c84176c568308133640.tar.gz
talos-obmc-uboot-5ec4f1a5f35dc71881f88c84176c568308133640.zip
dm: blk: Convert interface type to an enum
Since these are sequentially numbered it makes sense to use an enum. It avoids having to maintain the maximum value, and provides a type we can use if it is useful. In fact the maximum value is not used. Rename it to COUNT, since MAX suggests it is the maximum valid value, but it is not. Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--include/blk.h27
1 files changed, 15 insertions, 12 deletions
diff --git a/include/blk.h b/include/blk.h
index 1e8334c23a..fd545202eb 100644
--- a/include/blk.h
+++ b/include/blk.h
@@ -19,20 +19,23 @@ typedef ulong lbaint_t;
#define LBAFU "%" LBAFlength "u"
/* Interface types: */
-#define IF_TYPE_UNKNOWN 0
-#define IF_TYPE_IDE 1
-#define IF_TYPE_SCSI 2
-#define IF_TYPE_ATAPI 3
-#define IF_TYPE_USB 4
-#define IF_TYPE_DOC 5
-#define IF_TYPE_MMC 6
-#define IF_TYPE_SD 7
-#define IF_TYPE_SATA 8
-#define IF_TYPE_HOST 9
-#define IF_TYPE_MAX 10 /* Max number of IF_TYPE_* supported */
+enum if_type {
+ IF_TYPE_UNKNOWN = 0,
+ IF_TYPE_IDE,
+ IF_TYPE_SCSI,
+ IF_TYPE_ATAPI,
+ IF_TYPE_USB,
+ IF_TYPE_DOC,
+ IF_TYPE_MMC,
+ IF_TYPE_SD,
+ IF_TYPE_SATA,
+ IF_TYPE_HOST,
+
+ IF_TYPE_COUNT, /* Number of interface types */
+};
struct blk_desc {
- int if_type; /* type of the interface */
+ enum if_type if_type; /* type of the interface */
int dev; /* device number */
unsigned char part_type; /* partition type */
unsigned char target; /* target SCSI ID */
OpenPOWER on IntegriCloud