From c4b7a9049726e4aa2af6550d54d06db7f36695c1 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Wed, 3 Jul 2024 15:38:04 -0700 Subject: [PATCH] Relicense headers. --- LICENSE | 3 +- ch32v003fun/ch32v003fun.h | 67 +++++++++++++++++++-------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/LICENSE b/LICENSE index 1dac5b2..285bfce 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2023 CNLohr +Copyright (c) 2023-2024 CNLohr, Et. Al. +Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/ch32v003fun/ch32v003fun.h b/ch32v003fun/ch32v003fun.h index 8de7cf7..e8ab62f 100644 --- a/ch32v003fun/ch32v003fun.h +++ b/ch32v003fun/ch32v003fun.h @@ -1,4 +1,4 @@ -// This contains a copy of ch32v00x.h and core_riscv.h ch32v00x_conf.h and other misc functions See copyright notice at end. +// This contains a copy of ch32v00x.h and core_riscv.h ch32v00x_conf.h and other misc functions See copyright explaination at the end of the file. #ifndef __CH32V00x_H #define __CH32V00x_H @@ -6693,27 +6693,6 @@ with 00h to 64 bytes, otherwise the short packet is filled with 60 bytes of 0, a #endif /* __CH32V00x_H */ -/* - * This file contains the contents of various parts of the evt. - * - * The collection of this file was generated by cnlohr, 2023-02-18 - * and AlexanderMandera, 2023-06-23 - * - * Contents subject to below copyright where applicable by law. - * - * (IANAL, BUT Because it is an interface, it is unlikely protected by copyright) - * - *********************************** (C) COPYRIGHT ******************************* - * File Name : ------------------ - * Author : WCH - * Version : V1.0.0 - * Date : 2020/08/08 - * Description : Library configuration file. -********************************************************************************* -* Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd. -* Attention: This software (modified or not) and binary are used for -* microcontroller manufactured by Nanjing Qinheng Microelectronics. -*******************************************************************************/ #ifndef __CH32V00x_CONF_H #define __CH32V00x_CONF_H @@ -12977,19 +12956,39 @@ Encoder for some of the proprietary 'XW' RISC-V instructions present on the Qing #endif -/* Copyright notice from original EVT. - ********************************** (C) COPYRIGHT ******************************* - * File Name : core_riscv.h + ch32v00x.h - * Author : WCH - * Version : V1.0.0 - * Date : 2022/08/08 - * Description : RISC-V Core Peripheral Access Layer Header File - ********************************************************************************* +/* + * This file contains various parts of the official WCH EVT Headers which + * were originally under a restrictive license. + * + * The collection of this file was generated by cnlohr, 2023-02-18 and + * AlexanderMandera, 2023-06-23 + * + * While originally under a restrictive copyright, WCH has approved use + * under MIT-licensed use, because of inclusion in Zephyr, as well as other + * open-soruce licnsed projects. + * + * These copies of the headers from WCH are available now under: + * * Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd. - * Attention: This software (modified or not) and binary are used for - * microcontroller manufactured by Nanjing Qinheng Microelectronics. - *******************************************************************************/ - + * + * 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. + */ #ifdef __cplusplus };