djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add autoreload

Browse Source
This commit is contained in:
hathach 2018-09-22 02:08:00 +07:00
parent 9ace50a18a
commit e1fe7e71a1
1 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ports/nrf/usb/usb_msc_flash.c
View File

@ -1,38 +1,28 @@
/**************************************************************************/ /*
/*! * This file is part of the MicroPython project, http://micropython.org/
@file usb_msc_flash.c *
@author hathach (tinyusb.org) * The MIT License (MIT)
*
@section LICENSE * Copyright (c) 2018 hathach for Adafruit Industries
*
Software License Agreement (BSD License) * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Copyright (c) 2018, Adafruit Industries (adafruit.com) * in the Software without restriction, including without limitation the rights
All rights reserved. * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
Redistribution and use in source and binary forms, with or without * furnished to do so, subject to the following conditions:
modification, are permitted provided that the following conditions are met: *
1. Redistributions of source code must retain the above copyright * The above copyright notice and this permission notice shall be included in
notice, this list of conditions and the following disclaimer. * all copies or substantial portions of the Software.
2. Redistributions in binary form must reproduce the above copyright *
notice, this list of conditions and the following disclaimer in the * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
documentation and/or other materials provided with the distribution. * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
3. Neither the name of the copyright holders nor the * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
names of its contributors may be used to endorse or promote products * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
derived from this software without specific prior written permission. * 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
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY * THE SOFTWARE.
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/**************************************************************************/
#include "tusb.h" #include "tusb.h"
#include "internal_flash.h" #include "internal_flash.h"
@ -43,6 +33,8 @@
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "py/mpstate.h" #include "py/mpstate.h"
#include "supervisor/shared/autoreload.h"
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* MACRO TYPEDEF CONSTANT ENUM /* MACRO TYPEDEF CONSTANT ENUM
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
@ -56,8 +48,8 @@
// Callback invoked when received an SCSI command not in built-in list below // Callback invoked when received an SCSI command not in built-in list below
// - READ_CAPACITY10, READ_FORMAT_CAPACITY, INQUIRY, MODE_SENSE6, REQUEST_SENSE // - READ_CAPACITY10, READ_FORMAT_CAPACITY, INQUIRY, MODE_SENSE6, REQUEST_SENSE
// - READ10 and WRITE10 has their own callbacks // - READ10 and WRITE10 has their own callbacks
int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize) { int32_t tud_msc_scsi_cb (uint8_t lun, const uint8_t scsi_cmd[16], void* buffer, uint16_t bufsize) {
void const* response = NULL; const void* response = NULL;
uint16_t resplen = 0; uint16_t resplen = 0;
switch ( scsi_cmd[0] ) { switch ( scsi_cmd[0] ) {
@ -110,7 +102,7 @@ int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buf
(void) lun; (void) lun;
(void) offset; (void) offset;
uint32_t const block_count = bufsize / MSC_FLASH_BLOCK_SIZE; const uint32_t block_count = bufsize / MSC_FLASH_BLOCK_SIZE;
internal_flash_read_blocks(buffer, lba, block_count); internal_flash_read_blocks(buffer, lba, block_count);
@ -123,7 +115,7 @@ int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* bu
(void) lun; (void) lun;
(void) offset; (void) offset;
uint32_t const block_count = bufsize / MSC_FLASH_BLOCK_SIZE; const uint32_t block_count = bufsize / MSC_FLASH_BLOCK_SIZE;
// bufsize <= CFG_TUD_MSC_BUFSIZE (4096) // bufsize <= CFG_TUD_MSC_BUFSIZE (4096)
internal_flash_write_blocks(buffer, lba, block_count); internal_flash_write_blocks(buffer, lba, block_count);
@ -145,4 +137,7 @@ void tud_msc_write10_complete_cb (uint8_t lun) {
// flush pending cache when write10 is complete // flush pending cache when write10 is complete
internal_flash_flush(); internal_flash_flush();
// This write is complete, start the autoreload clock.
autoreload_start();
} }