From 595ce214cc01fbb40fe1e8953f9adecbb9082c70 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Tue, 25 Sep 2018 21:16:01 -0400 Subject: [PATCH] minor tweaks --- LICENSE.txt | 104 ++++++++++++++++++++++++++++++++++++++++ presets/apple2/cosmic.c | 5 +- src/ui.ts | 1 + 3 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..99da2e51 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,104 @@ + +https://github.com/sehugg/dasm +http://sdcc.sourceforge.net/ + +GPLv2 + +--- + +https://github.com/sehugg/javatari.js + +GNU Affero General Public License v3.0 + +--- + +https://www.veripool.org/wiki/verilator + +GNU Lesser Public License Version 3 + +--- + +http://mcpp.sourceforge.net/ + +/*- + * Copyright (c) 1998, 2002-2008 Kiyoshi Matsui + * All rights reserved. + * + * This software including the files in this directory is provided under + * the following license. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +--- + +https://github.com/sehugg/cc65 + +This software is provided 'as-is', without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not +claim that you wrote the original software. If you use this software in +a product, an acknowledgment in the product documentation would be +appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not +be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. + +--- + +https://github.com/datajerk/c2t/blob/master/LICENSE + +Copyright 2017 Egan Ford + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its +contributors may be used to endorse or promote products derived from this +software without specific prior written permission. + +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 HOLDER 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. diff --git a/presets/apple2/cosmic.c b/presets/apple2/cosmic.c index 9175ff44..53c39e1b 100644 --- a/presets/apple2/cosmic.c +++ b/presets/apple2/cosmic.c @@ -8,6 +8,7 @@ #include #include #include +#include // type aliases for byte/signed byte/unsigned 16-bit typedef unsigned char byte; @@ -15,10 +16,6 @@ typedef signed char sbyte; typedef unsigned short word; // peeks, pokes, and strobes -#define POKE(addr,val) (*(unsigned char*) (addr) = (val)) -#define POKEW(addr,val) (*(unsigned*) (addr) = (val)) -#define PEEK(addr) (*(unsigned char*) (addr)) -#define PEEKW(addr) (*(unsigned*) (addr)) #define STROBE(addr) __asm__ ("sta %w", addr) // speaker click diff --git a/src/ui.ts b/src/ui.ts index 106aa6b2..1f211377 100644 --- a/src/ui.ts +++ b/src/ui.ts @@ -381,6 +381,7 @@ function _downloadCassetteFile(e) { if (audout) { var blob = new Blob([audout], {type: "audio/wav"}); saveAs(blob, audpath); + stdout += "Then connect your audio output to the cassette input, turn up the volume, and play the audio file."; alert(stdout); } });