You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/09/01 03:56:37 UTC
[incubator-nuttx] branch master updated (adea1fd -> c836b15)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from adea1fd Add wifinsh documentation and fix missing "nsh> " in the doc
new a09a952 wireless: bluetooth: revert to the original license
new 98ea354 LICENSE: add wireless/bluetooth license
new 48c858c drivers: update licenses to Apache
new acf22d6 drivers: wireless: bluetooth: revert original license
new c836b15 LICENSE: add drivers/wireless/bluetooth license
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 33 ++++++++++++++++++++++++
drivers/ioexpander/tca64xx.c | 49 +++++++++++-------------------------
drivers/lcd/tda19988.c | 49 +++++++++++-------------------------
drivers/mtd/is25xp.c | 45 +++++++++------------------------
drivers/mtd/mx25lx.c | 44 +++++++++-----------------------
drivers/wireless/bluetooth/bt_uart.c | 7 ------
drivers/wireless/bluetooth/bt_uart.h | 7 ------
wireless/bluetooth/bt_att.c | 7 ------
wireless/bluetooth/bt_att.h | 7 ------
wireless/bluetooth/bt_buf.c | 7 ------
wireless/bluetooth/bt_buf.h | 7 ------
wireless/bluetooth/bt_conn.c | 7 ------
wireless/bluetooth/bt_conn.h | 7 ------
wireless/bluetooth/bt_gatt.c | 7 ------
wireless/bluetooth/bt_hcicore.c | 7 ------
wireless/bluetooth/bt_hcicore.h | 7 ------
wireless/bluetooth/bt_keys.c | 7 ------
wireless/bluetooth/bt_keys.h | 7 ------
wireless/bluetooth/bt_l2cap.c | 7 ------
wireless/bluetooth/bt_l2cap.h | 7 ------
wireless/bluetooth/bt_smp.c | 7 ------
wireless/bluetooth/bt_smp.h | 7 ------
wireless/bluetooth/bt_uuid.c | 7 ------
23 files changed, 86 insertions(+), 260 deletions(-)
[incubator-nuttx] 02/05: LICENSE: add wireless/bluetooth license
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 98ea35460d497afa42f2f243b875490c50a1780f
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Tue Aug 31 09:07:35 2021 +0200
LICENSE: add wireless/bluetooth license
Add wireless/bluetooth license to the LICENSE file
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
LICENSE | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/LICENSE b/LICENSE
index 668afa3..157c6da 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2253,3 +2253,34 @@ fs/spiffs
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+wireless/bluetooth
+===========================
+ Copyright (c) 2016, Intel Corporation
+ 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 holder 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 AND CONTRIBUTORS
+ "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 OR
+ CONTRIBUTORS 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.
[incubator-nuttx] 01/05: wireless: bluetooth: revert to the
original license
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit a09a9524b43b1bfd267fef278b2fabcb7395d30f
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Tue Aug 31 09:07:35 2021 +0200
wireless: bluetooth: revert to the original license
Those files are ported from the Intel/Zephyr
arduino101_firmware_source-v1.tar package
where the code was released with a compatible 3-clause BSD license
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
wireless/bluetooth/bt_att.c | 7 -------
wireless/bluetooth/bt_att.h | 7 -------
wireless/bluetooth/bt_buf.c | 7 -------
wireless/bluetooth/bt_buf.h | 7 -------
wireless/bluetooth/bt_conn.c | 7 -------
wireless/bluetooth/bt_conn.h | 7 -------
wireless/bluetooth/bt_gatt.c | 7 -------
wireless/bluetooth/bt_hcicore.c | 7 -------
wireless/bluetooth/bt_hcicore.h | 7 -------
wireless/bluetooth/bt_keys.c | 7 -------
wireless/bluetooth/bt_keys.h | 7 -------
wireless/bluetooth/bt_l2cap.c | 7 -------
wireless/bluetooth/bt_l2cap.h | 7 -------
wireless/bluetooth/bt_smp.c | 7 -------
wireless/bluetooth/bt_smp.h | 7 -------
wireless/bluetooth/bt_uuid.c | 7 -------
16 files changed, 112 deletions(-)
diff --git a/wireless/bluetooth/bt_att.c b/wireless/bluetooth/bt_att.c
index 9e816c3..5136809 100644
--- a/wireless/bluetooth/bt_att.c
+++ b/wireless/bluetooth/bt_att.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_att.c
- * Attribute protocol handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_att.h b/wireless/bluetooth/bt_att.h
index 6eb546b..254f729 100644
--- a/wireless/bluetooth/bt_att.h
+++ b/wireless/bluetooth/bt_att.h
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_att.h
- * Attribute protocol handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_buf.c b/wireless/bluetooth/bt_buf.c
index 296fe0d..218742a 100644
--- a/wireless/bluetooth/bt_buf.c
+++ b/wireless/bluetooth/bt_buf.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_buf.c
- * Bluetooth buffer management
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_buf.h b/wireless/bluetooth/bt_buf.h
index 6d2314a..8477bf7 100644
--- a/wireless/bluetooth/bt_buf.h
+++ b/wireless/bluetooth/bt_buf.h
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_buf.h
- * Bluetooth buffer management.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_conn.c b/wireless/bluetooth/bt_conn.c
index 40cd227..9c52445 100644
--- a/wireless/bluetooth/bt_conn.c
+++ b/wireless/bluetooth/bt_conn.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_conn.c
- * Bluetooth connection handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_conn.h b/wireless/bluetooth/bt_conn.h
index fe30394..3a29997 100644
--- a/wireless/bluetooth/bt_conn.h
+++ b/wireless/bluetooth/bt_conn.h
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_conn.h
- * Bluetooth connection handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_gatt.c b/wireless/bluetooth/bt_gatt.c
index e865d08..5855ce7 100644
--- a/wireless/bluetooth/bt_gatt.c
+++ b/wireless/bluetooth/bt_gatt.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_gatt.c
- * Generic Attribute Profile handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_hcicore.c b/wireless/bluetooth/bt_hcicore.c
index 0ee98e3..78e3b78 100644
--- a/wireless/bluetooth/bt_hcicore.c
+++ b/wireless/bluetooth/bt_hcicore.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_hcicore.c
- * HCI core Bluetooth handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_hcicore.h b/wireless/bluetooth/bt_hcicore.h
index 0b0fdf2..8bc2047 100644
--- a/wireless/bluetooth/bt_hcicore.h
+++ b/wireless/bluetooth/bt_hcicore.h
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_hcicore.h
- * HCI core Bluetooth handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_keys.c b/wireless/bluetooth/bt_keys.c
index 25724bf..f95c11b 100644
--- a/wireless/bluetooth/bt_keys.c
+++ b/wireless/bluetooth/bt_keys.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_keys.c
- * Bluetooth key handling
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_keys.h b/wireless/bluetooth/bt_keys.h
index da98c52..2eb8c96 100644
--- a/wireless/bluetooth/bt_keys.h
+++ b/wireless/bluetooth/bt_keys.h
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_keys.h
- * Bluetooth key handling
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_l2cap.c b/wireless/bluetooth/bt_l2cap.c
index 99e8241..a7e4f01 100644
--- a/wireless/bluetooth/bt_l2cap.c
+++ b/wireless/bluetooth/bt_l2cap.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_l2cap.c
- * L2CAP handling
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_l2cap.h b/wireless/bluetooth/bt_l2cap.h
index 2daeae7..35cd1d1 100644
--- a/wireless/bluetooth/bt_l2cap.h
+++ b/wireless/bluetooth/bt_l2cap.h
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_l2cap.h
- * L2CAP handling
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_smp.c b/wireless/bluetooth/bt_smp.c
index 98f1f35..8bade5e 100644
--- a/wireless/bluetooth/bt_smp.c
+++ b/wireless/bluetooth/bt_smp.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_smp.c
- * Security Manager Protocol implementation.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_smp.h b/wireless/bluetooth/bt_smp.h
index 5ec4767..151e719 100644
--- a/wireless/bluetooth/bt_smp.h
+++ b/wireless/bluetooth/bt_smp.h
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_smp.h
- * Security Manager Protocol implementation.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/wireless/bluetooth/bt_uuid.c b/wireless/bluetooth/bt_uuid.c
index 3821583..2ebfcd1 100644
--- a/wireless/bluetooth/bt_uuid.c
+++ b/wireless/bluetooth/bt_uuid.c
@@ -1,12 +1,5 @@
/****************************************************************************
* wireless/bluetooth/bt_uuid.c
- * Bluetooth UUID handling.
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
[incubator-nuttx] 03/05: drivers: update licenses to Apache
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 48c858c89c78f59d47480a4a8cde56169038bdfd
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Tue Aug 31 09:54:52 2021 +0200
drivers: update licenses to Apache
Gregory Nutt is the copyright holder for those files and he has submitted the
SGA as a result we can migrate the licenses to Apache.
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
drivers/ioexpander/tca64xx.c | 49 ++++++++++++++------------------------------
drivers/lcd/tda19988.c | 49 +++++++++++++-------------------------------
drivers/mtd/is25xp.c | 45 +++++++++++-----------------------------
drivers/mtd/mx25lx.c | 44 +++++++++++----------------------------
4 files changed, 53 insertions(+), 134 deletions(-)
diff --git a/drivers/ioexpander/tca64xx.c b/drivers/ioexpander/tca64xx.c
index 898a381..a8de1da 100644
--- a/drivers/ioexpander/tca64xx.c
+++ b/drivers/ioexpander/tca64xx.c
@@ -1,39 +1,20 @@
/****************************************************************************
* drivers/ioexpander/tca64xx.c
- * Supports the following parts: TCA6408, TCA6416, TCA6424
- *
- * Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * This header file derives, in part, from the Project Ara TCA64xx driver
- * which has this copyright:
- *
- * Copyright (c) 2014-2015 Google Inc.
- * All rights reserved.
- * Author: Patrick Titiano, Jean Pihet
- *
- * 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 NuttX 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 AND CONTRIBUTORS
- * "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 OWNER OR CONTRIBUTORS 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.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
*
****************************************************************************/
diff --git a/drivers/lcd/tda19988.c b/drivers/lcd/tda19988.c
index 41867d3..4b362a4 100644
--- a/drivers/lcd/tda19988.c
+++ b/drivers/lcd/tda19988.c
@@ -1,41 +1,20 @@
/****************************************************************************
* drivers/lcd/tda19988.c
*
- * Copyright (C) 2019 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Derives rather loosely from the FreeBSD driver which has a compatible
- * two-clause BSD license:
- *
- * Copyright (c) 2015 Oleksandr Tymoshenko <go...@freebsd.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 NuttX 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 AND CONTRIBUTORS
- * "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 OWNER OR CONTRIBUTORS 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
*
****************************************************************************/
diff --git a/drivers/mtd/is25xp.c b/drivers/mtd/is25xp.c
index 8f36fcc..bca6011 100644
--- a/drivers/mtd/is25xp.c
+++ b/drivers/mtd/is25xp.c
@@ -1,41 +1,20 @@
/****************************************************************************
* drivers/mtd/is25xp.c
- * Driver for SPI-based IS25LPxx parts 32MBit and larger.
*
- * Copyright (C) 2016 Marten Svanfeldt. All rights reserved.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
*
- * Copyright (C) 2009-2011, 2013, 2017 Gregory Nutt. All rights reserved.
- * Author: Ken Pettit <pe...@gmail.com>
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Copied from / based on m25px.c and sst25.c drivers written by
- * Gregory Nutt <gn...@nuttx.org>
- *
- * 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 NuttX 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 AND CONTRIBUTORS
- * "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 OWNER OR CONTRIBUTORS 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
*
****************************************************************************/
diff --git a/drivers/mtd/mx25lx.c b/drivers/mtd/mx25lx.c
index d23229d..12b0bfb 100644
--- a/drivers/mtd/mx25lx.c
+++ b/drivers/mtd/mx25lx.c
@@ -1,40 +1,20 @@
/****************************************************************************
* drivers/mtd/mx25lx.c
- * Driver for SPI-based or QSPI-based MX25Lxx33L parts of 32 or 64MBit.
*
- * Copyright (C) 2016, 2019 Gregory Nutt. All rights reserved.
- * Author: Aleksandr Vyhovanec <ww...@gmail.com>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
*
- * Copied from / based on sst25.c and w25.c drivers written by
- * Gregory Nutt <gn...@nuttx.org>
- * Ken Pettit <pe...@gmail.com>
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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 NuttX 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 AND CONTRIBUTORS
- * "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 OWNER OR CONTRIBUTORS 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
*
****************************************************************************/
[incubator-nuttx] 04/05: drivers: wireless: bluetooth: revert
original license
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit acf22d6c4221d25935928dd66842d23db0b866d0
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Tue Aug 31 10:24:11 2021 +0200
drivers: wireless: bluetooth: revert original license
Those files are ported from the Intel/Zephyr
arduino101_firmware_source-v1.tar package
where the code was released with a compatible 3-clause BSD license
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
drivers/wireless/bluetooth/bt_uart.c | 7 -------
drivers/wireless/bluetooth/bt_uart.h | 7 -------
2 files changed, 14 deletions(-)
diff --git a/drivers/wireless/bluetooth/bt_uart.c b/drivers/wireless/bluetooth/bt_uart.c
index b932251..2d3bbe0 100644
--- a/drivers/wireless/bluetooth/bt_uart.c
+++ b/drivers/wireless/bluetooth/bt_uart.c
@@ -1,12 +1,5 @@
/****************************************************************************
* drivers/wireless/bluetooth/bt_uart.c
- * UART based Bluetooth driver
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
diff --git a/drivers/wireless/bluetooth/bt_uart.h b/drivers/wireless/bluetooth/bt_uart.h
index 4156bba..0b8bcc0 100644
--- a/drivers/wireless/bluetooth/bt_uart.h
+++ b/drivers/wireless/bluetooth/bt_uart.h
@@ -1,12 +1,5 @@
/****************************************************************************
* drivers/wireless/bluetooth/bt_uart.h
- * UART based Bluetooth driver
- *
- * Copyright (C) 2018 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Ported from the Intel/Zephyr arduino101_firmware_source-v1.tar package
- * where the code was released with a compatible 3-clause BSD license:
*
* Copyright (c) 2016, Intel Corporation
* All rights reserved.
[incubator-nuttx] 05/05: LICENSE: add drivers/wireless/bluetooth
license
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c836b15715798efd3268d35375e1b158d23b67a4
Author: Alin Jerpelea <al...@sony.com>
AuthorDate: Tue Aug 31 10:31:48 2021 +0200
LICENSE: add drivers/wireless/bluetooth license
Add drivers wireless/bluetooth license to the LICENSE file
Signed-off-by: Alin Jerpelea <al...@sony.com>
---
LICENSE | 2 ++
1 file changed, 2 insertions(+)
diff --git a/LICENSE b/LICENSE
index 157c6da..bd7579c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2253,6 +2253,8 @@ fs/spiffs
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
+drivers/wireless/bluetooth/bt_uart.c
+drivers/wireless/bluetooth/bt_uart.h
wireless/bluetooth
===========================
Copyright (c) 2016, Intel Corporation