Allow 030 kernel do be compiled with native features,

for use in Hatari

sys/KERNELDEFS

@@ -68,7 +68,7 @@ endif
 ifeq ($(kernel),030)
 MINT = mint030.prg
 CPU  = 030
-KERNELDEFS = -DM68030
+KERNELDEFS = -DM68030 -DWITH_NATIVE_FEATURES
 endif
 
 ifeq ($(kernel),040)

sys/arch/aranym.c

@@ -32,7 +32,7 @@
 # include "aranym.h"
 
 
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 
 /* assembler routine */
 int detect_native_features(void);

sys/arch/aranym.h

@@ -39,7 +39,7 @@
 # include "mint/mint.h"
 # include "mint/arch/nf_ops.h"
 
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 
 struct nf_ops *nf_init(void);
 

sys/arch/aranym_asm.S

@@ -29,7 +29,7 @@
  * 
  */
 
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 
 	.text
 

sys/arch/halt.c

@@ -79,7 +79,7 @@ firebee_pic_write_byte(uchar b)
 void
 hw_poweroff(void)
 {
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 	nf_shutdown();
 # else
 	/* CT60 poweroff */

sys/arch/info_mach.c

@@ -79,7 +79,7 @@ char *machine_str (void)
 		case machine_ct60:
 			str = "Atari Falcon/CT60";
 			break;
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 		case machine_aranym:
 			str = nf_name();
 			break;

sys/arch/init_mach.c

@@ -58,7 +58,7 @@ enum special_hw
 	hades,
 	ct2,
 	ct60
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 	,
 	aranym
 # endif
@@ -171,13 +171,14 @@ _getmch (void)
 					break;
 				}
 
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 				case COOKIE_NF:
 				{
 					kernelinfo.nf_ops = nf_init();
 					kentry.vec_mch.nf_ops = nf_init();
 
-					add_info = aranym;
+					if (kernelinfo.nf_ops)
+						add_info = aranym;
 					break;
 				}
 # endif
@@ -363,7 +364,7 @@ identify (long mch, enum special_hw info)
 		case ct60:
 			machine = machine_ct60;
 			break;
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 		case aranym:
 			machine = machine_aranym;
 			break;

sys/bootmenu.c

@@ -134,7 +134,7 @@ static const char *debug_devices[] =
 
 static const char *write_boot_levels[] =
 {
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 	"(none)",
 	"(File)",
 	"(File/Host-Console)"

sys/console.c

@@ -22,7 +22,7 @@
 # include "filesys.h"
 # include "tty.h"
 # include "proc.h"
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 # include "arch/aranym.h"
 # endif
 
@@ -188,7 +188,7 @@ sys_c_conws (const char *str)
 	while (*p++)
 		cnt++;
 
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 	if( write_boot_file == 2 )
 		nf_debug(str);
 # endif

sys/debug.c

@@ -198,7 +198,7 @@ debug_ws(const char *s)
 	int scan;
 	int stopped;
 
-# ifdef ARANYM
+# if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 	if (nf_debug(s))
 		return;
 # endif

sys/init.c

@@ -28,6 +28,7 @@
 # include "arch/intr.h"		/* new_mediach, new_rwabs, new_getbpb, same for old_ */
 # include "arch/init_intr.h"	/* init_intr() */
 # include "arch/init_mach.h"	/* */
+# include "arch/info_mach.h"	/* machine_str() */
 # include "arch/mmu.h"		/* save_mmu */
 # include "arch/mprot.h"	/* */
 # include "arch/syscall.h"	/* call_aes */
@@ -616,9 +617,11 @@ init (void)
 			case machine_firebee:
 				mch_str = "firebee";
 				break;
-#ifdef ARANYM
+#if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
+			/* only when really running on aranym */
 			case machine_aranym:
-				mch_str = "aranym";
+				if (strcmp(machine_str(), "ARAnyM") == 0)
+					mch_str = "aranym";
 				break;
 #endif
 			case machine_unknown:

sys/mint/ktypes.h

@@ -122,7 +122,7 @@ typedef enum
 	machine_ct2,
 	machine_ct60,
 	machine_firebee
-#ifdef ARANYM
+#if defined(ARANYM) || defined(WITH_NATIVE_FEATURES)
 	,
 	machine_aranym
 #endif