From d84286cacd0afaf9fe3e379f382b0359d76e71ee Mon Sep 17 00:00:00 2001
From: neil <neil@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Fri, 22 Jul 2011 21:16:45 +0000
Subject: [PATCH] The same startup file is now used for all OSes.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@40298 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/fs/fat/mmakefile.src                    |  3 ++-
 workbench/fs/fat/startup-aros.c                   | 31 -----------------------
 workbench/fs/fat/{startup-amigaos.c => startup.c} |  6 ++++-
 3 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 workbench/fs/fat/startup-aros.c
 rename workbench/fs/fat/{startup-amigaos.c => startup.c} (85%)

diff --git a/workbench/fs/fat/mmakefile.src b/workbench/fs/fat/mmakefile.src
index e30d238606..df3704e2ac 100644
--- a/workbench/fs/fat/mmakefile.src
+++ b/workbench/fs/fat/mmakefile.src
@@ -1,6 +1,7 @@
 include $(TOP)/config/make.cfg
 
-FILES := startup-aros cache charset direntry disk fat file lock main names packet ops support notify timer
+FILES := startup cache charset direntry disk fat file lock main names packet\
+ ops support notify timer
 
 %build_prog mmake=workbench-fs-fat \
     progname=fat-handler targetdir=$(AROS_FS) \
diff --git a/workbench/fs/fat/startup-aros.c b/workbench/fs/fat/startup-aros.c
deleted file mode 100644
index c62d9f9d45..0000000000
--- a/workbench/fs/fat/startup-aros.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * fat.handler - FAT12/16/32 filesystem handler
- *
- * Copyright © 2006 Marek Szyprowski
- * Copyright © 2007 The AROS Development Team
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the same terms as AROS itself.
- *
- * $Id$
- */
-
-#define DEBUG 0
-
-#include <aros/asmcall.h>
-#include <exec/execbase.h>
-#include <aros/debug.h>
-
-struct ExecBase *SysBase;
-
-extern void handler(void);
-
-AROS_UFH1(__used void, startup,
-	  AROS_UFHA(struct ExecBase *, sBase, A6))
-{
-    AROS_USERFUNC_INIT
-    SysBase = sBase;
-    D(bug("[FAT] handler started, ExecBase = 0x%08lX\n", sBase));
-    handler();
-    AROS_USERFUNC_EXIT
-}
diff --git a/workbench/fs/fat/startup-amigaos.c b/workbench/fs/fat/startup.c
similarity index 85%
rename from workbench/fs/fat/startup-amigaos.c
rename to workbench/fs/fat/startup.c
index 9c622e4091..f94d7d0ef6 100644
--- a/workbench/fs/fat/startup-amigaos.c
+++ b/workbench/fs/fat/startup.c
@@ -19,12 +19,16 @@
 ULONG __abox__ = 1;
 #endif
 
+#ifndef __AROS__
 struct ExecBase *SysBase;
+#endif
 
 extern void handler(void);
 
 void startup (void) {
+#ifndef __AROS__
     SysBase = *(struct ExecBase **)4L;
-    D(bug("[FAT] handler started, ExecBase = 0x%08lX\n"));
+#endif
+    D(bug("[FAT] handler started\n"));
     handler();
 }
-- 
2.11.4.GIT