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;
     }

Kernel/Kernel.MAP

@@ -1585,7 +1585,6 @@ $LK,"_MEMSET",A="FL:::/Kernel/KUtils.CPP.Z,3"$
 $LK,"ROP_COLLISION",A="FL:::/Kernel/KernelA.HPP,2943"$
 $LK,"TK_PLUS_PLUS",A="FL:::/Kernel/KernelA.HPP,2078"$
 $LK,"sys_heap_init_val",A="FL:::/Kernel/KernelB.HPP,181"$
-$LK,"BDT_FILE_WRITE",A="FL:::/Kernel/KernelA.HPP,2633"$
 $LK,"MemVGAAlloc",A="FL:::/Kernel/Mem/MemPhysical.CPP.Z,156",BI=355$
 $LK,"DOCEF_DEREF_DATA",A="FL:::/Kernel/KernelA.HPP,1011"$
 $LK,"VGAP_REG_WRITE",A="FL:::/Kernel/KernelA.HPP,3737"$
@@ -1748,7 +1747,6 @@ $LK,"SUF_REM_LEADING",A="FL:::/Kernel/KernelA.HPP,3793"$
 $LK,"OPTf_USE_IMM64",A="FL:::/Kernel/KernelA.HPP,1547"$
 $LK,"Raw",A="FL:::/Kernel/KMisc.CPP.Z,238",BI=396$
 $LK,"Msg",A="FL:::/Kernel/SrvCmd.CPP.Z,257",BI=397$
-$LK,"BDT_FILE_READ",A="FL:::/Kernel/KernelA.HPP,2632"$
 $LK,"OPTf_GLBLS_ON_DATA_HEAP",A="FL:::/Kernel/KernelA.HPP,1544"$
 $LK,"KbdInit",A="FL:::/Kernel/SerialDev/Keyboard.CPP.Z,424",BI=398$
 $LK,"chars_bmp_zero_tab_ff_cr_nl_cursor_dollar",A="FL:::/Kernel/StrA.CPP.Z,368"$
@@ -2121,6 +2119,7 @@ $LK,"MBS_USED_SIGNATURE_VAL",A="FL:::/Kernel/KernelA.HPP,2856"$
 $LK,"HeapCtrlDel",A="FL:::/Kernel/Mem/HeapCtrl.CPP.Z,15",BI=471$
 $LK,"_CALLEXTSTR",A="FL:::/Kernel/KUtils.CPP.Z,392"$
 $LK,"FF_USE_OLD_DATETIME",A="FL:::/Kernel/KernelA.HPP,2785"$
+$LK,"BDT_ISO_FILE_READ",A="FL:::/Kernel/KernelA.HPP,2632"$
 $LK,"CCf_PAREN",A="FL:::/Kernel/KernelA.HPP,2164"$
 $LK,"CCF_PAREN",A="FL:::/Kernel/KernelA.HPP,2163"$
 $LK,"ACD_BLK_SIZE",A="FL:::/Kernel/KernelA.HPP,1513"$
@@ -2308,6 +2307,7 @@ $LK,"FifoU8Cnt",A="FL:::/Kernel/KDataTypes.CPP.Z,227",BI=506$
 $LK,"C:/Doc/TimeHPET.TXT.Z",A="FL:::/Kernel/KernelB.HPP,283"$
 $LK,"DOCf_PLAIN_TEXT",A="FL:::/Kernel/KernelA.HPP,1294"$
 $LK,"CArcEntry",A="FL:::/Kernel/KernelA.HPP,3752"$
+$LK,"BDT_ISO_FILE_WRITE",A="FL:::/Kernel/KernelA.HPP,2633"$
 $LK,"AOT_BIN_BLK_SIZE",A="FL:::/Kernel/KernelA.HPP,1798"$
 $LK,"DOCf_FORM",A="FL:::/Kernel/KernelA.HPP,1302"$
 $LK,"DOCF_FORM",A="FL:::/Kernel/KernelA.HPP,1266"$

Kernel/KernelA.HPP

@@ -2629,8 +2629,8 @@ public class CDirEntry
 #define BDT_NULL		0
 #define BDT_RAM			1
 #define BDT_ATA			2
-#define BDT_FILE_READ		3
-#define BDT_FILE_WRITE		4
+#define BDT_ISO_FILE_READ	3
+#define BDT_ISO_FILE_WRITE	4
 #define BDT_ATAPI		5
 #define BDT_NUM_TYPES		6
 

Kernel/KernelC.HPP

@@ -195,6 +195,7 @@ public extern U0 S(U8 *ip=INVALID_PTR,CTask *task=NULL);
 #help_index "Debugging/Debugger;DolDoc/Cmd Line (Typically);"\
 	"Cmd Line (Typically);Help System"
 public extern Bool Man(U8 *st,I64 edf_dof_flags=0);
+
 #help_index "Debugging/Dump"
 public extern U0 CallerRep(U8 **rbp=NULL,CTask *task=NULL);
 public extern U0 D(U8 *addr,I64 cnt=0x80,Bool show_offset=TRUE);