c_meyer/pxt-ev3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send restart request to uf2d upon usb disconnect

Browse Source
This commit is contained in:
Michal Moskal 2017-07-26 18:14:26 +01:00
parent 52ef98e249
commit c6b4e506d1
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
brick/kernel/f_mass_storage.c
View File

@ -2410,7 +2410,28 @@ static void fsg_disable(struct usb_function *f)
fsg->common->prev_fsg = fsg->common->fsg; fsg->common->prev_fsg = fsg->common->fsg;
fsg->common->fsg = fsg; fsg->common->fsg = fsg;
fsg->common->new_config = 0; fsg->common->new_config = 0;
raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE);
DBG(common, "fsg_disable filp=%p\n", fsg->common->luns[0].filp);
raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE_DISABLE);
}
static void shutdown_server(void) {
DBG(fsg_common, "shutdown_server filp=%p\n", fsg_common->luns[0].filp);
if (fsg_common->luns[0].filp) {
uint32_t buf[512 / 4];
loff_t file_offset_tmp = 512 * 50000; // make sure we're outside of FS area
int i;
// this should shut down the nbd server, so that the caches are flushed
memset(buf, 0, sizeof(buf));
buf[0] = 0x20da6d81;
buf[1] = 0x747e09d4;
fsg_common->luns[0].filp->f_flags |= O_SYNC;
for (i = 0; i < 2; ++i)
vfs_write(fsg_common->luns[0].filp,
(char*)buf, 512, &file_offset_tmp);
}
} }
@ -2532,6 +2553,9 @@ static void handle_exception(struct fsg_common *common)
/* SS_RESET_OCCURRED; */ /* SS_RESET_OCCURRED; */
break; break;
case FSG_STATE_CONFIG_CHANGE_DISABLE:
shutdown_server();
// fall-through
case FSG_STATE_CONFIG_CHANGE: case FSG_STATE_CONFIG_CHANGE:
rc = do_set_config(common, new_config); rc = do_set_config(common, new_config);
if (common->ep0_req_tag != exception_req_tag) if (common->ep0_req_tag != exception_req_tag)

1
brick/kernel/storage_common.c
View File

@ -334,6 +334,7 @@ enum fsg_state {
FSG_STATE_ABORT_BULK_OUT, FSG_STATE_ABORT_BULK_OUT,
FSG_STATE_RESET, FSG_STATE_RESET,
FSG_STATE_INTERFACE_CHANGE, FSG_STATE_INTERFACE_CHANGE,
FSG_STATE_CONFIG_CHANGE_DISABLE,
FSG_STATE_CONFIG_CHANGE, FSG_STATE_CONFIG_CHANGE,
FSG_STATE_DISCONNECT, FSG_STATE_DISCONNECT,
FSG_STATE_EXIT, FSG_STATE_EXIT,

11
brick/uf2daemon/fat.c
View File

@ -703,12 +703,23 @@ void restartProgram() {
exit(0); // causes parent to eject MSD etc exit(0); // causes parent to eject MSD etc
} }
int numWrites = 0;
static WriteState wrState; static WriteState wrState;
void write_block(uint32_t block_no, uint8_t *data) { void write_block(uint32_t block_no, uint8_t *data) {
WriteState *state = &wrState; WriteState *state = &wrState;
UF2_Block *bl = (void *)data; UF2_Block *bl = (void *)data;
if (bl->magicStart0 == 0x20da6d81 && bl->magicStart1 == 0x747e09d4) {
DBG("restart req, #wr=%d", numWrites);
if (numWrites) {
exit(0);
}
return;
}
numWrites++;
if (!is_uf2_block(bl)) { if (!is_uf2_block(bl)) {
return; return;
} }