#include "usb.h"
#include "dfu.h"
+#include "debug.h"
struct dfu_ctx *ctx = data;
int fail = 1;
- switch ((enum dfu_ctrl_req_code)req->bRequest) {
+ switch ((enum dfu_ctrl_req_code)req->bRequest)
+ {
case USB_CTRL_REQ_DFU_DNLOAD: {
void *buf;
goto out_no_status;
}
case USB_CTRL_REQ_DFU_UPLOAD: {
- return (0); // TODO
/*
void *buf;
+ size_t len = 0;
- switch (ctx->state) {
+ switch ( ctx->state )
+ {
case DFU_STATE_dfuIDLE:
- ctx->off = 0;
break;
case DFU_STATE_dfuUPLOAD_IDLE:
break;
goto err;
}
- // XXX Don't STALL? -HaaTa
- // TODO
- ctx->status = ctx->setup_write(ctx->off, req->wLength, &buf);
- if (ctx->status != DFU_STATUS_OK) {
+ // Find which sector to read
+ ctx->status = ctx->setup_read(ctx->off, &len, &buf);
+ print("UPLOAD off:");
+ printHex( ctx->off );
+ print(" len:");
+ printHex( len );
+ print(" addr:");
+ printHex( (uint32_t)buf );
+ print( NL );
+
+ if ( ctx->status != DFU_STATUS_OK || len > req->wLength )
+ {
ctx->state = DFU_STATE_dfuERROR;
goto err_have_status;
}
- if (req->wLength > 0)
- usb_ep0_rx(buf, req->wLength, dfu_dnload_complete, ctx);
+ // Send bytes to Host
+ if ( len > 0 )
+ {
+ usb_ep0_rx( buf, len, NULL, NULL );
+ }
else
- dfu_dnload_complete(NULL, 0, ctx);
+ {
+ ctx->state = DFU_STATE_dfuIDLE;
+ }
+
goto out_no_status;
*/
+ return 0;
}
case USB_CTRL_REQ_DFU_GETSTATUS: {
struct dfu_status_t st;
st.bStatus = ctx->status;
st.bwPollTimeout = 1000; /* XXX */
- // XXX FAKE WRITE
- if ( ctx->state == DFU_STATE_dfuMANIFEST )
- {
- uint8_t data[] = { 0x10, 0x20, 0x30, 0x40 };
- flash_program_longword((uintptr_t)&_app_rom, data);
- }
- /*
-
- uint32_t *position = &_app_rom + 0x100;
- for ( ; position < &_app_rom + 0x200; position++ )
- //for ( ; position < &_app_rom + 0x800; position++ )
- {
- if ( *position != 0xFFFFFFFF )
- {
- while( 1 )
- {
- GPIOA_PTOR |= (1<<5);
- for (uint32_t d = 0; d < 7200000; d++ );
- }
- }
- }*/
-
- // Check to see if vector table was flashed correctly
- // Return a flash error if it was not
- if (_app_rom == 0xffffffff && ctx->state == DFU_STATE_dfuMANIFEST)
- st.bStatus = DFU_STATUS_errPROG;
- //}
- /*
- if (ctx->state == DFU_STATE_dfuMANIFEST)
- {
- uint8_t *addr = (uint8_t*)_app_rom;
- //while (*(addr++) != 0x80);
- //st.bStatus = DFU_STATUS_errPROG;
- st.bStatus = (uint8_t)((uint32_t)(&_app_rom) >> 16);
- }
- */
-
/**
* If we're in DFU_STATE_dfuMANIFEST, we just finished
* the download, and we're just about to send our last
return (1);
}
-void dfu_init( dfu_setup_write_t setup_write, dfu_finish_write_t finish_write, struct dfu_ctx *ctx )
+void dfu_init( dfu_setup_read_t setup_read, dfu_setup_write_t setup_write, dfu_finish_write_t finish_write, struct dfu_ctx *ctx )
{
ctx->state = DFU_STATE_dfuIDLE;
+ ctx->setup_read = setup_read;
ctx->setup_write = setup_write;
ctx->finish_write = finish_write;
usb_attach_function(&dfu_function, &ctx->header);