diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-05-11 13:25:26 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-05-12 10:35:20 +0000 |
commit | cc22df198d0ccb64dfdfe0c2f247f7d86b7fd750 (patch) | |
tree | e6cd8aaa33c161bc0f72a9b35e763372b20f910d /rbutil/jztool/include | |
parent | 3748117ee3623437d63ba2016637fd532dbdd4b9 (diff) | |
download | rockbox-cc22df198d0ccb64dfdfe0c2f247f7d86b7fd750.tar.gz rockbox-cc22df198d0ccb64dfdfe0c2f247f7d86b7fd750.zip |
jztool: Support new M3K bootloader
Change-Id: Ia2d96893a9a5c77deb71c1fe32ae5a0585093f5b
Diffstat (limited to 'rbutil/jztool/include')
-rw-r--r-- | rbutil/jztool/include/jztool.h | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/rbutil/jztool/include/jztool.h b/rbutil/jztool/include/jztool.h index e16bc9765f..df51fe9f44 100644 --- a/rbutil/jztool/include/jztool.h +++ b/rbutil/jztool/include/jztool.h @@ -37,7 +37,6 @@ typedef struct jz_context jz_context; typedef struct jz_usbdev jz_usbdev; typedef struct jz_device_info jz_device_info; typedef struct jz_buffer jz_buffer; -typedef struct jz_paramlist jz_paramlist; typedef enum jz_error jz_error; typedef enum jz_identify_error jz_identify_error; @@ -46,7 +45,6 @@ typedef enum jz_device_type jz_device_type; typedef enum jz_cpu_type jz_cpu_type; typedef void(*jz_log_cb)(jz_log_level, const char*); -typedef int(*jz_device_action_fn)(jz_context*, jz_paramlist*); enum jz_error { JZ_SUCCESS = 0, @@ -92,10 +90,6 @@ struct jz_device_info { jz_cpu_type cpu_type; uint16_t vendor_id; uint16_t product_id; - int num_actions; - const char* const* action_names; - const jz_device_action_fn* action_funcs; - const char* const* const* action_params; }; struct jz_buffer { @@ -132,7 +126,6 @@ const jz_device_info* jz_get_device_info_indexed(int index); int jz_identify_x1000_spl(const void* data, size_t len); int jz_identify_scramble_image(const void* data, size_t len); -int jz_identify_fiiom3k_bootimage(const void* data, size_t len); /****************************************************************************** * USB boot ROM protocol @@ -148,27 +141,10 @@ int jz_usb_start2(jz_usbdev* dev, uint32_t addr); int jz_usb_flush_caches(jz_usbdev* dev); /****************************************************************************** - * X1000 flash protocol + * Rockbox loader (all functions are model-specific, see docs) */ -int jz_x1000_setup(jz_usbdev* dev, size_t spl_len, const void* spl_data); -int jz_x1000_read_flash(jz_usbdev* dev, uint32_t addr, size_t len, void* data); -int jz_x1000_write_flash(jz_usbdev* dev, uint32_t addr, size_t len, const void* data); -int jz_x1000_boot_rockbox(jz_usbdev* dev); - -/****************************************************************************** - * FiiO M3K bootloader backup/installation - */ - -int jz_fiiom3k_readboot(jz_usbdev* dev, jz_buffer** bufptr); -int jz_fiiom3k_writeboot(jz_usbdev* dev, size_t image_size, const void* image_buf); -int jz_fiiom3k_patchboot(jz_context* jz, void* image_buf, size_t image_size, - const void* spl_buf, size_t spl_size, - const void* boot_buf, size_t boot_size); - -int jz_fiiom3k_install(jz_context* jz, jz_paramlist* pl); -int jz_fiiom3k_backup(jz_context* jz, jz_paramlist* pl); -int jz_fiiom3k_restore(jz_context* jz, jz_paramlist* pl); +int jz_fiiom3k_boot(jz_usbdev* dev, const char* filename); /****************************************************************************** * Simple buffer API @@ -181,15 +157,6 @@ int jz_buffer_load(jz_buffer** buf, const char* filename); int jz_buffer_save(jz_buffer* buf, const char* filename); /****************************************************************************** - * Parameter list - */ - -jz_paramlist* jz_paramlist_new(void); -void jz_paramlist_free(jz_paramlist* pl); -int jz_paramlist_set(jz_paramlist* pl, const char* param, const char* value); -const char* jz_paramlist_get(jz_paramlist* pl, const char* param); - -/****************************************************************************** * END */ |