Merge branch 'master' into master

Author: WDrijver

arch/m68k-amiga/devs/sagasd/sagasd_device.c

@@ -730,7 +730,7 @@ static LONG SAGASD_PerformIO(struct IORequest *io)
         geom->dg_TrackSectors = SAGASD_SECTORS;
         geom->dg_BufMemType   = MEMF_PUBLIC;
         geom->dg_DeviceType   = DG_DIRECT_ACCESS;
-        geom->dg_Flags        = DGF_REMOVABLE;
+        geom->dg_Flags        = 0; //DGF_REMOVABLE; [WD]: We need to clear this to allow SFS to boot from SD-Card
         iostd->io_Actual = sizeof(*geom);
         err = 0;
         debug("\t[%s] geom->dg_SectorSize   = %10ld", __FUNCTION__ , geom->dg_SectorSize);

rom/dos/cliinit.c

@@ -1,5 +1,5 @@
 /*
-    Copyright © 1995-2020, The AROS Development Team. All rights reserved.
+    Copyright � 1995-2020, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc:
@@ -157,7 +157,7 @@ static LONG internalBootCliHandler(void);
 
     DeleteMsgPort(reply_mp);
 
-    D(bug("Dos/CliInit: Process returned Res1=%ld, Res2=%ld\n", Res1, Res2));
+    DD(bug("Dos/CliInit: Process returned Res1=%ld, Res2=%ld\n", Res1, Res2));
 
     /* Did we succeed? */
     if (Res1 == DOSTRUE)
