From 09cb41aada3a6a2356c514c3cebba5ccbc5af19e Mon Sep 17 00:00:00 2001 From: Alan Ott Date: Mon, 13 Sep 2010 11:15:24 -0400 Subject: [PATCH] Additional licenses. HIDAPI is now GPLv3, BSD, or the original license, at the discretion of the user. This should provide maximum flexibility and freedom. --- hidapi/hidapi.h | 11 +++++++++-- hidtest/hidtest.cpp | 6 ++++-- linux/hid-libusb.c | 11 +++++++++-- linux/hid.c | 11 +++++++++-- mac/hid.c | 11 +++++++++-- testgui/test.cpp | 5 +++-- windows/hid.cpp | 11 +++++++++-- 7 files changed, 52 insertions(+), 14 deletions(-) diff --git a/hidapi/hidapi.h b/hidapi/hidapi.h index 55e0ad1..b6e21ab 100644 --- a/hidapi/hidapi.h +++ b/hidapi/hidapi.h @@ -9,8 +9,15 @@ Copyright 2009, All Rights Reserved. - This software may be used by anyone for any reason so - long as this copyright notice remains intact. + At the discretion of the user of this library, + this software may be licensed under the terms of the + GNU Public License v3, a BSD-Style license, or the + original HIDAPI license as outlined in the LICENSE.txt, + LICENSE-gpl3.txt, LICENSE-bsd.txt, and LICENSE-orig.txt + files located at the root of the source distribution. + These files may also be found in the public source + code repository located at: + http://github.com/signal11/hidapi . ********************************************************/ #include diff --git a/hidtest/hidtest.cpp b/hidtest/hidtest.cpp index cb60777..84f8a85 100644 --- a/hidtest/hidtest.cpp +++ b/hidtest/hidtest.cpp @@ -8,8 +8,10 @@ Copyright 2009, All Rights Reserved. - This software may be used by anyone for any reason so - long as this copyright notice remains intact. + This contents of this file may be used by anyone + for any reason without any conditions and may be + used as a starting point for your own applications + which use HIDAPI. ********************************************************/ #include diff --git a/linux/hid-libusb.c b/linux/hid-libusb.c index ee066eb..8b7225c 100644 --- a/linux/hid-libusb.c +++ b/linux/hid-libusb.c @@ -11,8 +11,15 @@ Copyright 2009, All Rights Reserved. - This software may be used by anyone for any reason so - long as this copyright notice remains intact. + At the discretion of the user of this library, + this software may be licensed under the terms of the + GNU Public License v3, a BSD-Style license, or the + original HIDAPI license as outlined in the LICENSE.txt, + LICENSE-gpl3.txt, LICENSE-bsd.txt, and LICENSE-orig.txt + files located at the root of the source distribution. + These files may also be found in the public source + code repository located at: + http://github.com/signal11/hidapi . ********************************************************/ /* C */ diff --git a/linux/hid.c b/linux/hid.c index 6ce16af..60a3f78 100644 --- a/linux/hid.c +++ b/linux/hid.c @@ -10,8 +10,15 @@ Copyright 2009, All Rights Reserved. - This software may be used by anyone for any reason so - long as this copyright notice remains intact. + At the discretion of the user of this library, + this software may be licensed under the terms of the + GNU Public License v3, a BSD-Style license, or the + original HIDAPI license as outlined in the LICENSE.txt, + LICENSE-gpl3.txt, LICENSE-bsd.txt, and LICENSE-orig.txt + files located at the root of the source distribution. + These files may also be found in the public source + code repository located at: + http://github.com/signal11/hidapi . ********************************************************/ /* C */ diff --git a/mac/hid.c b/mac/hid.c index 607daae..05cfe86 100644 --- a/mac/hid.c +++ b/mac/hid.c @@ -9,8 +9,15 @@ Copyright 2010, All Rights Reserved. - This software may be used by anyone for any reason so - long as this copyright notice remains intact. + At the discretion of the user of this library, + this software may be licensed under the terms of the + GNU Public License v3, a BSD-Style license, or the + original HIDAPI license as outlined in the LICENSE.txt, + LICENSE-gpl3.txt, LICENSE-bsd.txt, and LICENSE-orig.txt + files located at the root of the source distribution. + These files may also be found in the public source + code repository located at: + http://github.com/signal11/hidapi . ********************************************************/ diff --git a/testgui/test.cpp b/testgui/test.cpp index ba6f817..253566b 100644 --- a/testgui/test.cpp +++ b/testgui/test.cpp @@ -9,8 +9,9 @@ Copyright 2010, All Rights Reserved This contents of this file may be used by anyone - for any reason and may be used as a starting point - for your own applications which use HIDAPI. + for any reason without any conditions and may be + used as a starting point for your own applications + which use HIDAPI. ********************************************************/ diff --git a/windows/hid.cpp b/windows/hid.cpp index f083590..f86017f 100644 --- a/windows/hid.cpp +++ b/windows/hid.cpp @@ -9,8 +9,15 @@ Copyright 2009, All Rights Reserved. - This software may be used by anyone for any reason so - long as this copyright notice remains intact. + At the discretion of the user of this library, + this software may be licensed under the terms of the + GNU Public License v3, a BSD-Style license, or the + original HIDAPI license as outlined in the LICENSE.txt, + LICENSE-gpl3.txt, LICENSE-bsd.txt, and LICENSE-orig.txt + files located at the root of the source distribution. + These files may also be found in the public source + code repository located at: + http://github.com/signal11/hidapi . ********************************************************/ #include