xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update tusb

Browse Source
This commit is contained in:
hathach 2018-07-15 00:02:44 +07:00
parent 1dcb424163
commit 98a1304881
4 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sdk11/components/libraries/bootloader_dfu/bootloader.c
View File

@ -129,7 +129,7 @@ static void wait_for_events(void)
tusb_task();
// Send out cdc's data
tud_cdc_flush();
tud_cdc_write_flush();
if ((m_update_status == BOOTLOADER_COMPLETE) ||
(m_update_status == BOOTLOADER_TIMEOUT) ||

2
lib/tinyusb

@ -1 +1 @@
Subproject commit 5d8cf5cf8fc30cb8fbb7553b0f949d8f3298c602
Subproject commit abb37e98baa16ae9f99f9d7562e4ee166e8bc4de

6
src/main.c
View File

@ -483,15 +483,13 @@ void assert_nrf_callback(uint16_t line_num, const uint8_t * p_file_name)
//--------------------------------------------------------------------+
// tinyusb callbacks
//--------------------------------------------------------------------+
void tud_mount_cb(uint8_t rhport)
void tud_mount_cb(void)
{
(void) rhport;
msc_uf2_mount();
}
void tud_umount_cb(uint8_t rhport)
void tud_umount_cb(void)
{
(void) rhport;
msc_uf2_umount();
}

29
src/usb/uf2/uf2.h
View File

@ -1,3 +1,32 @@
/**
Microsoft UF2
The MIT License (MIT)
Copyright (c) Microsoft Corporation
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#ifndef UF2FORMAT_H
#define UF2FORMAT_H 1