sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

partitions: dos: add partuuid string for logical partitions 

Commit bc31d85c6e ("cdev: Add partuuid string to struct cdev") added
partuuid strings for dos partitions but only for the (up to) four
primary partitions. Do the same for the logical partitions. Their
numbers start at 5 independently of the number of available primary
partitions.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2016-05-09 12:55:08 +02:00 committed by Sascha Hauer
parent 06f5a7c9ad
commit 9efa564805
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/partitions/dos.c
View File

@ -117,11 +117,12 @@ static int dos_get_disk_signature(struct param_d *p, void *_priv)
}
static void dos_extended_partition(struct block_device *blk, struct partition_desc *pd,
struct partition *partition)
struct partition *partition, uint32_t signature)
{
uint8_t *buf = dma_alloc(SECTOR_SIZE);
uint32_t ebr_sector = partition->first_sec;
struct partition_entry *table = (struct partition_entry *)&buf[0x1be];
unsigned partno = 5;
while (pd->used_entries < ARRAY_SIZE(pd->parts)) {
int rc, i;
@ -153,7 +154,11 @@ static void dos_extended_partition(struct block_device *blk, struct partition_de
get_unaligned_le32(&table[0].partition_start);
pd->parts[n].size = get_unaligned_le32(&table[0].partition_size);
pd->parts[n].dos_partition_type = table[0].type;
if (signature)
sprintf(pd->parts[n].partuuid, "%08x-%02u",
signature, partno);
pd->used_entries++;
partno++;
/* the second entry defines the start of the next ebr if != 0 */
if (get_unaligned_le32(&table[1].partition_start))
@ -231,7 +236,7 @@ static void dos_partition(void *buf, struct block_device *blk,
}
if (extended_partition)
dos_extended_partition(blk, pd, extended_partition);
dos_extended_partition(blk, pd, extended_partition, signature);
dsp = xzalloc(sizeof(*dsp));
dsp->blk = blk;