From be2ff20e429bf3cb38c4c94927b0affc0c3ab782 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 4 Jul 2018 17:15:49 +0700 Subject: [PATCH] enable usb cdc interface not handle anything yet. --- ports/nrf/Makefile | 14 +++-- ports/nrf/usb/tusb_config.h | 2 +- ports/nrf/usb/usb_cdc.c | 53 +++++++++++++++++++ .../nrf/usb/{msc_flash.c => usb_msc_flash.c} | 2 +- 4 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 ports/nrf/usb/usb_cdc.c rename ports/nrf/usb/{msc_flash.c => usb_msc_flash.c} (99%) diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index a40cbd58ec..1cc3d9e4a5 100644 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -116,8 +116,6 @@ SRC_C += \ boards/$(BOARD)/board.c \ nrfx/mdk/system_$(MCU_SUB_VARIANT).c \ device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \ - usb/tusb_descriptors.c \ - usb/msc_flash.c \ lib/oofatfs/ff.c \ lib/oofatfs/option/ccsbcs.c \ lib/timeutils/timeutils.c \ @@ -127,6 +125,15 @@ SRC_C += \ lib/utils/pyexec.c \ lib/libc/string0.c \ lib/mp-readline/readline.c \ + internal_flash.c \ + + +ifeq ($(MCU_SUB_VARIANT),nrf52840) + +SRC_C += \ + usb/tusb_descriptors.c \ + usb/usb_msc_flash.c \ + usb/usb_cdc.c \ lib/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c \ lib/tinyusb/src/portable/nordic/nrf5x/hal_nrf5x.c \ lib/tinyusb/src/common/tusb_fifo.c \ @@ -135,7 +142,8 @@ SRC_C += \ lib/tinyusb/src/class/msc/msc_device.c \ lib/tinyusb/src/class/cdc/cdc_device.c \ lib/tinyusb/src/tusb.c \ - internal_flash.c \ + +endif DRIVERS_SRC_C += $(addprefix modules/,\ diff --git a/ports/nrf/usb/tusb_config.h b/ports/nrf/usb/tusb_config.h index f4f7dc04d7..0875f91da0 100644 --- a/ports/nrf/usb/tusb_config.h +++ b/ports/nrf/usb/tusb_config.h @@ -68,7 +68,7 @@ #define CFG_TUD_ENDOINT0_SIZE 64 //------------- CLASS -------------// -#define CFG_TUD_CDC 0 +#define CFG_TUD_CDC 1 #define CFG_TUD_MSC 1 #define CFG_TUD_HID_KEYBOARD 0 #define CFG_TUD_HID_MOUSE 0 diff --git a/ports/nrf/usb/usb_cdc.c b/ports/nrf/usb/usb_cdc.c new file mode 100644 index 0000000000..1f4600d526 --- /dev/null +++ b/ports/nrf/usb/usb_cdc.c @@ -0,0 +1,53 @@ +/**************************************************************************/ +/*! + @file usb_cdc.c + @author hathach (tinyusb.org) + + @section LICENSE + + Software License Agreement (BSD License) + + Copyright (c) 2018, Adafruit Industries (adafruit.com) + 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. +*/ +/**************************************************************************/ + +#include "tusb.h" + +/*------------------------------------------------------------------*/ +/* MACRO TYPEDEF CONSTANT ENUM + *------------------------------------------------------------------*/ + +/*------------------------------------------------------------------*/ +/* VARIABLE DECLARATION + *------------------------------------------------------------------*/ + +/*------------------------------------------------------------------*/ +/* FUNCTION DECLARATION + *------------------------------------------------------------------*/ + +void tud_cdc_rx_cb(uint8_t port) +{ +} diff --git a/ports/nrf/usb/msc_flash.c b/ports/nrf/usb/usb_msc_flash.c similarity index 99% rename from ports/nrf/usb/msc_flash.c rename to ports/nrf/usb/usb_msc_flash.c index 48600d0524..b9e0c86106 100644 --- a/ports/nrf/usb/msc_flash.c +++ b/ports/nrf/usb/usb_msc_flash.c @@ -1,6 +1,6 @@ /**************************************************************************/ /*! - @file msc_flash.c + @file usb_msc_flash.c @author hathach (tinyusb.org) @section LICENSE