projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmc: fsl_esdhc: Fix SDR104 and HS200 support
[oweals/u-boot.git]
/
disk
/
part.c
diff --git
a/disk/part.c
b/disk/part.c
index 8982ef3baed129f13ed8936eecb2380a334c9b0b..f6a31025dc8a0a1a1a484105285ae060b8765b2d 100644
(file)
--- a/
disk/part.c
+++ b/
disk/part.c
@@
-5,10
+5,12
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <blk.h>
#include <command.h>
#include <env.h>
#include <errno.h>
#include <ide.h>
#include <command.h>
#include <env.h>
#include <errno.h>
#include <ide.h>
+#include <log.h>
#include <malloc.h>
#include <part.h>
#include <ubifs_uboot.h>
#include <malloc.h>
#include <part.h>
#include <ubifs_uboot.h>
@@
-104,17
+106,18
@@
typedef lbaint_t lba512_t;
#endif
/*
#endif
/*
- * Overflowless variant of (block_count * mul_by / 2**
div_by
)
- * when
div_by
> mul_by
+ * Overflowless variant of (block_count * mul_by / 2**
right_shift
)
+ * when
2**right_shift
> mul_by
*/
*/
-static lba512_t lba512_muldiv(lba512_t block_count, lba512_t mul_by, int div_by)
+static lba512_t lba512_muldiv(lba512_t block_count, lba512_t mul_by,
+ int right_shift)
{
lba512_t bc_quot, bc_rem;
/* x * m / d == x / d * m + (x % d) * m / d */
{
lba512_t bc_quot, bc_rem;
/* x * m / d == x / d * m + (x % d) * m / d */
- bc_quot = block_count >>
div_by
;
- bc_rem = block_count - (bc_quot <<
div_by
);
- return bc_quot * mul_by + ((bc_rem * mul_by) >>
div_by
);
+ bc_quot = block_count >>
right_shift
;
+ bc_rem = block_count - (bc_quot <<
right_shift
);
+ return bc_quot * mul_by + ((bc_rem * mul_by) >>
right_shift
);
}
void dev_print (struct blk_desc *dev_desc)
}
void dev_print (struct blk_desc *dev_desc)
@@
-317,7
+320,7
@@
void part_print(struct blk_desc *dev_desc)
#endif /* CONFIG_HAVE_BLOCK_DEVICE */
int part_get_info(struct blk_desc *dev_desc, int part,
#endif /* CONFIG_HAVE_BLOCK_DEVICE */
int part_get_info(struct blk_desc *dev_desc, int part,
-
disk_partition_t
*info)
+
struct disk_partition
*info)
{
#ifdef CONFIG_HAVE_BLOCK_DEVICE
struct part_driver *drv;
{
#ifdef CONFIG_HAVE_BLOCK_DEVICE
struct part_driver *drv;
@@
-350,7
+353,8
@@
int part_get_info(struct blk_desc *dev_desc, int part,
return -1;
}
return -1;
}
-int part_get_info_whole_disk(struct blk_desc *dev_desc, disk_partition_t *info)
+int part_get_info_whole_disk(struct blk_desc *dev_desc,
+ struct disk_partition *info)
{
info->start = 0;
info->size = dev_desc->lba;
{
info->start = 0;
info->size = dev_desc->lba;
@@
-430,7
+434,7
@@
cleanup:
#define PART_AUTO -1
int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
struct blk_desc **dev_desc,
#define PART_AUTO -1
int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
struct blk_desc **dev_desc,
-
disk_partition_t
*info, int allow_whole_dev)
+
struct disk_partition
*info, int allow_whole_dev)
{
int ret = -1;
const char *part_str;
{
int ret = -1;
const char *part_str;
@@
-440,7
+444,7
@@
int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
char *ep;
int p;
int part;
char *ep;
int p;
int part;
-
disk_partition_t
tmpinfo;
+
struct disk_partition
tmpinfo;
#ifdef CONFIG_SANDBOX
/*
#ifdef CONFIG_SANDBOX
/*
@@
-645,7
+649,7
@@
cleanup:
}
int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name,
}
int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name,
-
disk_partition_t
*info, int part_type)
+
struct disk_partition
*info, int part_type)
{
struct part_driver *part_drv;
int ret;
{
struct part_driver *part_drv;
int ret;
@@
-670,7
+674,7
@@
int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name,
}
int part_get_info_by_name(struct blk_desc *dev_desc, const char *name,
}
int part_get_info_by_name(struct blk_desc *dev_desc, const char *name,
-
disk_partition_t
*info)
+
struct disk_partition
*info)
{
return part_get_info_by_name_type(dev_desc, name, info, PART_TYPE_ALL);
}
{
return part_get_info_by_name_type(dev_desc, name, info, PART_TYPE_ALL);
}
@@
-692,7
+696,7
@@
int part_get_info_by_name(struct blk_desc *dev_desc, const char *name,
static int part_get_info_by_dev_and_name(const char *dev_iface,
const char *dev_part_str,
struct blk_desc **dev_desc,
static int part_get_info_by_dev_and_name(const char *dev_iface,
const char *dev_part_str,
struct blk_desc **dev_desc,
-
disk_partition_t
*part_info)
+
struct disk_partition
*part_info)
{
char *ep;
const char *part_str;
{
char *ep;
const char *part_str;
@@
-724,7
+728,7
@@
static int part_get_info_by_dev_and_name(const char *dev_iface,
int part_get_info_by_dev_and_name_or_num(const char *dev_iface,
const char *dev_part_str,
struct blk_desc **dev_desc,
int part_get_info_by_dev_and_name_or_num(const char *dev_iface,
const char *dev_part_str,
struct blk_desc **dev_desc,
-
disk_partition_t
*part_info)
+
struct disk_partition
*part_info)
{
/* Split the part_name if passed as "$dev_num#part_name". */
if (!part_get_info_by_dev_and_name(dev_iface, dev_part_str,
{
/* Split the part_name if passed as "$dev_num#part_name". */
if (!part_get_info_by_dev_and_name(dev_iface, dev_part_str,