Rijn/TempleOS-Rijn
1
1 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TempleOS V5.03 Nightly (ISO SHA-1 aed1efc)

Browse Source
This commit is contained in:
Terry A. Davis authored and minexew committed 2018-09-09 11:35:02 +02:00
1 parent bbd014d8e9
commit da84afbaf7
124 files changed
+3453 -3407
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Kernel/BlkDev/DskCDDVD.HC
+6 -10
View File
@@ -1,13 +1,9 @@
//ISO1 is ISO9660
//ISO2 is ISO13490
//ISO3 is ISO13346
Bool ISOInit(CDrv *dv,I64 blk)
{
CBlkDev *bd=dv->bd;
I64 spc=bd->blk_size>>BLK_SIZE_BITS,i=blk/spc,drv_offset=0;
CISO1PriDesc *iso=MAlloc(bd->blk_size);
CISO1DirEntry *de;
CISOPriDesc *iso=MAlloc(bd->blk_size);
CISODirEntry *de;
Bool unlock,res=FALSE;
U8 buf[8];
@@ -25,10 +21,10 @@ Bool ISOInit(CDrv *dv,I64 blk)
LMF_EXACT)) {
case 0:
switch (iso->type) {
case ISO1T_BOOT_RECORD:
case ISOT_BOOT_RECORD:
drv_offset+=(2*DVD_BLK_SIZE+DVD_BLK_SIZE)/BLK_SIZE;
break;
case ISO1T_SUPPLEMENTARY_DESC:
case ISOT_SUPPLEMENTARY_DESC:
de=&iso->root_dir_record;
dv->size=iso->vol_space_size.little*bd->blk_size>>BLK_SIZE_BITS;
if (!StrCmp(iso->publisher_id,"TempleOS RedSea")) {
@@ -41,11 +37,11 @@ Bool ISOInit(CDrv *dv,I64 blk)
dv->root_clus=de->loc.little;
res=TRUE;
goto di_done;
case ISO1T_TERMINATOR:
case ISOT_TERMINATOR:
throw('Drv');
}
break;
default: //Its normal for ISO13346 to read NULL blk as terminator
default: //Its normal for ISO3346 to read NULL blk as terminator
PrintErr("File System Not Supported\n");
throw('Drv');
}
Kernel/BlkDev/DskClus.HC
-6
View File
@@ -6,7 +6,6 @@ I64 ClusNumNext(CDrv *dv,I64 c,I64 cnt=1)
try {
unlock=DrvLock(dv);
switch (dv->fs_type) {
case FSt_ISO9660:
case FSt_REDSEA:
c+=cnt;
break;
@@ -35,7 +34,6 @@ I64 Clus2Blk(CDrv *dv,I64 c)
switch (dv->fs_type) {
case FSt_REDSEA:
return c;
case FSt_ISO9660:
case FSt_FAT32:
return dv->data_area+c*dv->spc;
default:
@@ -52,10 +50,6 @@ I64 ClusBlkRead(CDrv *dv,U8 *buf,I64 c,I64 blks)
try {
unlock=DrvLock(dv);
switch (dv->fs_type) {
case FSt_ISO9660:
BlkRead(dv,buf,dv->data_area+c*dv->spc,blks);
c+=(blks+dv->spc-1)/dv->spc;
break;
case FSt_REDSEA:
BlkRead(dv,buf,c,blks);
c+=blks;
Kernel/BlkDev/DskCopy.HC
+4 -7
View File
@@ -13,9 +13,9 @@ Bool CopySingleZ(U8 *f1,U8 *f2) //Just one file
Free(file_buf);
return ToBool(c);
} else
PrintErr("File not found.\n");
PrintErr("File not found: \"%s\".\n",f1);
} else
PrintErr("File not found.\n");
PrintErr("File not found: \"%s\".\n",f1);
return FALSE;
}
@@ -71,10 +71,10 @@ Bool CopySingle(U8 *f1,U8 *f2) //Just one file
Free(buf);
return TRUE;
} else
PrintErr("File not found.\n");
PrintErr("File not found: \"%s\".\n",f2);
FClose(in_file);
} else
PrintErr("File not found.\n");
PrintErr("File not found: \"%s\".\n",f1);
Free(buf);
return FALSE;
}
@@ -94,9 +94,6 @@ I64 Del(U8 *files_find_mask,Bool make_mask=FALSE,
res=FAT32FilesDel(dirc->dv,Fs->cur_dir,dirc->mask,
0,del_dir,print_msg);
break;
case FSt_ISO9660:
PrintErr("Not Writable\n");
break;
default:
PrintErr("File System Not Supported\n");
}
Kernel/BlkDev/DskDirA.HC
-3
View File
@@ -5,9 +5,6 @@ Bool DirNew(CDrv *dv,U8 *cur_dir,CDirEntry *tmpde,Bool free_old_chain=TRUE)
return RedSeaDirNew(dv,cur_dir,tmpde,free_old_chain);
case FSt_FAT32:
return FAT32DirNew(dv,cur_dir,tmpde,free_old_chain);
case FSt_ISO9660:
PrintErr("Not Writable\n");
return FALSE;
default:
PrintErr("File System Not Supported\n");
return FALSE;
Kernel/BlkDev/DskDirB.HC
+1 -7
View File
@@ -60,9 +60,6 @@ Bool Cd(U8 *dirname=NULL,Bool make_dirs=FALSE)
case FSt_FAT32:
res=FAT32Cd(buf,cur_dir_clus);
break;
case FSt_ISO9660:
res=ISO1Cd(buf,cur_dir_clus);
break;
default:
PrintErr("File System Not Supported\n");
res=FALSE;
@@ -173,7 +170,7 @@ Bool DirMk(U8 *filename,I64 entry_cnt=0)
if (dirc=DirContextNew(filename)) {
if (*dirc->mask) {
if (!FileNameChk(dirc->mask))
PrintErr("Invalid FileName.\n");
PrintErr("Invalid FileName: \"%s\".\n",dirc->mask);
else {
"Make Directory:%s\n",filename;
name=MStrUtil(dirc->mask,
@@ -185,9 +182,6 @@ Bool DirMk(U8 *filename,I64 entry_cnt=0)
case FSt_FAT32:
res=FAT32MkDir(dirc->dv,Fs->cur_dir,name,entry_cnt);
break;
case FSt_ISO9660:
PrintErr("Not Writable\n");
break;
default:
PrintErr("File System Not Supported\n");
}
Kernel/BlkDev/DskDrv.HC
-1
View File
@@ -278,7 +278,6 @@ Bool Drv(U8 drv_let)
switch (dv->fs_type) {
case FSt_REDSEA:
case FSt_FAT32:
case FSt_ISO9660:
return TRUE;
default:
PrintErr("File System Not Supported\n");
Kernel/BlkDev/DskFile.HC
+2 -13
View File
@@ -28,9 +28,6 @@ U8 *FileRead(U8 *filename,I64 *_size=NULL,I64 *_attr=NULL)
case FSt_FAT32:
res=FAT32FileRead(dirc->dv,Fs->cur_dir,dirc->mask,&size,&attr);
break;
case FSt_ISO9660:
res=ISO1FileRead(dirc->dv,Fs->cur_dir,dirc->mask,&size,&attr);
break;
default:
PrintErr("File System Not Supported\n");
}
@@ -54,9 +51,6 @@ U8 *FileRead(U8 *filename,I64 *_size=NULL,I64 *_attr=NULL)
case FSt_FAT32:
res=FAT32FileRead(dirc->dv,Fs->cur_dir,dirc->mask,&size,&attr);
break;
case FSt_ISO9660:
res=ISO1FileRead(dirc->dv,Fs->cur_dir,dirc->mask,&size,&attr);
break;
default:
PrintErr("File System Not Supported\n");
}
@@ -64,10 +58,8 @@ U8 *FileRead(U8 *filename,I64 *_size=NULL,I64 *_attr=NULL)
DirContextDel(dirc);
}
}
if (!res) {
"%s ",filename;
PrintErr("File not found.\n");
}
if (!res)
PrintErr("File not found: \"%s\".\n",filename);
if (res && attr & RS_ATTR_RESIDENT)
HashGenericAdd(curname,HTT_FILE,AMAllocIdent(res),size,0,adam_task);
}
@@ -106,9 +98,6 @@ I64 FileWrite(U8 *filename,U8 *fbuf,I64 size,CDate cdt=0,I64 attr=0)
case FSt_FAT32:
c=FAT32FileWrite(dirc->dv,Fs->cur_dir,dirc->mask,fbuf,size,cdt,attr);
break;
case FSt_ISO9660:
PrintErr("Not Writable\n");
break;
default:
PrintErr("File System Not Supported\n");
}
Kernel/BlkDev/DskFind.HC
-11
View File
@@ -10,9 +10,6 @@ CDirEntry *FilesFind2(U8 *files_find_mask,I64 fuf_flags)
case FSt_FAT32:
res=FAT32FilesFind(files_find_mask,fuf_flags);
break;
case FSt_ISO9660:
res=ISO1FilesFind(files_find_mask,fuf_flags);
break;
default:
PrintErr("File System Not Supported\n");
res=NULL;
@@ -91,10 +88,6 @@ Bool FileFind(U8 *filename,CDirEntry *_de=NULL,I64 fuf_flags=0)
res=FAT32FileFind(dirc->dv,cur_dir_clus,dirc->mask,
&de,fuf_flags);
break;
case FSt_ISO9660:
res=ISO1FileFind(dirc->dv,cur_dir_clus,dirc->mask,
&de,fuf_flags);
break;
default:
PrintErr("File System Not Supported\n");
}
@@ -131,10 +124,6 @@ Bool FileFind(U8 *filename,CDirEntry *_de=NULL,I64 fuf_flags=0)
res=FAT32FileFind(dirc->dv,cur_dir_clus,
dirc->mask,&de,fuf_flags);
break;
case FSt_ISO9660:
res=ISO1FileFind(dirc->dv,cur_dir_clus,
dirc->mask,&de,fuf_flags);
break;
default:
PrintErr("File System Not Supported\n");
}
Kernel/BlkDev/DskFmt.HC
-3
View File
@@ -86,9 +86,6 @@ U0 Fmt(I64 drv_let,Bool quick=TRUE,Bool confirm=TRUE,I64 type=FSt_FAT32)
DskCacheInvalidate(Let2Drv(drv_let));
Drv(drv_let);
break;
case FSt_ISO9660:
PrintErr("Not Writable\n");
break;
default:
PrintErr("File System Not Supported\n");
}
Kernel/BlkDev/DskStrB.HC
+2 -10
View File
@@ -27,9 +27,6 @@ I64 Name2DirClus(CDrv *dv,U8 *dirname)
case FSt_FAT32:
cont=FAT32FileFind(dv,cur_dir_clus,buf2,&de,FUF_JUST_DIRS);
break;
case FSt_ISO9660:
cont=ISO1FileFind(dv,cur_dir_clus,buf2,&de,FUF_JUST_DIRS);
break;
default:
throw('Drv');
}
@@ -37,8 +34,7 @@ I64 Name2DirClus(CDrv *dv,U8 *dirname)
}
}
if (!cont) {
"%s ",dirname;
PrintErr("File not found.\n");
PrintErr("File not found: \"%s\".\n",dirname);
cur_dir_clus=0;
}
if (unlock)
@@ -72,9 +68,6 @@ I64 Name2ParentDirClus(CDrv *dv,U8 *dirname)
case FSt_FAT32:
cont=FAT32FileFind(dv,cur_dir_clus,buf2,&de,FUF_JUST_DIRS);
break;
case FSt_ISO9660:
cont=ISO1FileFind(dv,cur_dir_clus,buf2,&de,FUF_JUST_DIRS);
break;
default:
throw('Drv');
}
@@ -82,8 +75,7 @@ I64 Name2ParentDirClus(CDrv *dv,U8 *dirname)
}
}
if (!cont) {
"%s ",dirname;
PrintErr("File not found.\n");
PrintErr("File not found: \"%s\".\n",dirname);
cur_dir_clus2=0;
}
if (unlock)
Kernel/BlkDev/FileSysFAT.HC
+4 -6
View File
@@ -299,7 +299,7 @@ Bool FAT32FileFind(CDrv *dv,I64 cur_dir_clus,
if (dv->fs_type!=FSt_FAT32)
PrintErr("Not FAT32 Drv\n");
else if (!CFileNameTo(dname,name))
PrintErr("Invalid FileName.\n");
PrintErr("Invalid FileName: \"%s\".\n",name);
else
try {
unlock=DrvLock(dv);
@@ -391,10 +391,8 @@ Bool FAT32Cd(U8 *name,I64 cur_dir_clus)
PrintErr("Not FAT32 Drv\n");
else if (FAT32FileFind(Fs->cur_dv,cur_dir_clus,name,&de,FUF_JUST_DIRS))
return TRUE;
else {
"%s ",name;
PrintErr("File not found.\n");
}
else
PrintErr("File not found: \"%s\".\n",name);
return FALSE;
}
@@ -809,7 +807,7 @@ I64 FAT32FileWrite(CDrv *dv,U8 *cur_dir,U8 *name,U8 *buf,I64 size,
if (dv->fs_type!=FSt_FAT32)
PrintErr("Not FAT32 Drv\n");
else if (!CFileNameTo(de.name,name))
PrintErr("Invalid FileName.\n");
PrintErr("Invalid FileName: \"%s\".\n",name);
else {
FAT32FilesDel(dv,cur_dir,de.name,0,FALSE,FALSE);
if (attr & RS_ATTR_CONTIGUOUS)
Kernel/BlkDev/FileSysRedSea.HC
+4 -6
View File
@@ -166,7 +166,7 @@ Bool RedSeaFileFind(CDrv *dv,I64 cur_dir_clus,U8 *name,
if (dv->fs_type!=FSt_REDSEA)
PrintErr("Not RedSea Drv\n");
else if (!CFileNameTo(dname,name))
PrintErr("Invalid FileName.\n");
PrintErr("Invalid FileName: \"%s\".\n",name);
else
try {
unlock=DrvLock(dv);
@@ -240,10 +240,8 @@ Bool RedSeaCd(U8 *name,I64 cur_dir_clus)
PrintErr("Not RedSea Drv\n");
else if (RedSeaFileFind(Fs->cur_dv,cur_dir_clus,name,&de,FUF_JUST_DIRS))
return TRUE;
else {
"%s ",name;
PrintErr("File not found.\n");
}
else
PrintErr("File not found: \"%s\".\n",name);
return FALSE;
}
@@ -518,7 +516,7 @@ I64 RedSeaFileWrite(CDrv *dv,U8 *cur_dir,U8 *name,U8 *buf,I64 size,
if (dv->fs_type!=FSt_REDSEA)
PrintErr("Not RedSea Drv\n");
else if (!CFileNameTo(de.name,name))
PrintErr("Invalid FileName.\n");
PrintErr("Invalid FileName: \"%s\".\n",name);
else {
RedSeaFilesDel(dv,cur_dir,de.name,0,FALSE,FALSE);
de.size=size;
Kernel/BlkDev/MakeBlkDev.HC
-1
View File
@@ -10,7 +10,6 @@
#include "DskStrB"
#include "DskAddDev"
#include "DskDirA"
#include "FileSysISO"
#include "FileSysRedSea"
#include "FileSysFAT"
#include "DskDirContext"