Skip to content

Commit

Permalink
Change license to Apache 2 with LLVM exceptions (#51)
Browse files Browse the repository at this point in the history
* Copy in Apache 2 license w. llvm exceptions

This is taken directly from llvm-mos-sdk

* Update PR form

* Remove license text from source files
  • Loading branch information
mlund authored Sep 8, 2024
1 parent 5fb917b commit 1cf4c3e
Show file tree
Hide file tree
Showing 10 changed files with 287 additions and 352 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# PRG files
*.prg
tests/*.prg
*.tex

# Prerequisites
*.d
Expand Down
443 changes: 278 additions & 165 deletions LICENSE

Large diffs are not rendered by default.

60 changes: 1 addition & 59 deletions include/mega65/conio.h
Original file line number Diff line number Diff line change
@@ -1,69 +1,11 @@
/**
* @file conio.h
* @author Hernán Di Pietro
* @brief Console I/O support
* @todo Convert `\m65lib*` to Doxygen tags. How/where is this used? The
* reference guide? Doxygen can also output XML which is easy to parse.
*/

/* CONIO.H style Text mode support for the Mega65 libC
Copyright (c) 2020-2021 Hernán Di Pietro
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Version 0.10
Date 2021-06-21
CHANGELOG
v0.4 Added getscreensize, setscreensize, setextendattribute,
set16bitcharmode, moveup,moveleft,moveright, movedown, gohome,
flushkeybuf.
Cache screen sizes for faster calls.
Added cprintf escape codes for formatted screen colors and
attributes. Added proper initialisation function. Fixed a bug where screen
was fixed at $8000!
v0.5 Added fillrect, box, cgets, wherex, wherey, togglecase
functions. Fixed moveXXXX to do multiple steps. Minor optimizations in
cputs/cputc.
v0.6 Added vline, hline to draw lines. cputnc,cputncxy for repeating
characters.
v0.6.5 Added LaTEX style comments for doc generation.
v0.7 Added cinput function. Fixed cputncxy color fill. BOX_STYLE_NONE
added.
v0.8 Fixed documentation. COLOR_RAM_BASE is 0xFF80000UL to access
full 32/64KB space. Added setcolramoffset, getcolramoffset, setcharsetaddr,
getcharsetaddr.
v0.8.1 Fixed Latex documentation.
v0.9 Added sethotregs.
v0.9.1 Fixed cinput buffer overrun bug and documentation.
v0.9.2 Fixed CC65 2.19 mismatched header types.
v0.10 Added setpalbank, getpalbank, setpalbanka, getpalbanka,
setmapedpal, getmapedpal, setpalentry.
*/

#ifndef __MEGA65_CONIO_H
#define __MEGA65_CONIO_H

Expand Down
24 changes: 0 additions & 24 deletions include/mega65/math.h
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
/*
MIT License
Copyright (c) 2023 The MEGA65 Community
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 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 THE
AUTHORS OR COPYRIGHT HOLDERS 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.
*/

/**
* @file math.h
* @brief Math functions for the MEGA65
Expand Down
23 changes: 2 additions & 21 deletions include/mega65/mouse.h
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
/**
* @file mouse.h
* @brief Simple mouse support for the Mega65 libC
* @author Paul Gardner-Stephen
* @date 2020
*/

/* Simple mouse support for the Mega65 libC
Copyright (c) 2020 Paul Gardner-Stephen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Version 0.1
Date 2020-07-01
*/

#ifndef __MEGA65_MOUSE_H
#define __MEGA65_MOUSE_H

Expand Down
5 changes: 5 additions & 0 deletions include/mega65/time.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// Copyright 2023 The MEGA65 project
// Licensed under the Apache License, Version 2.0 with LLVM Exceptions.
// See https://github.com/mega65/mega65-libc/blob/main/LICENSE for license
// information.

/**
* @file time.h
* @brief Real time clock support
Expand Down
18 changes: 0 additions & 18 deletions src/conio.c
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
/* CONIO.H style Text mode support for the Mega65 libC
Copyright (c) 2020-2021 Hernán Di Pietro
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

#include <mega65/conio.h>
#include <mega65/memory.h>
#include <string.h>
Expand Down
20 changes: 0 additions & 20 deletions src/fcio.c
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
/*
* fcio.c
* MEGA65 full colour mode console and bitmap display support
*
* Copyright (C) 2019-21 - Stephan Kleinert
*
* 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, see <http://www.gnu.org/licenses/>.
*/

#define __fastcall__ // to silence stupid vscode warning

#ifdef __clang__
Expand Down
24 changes: 0 additions & 24 deletions src/math.c
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
/*
MIT License
Copyright (c) 2023 The MEGA65 Community
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 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 THE
AUTHORS OR COPYRIGHT HOLDERS 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.
*/

#include <mega65/math.h>

uint32_t umul32(const uint32_t a, const uint32_t b)
Expand Down
21 changes: 0 additions & 21 deletions src/mouse.c
Original file line number Diff line number Diff line change
@@ -1,24 +1,3 @@
/* Simple mouse support for the Mega65 libC
Copyright (c) 2020 Paul Gardner-Stephen
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 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 Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Version 0.1
Date 2020-07-01
*/

#include <mega65/memory.h>
#include <mega65/mouse.h>

Expand Down

0 comments on commit 1cf4c3e

Please sign in to comment.