Skip to content

Commit

Permalink
mtp deinit function
Browse files Browse the repository at this point in the history
fix rx/tx/tmp buffers sizes.
v0.8.1
  • Loading branch information
jfdelnero committed May 8, 2018
1 parent 442aac6 commit 92c057d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 5 deletions.
5 changes: 4 additions & 1 deletion inc/mtp.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ typedef struct mtp_ctx_
}mtp_ctx;

mtp_ctx * mtp_init_responder();

int mtp_incoming_packet(mtp_ctx * ctx);
void mtp_set_usb_handle(mtp_ctx * ctx, void * handle, uint32_t max_packet_size);

Expand All @@ -110,4 +111,6 @@ uint32_t mtp_add_storage(mtp_ctx * ctx, char * path, char * description);
char * mtp_get_storage_description(mtp_ctx * ctx, uint32_t storage_id);
char * mtp_get_storage_root(mtp_ctx * ctx, uint32_t storage_id);

#define APP_VERSION "v0.8.0"
void mtp_deinit_responder(mtp_ctx * ctx);

#define APP_VERSION "v0.8.1"
28 changes: 24 additions & 4 deletions src/mtp.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ mtp_ctx * mtp_init_responder()
{
memset(ctx,0,sizeof(mtp_ctx));

ctx->wrbuffer = malloc(MAX_RX_BUFFER_SIZE);
ctx->wrbuffer = malloc(MAX_TX_BUFFER_SIZE);
if(!ctx->wrbuffer)
goto init_error;

ctx->rdbuffer = malloc(128*1024);
ctx->rdbuffer = malloc( MAX_RX_BUFFER_SIZE );
if(!ctx->rdbuffer)
goto init_error;

ctx->rdbuffer2 = malloc(128*1024);
ctx->rdbuffer2 = malloc( MAX_RX_BUFFER_SIZE );
if(!ctx->rdbuffer2)
goto init_error;

ctx->temp_array = malloc(128*1024);
ctx->temp_array = malloc( MAX_STORAGE_NB * sizeof(uint32_t) );
if(!ctx->temp_array)
goto init_error;

Expand Down Expand Up @@ -108,6 +108,26 @@ mtp_ctx * mtp_init_responder()
return 0;
}

void mtp_deinit_responder(mtp_ctx * ctx)
{
if( ctx )
{
if(ctx->wrbuffer)
free(ctx->wrbuffer);

if(ctx->rdbuffer)
free(ctx->rdbuffer);

if(ctx->rdbuffer2)
free(ctx->rdbuffer2);

if(ctx->temp_array)
free(ctx->temp_array);

free(ctx);
}
}

int delete_tree(mtp_ctx * ctx,uint32_t handle)
{
int ret;
Expand Down
5 changes: 5 additions & 0 deletions src/umtprd.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,13 @@ int main(int argc, char *argv[])
else
{
PRINT_ERROR("USB Init failed !");

mtp_deinit_responder(mtp_context);

exit(-2);
}

mtp_deinit_responder(mtp_context);

exit(0);
}

0 comments on commit 92c057d

Please sign in to comment.