Browse Source

ztex: Use standard file header/comment formatting, and update license to GPLv3

Also removes copyright entirely from libztex.h which contains no copyrightable information.
Luke Dashjr 12 years ago
parent
commit
b279bc3aeb
3 changed files with 32 additions and 65 deletions
  1. 13 22
      driver-ztex.c
  2. 19 21
      libztex.c
  3. 0 22
      libztex.h

+ 13 - 22
driver-ztex.c

@@ -1,27 +1,18 @@
-/**
- *   ztex.c - BFGMiner worker for Ztex 1.15x/y fpga board
+/*
+ * Copyright 2012 nelisky
+ * Copyright 2012-2013 Luke Dashjr
+ * Copyright 2012-2013 Denis Ahrens
+ * Copyright 2012 Xiangfu
  *
  *
- *   Copyright 2012 nelisky
- *   Copyright 2012-2013 Luke Dashjr
- *   Copyright 2012-2013 Denis Ahrens
- *   Copyright 2012 Xiangfu
+ * This work is based upon the Java SDK provided by ztex which is
+ * Copyright (C) 2009-2011 ZTEX GmbH.
+ * http://www.ztex.de
  *
  *
- *   This work is based upon the Java SDK provided by ztex which is
- *   Copyright (C) 2009-2011 ZTEX GmbH.
- *   http://www.ztex.de
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2 as
- *   published by the Free Software Foundation.
- *
- *   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, see http://www.gnu.org/licenses/.
-**/
+ * 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 3 of the License, or (at your option)
+ * any later version.  See COPYING for more details.
+ */
 
 
 #include "config.h"
 #include "config.h"
 
 

+ 19 - 21
libztex.c

@@ -1,27 +1,25 @@
-/**
- *   libztex.c - Ztex 1.15x/1.15y fpga board support library
+/*
+ * Copyright 2012 nelisky
+ * Copyright 2012-2013 Luke Dashjr
+ * Copyright 2012-2013 Denis Ahrens~
+ * Copyright 2012 Peter Stuge~
  *
  *
- *   Copyright 2012 nelisky
- *   Copyright 2012-2013 Luke Dashjr
- *   Copyright 2012-2013 Denis Ahrens
- *   Copyright 2012 Peter Stuge
+ * This work is based upon the Java SDK provided by ztex which is
+ * Copyright (C) 2009-2011 ZTEX GmbH.
+ * http://www.ztex.de
  *
  *
- *   This work is based upon the Java SDK provided by ztex which is
- *   Copyright (C) 2009-2011 ZTEX GmbH.
- *   http://www.ztex.de
+ * 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 3 of the License, or (at your option)
+ * any later version.  See COPYING for more details.
  *
  *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2 as
- *   published by the Free Software Foundation.
- *
- *   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, see http://www.gnu.org/licenses/.
-**/
+ * The copyright status of some of this code is currently a bit confused. They
+ * were initially released under a license (GPLv2 only) incompatible with the
+ * rest of the program at the time (GPLv3 or newer), and I haven't had luck
+ * getting in touch with some later contributors (denoted above with a tilde) to
+ * clarify it. Since their modifications would have been a license violation,
+ * I'm assuming it was just an innocent mistake on their part.
+ */
 
 
 #define _GNU_SOURCE
 #define _GNU_SOURCE
 
 

+ 0 - 22
libztex.h

@@ -1,25 +1,3 @@
-/**
- *   libztex.h - headers for Ztex 1.15x fpga board support library
- *
- *   Copyright 2012 nelisky
- *   Copyright 2012 Luke Dashjr
- *
- *   This work is based upon the Java SDK provided by ztex which is
- *   Copyright (C) 2009-2011 ZTEX GmbH.
- *   http://www.ztex.de
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2 as
- *   published by the Free Software Foundation.
- *
- *   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, see http://www.gnu.org/licenses/.
-**/
 #ifndef __LIBZTEX_H__
 #ifndef __LIBZTEX_H__
 #define __LIBZTEX_H__
 #define __LIBZTEX_H__