TempleOSCD_160707.ISO

Kernel/BlkDev/DskATA.CPP

@@ -229,7 +229,7 @@ I64 ATAReadNativeMax(CBlkDev *bd,F64 timeout)
 	res.u8[4]=InU8(bd->base0+ATAR0_LCYL);
 	res.u8[5]=InU8(bd->base0+ATAR0_HCYL);
 
-	if (res>>24==res&0xFFFFFF) {//Kludge to make qemu-kvm work
+	if (res>>24==res&0xFFFFFF) {//Kludge to make QEMU work
 	  bd->flags&=~BDF_EXT_SIZE;
 	  res&=0xFFFFFF;
 	}

Kernel/BlkDev/DskAddDev.CPP

@@ -5,8 +5,8 @@ U0 BlkDevLockFwdingSet(CBlkDev *bd)
   switch (bd->type) {
     case BDT_RAM:
       break;
-    case BDT_FILE_READ:
-    case BDT_FILE_WRITE:
+    case BDT_ISO_FILE_READ:
+    case BDT_ISO_FILE_WRITE:
       bd->lock_fwding=Let2BlkDev(*bd->file_dsk_name);
       break;
     case BDT_ATA:
@@ -41,8 +41,8 @@ I64 BlkDevAdd(CBlkDev *bd,Bool one_drv,Bool make_free)
   dv->size=bd->max_blk+1-bd->drv_offset;
   switch (bd->type) {
     case BDT_RAM:
-    case BDT_FILE_READ:
-    case BDT_FILE_WRITE:
+    case BDT_ISO_FILE_READ:
+    case BDT_ISO_FILE_WRITE:
       dv->dv_signature=DRV_SIGNATURE_VAL;
       dv->fs_type=FSt_REDSEA;
 //This is to force creation of a RAM

Kernel/BlkDev/DskBlk.CPP

@@ -47,8 +47,8 @@ Bool RBlks(CDrv *dv,U8 *buf, I64 blk, I64 cnt)
 	case BDT_RAM:
 	  MemCpy(buf,bd->RAM_dsk+blk<<BLK_SIZE_BITS,cnt<<BLK_SIZE_BITS);
 	  break;
-	case BDT_FILE_READ:
-	case BDT_FILE_WRITE:
+	case BDT_ISO_FILE_READ:
+	case BDT_ISO_FILE_WRITE:
 	  FRBlks(bd->file_dsk,buf,blk,cnt);
 	  break;
 	case BDT_ATA:
@@ -87,8 +87,8 @@ Bool WBlks(CDrv *dv,U8 *buf, I64 blk, I64 cnt)
 	case BDT_RAM:
 	  MemCpy(bd->RAM_dsk+blk<<BLK_SIZE_BITS,buf,cnt<<BLK_SIZE_BITS);
 	  break;
-	case BDT_FILE_READ:
-	case BDT_FILE_WRITE:
+	case BDT_ISO_FILE_READ:
+	case BDT_ISO_FILE_WRITE:
 	  FWBlks(bd->file_dsk,buf,blk,cnt);
 	  break;
 	case BDT_ATA:

Kernel/BlkDev/DskBlkDev.CPP

@@ -50,7 +50,7 @@ Bool BlkDevInit(CBlkDev *bd)
 	  RedSeaFmt(bd->first_drv_let);
 	res=TRUE;
 	break;
-      case BDT_FILE_READ:
+      case BDT_ISO_FILE_READ:
 	if (FileFind(bd->file_dsk_name,&de,FUF_JUST_FILES)) {
 	  bd->max_blk=de.size>>BLK_SIZE_BITS-1;
 	  try bd->file_dsk=FOpen(bd->file_dsk_name,"rc",bd->max_blk+1);
@@ -66,7 +66,7 @@ Bool BlkDevInit(CBlkDev *bd)
 	  }
 	}
 	break;
-      case BDT_FILE_WRITE:
+      case BDT_ISO_FILE_WRITE:
 	if (!bd->file_dsk_name) {
 	  StrPrint(buf,"%C:/Drv%C.DRV.C",
 		blkdev.boot_drv_let,bd->first_drv_let);
@@ -136,7 +136,7 @@ CBlkDev *BlkDevNextFreeSlot(U8 first_drv_let,I64 type)
 	case BDT_RAM:
 	  res->flags&=~BDF_READ_CACHE;
 	  break;
-	case BDT_FILE_READ:
+	case BDT_ISO_FILE_READ:
 	  res->flags|=BDF_READ_ONLY;
 	  break;
 	case BDT_ATAPI:

Kernel/BlkDev/DskDrv.CPP

@@ -166,9 +166,9 @@ I64 Let2BlkDevType(U8 drv_let)
   if ('C'<=drv_let<='L')
     return BDT_ATA;
   if ('M'<=drv_let<='P')
-    return BDT_FILE_READ;
+    return BDT_ISO_FILE_READ;
   if ('Q'<=drv_let<='S')
-    return BDT_FILE_WRITE;
+    return BDT_ISO_FILE_WRITE;
   if ('T'<=drv_let<='Z')
     return BDT_ATAPI;
   return BDT_NULL;
@@ -259,7 +259,7 @@ Bool Drv(U8 drv_let)
     if (bd->flags & BDF_REMOVABLE && !(bd->flags & BDF_INITIALIZED))
       ChgDsk(Drv2Let(dv));
     if (bd->type==BDT_RAM ||
-	bd->type==BDT_FILE_READ || bd->type==BDT_FILE_WRITE)
+	bd->type==BDT_ISO_FILE_READ || bd->type==BDT_ISO_FILE_WRITE)
       BlkDevInit(bd);
   }
   Fs->cur_dv=dv;
@@ -354,7 +354,7 @@ U0 DrvRep()
 	"   Serial#:%s\n",st;
 	Free(st);
       }
-      if (bd->type==BDT_FILE_READ || bd->type==BDT_FILE_WRITE)
+      if (bd->type==BDT_ISO_FILE_READ || bd->type==BDT_ISO_FILE_WRITE)
 	"   File=\"%s\"\n",bd->file_dsk_name;
       "   %016X-%016X\n$$FG$$$$BG$$",dv->drv_offset,dv->drv_offset+dv->size-1;
     }