[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-610-g0154147

[ljsebald <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  0154147fa4cf1ee827cad46a98de06e661f51c87 (commit)
      from  32fafbc497adaff4726a771bee76222de0a39987 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0154147fa4cf1ee827cad46a98de06e661f51c87
Author: Lawrence Sebald <ljs...@us...>
Date:   Wed Jan 4 20:35:29 2023 -0500

    Remove 'navi' subarch and move all code for it to addons/libnavi.

-----------------------------------------------------------------------

Summary of changes:
 .../arch/dreamcast => addons}/include/navi/flash.h    |  0
 {kernel/arch/dreamcast => addons}/include/navi/ide.h  |  0
 addons/libnavi/Makefile                               | 18 ++++++++++++++++++
 .../dreamcast/navi => addons/libnavi}/navi_flash.c    |  0
 .../arch/dreamcast/navi => addons/libnavi}/navi_ide.c |  0
 doc/environ.sh.sample                                 |  1 -
 kernel/arch/dreamcast/Makefile                        |  8 ++------
 kernel/arch/dreamcast/navi/Makefile                   | 19 -------------------
 8 files changed, 20 insertions(+), 26 deletions(-)
 rename {kernel/arch/dreamcast => addons}/include/navi/flash.h (100%)
 rename {kernel/arch/dreamcast => addons}/include/navi/ide.h (100%)
 create mode 100644 addons/libnavi/Makefile
 rename {kernel/arch/dreamcast/navi => addons/libnavi}/navi_flash.c (100%)
 rename {kernel/arch/dreamcast/navi => addons/libnavi}/navi_ide.c (100%)
 delete mode 100644 kernel/arch/dreamcast/navi/Makefile

diff --git a/kernel/arch/dreamcast/include/navi/flash.h b/addons/include/navi/flash.h
similarity index 100%
rename from kernel/arch/dreamcast/include/navi/flash.h
rename to addons/include/navi/flash.h
diff --git a/kernel/arch/dreamcast/include/navi/ide.h b/addons/include/navi/ide.h
similarity index 100%
rename from kernel/arch/dreamcast/include/navi/ide.h
rename to addons/include/navi/ide.h
diff --git a/addons/libnavi/Makefile b/addons/libnavi/Makefile
new file mode 100644
index 0000000..bc6e2e9
--- /dev/null
+++ b/addons/libnavi/Makefile
@@ -0,0 +1,18 @@
+# KallistiOS ##version##
+#
+# addons/libnavi/Makefile
+# Copyright (C) 2002 Dan Potter
+#
+
+TARGET = libnavi.a
+
+# IDE
+OBJS += navi_ide.o
+
+# Flash BIOS
+OBJS += navi_flash.o
+
+# SUBDIRS = fs
+SUBDIRS =
+
+include $(KOS_BASE)/addons/Makefile.prefab
diff --git a/kernel/arch/dreamcast/navi/navi_flash.c b/addons/libnavi/navi_flash.c
similarity index 100%
rename from kernel/arch/dreamcast/navi/navi_flash.c
rename to addons/libnavi/navi_flash.c
diff --git a/kernel/arch/dreamcast/navi/navi_ide.c b/addons/libnavi/navi_ide.c
similarity index 100%
rename from kernel/arch/dreamcast/navi/navi_ide.c
rename to addons/libnavi/navi_ide.c
diff --git a/doc/environ.sh.sample b/doc/environ.sh.sample
index 8539dc6..f5516fb 100644
--- a/doc/environ.sh.sample
+++ b/doc/environ.sh.sample
@@ -15,7 +15,6 @@ export KOS_ARCH="dreamcast"
 # that here; otherwise use "pristine".
 # Possible subarch options include:
 #  "pristine" - a normal Dreamcast console or HKT-0120 devkit
-#  "navi" - a Dreamcast with the navi mod applied to it
 #  "naomi" - a NAOMI or NAOMI 2 arcade board
 # You can also pre-define it in eg the build config of your IDE
 if [ -z "${KOS_SUBARCH}" ] ; then
diff --git a/kernel/arch/dreamcast/Makefile b/kernel/arch/dreamcast/Makefile
index e5f6c5a..31278bd 100644
--- a/kernel/arch/dreamcast/Makefile
+++ b/kernel/arch/dreamcast/Makefile
@@ -1,14 +1,10 @@
 # KallistiOS ##version##
 #
 # arch/dreamcast Makefile
-# (c)2001 Dan Potter
+# Copyright (C) 2001 Dan Potter
 #
-	
-SUBDIRS=fs hardware kernel math sound util
 
-ifeq ($(KOS_SUBARCH), navi)
-	SUBDIRS += navi
-endif
+SUBDIRS=fs hardware kernel math sound util
 
 include $(KOS_BASE)/Makefile.rules
 
diff --git a/kernel/arch/dreamcast/navi/Makefile b/kernel/arch/dreamcast/navi/Makefile
deleted file mode 100644
index 0e598b9..0000000
--- a/kernel/arch/dreamcast/navi/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# KallistiOS ##version##
-#
-# arch/dreamcast/navi/Makefile
-# (c)2002 Dan Potter
-#
-
-# IDE
-OBJS += navi_ide.o
-
-# Flash BIOS
-OBJS += navi_flash.o
-
-# SUBDIRS = fs
-SUBDIRS =
-
-include $(KOS_BASE)/Makefile.prefab
-
-
-


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.