Merge branch 'master' of git://git.denx.de/u-boot-usb
This commit is contained in:
@@ -150,9 +150,6 @@ struct dfu_entity *dfu_get_entity(int alt);
|
||||
char *dfu_extract_token(char** e, int *n);
|
||||
void dfu_trigger_reset(void);
|
||||
int dfu_get_alt(char *name);
|
||||
bool dfu_detach(void);
|
||||
void dfu_trigger_detach(void);
|
||||
void dfu_clear_detach(void);
|
||||
int dfu_init_env_entities(char *interface, char *devstr);
|
||||
unsigned char *dfu_get_buf(struct dfu_entity *dfu);
|
||||
unsigned char *dfu_free_buf(void);
|
||||
|
||||
@@ -39,4 +39,8 @@ int g_dnl_register(const char *s);
|
||||
void g_dnl_unregister(void);
|
||||
void g_dnl_set_serialnumber(char *);
|
||||
|
||||
bool g_dnl_detach(void);
|
||||
void g_dnl_trigger_detach(void);
|
||||
void g_dnl_clear_detach(void);
|
||||
|
||||
#endif /* __G_DOWNLOAD_H_ */
|
||||
|
||||
@@ -244,6 +244,26 @@ int gpt_fill_header(block_dev_desc_t *dev_desc, gpt_header *gpt_h,
|
||||
*/
|
||||
int gpt_restore(block_dev_desc_t *dev_desc, char *str_disk_guid,
|
||||
disk_partition_t *partitions, const int parts_count);
|
||||
|
||||
/**
|
||||
* is_valid_gpt_buf() - Ensure that the Primary GPT information is valid
|
||||
*
|
||||
* @param dev_desc - block device descriptor
|
||||
* @param buf - buffer which contains the MBR and Primary GPT info
|
||||
*
|
||||
* @return - '0' on success, otherwise error
|
||||
*/
|
||||
int is_valid_gpt_buf(block_dev_desc_t *dev_desc, void *buf);
|
||||
|
||||
/**
|
||||
* write_mbr_and_gpt_partitions() - write MBR, Primary GPT and Backup GPT
|
||||
*
|
||||
* @param dev_desc - block device descriptor
|
||||
* @param buf - buffer which contains the MBR and Primary GPT info
|
||||
*
|
||||
* @return - '0' on success, otherwise error
|
||||
*/
|
||||
int write_mbr_and_gpt_partitions(block_dev_desc_t *dev_desc, void *buf);
|
||||
#endif
|
||||
|
||||
#endif /* _PART_H */
|
||||
|
||||
Reference in New Issue
Block a user