Among else, this allows projects like libdc1394 to carry copies of the
ABI related header files without them or distributors having to worry
about effects on the project's overall license terms. Switch to MIT
license as suggested by Kristian. Also update the year in the
copyright statement according to source history.
Cc: Kristian H?gsberg <[email protected]>
Cc: Jay Fenlason <[email protected]>
Cc: Clemens Ladisch <[email protected]>
Signed-off-by: Stefan Richter <[email protected]>
---
as discussed on libdc1394-devel, plus added license statement in
firewire-constants.h and copyright datum update
include/linux/firewire-cdev.h | 33 +++++++++++++++++------------
include/linux/firewire-constants.h | 29 +++++++++++++++++++++++--
2 files changed, 46 insertions(+), 16 deletions(-)
Index: b/include/linux/firewire-cdev.h
===================================================================
--- a/include/linux/firewire-cdev.h
+++ b/include/linux/firewire-cdev.h
@@ -1,21 +1,26 @@
/*
* Char device interface.
*
- * Copyright (C) 2005-2006 Kristian Hoegsberg <[email protected]>
+ * Copyright (C) 2005-2007 Kristian Hoegsberg <[email protected]>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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 (including the next
+ * paragraph) 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
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
*/
#ifndef _LINUX_FIREWIRE_CDEV_H
Index: b/include/linux/firewire-constants.h
===================================================================
--- a/include/linux/firewire-constants.h
+++ b/include/linux/firewire-constants.h
@@ -1,3 +1,28 @@
+/*
+ * IEEE 1394 constants.
+ *
+ * Copyright (C) 2005-2007 Kristian Hoegsberg <[email protected]>
+ *
+ * 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 (including the next
+ * paragraph) 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
+ * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
+ */
+
#ifndef _LINUX_FIREWIRE_CONSTANTS_H
#define _LINUX_FIREWIRE_CONSTANTS_H
@@ -21,7 +46,7 @@
#define EXTCODE_WRAP_ADD 0x6
#define EXTCODE_VENDOR_DEPENDENT 0x7
-/* Juju specific tcodes */
+/* Linux firewire-core (Juju) specific tcodes */
#define TCODE_LOCK_MASK_SWAP (0x10 | EXTCODE_MASK_SWAP)
#define TCODE_LOCK_COMPARE_SWAP (0x10 | EXTCODE_COMPARE_SWAP)
#define TCODE_LOCK_FETCH_ADD (0x10 | EXTCODE_FETCH_ADD)
@@ -36,7 +61,7 @@
#define RCODE_TYPE_ERROR 0x6
#define RCODE_ADDRESS_ERROR 0x7
-/* Juju specific rcodes */
+/* Linux firewire-core (Juju) specific rcodes */
#define RCODE_SEND_ERROR 0x10
#define RCODE_CANCELLED 0x11
#define RCODE_BUSY 0x12
--
Stefan Richter
-=====-==-=- -=-- -=-==
http://arcgraph.de/sr/
Stefan Richter wrote:
> Among else, this allows projects like libdc1394 to carry copies of the
> ABI related header files without them or distributors having to worry
> about effects on the project's overall license terms. Switch to MIT
> license as suggested by Kristian. Also update the year in the
> copyright statement according to source history.
>
> Cc: Kristian Høgsberg <[email protected]>
> Cc: Jay Fenlason <[email protected]>
> Cc: Clemens Ladisch <[email protected]>
Acked-by: Clemens Ladisch <[email protected]>
> Signed-off-by: Stefan Richter <[email protected]>
On Sun, Apr 11, 2010 at 5:52 AM, Stefan Richter
<[email protected]> wrote:
> Among else, this allows projects like libdc1394 to carry copies of the
> ABI related header files without them or distributors having to worry
> about effects on the project's overall license terms. Switch to MIT
> license as suggested by Kristian. Also update the year in the
> copyright statement according to source history.
>
> Cc: Kristian Høgsberg <[email protected]>
> Cc: Jay Fenlason <[email protected]>
> Cc: Clemens Ladisch <[email protected]>
> Signed-off-by: Stefan Richter <[email protected]>
And you can add my
Signed-off-by: Kristian Høgsberg <[email protected]>
thanks,
Kristian
> ---
> as discussed on libdc1394-devel, plus added license statement in
> firewire-constants.h and copyright datum update
>
> include/linux/firewire-cdev.h | 33 +++++++++++++++++------------
> include/linux/firewire-constants.h | 29 +++++++++++++++++++++++--
> 2 files changed, 46 insertions(+), 16 deletions(-)
>
> Index: b/include/linux/firewire-cdev.h
> ===================================================================
> --- a/include/linux/firewire-cdev.h
> +++ b/include/linux/firewire-cdev.h
> @@ -1,21 +1,26 @@
> /*
> * Char device interface.
> *
> - * Copyright (C) 2005-2006 Kristian Hoegsberg <[email protected]>
> + * Copyright (C) 2005-2007 Kristian Hoegsberg <[email protected]>
> *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public License
> - * along with this program; if not, write to the Free Software Foundation,
> - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> + * 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 (including the next
> + * paragraph) 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
> + * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
> */
>
> #ifndef _LINUX_FIREWIRE_CDEV_H
> Index: b/include/linux/firewire-constants.h
> ===================================================================
> --- a/include/linux/firewire-constants.h
> +++ b/include/linux/firewire-constants.h
> @@ -1,3 +1,28 @@
> +/*
> + * IEEE 1394 constants.
> + *
> + * Copyright (C) 2005-2007 Kristian Hoegsberg <[email protected]>
> + *
> + * 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 (including the next
> + * paragraph) 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
> + * PRECISION INSIGHT AND/OR ITS SUPPLIERS 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.
> + */
> +
> #ifndef _LINUX_FIREWIRE_CONSTANTS_H
> #define _LINUX_FIREWIRE_CONSTANTS_H
>
> @@ -21,7 +46,7 @@
> #define EXTCODE_WRAP_ADD 0x6
> #define EXTCODE_VENDOR_DEPENDENT 0x7
>
> -/* Juju specific tcodes */
> +/* Linux firewire-core (Juju) specific tcodes */
> #define TCODE_LOCK_MASK_SWAP (0x10 | EXTCODE_MASK_SWAP)
> #define TCODE_LOCK_COMPARE_SWAP (0x10 | EXTCODE_COMPARE_SWAP)
> #define TCODE_LOCK_FETCH_ADD (0x10 | EXTCODE_FETCH_ADD)
> @@ -36,7 +61,7 @@
> #define RCODE_TYPE_ERROR 0x6
> #define RCODE_ADDRESS_ERROR 0x7
>
> -/* Juju specific rcodes */
> +/* Linux firewire-core (Juju) specific rcodes */
> #define RCODE_SEND_ERROR 0x10
> #define RCODE_CANCELLED 0x11
> #define RCODE_BUSY 0x12
>
>
> --
> Stefan Richter
> -=====-==-=- -=-- -=-==
> http://arcgraph.de/sr/
>
>