From 40d5829a03b9eba2ea4bb80e6d65d64eb8e8f65a Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Thu, 12 May 2016 13:25:43 +0200 Subject: [PATCH] TPL: TM2: f_thor: Allow to download 4GB images This commit fixes 2GB file size limit for thor downloader. The application on host side sends the downloaded file size as 32-bit unsigned value. But the thor implementation on U-Boot side interpreted this as signed value. This caused an error for files with size greater than 2GB. This commit fixes the data types in code, which allows to send file of size 4GB. Signed-off-by: Przemyslaw Marczak [m.szyprowski: ported from tizen.org and fixed 64bit issues] Signed-off-by: Marek Szyprowski --- drivers/usb/gadget/f_thor.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index 1e67c80..5d759d4 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -178,7 +178,7 @@ static int download_head(unsigned long long total, if (ret < 0) return ret; rcv_cnt += ret_rcv; - debug("%d: RCV data count: %u cnt: %d\n", usb_pkt_cnt, + debug("%d: RCV data count: %zu cnt: %d\n", usb_pkt_cnt, rcv_cnt, *cnt); if ((rcv_cnt % THOR_STORE_UNIT_SIZE) == 0) { @@ -203,7 +203,7 @@ static int download_head(unsigned long long total, * on the medium (they are smaller than THOR_STORE_UNIT_SIZE) */ *left = left_to_rcv + buf - transfer_buffer; - debug("%s: left: %u left_to_rcv: %u buf: 0x%p\n", __func__, + debug("%s: left: %zu left_to_rcv: %zu buf: 0x%p\n", __func__, *left, left_to_rcv, buf); if (left_to_rcv) { @@ -215,7 +215,7 @@ static int download_head(unsigned long long total, send_data_rsp(0, ++usb_pkt_cnt); } - debug("%s: %u total: %llu cnt: %d\n", __func__, rcv_cnt, total, *cnt); + debug("%s: %zu total: %llu cnt: %d\n", __func__, rcv_cnt, total, *cnt); return 0; } @@ -282,7 +282,7 @@ static int process_rqt_download(const struct rqt_box *rqt) total_file_size = thor_file_size; downloaded_file_size = 0; #endif - debug("INIT: total %u bytes\n", (size_t)rqt->int_data[0]); + debug("INIT: total %zu bytes\n", (size_t)rqt->int_data[0]); break; case RQT_DL_FILE_INFO: file_type = rqt->int_data[0]; @@ -299,7 +299,7 @@ static int process_rqt_download(const struct rqt_box *rqt) memcpy(f_name, rqt->str_data[0], F_NAME_BUF_SIZE); f_name[F_NAME_BUF_SIZE] = '\0'; - debug("INFO: name(%s, %d), size(%llu), type(%d)\n", + debug("INFO: name(%s, %d), size(%zu), type(%d)\n", f_name, 0, thor_file_size, file_type); rsp->int_data[0] = THOR_PACKET_SIZE; -- 2.7.4