@@ -248,27 +248,27 @@ static void internalPatchBootNode(struct FileSysResource *fsr, struct DeviceNode
     /* If the DosType is 0 and dn_Handler == BNULL, use the default handler */
     if (de->de_DosType == 0 && dn->dn_Handler == BNULL)
     {
-        D(bug("Dos/CliInit: Neither DosType nor Handler specified, using default filesystem\n"));
+        DD(bug("Dos/CliInit: Neither DosType nor Handler specified, using default filesystem\n"));
         dn->dn_SegList = defseg;
         dn->dn_GlobalVec = (BPTR)-1;
         return;
     }
 
     /* If no FileSysResource, nothing to do */
     if (fsr == NULL) {
-        D(bug("Dos/CliInit: No FileSystem.resource, not patching DeviceNode %p\n", dn));
+        DD(bug("Dos/CliInit: No FileSystem.resource, not patching DeviceNode %p\n", dn));
         return;
     }
 
-    D(bug("Dos/CliInit: Looking for patches for DeviceNode %p\n", dn));
+    DD(bug("Dos/CliInit: Looking for patches for DeviceNode %p\n", dn));
 
     /*
      * internalMatchFileSystemResourceHandler looks up the filesystem
      */
     fse = internalMatchFileSystemResourceHandler(fsr, de->de_DosType, dn->dn_Handler);
     if (fse != NULL)
     {
-        D(bug("Dos/CliInit: found 0x%p in FileSystem.resource\n", fse));
+        DD(bug("Dos/CliInit: found 0x%p in FileSystem.resource\n", fse));
         PRINT_DOSTYPE(fse->fse_DosType);
 
         dn->dn_SegList = fse->fse_SegList;
@@ -296,7 +296,7 @@ static struct MsgPort *mountBootNode(struct DeviceNode *dn, struct FileSysResour
     if ((dn == NULL) || (dn->dn_Name == BNULL))
         return NULL;
 
-    D(bug("Dos/CliInit: Mounting 0x%p (%b)...\n", dn, dn->dn_Name));
+    DD(bug("Dos/CliInit: Mounting 0x%p (%b)...\n", dn, dn->dn_Name));
 
     /* Check if the device is already in DOS list */
     dl = LockDosList(LDF_DEVICES | LDF_READ);
@@ -312,7 +312,7 @@ static struct MsgPort *mountBootNode(struct DeviceNode *dn, struct FileSysResour
     /* Found in DOS list? Do nothing. */
     if (dl)
     {
-        D(bug("Dos/CliInit: Found in DOS list, nothing to do\n"));
+        DD(bug("Dos/CliInit: Found in DOS list, nothing to do\n"));
         return dl->dol_Task;
     }
 
@@ -322,7 +322,7 @@ static struct MsgPort *mountBootNode(struct DeviceNode *dn, struct FileSysResour
     if (!dn->dn_Handler && !dn->dn_SegList)
     {
         /* Don't know how to mount? Error... */
-        D(bug("Dos/CliInit: Don't know how to mount\n"));
+        DD(bug("Dos/CliInit: Don't know how to mount\n"));
         return NULL;
     }
 
@@ -333,18 +333,18 @@ static struct MsgPort *mountBootNode(struct DeviceNode *dn, struct FileSysResour
          * a) On the Amiga ADNF_STARTPROC was not present in KS 1.3 and earlier, there was no deferred mount.
          * b) In fact if we have something in ExpansionBase, we for sure want it to be mounted.
          */
-        D(bug("Dos/CliInit: Added to DOS list, starting up handler...\n"));
+        DD(bug("Dos/CliInit: Added to DOS list, starting up handler...\n"));
 
         if (RunHandler(dn, NULL, DOSBase))
         {
-            D(bug("dn->dn_Task = 0x%p\n", dn->dn_Task));
+            DD(bug("dn->dn_Task = 0x%p\n", dn->dn_Task));
             return dn->dn_Task;
         }
 
-        D(bug("Failed\n"));
+        DD(bug("Failed\n"));
         RemDosEntry((struct DosList *)dn);
     }
-    D(else bug("Dos/CliInit: AddDosEntry() failed\n"));
+    DD(else bug("Dos/CliInit: AddDosEntry() failed\n"));
 
     /*
      * TODO: AddDosEntry() can fail in case of duplicate name. In this case it would be useful
@@ -376,7 +376,7 @@ static BPTR internalBootLock(struct DosLibrary *DOSBase, struct ExpansionBase *E
      */
     ObtainSemaphore(&IntExpBase(ExpansionBase)->BootSemaphore);
     bn = (struct BootNode *)GetHead(&ExpansionBase->MountList);
-    D(bug("Dos/CliInit: MountList head: 0x%p\n", bn));
+    DD(bug("Dos/CliInit: MountList head: 0x%p\n", bn));
 
     if (bn == NULL)
     {
@@ -394,7 +394,7 @@ static BPTR internalBootLock(struct DosLibrary *DOSBase, struct ExpansionBase *E
         return BNULL;
     }
 
-    D(bug("Dos/CliInit: %b (%d) appears usable\n", dn->dn_Name, bn->bn_Node.ln_Pri));
+    DD(bug("Dos/CliInit: %b (%d) appears usable\n", dn->dn_Name, bn->bn_Node.ln_Pri));
 
     /* Try to find a Lock for 'name:' */
     name_len = AROS_BSTR_strlen(dn->dn_Name);
@@ -407,10 +407,10 @@ static BPTR internalBootLock(struct DosLibrary *DOSBase, struct ExpansionBase *E
         CopyMem(AROS_BSTR_ADDR(dn->dn_Name), name, name_len);
         name[name_len+0] = ':';
         name[name_len+1] = 0;
-        D(bug("Dos/CliInit:   Attempt to Lock(\"%s\")... ", name));
+        DD(bug("Dos/CliInit:   Attempt to Lock(\"%s\")... ", name));
 
         lock = Lock(name, SHARED_LOCK);
-        D(bug("=> 0x%p\n", BADDR(lock)));
+        DD(bug("=> 0x%p\n", BADDR(lock)));
 
         if (lock != BNULL)
         {
@@ -435,11 +435,11 @@ static BPTR internalBootLock(struct DosLibrary *DOSBase, struct ExpansionBase *E
             SIPTR dead;
 
             /* Darn. Not bootable. Try to unmount it. */
-            D(bug("Dos/CliInit:   Does not have a bootable filesystem, unmounting...\n"));
+            DD(bug("Dos/CliInit:   Does not have a bootable filesystem, unmounting...\n"));
 
             /* It's acceptable if this fails */
             dead = DoPkt(mp, ACTION_DIE, 0, 0, 0, 0, 0);
-            D(bug("Dos/CliInit:  ACTION_DIE returned %ld\n", dead));
+            DD(bug("Dos/CliInit:  ACTION_DIE returned %ld\n", dead));
 
             if (dead)
             {
@@ -500,7 +500,7 @@ static LONG internalBootCliHandler(void)
 
     DOSBase = (APTR)TaggedOpenLibrary(TAGGEDOPEN_DOS);
     if (DOSBase == NULL) {
-        D(bug("Dos/CliInit: failed to open dos.library!\n"));
+        DD(bug("Dos/CliInit: failed to open dos.library!\n"));
         Alert(AT_DeadEnd | AG_OpenLib | AO_DOSLib);
     }
 
@@ -518,7 +518,7 @@ static LONG internalBootCliHandler(void)
 
         /* Find and Lock the proposed boot device */
         lock = internalBootLock(DOSBase, ExpansionBase, fsr);
-        D(bug("Dos/CliInit: Proposed SYS: lock is: %p\n", BADDR(lock)));
+        DD(bug("Dos/CliInit: Proposed SYS: lock is: %p\n", BADDR(lock)));
         if (lock == BNULL)
             err = IoErr();
     }
@@ -556,7 +556,7 @@ static LONG internalBootCliHandler(void)
     lock = Lock("SYS:", SHARED_LOCK);
     if (lock == BNULL)
     {
-        D(bug("DOS/CliInit: Impossible! The SYS: assign failed!\n"));
+        DD(bug("DOS/CliInit: Impossible! The SYS: assign failed!\n"));
         Alert(AT_DeadEnd | AG_BadParm | AN_DOSLib);
     }
 
@@ -592,11 +592,11 @@ static LONG internalBootCliHandler(void)
      * This means the handler needs to be loaded from disk (fat-handler for example).
      * Here we can already do it.
      */
-    D(bug("Dos/CliInit: Assigns done, mount remaining handlers...\n"));
+    DD(bug("Dos/CliInit: Assigns done, mount remaining handlers...\n"));
 
     BootFlags = IntExpBase(ExpansionBase)->BootFlags;
     Flags = ExpansionBase->Flags;
-    D(bug("Dos/CliInit: BootFlags 0x%lx Flags 0x%x\n", BootFlags, Flags));
+    DD(bug("Dos/CliInit: BootFlags 0x%lx Flags 0x%x\n", BootFlags, Flags));
 
     ForeachNodeSafe(&ExpansionBase->MountList, bn, tmpbn)
     {
@@ -617,14 +617,14 @@ static LONG internalBootCliHandler(void)
     bootProc->pr_WindowPtr = bootWin;
 
     /* Init all the RTF_AFTERDOS code, since we now have SYS:, the dos devices, and all the other assigns */
-    D(bug("Dos/CliInit: Calling InitCode(RTF_AFTERDOS, 0)\n"));
+    DD(bug("Dos/CliInit: Calling InitCode(RTF_AFTERDOS, 0)\n"));
     InitCode(RTF_AFTERDOS, 0);
 
     /* Call the platform-overridable portions */
-    D(bug("Dos/CliInit: Calling __dos_Boot(%p, 0x%lx, 0x%x)\n", DOSBase, BootFlags, Flags));
+    DD(bug("Dos/CliInit: Calling __dos_Boot(%p, 0x%lx, 0x%x)\n", DOSBase, BootFlags, Flags));
     __dos_Boot(DOSBase, BootFlags, Flags);
 
-    D(bug("Dos/CliInit: Boot sequence exited\n"));
+    DD(bug("Dos/CliInit: Boot sequence exited\n"));
     CloseLibrary((APTR)DOSBase);
 
     /* And exit... */

rom/dos/close.c

@@ -1,17 +1,18 @@
 /*
-    Copyright © 1995-2013, The AROS Development Team. All rights reserved.
+    Copyright � 1995-2013, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc:
     Lang: English
 */
 
+#include <aros/debug.h>
 #include <proto/exec.h>
 #include <dos/dosextens.h>
 
 #include <proto/dos.h>
 #include "dos_intern.h"
-#include <aros/debug.h>
+
 
 /*****************************************************************************
 

rom/dos/dos_intern.h

@@ -29,7 +29,7 @@
 
 #if DEBUG
 #define DD(x) x
-#define D(x)
+#define D(x) 
 #define bug kprintf
 #else
 #define D(x)

rom/dos/fs_driver.c

@@ -1,5 +1,5 @@
 /*
-    Copyright © 2011-2014, The AROS Development Team. All rights reserved.
+    Copyright � 2011-2014, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Low-level filesystem access functions, packet version
@@ -16,6 +16,8 @@
 
 LONG fs_LocateObject(BPTR *ret, struct MsgPort *port, BPTR parent, CONST_STRPTR name, LONG accessMode, struct DosLibrary *DOSBase)
 {
+    D(bug("[fs_driver] fs_LocateObject('%s', %d)\n", name, accessMode));
+        
     SIPTR error = 0;
     BSTR bstrname = C2BSTR(name);
 
@@ -25,6 +27,8 @@ LONG fs_LocateObject(BPTR *ret, struct MsgPort *port, BPTR parent, CONST_STRPTR
     *ret = (BPTR)dopacket3(DOSBase, &error, port, ACTION_LOCATE_OBJECT, parent, bstrname, accessMode);
     FREEC2BSTR(bstrname);
 
+    D(bug("[fs_driver] fs_LocateObject returned %p, error=%d\n", *ret, error));
+
     return (*ret) ? 0 : error;
 }
 

rom/dos/getdeviceproc.c

@@ -1,5 +1,5 @@
 /*
-    Copyright © 1995-2017, The AROS Development Team. All rights reserved.
+    Copyright � 1995-2017, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: GetDeviceProc() - Find the filesystem for a path.
@@ -70,12 +70,9 @@ static struct DevProc *deviceproc_internal(struct DosLibrary *DOSBase, CONST_STR
     D(bug("[GetDeviceProc] '%s':0x%p\n", name, dp));
     dp2 = deviceproc_internal(DOSBase, name, dp);
 
-#if DEBUG
-    bug("[GetDeviceProc] = 0x%p", dp2);
-    if (dp2)
-        bug(", port=0x%p lock=0x%p dv=0x%p\n", dp2->dvp_Port, dp2->dvp_Lock, dp2->dvp_DevNode);
-    RawPutChar('\n');
-#endif
+    D(bug("[GetDeviceProc] = 0x%p", dp2);)
+    D(if (dp2) D(bug(", port=0x%p lock=0x%p dv=0x%p\n", dp2->dvp_Port, dp2->dvp_Lock, dp2->dvp_DevNode);))
+    D(RawPutChar('\n');)
 
     return dp2;
 

rom/dos/lock.c

@@ -1,5 +1,5 @@
 /*
-    Copyright © 1995-2011, The AROS Development Team. All rights reserved.
+    Copyright � 1995-2011, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Locks a file or directory.
@@ -176,11 +176,16 @@ static LONG InternalLock(CONST_STRPTR name, LONG accessMode,
         return ret;
 
     filename = strchr(name, ':');
+
+    D(bug("[Lock] '%s' accessMode=%d, soft_nesting=%d, filename=%s\n", name, accessMode, soft_nesting, filename));
+
     if (!filename)
     {
         struct MsgPort *port;
         BPTR lock;
 
+        D(bug("[Lock] No FileName in path, using current directory\n"));
+
         /* No ':' in the pathname, path is relative to current directory */
         cur = me->pr_CurrentDir;
         if (cur && cur != (BPTR)-1) {
@@ -197,6 +202,7 @@ static LONG InternalLock(CONST_STRPTR name, LONG accessMode,
     else 
     {
         filename++;
+        D(bug("[Lock] FileName in path, using device %s\n", filename));
         do
         {
             if ((dvp = GetDeviceProc(name, dvp)) == NULL) 
@@ -211,23 +217,14 @@ static LONG InternalLock(CONST_STRPTR name, LONG accessMode,
 
         if (error == ERROR_NO_MORE_ENTRIES)
             error = me->pr_Result2 = ERROR_OBJECT_NOT_FOUND;
-
-#ifndef __mc68000
-        /* FIXME: On Linux hosted we sometimes get ERROR_IS_SOFTLINK with dvp == NULL,
-         * which causes segfaults below if we don't change "error". Adding !dvp below
-         * is probably a hack.
-         *
-         * This is wrong, GetDeviceProc() can return other errors than ERROR_OBJECT_NOT_FOUND.
-         */
-        if (!dvp)
-            error = me->pr_Result2 = ERROR_OBJECT_NOT_FOUND;
-#endif
     }
 
     if (error == ERROR_IS_SOFT_LINK)
     {
         STRPTR softname = ResolveSoftlink(cur, dvp, name, DOSBase);
 
+        D(bug("[Lock] Softlink resolved to %s\n", softname));
+
         if (softname)
         {
             BPTR olddir = BNULL;
@@ -242,6 +239,7 @@ static LONG InternalLock(CONST_STRPTR name, LONG accessMode,
             {
                 olddir = me->pr_CurrentDir;
                 error = RootDir(dvp, DOSBase);
+                D(bug("[Lock] Changed current directory to %p, error=%d\n", me->pr_CurrentDir, error));
             }
             else
                 error = 0;
@@ -266,6 +264,8 @@ static LONG InternalLock(CONST_STRPTR name, LONG accessMode,
 
     if (error)
     {
+        D(bug("[Lock] failed, err=%d\n", error));
+        
         SetIoErr(error);
         ret = DOSFALSE;
     }

rom/dos/namefrom.c

@@ -1,15 +1,16 @@
 /*
-    Copyright © 1995-2007, The AROS Development Team. All rights reserved.
+    Copyright � 1995-2007, The AROS Development Team. All rights reserved.
     $Id$
 
     Desc: Retrieve the full pathname from a lock or a filehandle.
     Lang: english
 */
 
+#include <aros/debug.h>
 #include <proto/exec.h>
 #include "dos_intern.h"
 #include <proto/dos.h>
-#include <aros/debug.h>
+
 
 BOOL namefrom_internal(struct DosLibrary *DOSBase, BPTR lock, STRPTR buffer, LONG length)
 {