Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/tusb_missing_licence' into 'master'

Browse source 
tinyusb: updated the license header in the driver

See merge request espressif/esp-idf!8083
This commit is contained in:
Ivan Grokhotkov 2020-03-25 21:20:49 +08:00
parent 8aad738f02 337fff703a
commit 462fda201a
1 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
components/tinyusb/port/esp32s2/src/device_controller_driver.c
View file

@ -1,16 +1,30 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * The MIT License (MIT)
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * Copyright (c) 2018 Scott Shawcroft, 2019 William D. Jones for Adafruit Industries
// You may obtain a copy of the License at * Copyright (c) 2019 Ha Thach (tinyusb.org)
// * Additions Copyright (c) 2020, Espressif Systems (Shanghai) Co. Ltd.
// http://www.apache.org/licenses/LICENSE-2.0 *
// * Permission is hereby granted, free of charge, to any person obtaining a copy
// Unless required by applicable law or agreed to in writing, software * of this software and associated documentation files (the "Software"), to deal
// distributed under the License is distributed on an "AS IS" BASIS, * in the Software without restriction, including without limitation the rights
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// See the License for the specific language governing permissions and * copies of the Software, and to permit persons to whom the Software is
// limitations under the License. * 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.
*
* This file is part of the TinyUSB stack.
*/
#include "device_controller_driver.h" #include "device_controller_driver.h"