ata.device [44.43] added cdfs to rom - DOS/0 default - StartCyl ApolloTeam-dev#2 - Format check for DOS/o

Author: WDrijver

arch/m68k-amiga/boot/mmakefile.src

@@ -166,7 +166,7 @@ AFILES  := ext_entry
 ifeq ($(APOLLOROM),V4)
 	KLIBS   := keymap graphics layers intuition gadtools workbench mathffp mathieeesingbas freeanim lowlevel setpatch
 	KDEVS   := ata trackdisk
-	KHNDLRS := 
+	KHNDLRS := cdrom
 	KHIDDS  := bus storage system
 	KRSRCS  := shellcommands wbtag misc shell card bootloader
 	KHOOKS  := alert 

rom/devs/ata/ata.conf

@@ -1,6 +1,6 @@
 ##begin config
 basename        ata
-version		    44.42
+version		    44.43
 libbasetype     struct ataBase
 residentpri     4
 beginio_func    BeginIO

rom/devs/ata/ata_init.c

@@ -49,8 +49,8 @@ BOOL ata_RegisterVolume(ULONG StartCyl, ULONG EndCyl, struct ata_Unit *unit)
     struct ExpansionBase *ExpansionBase;
     struct DeviceNode *devnode;
     TEXT dosdevname[4] = "HD0";
-    const ULONG IdDOS = AROS_MAKE_ID('D','O','S','\001');
-    const ULONG IdCDVD = AROS_MAKE_ID('C','D','V','D');
+    const ULONG IdDOS = AROS_MAKE_ID('D','O','S','\000');
+    const ULONG IdCDVD = AROS_MAKE_ID('C','D','F','S');         // Opticals are all using CDFS
 
     ExpansionBase = (struct ExpansionBase *)TaggedOpenLibrary(TAGGEDOPEN_EXPANSION);
     if (ExpansionBase)

rom/devs/ata/lowlevel.c

@@ -1204,7 +1204,7 @@ static BYTE ata_Identify(struct ata_Unit *unit)
                     unit->au_Heads      = 16;
                     unit->au_Sectors    = 63;
                     unit->au_Cylinders  = 195;
-                    unit->au_StartCyl   = 4;                        // First partition starts on Cylinder 4
+                    unit->au_StartCyl   = 2;                        // First partition starts on Cylinder 4
                     unit->au_EndCyl     = unit->au_Cylinders - 1;         // Partition covers full disk
                     unit->au_Capacity   = unit->au_Heads * unit->au_Sectors * unit->au_Cylinders;
                     unit->au_Capacity48 = unit->au_Capacity;

workbench/system/BHFormat/gui.c

@@ -520,6 +520,7 @@ int rcGuiMain(void)
 				goto cleanup;
 			}
 			strcpy(szVolumeName, "_____");
