From a56e1fe89989afab6eddf39c66e41157c772e540 Mon Sep 17 00:00:00 2001 From: Ivan Tatarinov Date: Wed, 14 Apr 2021 17:47:27 +0300 Subject: [PATCH] software/ugophy: make uGoph be compliant with version 3.0 of the REUSE Specification --- software/ugophy/.gitignore | 6 +++++- .../{LICENSE => LICENSES/GPL-3.0-or-later.txt} | 0 software/ugophy/Makefile | 14 +++++++++++--- software/ugophy/README.md.license | 5 +++++ software/ugophy/esxdos.asm | 4 ++++ software/ugophy/gopher.asm | 4 ++++ software/ugophy/keyboard.asm | 6 +++++- software/ugophy/main.asm | 7 ++++++- software/ugophy/render.asm | 4 ++++ software/ugophy/ring.asm | 6 +++++- software/ugophy/textrender.asm | 4 ++++ software/ugophy/tscreen.asm | 4 ++++ software/ugophy/uart.asm | 6 +++++- software/ugophy/utils.asm | 4 ++++ software/ugophy/vtpl.asm | 10 ++++++++++ software/ugophy/wifi.asm | 4 ++++ 16 files changed, 80 insertions(+), 8 deletions(-) rename software/ugophy/{LICENSE => LICENSES/GPL-3.0-or-later.txt} (100%) create mode 100644 software/ugophy/README.md.license diff --git a/software/ugophy/.gitignore b/software/ugophy/.gitignore index 1e37c6e..b216dab 100644 --- a/software/ugophy/.gitignore +++ b/software/ugophy/.gitignore @@ -1,4 +1,8 @@ +# SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +# +# SPDX-License-Identifier: GPL-3.0-or-later + *.tap player.bin ugoph.bin -.vscode \ No newline at end of file +.vscode diff --git a/software/ugophy/LICENSE b/software/ugophy/LICENSES/GPL-3.0-or-later.txt similarity index 100% rename from software/ugophy/LICENSE rename to software/ugophy/LICENSES/GPL-3.0-or-later.txt diff --git a/software/ugophy/Makefile b/software/ugophy/Makefile index 35a68ba..7f55c85 100644 --- a/software/ugophy/Makefile +++ b/software/ugophy/Makefile @@ -1,7 +1,15 @@ +# SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +# +# SPDX-License-Identifier: GPL-3.0-or-later + +include ../../sdk/common.mk + +.PHONY: all all: ugoph.bin -ugoph.bin: *.asm +ugoph.bin: *.asm sjasmplus main.asm -clean: - rm ugoph.bin +.PHONY: clean +clean: + rm -f ugoph.bin diff --git a/software/ugophy/README.md.license b/software/ugophy/README.md.license new file mode 100644 index 0000000..610a315 --- /dev/null +++ b/software/ugophy/README.md.license @@ -0,0 +1,5 @@ +SPDX-FileType: TEXT + +SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin + +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/software/ugophy/esxdos.asm b/software/ugophy/esxdos.asm index 1ef7ac7..5a9c178 100644 --- a/software/ugophy/esxdos.asm +++ b/software/ugophy/esxdos.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + ; API methods ESX_GETSETDRV = #89 ESX_FOPEN = #9A diff --git a/software/ugophy/gopher.asm b/software/ugophy/gopher.asm index 08e9724..bdc9764 100644 --- a/software/ugophy/gopher.asm +++ b/software/ugophy/gopher.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + ; hl - server ; de - path ; bc - port diff --git a/software/ugophy/keyboard.asm b/software/ugophy/keyboard.asm index cdcddd9..81061a7 100644 --- a/software/ugophy/keyboard.asm +++ b/software/ugophy/keyboard.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + CURKEY = 23560 ; Returns in A key code or zero if key wans't pressed @@ -60,4 +64,4 @@ iRet: ld hl, cleanLine :call printZ64 ret -iBuff defs 65 \ No newline at end of file +iBuff defs 65 diff --git a/software/ugophy/main.asm b/software/ugophy/main.asm index 8f048c2..4ff208e 100644 --- a/software/ugophy/main.asm +++ b/software/ugophy/main.asm @@ -11,6 +11,11 @@ ;; ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . +;; +;; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +;; +;; SPDX-License-Identifier: GPL-3.0-or-later + DEVICE ZXSPECTRUM128 org 24100 @@ -88,4 +93,4 @@ player ENT eop equ $ SAVEBIN "ugoph.bin", Start, $ - Start - SAVETAP "ugoph.tap", Start \ No newline at end of file + SAVETAP "ugoph.tap", Start diff --git a/software/ugophy/render.asm b/software/ugophy/render.asm index b04548f..7afaa1b 100644 --- a/software/ugophy/render.asm +++ b/software/ugophy/render.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + showPage: xor a : ld (show_offset), a inc a :ld (cursor_pos), a diff --git a/software/ugophy/ring.asm b/software/ugophy/ring.asm index e420b5d..ae296b8 100644 --- a/software/ugophy/ring.asm +++ b/software/ugophy/ring.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + ; Pushes A to ring buffer pushRing push af @@ -37,4 +41,4 @@ clearRing: ring_buffer dup 33 defb 0 - edup \ No newline at end of file + edup diff --git a/software/ugophy/textrender.asm b/software/ugophy/textrender.asm index 88abffd..e97251a 100644 --- a/software/ugophy/textrender.asm +++ b/software/ugophy/textrender.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + showText: xor a : ld (show_offset), a call renderTextScreen diff --git a/software/ugophy/tscreen.asm b/software/ugophy/tscreen.asm index c2db1e4..639e7e5 100644 --- a/software/ugophy/tscreen.asm +++ b/software/ugophy/tscreen.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + ; Timex screen routines showCursor: diff --git a/software/ugophy/uart.asm b/software/ugophy/uart.asm index 0ca1d13..a80328b 100644 --- a/software/ugophy/uart.asm +++ b/software/ugophy/uart.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + UART_DATA_REG = #c6 UART_STAT_REG = #c7 UART_BYTE_RECIVED = #80 @@ -111,4 +115,4 @@ retBuff poked_byte defb 0 byte_buff defb 0 -is_recv defb 0 \ No newline at end of file +is_recv defb 0 diff --git a/software/ugophy/utils.asm b/software/ugophy/utils.asm index 2055871..cec7365 100644 --- a/software/ugophy/utils.asm +++ b/software/ugophy/utils.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + SCANDBLCTRL_REG = #0B ZXUNO_ADDR = #FC3B ZXUNO_REG = #FD3B diff --git a/software/ugophy/vtpl.asm b/software/ugophy/vtpl.asm index 13927b0..88ef7df 100644 --- a/software/ugophy/vtpl.asm +++ b/software/ugophy/vtpl.asm @@ -1,3 +1,13 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later +; +; SPDX-FileComment: Universal PT2'n'PT3 Turbo Sound player for ZX Spectrum +; +; SPDX-FileNotice: Original code is Copyright (C) 2004-2007 S.V.Bulba +; SPDX-FileNotice: Specially for AlCo +; SPDX-FileNotice: http://bulba.untergrund.net/ (http://bulba.at.kz/) + ;Universal PT2'n'PT3 Turbo Sound player for ZX Spectrum ;(c)2004-2007 S.V.Bulba ;Specially for AlCo diff --git a/software/ugophy/wifi.asm b/software/ugophy/wifi.asm index e54c85b..d391606 100644 --- a/software/ugophy/wifi.asm +++ b/software/ugophy/wifi.asm @@ -1,3 +1,7 @@ +; SPDX-FileCopyrightText: Copyright (C) 2019 Alexander Sharikhin +; +; SPDX-License-Identifier: GPL-3.0-or-later + ; Initialize WiFi chip and connect to WiFi initWifi: call setNoTurboMode : call loadWiFiConfig : call uartBegin