@ -324,7 +324,7 @@ static int test_part_efi(struct blk_desc *dev_desc)
ALLOC_CACHE_ALIGN_BUFFER_PAD ( legacy_mbr , legacymbr , 1 , dev_desc - > blksz ) ;
ALLOC_CACHE_ALIGN_BUFFER_PAD ( legacy_mbr , legacymbr , 1 , dev_desc - > blksz ) ;
/* Read legacy MBR from block 0 and validate it */
/* Read legacy MBR from block 0 and validate it */
if ( ( dev_desc - > bloc k_read ( dev_desc , 0 , 1 , ( ulong * ) legacymbr ) ! = 1 )
if ( ( blk_d read ( dev_desc , 0 , 1 , ( ulong * ) legacymbr ) ! = 1 )
| | ( is_pmbr_valid ( legacymbr ) ! = 1 ) ) {
| | ( is_pmbr_valid ( legacymbr ) ! = 1 ) ) {
return - 1 ;
return - 1 ;
}
}
@ -354,7 +354,7 @@ static int set_protective_mbr(struct blk_desc *dev_desc)
p_mbr - > partition_record [ 0 ] . nr_sects = ( u32 ) dev_desc - > lba - 1 ;
p_mbr - > partition_record [ 0 ] . nr_sects = ( u32 ) dev_desc - > lba - 1 ;
/* Write MBR sector to the MMC device */
/* Write MBR sector to the MMC device */
if ( dev_desc - > bloc k_write ( dev_desc , 0 , 1 , p_mbr ) ! = 1 ) {
if ( blk_d write ( dev_desc , 0 , 1 , p_mbr ) ! = 1 ) {
printf ( " ** Can't write to device %d ** \n " ,
printf ( " ** Can't write to device %d ** \n " ,
dev_desc - > devnum ) ;
dev_desc - > devnum ) ;
return - 1 ;
return - 1 ;
@ -386,24 +386,21 @@ int write_gpt_table(struct blk_desc *dev_desc,
gpt_h - > header_crc32 = cpu_to_le32 ( calc_crc32 ) ;
gpt_h - > header_crc32 = cpu_to_le32 ( calc_crc32 ) ;
/* Write the First GPT to the block right after the Legacy MBR */
/* Write the First GPT to the block right after the Legacy MBR */
if ( dev_desc - > bloc k_write ( dev_desc , 1 , 1 , gpt_h ) ! = 1 )
if ( blk_d write ( dev_desc , 1 , 1 , gpt_h ) ! = 1 )
goto err ;
goto err ;
if ( dev_desc - > bloc k_write ( dev_desc , 2 , pte_blk_cnt , gpt_e )
if ( blk_d write ( dev_desc , 2 , pte_blk_cnt , gpt_e )
! = pte_blk_cnt )
! = pte_blk_cnt )
goto err ;
goto err ;
prepare_backup_gpt_header ( gpt_h ) ;
prepare_backup_gpt_header ( gpt_h ) ;
if ( dev_desc - > block_write ( dev_desc ,
if ( blk_dwrite ( dev_desc , ( lbaint_t ) le64_to_cpu ( gpt_h - > last_usable_lba )
( lbaint_t ) le64_to_cpu ( gpt_h - > last_usable_lba )
+ 1 , pte_blk_cnt , gpt_e ) ! = pte_blk_cnt )
+ 1 ,
pte_blk_cnt , gpt_e ) ! = pte_blk_cnt )
goto err ;
goto err ;
if ( dev_desc - > block_write ( dev_desc ,
if ( blk_dwrite ( dev_desc , ( lbaint_t ) le64_to_cpu ( gpt_h - > my_lba ) , 1 ,
( lbaint_t ) le64_to_cpu ( gpt_h - > my_lba ) , 1 ,
gpt_h ) ! = 1 )
gpt_h ) ! = 1 )
goto err ;
goto err ;
debug ( " GPT successfully written to block device! \n " ) ;
debug ( " GPT successfully written to block device! \n " ) ;
@ -739,7 +736,7 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf)
/* write MBR */
/* write MBR */
lba = 0 ; /* MBR is always at 0 */
lba = 0 ; /* MBR is always at 0 */
cnt = 1 ; /* MBR (1 block) */
cnt = 1 ; /* MBR (1 block) */
if ( dev_desc - > bloc k_write ( dev_desc , lba , cnt , buf ) ! = cnt ) {
if ( blk_d write ( dev_desc , lba , cnt , buf ) ! = cnt ) {
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
__func__ , " MBR " , cnt , lba ) ;
__func__ , " MBR " , cnt , lba ) ;
return 1 ;
return 1 ;
@ -748,7 +745,7 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf)
/* write Primary GPT */
/* write Primary GPT */
lba = GPT_PRIMARY_PARTITION_TABLE_LBA ;
lba = GPT_PRIMARY_PARTITION_TABLE_LBA ;
cnt = 1 ; /* GPT Header (1 block) */
cnt = 1 ; /* GPT Header (1 block) */
if ( dev_desc - > bloc k_write ( dev_desc , lba , cnt , gpt_h ) ! = cnt ) {
if ( blk_d write ( dev_desc , lba , cnt , gpt_h ) ! = cnt ) {
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
__func__ , " Primary GPT Header " , cnt , lba ) ;
__func__ , " Primary GPT Header " , cnt , lba ) ;
return 1 ;
return 1 ;
@ -756,7 +753,7 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf)
lba = le64_to_cpu ( gpt_h - > partition_entry_lba ) ;
lba = le64_to_cpu ( gpt_h - > partition_entry_lba ) ;
cnt = gpt_e_blk_cnt ;
cnt = gpt_e_blk_cnt ;
if ( dev_desc - > bloc k_write ( dev_desc , lba , cnt , gpt_e ) ! = cnt ) {
if ( blk_d write ( dev_desc , lba , cnt , gpt_e ) ! = cnt ) {
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
__func__ , " Primary GPT Entries " , cnt , lba ) ;
__func__ , " Primary GPT Entries " , cnt , lba ) ;
return 1 ;
return 1 ;
@ -767,7 +764,7 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf)
/* write Backup GPT */
/* write Backup GPT */
lba = le64_to_cpu ( gpt_h - > partition_entry_lba ) ;
lba = le64_to_cpu ( gpt_h - > partition_entry_lba ) ;
cnt = gpt_e_blk_cnt ;
cnt = gpt_e_blk_cnt ;
if ( dev_desc - > bloc k_write ( dev_desc , lba , cnt , gpt_e ) ! = cnt ) {
if ( blk_d write ( dev_desc , lba , cnt , gpt_e ) ! = cnt ) {
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
__func__ , " Backup GPT Entries " , cnt , lba ) ;
__func__ , " Backup GPT Entries " , cnt , lba ) ;
return 1 ;
return 1 ;
@ -775,7 +772,7 @@ int write_mbr_and_gpt_partitions(struct blk_desc *dev_desc, void *buf)
lba = le64_to_cpu ( gpt_h - > my_lba ) ;
lba = le64_to_cpu ( gpt_h - > my_lba ) ;
cnt = 1 ; /* GPT Header (1 block) */
cnt = 1 ; /* GPT Header (1 block) */
if ( dev_desc - > bloc k_write ( dev_desc , lba , cnt , gpt_h ) ! = cnt ) {
if ( blk_d write ( dev_desc , lba , cnt , gpt_h ) ! = cnt ) {
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
printf ( " %s: failed writing '%s' (%d blks at 0x " LBAF " ) \n " ,
__func__ , " Backup GPT Header " , cnt , lba ) ;
__func__ , " Backup GPT Header " , cnt , lba ) ;
return 1 ;
return 1 ;
@ -845,7 +842,7 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,
}
}
/* Read GPT Header from device */
/* Read GPT Header from device */
if ( dev_desc - > bloc k_read ( dev_desc , ( lbaint_t ) lba , 1 , pgpt_head ) ! = 1 ) {
if ( blk_d read ( dev_desc , ( lbaint_t ) lba , 1 , pgpt_head ) ! = 1 ) {
printf ( " *** ERROR: Can't read GPT header *** \n " ) ;
printf ( " *** ERROR: Can't read GPT header *** \n " ) ;
return 0 ;
return 0 ;
}
}
@ -913,8 +910,7 @@ static gpt_entry *alloc_read_gpt_entries(struct blk_desc *dev_desc,
/* Read GPT Entries from device */
/* Read GPT Entries from device */
blk = le64_to_cpu ( pgpt_head - > partition_entry_lba ) ;
blk = le64_to_cpu ( pgpt_head - > partition_entry_lba ) ;
blk_cnt = BLOCK_CNT ( count , dev_desc ) ;
blk_cnt = BLOCK_CNT ( count , dev_desc ) ;
if ( dev_desc - > block_read ( dev_desc , blk , ( lbaint_t ) blk_cnt , pte )
if ( blk_dread ( dev_desc , blk , ( lbaint_t ) blk_cnt , pte ) ! = blk_cnt ) {
! = blk_cnt ) {
printf ( " *** ERROR: Can't read GPT Entries *** \n " ) ;
printf ( " *** ERROR: Can't read GPT Entries *** \n " ) ;
free ( pte ) ;
free ( pte ) ;
return NULL ;
return NULL ;