xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

efi: allow access to iso filesystem on non-cdrom media (iso/hybrid)

Browse source
This commit is contained in:
cinap_lenrek 2016-05-22 15:22:46 +02:00
parent 9adaf2e7f8
commit 66b1a83b74
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
sys/src/boot/efi/iso.c
View file

@ -73,6 +73,7 @@ static EFI_BLOCK_IO_PROTOCOL *bio;
static int static int
readsect(ulong lba, void *buf) readsect(ulong lba, void *buf)
{ {
lba *= Sectsz/bio->Media->BlockSize;
return eficall(bio->ReadBlocks, bio, (UINTN)bio->Media->MediaId, (UINT64)lba, (UINTN)Sectsz, buf); return eficall(bio->ReadBlocks, bio, (UINTN)bio->Media->MediaId, (UINT64)lba, (UINTN)Sectsz, buf);
} }
@ -117,11 +118,15 @@ isowalk(Extend *ex, char *path)
for(i=0x10; i<0x1000; i++){ for(i=0x10; i<0x1000; i++){
if(readsect(i, ex->buf)) if(readsect(i, ex->buf))
return -1; return -1;
if(*ex->buf == 1) if(memcmp(ex->buf, "\001CD001\001", 7) == 0)
break; goto Foundpvd;
} }
return -1;
Foundpvd:
ex->lba = *((ulong*)(ex->buf + 156 + 2)); ex->lba = *((ulong*)(ex->buf + 156 + 2));
ex->len = *((ulong*)(ex->buf + 156 + 10)); ex->len = *((ulong*)(ex->buf + 156 + 10));
if(*path == 0)
return 0;
for(;;){ for(;;){
if(readn(ex, &d, Dirsz) != Dirsz) if(readn(ex, &d, Dirsz) != Dirsz)
@ -197,9 +202,9 @@ isoinit(void **fp)
media = bio->Media; media = bio->Media;
if(media != nil if(media != nil
&& media->MediaPresent && media->MediaPresent
&& media->RemovableMedia
&& media->LogicalPartition == 0 && media->LogicalPartition == 0
&& media->BlockSize == Sectsz) && media->BlockSize != 0
&& isoopen("") != nil)
goto Found; goto Found;
} }
return -1; return -1;