diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index a79dec16..17f37bba 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -26,7 +26,7 @@ The full set of tests is only run for tagged releases. ### Summary - use vivado 2019.1 as default - finalize coverity fixups, now defect free ([see blog](https://wfjm.github.io/blogs/w11/2019-06-14-coverity-fixes-done.html)) -- use SPDX license tags, remove boilerplate license disclaimers +- use SPDX license tags, remove boilerplate license disclaimers ([see blog](https://wfjm.github.io/blogs/w11/2019-07-21-spdx.html)) ### New features - new tools diff --git a/tools/fx2/src/dscr_gen.A51 b/tools/fx2/src/dscr_gen.A51 index 9d4c8aa0..017d1b78 100644 --- a/tools/fx2/src/dscr_gen.A51 +++ b/tools/fx2/src/dscr_gen.A51 @@ -1,7 +1,8 @@ ;;; -*- asm -*- -;;; $Id: dscr_gen.A51 985 2018-01-03 08:59:40Z mueller $ -;;; +;;; $Id: dscr_gen.A51 1194 2019-07-20 07:43:21Z mueller $ +;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright 2011-2014 by Walter F.J. Mueller +;;; ;;; Code was forked from ixo-jtag.svn.sourceforge.net on 2011-07-17 ;;; ;;;- original copyright and licence disclaimer --------------------------------- @@ -11,16 +12,6 @@ ;;;- This code is part of usbjtag. usbjtag is free software; ;;;- --------------------------------------------------------------------------- ;;; -;;; This program is free software; you may redistribute and/or modify it under -;;; the terms of the GNU General Public License as published by the Free -;;; Software Foundation, either version 3, 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 complete details. -;;; -;;;----------------------------------------------------------------------------- ;;; USB Descriptor, common source for jtag + 0, 2, or 3 hardware fifo interface ;;; ;;; Use C preprocessor to create an assembler source for the configurations: diff --git a/tools/fx2/src/eeprom.c b/tools/fx2/src/eeprom.c index bb0b3920..50b939ab 100644 --- a/tools/fx2/src/eeprom.c +++ b/tools/fx2/src/eeprom.c @@ -1,19 +1,10 @@ -/* $Id: eeprom.c 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: eeprom.c 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * FTDI EEPROM emulation *----------------------------------------------------------------------------- + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright (C) 2007 Kolja Waschk, ixo.de - *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/eeprom.h b/tools/fx2/src/eeprom.h index f70c9822..ca0defa7 100644 --- a/tools/fx2/src/eeprom.h +++ b/tools/fx2/src/eeprom.h @@ -1,19 +1,10 @@ -/* $Id: eeprom.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: eeprom.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * FTDI EEPROM emulation *----------------------------------------------------------------------------- + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright (C) 2007 Kolja Waschk, ixo.de - *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/hardware.h b/tools/fx2/src/hardware.h index b58a7c58..5ca8f5d1 100644 --- a/tools/fx2/src/hardware.h +++ b/tools/fx2/src/hardware.h @@ -1,19 +1,10 @@ -/* $Id: hardware.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: hardware.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Hardware-dependent code for usb_jtag *----------------------------------------------------------------------------- + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright (C) 2007 Kolja Waschk, ixo.de - *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/hw_nexys2.c b/tools/fx2/src/hw_nexys2.c index 4dabe2f5..0f559714 100644 --- a/tools/fx2/src/hw_nexys2.c +++ b/tools/fx2/src/hw_nexys2.c @@ -1,6 +1,7 @@ -/* $Id: hw_nexys2.c 985 2018-01-03 08:59:40Z mueller $ */ -/* +/* $Id: hw_nexys2.c 1194 2019-07-20 07:43:21Z mueller $ */ +/* SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2011- by Walter F.J. Mueller + * * Code was forked from ixo-jtag.svn.sourceforge.net on 2011-07-17 * * - original copyright and licence disclaimer -------------------------------- @@ -11,16 +12,6 @@ * - (May 2010). See http://www.fpga4fun.com/forum/viewtopic.php?t=483&start=50 * ---------------------------------------------------------------------------- * - * This program is free software; you may redistribute and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3, 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 complete details. - * - * ---------------------------------------------------------------------------- * Hardware-dependent code for usb_jtag * * Revision History: diff --git a/tools/fx2/src/hw_nexys3.c b/tools/fx2/src/hw_nexys3.c index 1382b216..9c86ade7 100644 --- a/tools/fx2/src/hw_nexys3.c +++ b/tools/fx2/src/hw_nexys3.c @@ -1,6 +1,7 @@ -/* $Id: hw_nexys3.c 985 2018-01-03 08:59:40Z mueller $ */ -/* +/* $Id: hw_nexys3.c 1194 2019-07-20 07:43:21Z mueller $ */ +/* SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2011- by Walter F.J. Mueller + * * Code was forked from ixo-jtag.svn.sourceforge.net on 2011-07-17 * * - original copyright and licence disclaimer -------------------------------- @@ -11,16 +12,6 @@ * - (May 2010). See http://www.fpga4fun.com/forum/viewtopic.php?t=483&start=50 * ---------------------------------------------------------------------------- * - * This program is free software; you may redistribute and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3, 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 complete details. - * - * ---------------------------------------------------------------------------- * Hardware-dependent code for usb_jtag * * Revision History: diff --git a/tools/fx2/src/lib/delay.c b/tools/fx2/src/lib/delay.c index 774537f1..9a08b311 100644 --- a/tools/fx2/src/lib/delay.c +++ b/tools/fx2/src/lib/delay.c @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: delay.c 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: delay.c 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Delay routines *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/delay.h b/tools/fx2/src/lib/delay.h index 3ee2aa75..67a3fb4d 100644 --- a/tools/fx2/src/lib/delay.h +++ b/tools/fx2/src/lib/delay.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: delay.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: delay.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Delay routines *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/fx2regs.h b/tools/fx2/src/lib/fx2regs.h index 74ca99b4..56a585a2 100644 --- a/tools/fx2/src/lib/fx2regs.h +++ b/tools/fx2/src/lib/fx2regs.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: fx2regs.h 604 2014-11-16 22:33:09Z mueller $ */ +/* $Id: fx2regs.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * FX2 register definitions *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/fx2utils.c b/tools/fx2/src/lib/fx2utils.c index b91f9e6c..9da5ea92 100644 --- a/tools/fx2/src/lib/fx2utils.c +++ b/tools/fx2/src/lib/fx2utils.c @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: fx2utils.c 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: fx2utils.c 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * FX2 specific subroutines *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/fx2utils.h b/tools/fx2/src/lib/fx2utils.h index 9dd4ff18..b5739212 100644 --- a/tools/fx2/src/lib/fx2utils.h +++ b/tools/fx2/src/lib/fx2utils.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: fx2utils.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: fx2utils.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * FX2 specific subroutines *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/i2c.c b/tools/fx2/src/lib/i2c.c index ee0479e3..d3864dde 100644 --- a/tools/fx2/src/lib/i2c.c +++ b/tools/fx2/src/lib/i2c.c @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: i2c.c 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: i2c.c 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * I2C read/write functions for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/i2c.h b/tools/fx2/src/lib/i2c.h index 977f5267..58281c53 100644 --- a/tools/fx2/src/lib/i2c.h +++ b/tools/fx2/src/lib/i2c.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: i2c.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: i2c.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * I2C read/write functions for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/isr.c b/tools/fx2/src/lib/isr.c index ac08fe8e..59feafa5 100644 --- a/tools/fx2/src/lib/isr.c +++ b/tools/fx2/src/lib/isr.c @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: isr.c 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: isr.c 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Interrupt handling for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/isr.h b/tools/fx2/src/lib/isr.h index b7465f12..5fa71d78 100644 --- a/tools/fx2/src/lib/isr.h +++ b/tools/fx2/src/lib/isr.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: isr.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: isr.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Interrupt handling for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/syncdelay.h b/tools/fx2/src/lib/syncdelay.h index e4f45c23..563219d8 100644 --- a/tools/fx2/src/lib/syncdelay.h +++ b/tools/fx2/src/lib/syncdelay.h @@ -1,25 +1,14 @@ /* -*- c++ -*- */ -/* $Id: syncdelay.h 985 2018-01-03 08:59:40Z mueller $ */ -/* +/* $Id: syncdelay.h 1194 2019-07-20 07:43:21Z mueller $ */ +/* SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2014- by Walter F.J. Mueller * Code was forked from USRP2 firmware (GNU Radio Project), version 3.0.2 * * - original copyright and licence disclaimers ------------------------------- * Copyright 2003 Free Software Foundation, Inc. - * This code is part of usbjtag. + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- * - * This program is free software; you may redistribute and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3, 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 complete details. - * - *----------------------------------------------------------------------------- - * * Synchronization delay for FX2 access to specific registers * * Revision History: diff --git a/tools/fx2/src/lib/timer.c b/tools/fx2/src/lib/timer.c index 62ed4fc3..f1cdc3cd 100644 --- a/tools/fx2/src/lib/timer.c +++ b/tools/fx2/src/lib/timer.c @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: timer.c 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: timer.c 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Timer handling for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/timer.h b/tools/fx2/src/lib/timer.h index 03f00179..b1704042 100644 --- a/tools/fx2/src/lib/timer.h +++ b/tools/fx2/src/lib/timer.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: timer.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: timer.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Timer handling for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/usb_common.c b/tools/fx2/src/lib/usb_common.c index cf96b5ba..9dad795b 100644 --- a/tools/fx2/src/lib/usb_common.c +++ b/tools/fx2/src/lib/usb_common.c @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: usb_common.c 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: usb_common.c 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Common USB code for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/usb_common.h b/tools/fx2/src/lib/usb_common.h index 2dd7949d..275f6b05 100644 --- a/tools/fx2/src/lib/usb_common.h +++ b/tools/fx2/src/lib/usb_common.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: usb_common.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: usb_common.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * Common USB code for FX2 *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/usb_descriptors.h b/tools/fx2/src/lib/usb_descriptors.h index 0b359dad..06a58ce9 100644 --- a/tools/fx2/src/lib/usb_descriptors.h +++ b/tools/fx2/src/lib/usb_descriptors.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: usb_descriptors.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: usb_descriptors.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * USB descriptor references *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/lib/usb_requests.h b/tools/fx2/src/lib/usb_requests.h index 210c7a7a..8759b5b4 100644 --- a/tools/fx2/src/lib/usb_requests.h +++ b/tools/fx2/src/lib/usb_requests.h @@ -1,21 +1,13 @@ /* -*- c++ -*- */ -/* $Id: usb_requests.h 395 2011-07-17 22:02:55Z mueller $ */ +/* $Id: usb_requests.h 1194 2019-07-20 07:43:21Z mueller $ */ /*----------------------------------------------------------------------------- * USB request definitions *----------------------------------------------------------------------------- * Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, + * SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2003 Free Software Foundation, Inc. *----------------------------------------------------------------------------- - * This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file - * COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA + * This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- */ diff --git a/tools/fx2/src/main.c b/tools/fx2/src/main.c index 9300a617..e47e364e 100644 --- a/tools/fx2/src/main.c +++ b/tools/fx2/src/main.c @@ -1,6 +1,7 @@ -/* $Id: main.c 985 2018-01-03 08:59:40Z mueller $ */ -/* +/* $Id: main.c 1194 2019-07-20 07:43:21Z mueller $ */ +/* SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2011-2013 by Walter F.J. Mueller + * * Code was forked from ixo-jtag.svn.sourceforge.net on 2011-07-17 * * - original copyright and licence disclaimer -------------------------------- @@ -8,17 +9,6 @@ * - Copyright (C) 2005..2007 Kolja Waschk, ixo.de * - This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- - * - * This program is free software; you may redistribute and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3, 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 complete details. - * - *----------------------------------------------------------------------------- * * EZ-USB FX2 controller main program * diff --git a/tools/fx2/src/startup.a51 b/tools/fx2/src/startup.a51 index fe163cec..480f9ce9 100644 --- a/tools/fx2/src/startup.a51 +++ b/tools/fx2/src/startup.a51 @@ -1,22 +1,14 @@ ;;; -*- asm -*- -;;; $Id: startup.a51 395 2011-07-17 22:02:55Z mueller $ +;;; $Id: startup.a51 1194 2019-07-20 07:43:21Z mueller $ ;;; ;;;----------------------------------------------------------------------------- ;;; Startup code ;;;----------------------------------------------------------------------------- ;;; Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, +;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright 2003 Free Software Foundation, Inc. ;;;----------------------------------------------------------------------------- -;;; This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file -;;; COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin -;;; St, Fifth Floor, Boston, MA 02110-1301 USA +;;; This code is part of usbjtag. ;;;----------------------------------------------------------------------------- ;;; The default external memory initialization provided by sdcc is not diff --git a/tools/fx2/src/usb_fifo_init.c b/tools/fx2/src/usb_fifo_init.c index c791d47f..0b67b32e 100644 --- a/tools/fx2/src/usb_fifo_init.c +++ b/tools/fx2/src/usb_fifo_init.c @@ -1,6 +1,7 @@ -/* $Id: usb_fifo_init.c 985 2018-01-03 08:59:40Z mueller $ */ -/* +/* $Id: usb_fifo_init.c 1194 2019-07-20 07:43:21Z mueller $ */ +/* SPDX-License-Identifier: GPL-3.0-or-later * Copyright 2011-2012 by Walter F.J. Mueller + * * Code was forked from ixo-jtag.svn.sourceforge.net on 2011-07-17 * The data fifo treatment is partially inspired by work of Marco Oster * done at ZITI, Heidelberg in 2010. @@ -11,17 +12,6 @@ * - This code is part of usbjtag. usbjtag is free software; *----------------------------------------------------------------------------- * - * This program is free software; you may redistribute and/or modify it under - * the terms of the GNU General Public License as published by the Free - * Software Foundation, either version 3, 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 complete details. - * - *----------------------------------------------------------------------------- - * * USB FIFO setup * * Revision History: diff --git a/tools/fx2/src/vectors.a51 b/tools/fx2/src/vectors.a51 index bf6a8d19..f4dac3de 100644 --- a/tools/fx2/src/vectors.a51 +++ b/tools/fx2/src/vectors.a51 @@ -1,22 +1,14 @@ ;;; -*- asm -*- -;;; $Id: vectors.a51 395 2011-07-17 22:02:55Z mueller $ +;;; $Id: vectors.a51 1194 2019-07-20 07:43:21Z mueller $ ;;; ;;;----------------------------------------------------------------------------- ;;; Interrupt vectors ;;;----------------------------------------------------------------------------- ;;; Code taken from USRP2 firmware (GNU Radio Project), version 3.0.2, +;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; Copyright 2003 Free Software Foundation, Inc. ;;;----------------------------------------------------------------------------- -;;; This code is part of usbjtag. usbjtag 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. usbjtag 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 in the file -;;; COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin -;;; St, Fifth Floor, Boston, MA 02110-1301 USA +;;; This code is part of usbjtag. usbjtag is free software; ;;;----------------------------------------------------------------------------- ;;; N.B. This object module must come first in the list of modules diff --git a/tools/fx2/sys/90-retro-usb-permissions.rules b/tools/fx2/sys/90-retro-usb-permissions.rules index 21f89021..27d8ada4 100644 --- a/tools/fx2/sys/90-retro-usb-permissions.rules +++ b/tools/fx2/sys/90-retro-usb-permissions.rules @@ -1,4 +1,6 @@ -# $Id: 90-retro-usb-permissions.rules 902 2017-06-03 14:02:17Z mueller $ +# $Id: 90-retro-usb-permissions.rules 1194 2019-07-20 07:43:21Z mueller $ +# SPDX-License-Identifier: GPL-3.0-or-later +# Copyright 2017- by Walter F.J. Mueller # # udev rules to make some USB adaptors writable to group plugdev #