Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ae1e2b2 authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Mauro Carvalho Chehab
Browse files

[media] usbtv: clarify the licensing 



OpenBSD would like to reuse some code but consider the licensing not
clear enough. Let's clarify it a bit so that it suits their conventions:

1.) Keep the "extra text" away from the copyright statement and the
rights grant.

2.) Add the warranty disclaimer -- it should not be legally required,
nevertheless the clause 1. of the rights grant refest to it.

Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Acked-by: default avatarFederico Simoncelli <fsimonce@redhat.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 6a858815

drivers/media/usb/usbtv/usbtv-audio.c

+21 −7
Original line number Diff line number Diff line 
/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * Product web site:

 * http://www.fushicai.com/products_detail/&productId=d05449ee-b690-42f9-a661-aa7353894bed.html

 *

 * Copyright (c) 2013 Federico Simoncelli

 * All rights reserved.

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -20,6 +13,27 @@ 
 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL").

 *

 * 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.

 */

/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * Product web site:

 * http://www.fushicai.com/products_detail/&productId=d05449ee-b690-42f9-a661-aa7353894bed.html

 *

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 */



#include <sound/core.h>

drivers/media/usb/usbtv/usbtv-core.c

+27 −13
Original line number Diff line number Diff line 
/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * Product web site:

 * http://www.fushicai.com/products_detail/&productId=d05449ee-b690-42f9-a661-aa7353894bed.html

 *

 * Following LWN articles were very useful in construction of this driver:

 * Video4Linux2 API series: http://lwn.net/Articles/203924/

 * videobuf2 API explanation: http://lwn.net/Articles/447435/

 * Thanks go to Jonathan Corbet for providing this quality documentation.

 * He is awesome.

 *

 * Copyright (c) 2013 Lubomir Rintel

 * All rights reserved.

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -26,6 +13,33 @@ 
 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL").

 *

 * 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.

 */

/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * Product web site:

 * http://www.fushicai.com/products_detail/&productId=d05449ee-b690-42f9-a661-aa7353894bed.html

 *

 * Following LWN articles were very useful in construction of this driver:

 * Video4Linux2 API series: http://lwn.net/Articles/203924/

 * videobuf2 API explanation: http://lwn.net/Articles/447435/

 * Thanks go to Jonathan Corbet for providing this quality documentation.

 * He is awesome.

 *

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 */



#include "usbtv.h"

drivers/media/usb/usbtv/usbtv-video.c

+27 −13
Original line number Diff line number Diff line 
/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * Product web site:

 * http://www.fushicai.com/products_detail/&productId=d05449ee-b690-42f9-a661-aa7353894bed.html

 *

 * Following LWN articles were very useful in construction of this driver:

 * Video4Linux2 API series: http://lwn.net/Articles/203924/

 * videobuf2 API explanation: http://lwn.net/Articles/447435/

 * Thanks go to Jonathan Corbet for providing this quality documentation.

 * He is awesome.

 *

 * Copyright (c) 2013 Lubomir Rintel

 * All rights reserved.

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -26,6 +13,33 @@ 
 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL").

 *

 * 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.

 */

/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * Product web site:

 * http://www.fushicai.com/products_detail/&productId=d05449ee-b690-42f9-a661-aa7353894bed.html

 *

 * Following LWN articles were very useful in construction of this driver:

 * Video4Linux2 API series: http://lwn.net/Articles/203924/

 * videobuf2 API explanation: http://lwn.net/Articles/447435/

 * Thanks go to Jonathan Corbet for providing this quality documentation.

 * He is awesome.

 *

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 */



#include <media/v4l2-ioctl.h>

drivers/media/usb/usbtv/usbtv.h

+18 −4
Original line number Diff line number Diff line 
/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * Copyright (c) 2013 Lubomir Rintel

 * All rights reserved.

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -17,6 +13,24 @@ 
 *

 * Alternatively, this software may be distributed under the terms of the

 * GNU General Public License ("GPL").

 *

 * 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.

 */

/*

 * Fushicai USBTV007 Audio-Video Grabber Driver

 *

 * No physical hardware was harmed running Windows during the

 * reverse-engineering activity

 */



#include <linux/module.h>