TempleOSCDV4.08.ISO

Kernel/BlkDev/DskATAId.CPP

@@ -1,6 +1,6 @@
 Bool BootDVDProve(CBlkDev *bd)
 {
-  CKernel *img=CAlloc(DVD_BLK_SIZE);
+  U8 *img=CAlloc(DVD_BLK_SIZE);
   I64 i;
   Bool res=FALSE;
   "Port: %04X,%04X Unit: %02X  ",bd->base0,bd->base1,bd->unit;
@@ -9,8 +9,9 @@ Bool BootDVDProve(CBlkDev *bd)
     if (ATAPIStartStop(bd,tS+5.0,TRUE)) {
       " Started";
       for (i=0;i<2;i++) {//Retry
-	if (ATAPIReadBlks2(bd,tS+7.0,img,sys_boot_src.u16[1],1,FALSE)) {
-	  if (img->compile_time==sys_compile_time) {
+	if (ATAPIReadBlks2(bd,tS+7.0,img,sys_boot_blk,1,FALSE)) {
+	  if ((img+sys_boot_src.u16[1]<<BLK_SIZE_BITS)(CKernel *)
+		->compile_time==sys_compile_time) {
 	    " Found";
 	    return TRUE;
 	  } else
@@ -201,13 +202,12 @@ CATARep *ATARepFind(CATARep *haystack_root,I64 needle_num)
   return NULL;
 }
 
-CATARep *ATAIDDrvs(CATARep *root,I64 _sys_boot_drv,
-		CATARep **_ata_drv,CATARep **_atapi_drv)
+CATARep *ATAIDDrvs(CATARep *root,CATARep **_ata_drv,CATARep **_atapi_drv)
 {//This is for when trying to sort-out main hard drives and CD/DVD drives.
   CATARep *res=NULL,*tempha=root,*ata_drv=NULL,*atapi_drv=NULL;
   CBlkDev *bd;
   Bool was_silent=Silent;
-  bd=Let2BlkDev(_sys_boot_drv,FALSE);
+  bd=Let2BlkDev(':',FALSE);
   Silent(was_silent);
   while (tempha) {
     if (!res && bd && bd->type==tempha->type) {
@@ -258,7 +258,7 @@ I64 AutoMountIDE()
   I64 res=0;
   CATARep *root=NULL,*ata_drv=NULL,*atapi_drv=NULL,*tempha;
   ATARep(FALSE,TRUE,&root);
-  ATAIDDrvs(root,blkdev.boot_drv_let,&ata_drv,&atapi_drv);
+  ATAIDDrvs(root,&ata_drv,&atapi_drv);
   if (ata_drv && ATAMount(blkdev.first_hd_drv_let,BDT_ATA,
 	ata_drv->base0,ata_drv->base1,ata_drv->unit))
     res++;