From d7e48f307bb77e8e6a55967d9b94c7218f267e83 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 22 Nov 2018 11:36:50 +0700 Subject: [PATCH] clean up msc example --- examples/device/cdc_msc_hid/src/msc_app.c | 3 +- examples/device/cdc_msc_hid/src/msc_app.h | 64 ------------------- .../device/cdc_msc_hid/src/msc_disk_ram.c | 8 ++- 3 files changed, 9 insertions(+), 66 deletions(-) delete mode 100644 examples/device/cdc_msc_hid/src/msc_app.h diff --git a/examples/device/cdc_msc_hid/src/msc_app.c b/examples/device/cdc_msc_hid/src/msc_app.c index 52cf58f78..5d46b1cfa 100644 --- a/examples/device/cdc_msc_hid/src/msc_app.c +++ b/examples/device/cdc_msc_hid/src/msc_app.c @@ -36,7 +36,8 @@ */ /**************************************************************************/ -#include "msc_app.h" +#include "bsp/board.h" +#include "tusb.h" #if CFG_TUD_MSC diff --git a/examples/device/cdc_msc_hid/src/msc_app.h b/examples/device/cdc_msc_hid/src/msc_app.h deleted file mode 100644 index 38d0f4c99..000000000 --- a/examples/device/cdc_msc_hid/src/msc_app.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************/ -/*! - @file msc_app.h - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, hathach (tinyusb.org) - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY - 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. - - This file is part of the tinyusb stack. - */ -/**************************************************************************/ - -/** \ingroup group_demo - * \defgroup Mass Storage Device App - * @{ */ - -#ifndef _TUSB_MSCD_DEVICE_APP_H_ -#define _TUSB_MSCD_DEVICE_APP_H_ - -#include "bsp/board.h" -#include "tusb.h" - -#ifdef __cplusplus - extern "C" { -#endif - -#define README_CONTENTS \ -"This is tinyusb's MassStorage Class demo.\r\n\r\n\ -If you find any bugs or get any questions, feel free to file an\r\n\ -issue at github.com/hathach/tinyusb" - -#ifdef __cplusplus - } -#endif - -#endif /* _TUSB_MSCD_DEVICE_APP_H_ */ - -/** @} */ diff --git a/examples/device/cdc_msc_hid/src/msc_disk_ram.c b/examples/device/cdc_msc_hid/src/msc_disk_ram.c index c27105f8e..89711ad32 100644 --- a/examples/device/cdc_msc_hid/src/msc_disk_ram.c +++ b/examples/device/cdc_msc_hid/src/msc_disk_ram.c @@ -36,10 +36,16 @@ */ /**************************************************************************/ -#include "msc_app.h" +#include "bsp/board.h" +#include "tusb.h" #if CFG_TUD_MSC +#define README_CONTENTS \ +"This is tinyusb's MassStorage Class demo.\r\n\r\n\ +If you find any bugs or get any questions, feel free to file an\r\n\ +issue at github.com/hathach/tinyusb" + enum { DISK_BLOCK_NUM = 16, // 8KB is the smallest size that windows allow to mount