diff options
author | Colin Cross <ccross@android.com> | 2012-07-17 23:35:21 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-07-17 23:35:49 -0700 |
commit | 9a70e5c33891632c89c9f3f03e30d7183227d661 (patch) | |
tree | ca65b8c3ba14966fc1a1a981fe2cbda704d53b0d /fastboot/fastboot.h | |
parent | 4be2c38884eeb32be469764c3569f3b7be487189 (diff) | |
parent | 4d72d8818e0a60e1f0cb9a2b9de51f16f3e3ebbb (diff) | |
download | system_core-9a70e5c33891632c89c9f3f03e30d7183227d661.zip system_core-9a70e5c33891632c89c9f3f03e30d7183227d661.tar.gz system_core-9a70e5c33891632c89c9f3f03e30d7183227d661.tar.bz2 |
resolved conflicts for merge of 4d72d881 to master
Change-Id: Ic092d27d3fc2bcc4db8a375bbcb5b86c111bf062
Diffstat (limited to 'fastboot/fastboot.h')
-rw-r--r-- | fastboot/fastboot.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fastboot/fastboot.h b/fastboot/fastboot.h index 90d8a6a..b4cf195 100644 --- a/fastboot/fastboot.h +++ b/fastboot/fastboot.h @@ -31,17 +31,22 @@ #include "usb.h" +struct sparse_file; + /* protocol.c - fastboot protocol */ int fb_command(usb_handle *usb, const char *cmd); int fb_command_response(usb_handle *usb, const char *cmd, char *response); int fb_download_data(usb_handle *usb, const void *data, unsigned size); +int fb_download_data_sparse(usb_handle *usb, struct sparse_file *s); char *fb_get_error(void); #define FB_COMMAND_SZ 64 #define FB_RESPONSE_SZ 64 /* engine.c - high level command queue engine */ +int fb_getvar(struct usb_handle *usb, char *response, const char *fmt, ...); void fb_queue_flash(const char *ptn, void *data, unsigned sz);; +void fb_queue_flash_sparse(const char *ptn, struct sparse_file *s, unsigned sz); void fb_queue_erase(const char *ptn); void fb_queue_format(const char *ptn, int skip_if_not_supported); void fb_queue_require(const char *prod, const char *var, int invert, |