+// SPDX-License-Identifier: GPL-2.0+
/*
* f_sdp.c -- USB HID Serial Download Protocol
*
* SKIP_DCD_HEADER are only stubs.
*
* Parts of the implementation are based on f_dfu and f_thor.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <errno.h>
enum sdp_state state;
enum sdp_state next_state;
u32 dnl_address;
+ u32 dnl_bytes;
u32 dnl_bytes_remaining;
u32 jmp_address;
bool always_send_status;
NULL,
};
+static inline void *sdp_ptr(u32 val)
+{
+ return (void *)(uintptr_t)val;
+}
+
static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
{
struct f_sdp *sdp = req->context;
u8 report = data[0];
if (status != 0) {
- pr_err("Status: %d", status);
+ pr_err("Status: %d\n", status);
return;
}
if (report != 1) {
- pr_err("Unexpected report %d", report);
+ pr_err("Unexpected report %d\n", report);
return;
}
sdp->state = SDP_STATE_RX_FILE_DATA;
sdp->dnl_address = be32_to_cpu(cmd->addr);
sdp->dnl_bytes_remaining = be32_to_cpu(cmd->cnt);
+ sdp->dnl_bytes = sdp->dnl_bytes_remaining;
sdp->next_state = SDP_STATE_IDLE;
printf("Downloading file of size %d to 0x%08x... ",
int datalen = req->length - 1;
if (status != 0) {
- pr_err("Status: %d", status);
+ pr_err("Status: %d\n", status);
return;
}
if (report != 2) {
- pr_err("Unexpected report %d", report);
+ pr_err("Unexpected report %d\n", report);
return;
}
}
if (sdp->state == SDP_STATE_RX_FILE_DATA) {
- memcpy((void *)sdp->dnl_address, req->buf + 1, datalen);
+ memcpy(sdp_ptr(sdp->dnl_address), req->buf + 1, datalen);
sdp->dnl_address += datalen;
}
if (sdp->dnl_bytes_remaining)
return;
+#ifndef CONFIG_SPL_BUILD
+ env_set_hex("filesize", sdp->dnl_bytes);
+#endif
printf("done\n");
switch (sdp->state) {
sdp->state = SDP_STATE_TX_SEC_CONF;
break;
default:
- pr_err("Invalid state: %d", sdp->state);
+ pr_err("Invalid state: %d\n", sdp->state);
}
}
int status = req->status;
if (status != 0) {
- pr_err("Status: %d", status);
+ pr_err("Status: %d\n", status);
return;
}
sdp->state = SDP_STATE_IDLE;
break;
default:
- pr_err("Wrong State: %d", sdp->state);
+ pr_err("Wrong State: %d\n", sdp->state);
sdp->state = SDP_STATE_IDLE;
break;
}
}
printf("Jumping to 0x%08x\n", headerv2->entry);
- entry = (void *)headerv2->entry;
+ entry = sdp_ptr(headerv2->entry);
entry();
/* The image probably never returns hence we won't reach that point */
if (datalen > 64)
datalen = 64;
- memcpy(&data[1], (void *)sdp_func->dnl_address, datalen);
+ memcpy(&data[1], sdp_ptr(sdp_func->dnl_address), datalen);
sdp_func->in_req->length = 65;
sdp_func->dnl_bytes_remaining -= datalen;
break;
case SDP_STATE_JUMP:
printf("Jumping to header at 0x%08x\n", sdp_func->jmp_address);
- status = sdp_jump_imxheader((void *)sdp_func->jmp_address);
+ status = sdp_jump_imxheader(sdp_ptr(sdp_func->jmp_address));
/* If imx header fails, try some U-Boot specific headers */
if (status) {