prepare for source release, relicense

diff --git a/COPYING b/COPYING
new file mode 100644 (file)
index 0000000..4d5f35d
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,31 @@
+MAME License
+
+Redistribution and use of this code or any derivative works are permitted
+provided that the following conditions are met:
+
+* Redistributions may not be sold, nor may they be used in a commercial
+product or activity.
+
+* Redistributions that are modified from the original source must include the
+complete source code, including the source code for all components used by a
+binary built from the modified sources. However, as a special exception, the
+source code distributed need not include anything that is normally distributed
+(in either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+* Redistributions 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 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 OWNER 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/common/host_fb.c b/common/host_fb.c
index d0cc754..be6d934 100644 (file)
--- a/common/host_fb.c
+++ b/common/host_fb.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #include <string.h>
 #ifdef LOADER
 #include "../loader/realfuncs.h"
 #include <string.h>
 #ifdef LOADER
 #include "../loader/realfuncs.h"


@@ -206,3 +211,4 @@ void host_video_blit16(const unsigned short *src, int w, int h, int stride)
 
 #endif // WIZ
 
 
 #endif // WIZ
 

+// vim:shiftwidth=2:expandtab

diff --git a/common/wiz_video.c b/common/wiz_video.c
index 8545618..4bfc7c5 100644 (file)
--- a/common/wiz_video.c
+++ b/common/wiz_video.c
@@ -1,3 +1,9 @@
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/loader/dl.c b/loader/dl.c
index b12c921..4282764 100644 (file)
--- a/loader/dl.c
+++ b/loader/dl.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>


@@ -80,3 +85,4 @@ static void ginge_init(void)
   emu_init((void *)lowest_segment);
 }
 
   emu_init((void *)lowest_segment);
 }
 

+// vim:shiftwidth=2:expandtab

diff --git a/loader/emu.c b/loader/emu.c
index 02e29dc..837e77c 100644 (file)
--- a/loader/emu.c
+++ b/loader/emu.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 // a "gentle" reminder
 #ifdef __ARM_EABI__
 #error loader is meant to be OABI!
 // a "gentle" reminder
 #ifdef __ARM_EABI__
 #error loader is meant to be OABI!


@@ -1339,3 +1344,4 @@ int emu_do_execve(const char *filename, char *const argv[], char *const envp[])
   return ret;
 }
 
   return ret;
 }
 

+// vim:shiftwidth=2:expandtab

diff --git a/loader/host_wiz.c b/loader/host_wiz.c
index 59b5dec..18d7b1c 100644 (file)
--- a/loader/host_wiz.c
+++ b/loader/host_wiz.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>


@@ -128,3 +133,5 @@ static void host_actions(int actions[IN_BINDTYPE_COUNT])
     actions[IN_BINDTYPE_PLAYER12] = act;
   }
 }
     actions[IN_BINDTYPE_PLAYER12] = act;
   }
 }

+
+// vim:shiftwidth=2:expandtab

diff --git a/loader/loader.c b/loader/loader.c
index fea8bb6..7e71d4d 100644 (file)
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -177,3 +182,4 @@ int main(int argc, char *argv[])
   return 1;
 }
 
   return 1;
 }
 

+// vim:shiftwidth=2:expandtab

diff --git a/loader/override.c b/loader/override.c
index b61ed8b..4ba4018 100644 (file)
--- a/loader/override.c
+++ b/loader/override.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>


@@ -369,3 +374,5 @@ int real_chdir(const char *path)
 {
   return chdir(path);
 }
 {
   return chdir(path);
 }

+
+// vim:shiftwidth=2:expandtab

diff --git a/loader/patches.c b/loader/patches.c
index 0504909..4b1735e 100644 (file)
--- a/loader/patches.c
+++ b/loader/patches.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #include <stdio.h>
 
 #include "header.h"
 #include <stdio.h>
 
 #include "header.h"


@@ -115,3 +120,4 @@ found:
   sys_cacheflush(ptr, (char *)ptr + size);
 }
 
   sys_cacheflush(ptr, (char *)ptr + size);
 }
 

+// vim:shiftwidth=2:expandtab

diff --git a/prep/main.c b/prep/main.c
index 07cdf48..e732ef6 100644 (file)
--- a/prep/main.c
+++ b/prep/main.c
@@ -1,4 +1,9 @@
-// vim:shiftwidth=2:expandtab
+/*
+ * GINGE - GINGE Is Not Gp2x Emulator
+ * (C) notaz, 2010-2011
+ *
+ * This work is licensed under the MAME license, see COPYING file for details.
+ */

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -482,3 +487,4 @@ no_in_script:
   return 1;
 }
 
   return 1;
 }
 

+// vim:shiftwidth=2:expandtab

diff --git a/readme.txt b/readme.txt
index 3c35ee5..6cc3646 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,7 @@ License
 \r
 gp2xmenu is based on GPH GPL source (http://www.gnu.org/licenses/gpl.html).\r
 Source is available at http://notaz.gp2x.de/releases/ginge/gp2xmenu.tar.bz2\r
 \r
 gp2xmenu is based on GPH GPL source (http://www.gnu.org/licenses/gpl.html).\r
 Source is available at http://notaz.gp2x.de/releases/ginge/gp2xmenu.tar.bz2\r

+It is separate program and not linked to the remaining portion in any way.\r

 \r
 Ginge may come with some libraries. Those libraries are unmodified copies\r
 of ones found in root filesystems in GP2X and Wiz and are included to more\r
 \r
 Ginge may come with some libraries. Those libraries are unmodified copies\r
 of ones found in root filesystems in GP2X and Wiz and are included to more\r


@@ -86,27 +87,5 @@ accurately reproduce environment found on GP2X. Their source code may or may
 not be available, I did not use it, but whatever I found is mirrored here:\r
 http://notaz.gp2x.de/downloads/gp2x/src/410_all/\r
 \r
 not be available, I did not use it, but whatever I found is mirrored here:\r
 http://notaz.gp2x.de/downloads/gp2x/src/410_all/\r
 \r

-Remaining portion is released under custom closed source license. It is not\r
-derived from gp2xmenu and is completely standalone, the menu is only included\r
-for user's convenience.\r
-\r
-Redistribution and use of program's binaries and helper scripts, with or without\r
-modification, is permitted provided that the following conditions are met:\r
-  * This readme is included in unmodified form.\r
-  * The program in any of it's forms is not sold or used as part of any\r
-    commercial package, including pre-installed or included in any kind of\r
-    portable device.\r
-  * It is not bundled and distributed with any GP2X or Wiz program without\r
-    respective program's author's permission.\r
-\r
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\r
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER BE LIABLE FOR ANY\r
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\r
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\r
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\r
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\r
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-\r
+Remaining portion is released under the MAME license, see COPYING file for\r
+details.\r

diff --git a/todo.txt b/todo.txt
index 25c6274..0a7760a 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -2,3 +2,5 @@
 - giana
 - odanata - no sound
 - touchscreen
 - giana
 - odanata - no sound
 - touchscreen

+
+- FBA works on Wiz, not on Caanoo?