+
 		} else {
 			if( _WBenchMsg->sm_ArgList[1].wa_Name[0] == 0 )
 			{
@@ -578,7 +579,7 @@ int rcGuiMain(void)
 	}
 
 	if (!bGetDosDevice(pdlDevice, LDF_DEVICES|LDF_READ)) goto cleanup;
-	
+
 	ComputeCapacity(pdlVolume, &dinf );
 
 	DD(bug("Device = %s | Volume = %s | Capacity = %s\n", szDosDevice, szVolumeName, szCapacityInfo));

workbench/system/BHFormat/main.c

@@ -284,7 +284,7 @@ BOOL bSetDevfFromSz( const char * pszDevFlags )
 BOOL bGetDosDevice(struct DosList *pdlDevice, ULONG flags)
 {
     struct DosList *pdlList;
-    struct DosEnvec * pdenDevice;
+    struct DosEnvec *pdenDevice;
 
     if (!pdlDevice)
 	{
@@ -304,8 +304,7 @@ BOOL bGetDosDevice(struct DosList *pdlDevice, ULONG flags)
 	}
 
 	/* Find startup message and verify file-system settings. Use TypeOfMem to protect against devices that use integer or string startup values. */
-	if( (pfssm = (struct FileSysStartupMsg *)
-		BADDR(pdlDevice->dol_misc.dol_handler.dol_Startup)) == 0
+	if( (pfssm = (struct FileSysStartupMsg *)BADDR(pdlDevice->dol_misc.dol_handler.dol_Startup)) == 0
 		|| TypeOfMem(pfssm) == 0
 		|| pfssm->fssm_Device == 0
 		|| (pdenDevice = (struct DosEnvec *)BADDR(pfssm->fssm_Environ)) == 0
@@ -340,16 +339,23 @@ BOOL bGetDosDevice(struct DosList *pdlDevice, ULONG flags)
     ibyStart = pdenDevice->de_LowCyl * cbyCylinder;
     ibyEnd = (pdenDevice->de_HighCyl + 1) * cbyCylinder;
 
-	DD(bug("bGetDosDevice: LowCyl = %u | HighCyl = %u | Heads = %u | Sectors = %u | ibyStart = %u | ibyEnd = %u\n",
-		pdenDevice->de_LowCyl, pdenDevice->de_HighCyl, pdenDevice->de_Surfaces, pdenDevice->de_BlocksPerTrack, ibyStart, ibyEnd));
+	DD(bug("bGetDosDevice: LowCyl = %u | HighCyl = %u | Heads = %u | Sectors = %u | ibyStart = %llu | ibyEnd = %llu | DosType = %u\n",
+		LowCyl, HighCyl, pdenDevice->de_Surfaces, pdenDevice->de_BlocksPerTrack, ibyStart, ibyEnd, DosType));
+
+	if(DosType == 0x444F5300)	// Check for DOS/0 and if found then Drive needs to be partitioned by HDToolBox first
+	{
+		DD(bug("bGetDosDevice: ERROR: No Partition(s) Found!\n"));
+		ReportErrSz( ertError, 0, "\nERROR: No Partition(s) Found!\n\nUse Tools->HDToolBox to Create Partition(s)\n");
+		return FALSE;
+	}
+	DD(bug("bGetDosDevice: OK: Partition(s) Found!\n"));
 
 #if defined(__mc68000) && !defined(__AROS__)
     /* If the device has a native Amiga file-system, we can check for
        various limitations and also apply the various command-line
        flags that specify which variant to use for the new volume. */
-       
-    if( pdenDevice->de_DosType >= 0x444F5300
-	&& pdenDevice->de_DosType <= 0x444F5305 )
+
+    if( pdenDevice->de_DosType >= 0x444F5300 && pdenDevice->de_DosType <= 0x444F5305 )			// Filter for classic AmigaDOS OFS/FFS
     {
 	const struct Resident * prt;
 	UWORD verFS;
@@ -360,14 +366,10 @@ BOOL bGetDosDevice(struct DosList *pdlDevice, ULONG flags)
 	   would be a bit pointless. Perhaps I should use TypeOfMem
 	   to decide whether the segment is in ROM or RAM first? */
 
-	prt = (struct Resident *)((char *)BADDR(
-	    pdlDevice->dol_misc.dol_handler.dol_SegList) + 4);
-	while( prt->rt_MatchWord != RTC_MATCHWORD
-	       || prt->rt_MatchTag != prt )
-	    prt = (struct Resident *)((UWORD *)prt + 1);
+	prt = (struct Resident *)((char *)BADDR(pdlDevice->dol_misc.dol_handler.dol_SegList) + 4);
+	while( prt->rt_MatchWord != RTC_MATCHWORD || prt->rt_MatchTag != prt ) prt = (struct Resident *)((UWORD *)prt + 1);
 	verFS = prt->rt_Version;
-	DD(bug( "found RomTag at 0x%08lx; rt_Version = %lu\n",
-		  (ULONG)prt, (ULONG)verFS ));
+	DD(bug( "found RomTag at 0x%08lx; rt_Version = %lu\n", (ULONG)prt, (ULONG)verFS ));
 
 	/* check that the fs can handle this device correctly */