Apple-2-Tools/diskm8
1
0
Fork 0
mirror of https://github.com/paleotronic/diskm8.git synced 2024-12-30 02:32:14 +00:00
Code Issues Projects Releases Wiki Activity

feat(disk/diskimagepd.go): start of handling work for non std volumes

Browse Source
This commit is contained in:
April Ayres-Griffiths 2024-05-25 08:51:05 -07:00
parent 7d13e7f8d8
commit 5135679d0b
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
disk/diskimagepd.go
View File

@ -5,6 +5,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"time" "time"
"fmt"
) )
type VDH struct { type VDH struct {
@ -264,6 +265,28 @@ func (dsk *DSKWrapper) IsProDOS() (bool, DiskFormat, SectorOrder) {
} }
} else {
fmt.Println("Trying alternative format identification")
layouts := []SectorOrder{SectorOrderDOS33, SectorOrderDOS33Alt, SectorOrderProDOS, SectorOrderProDOSLinear}
for _, l := range layouts {
dsk.Layout = l
vdh, err := dsk.PRODOSGetVDH(2)
if err != nil {
return false, oldFormat, oldLayout
}
fmt.Printf("Blocks = %d, Size/512 = %d, Storage Type = %d\n", vdh.GetTotalBlocks(), len(dsk.Data)/512, vdh.GetStorageType())
if vdh.GetStorageType() == 0xf && vdh.GetTotalBlocks() == len(dsk.Data)/512 {
return true, GetDiskFormat(DF_PRODOS_CUSTOM), l
}
}
} }
return false, oldFormat, oldLayout return false, oldFormat, oldLayout
@ -834,6 +857,15 @@ func (fd *ProDOSFileDescriptor) HeaderPointer() int {
func (d *DSKWrapper) PRODOS800GetBlock(block int) ([]byte, error) { func (d *DSKWrapper) PRODOS800GetBlock(block int) ([]byte, error) {
if len(d.Data) > 819200 {
maxblocks := len(d.Data) / 512
if block < maxblocks {
offset := 512 * block
return d.Data[offset : offset+512], nil
}
return nil, errors.New("Invalid block")
}
t, s1, s2 := d.PRODOS800GetBlockSectors(block) t, s1, s2 := d.PRODOS800GetBlockSectors(block)
e := d.Seek(t, s1) e := d.Seek(t, s1)
@ -977,9 +1009,13 @@ func (d *DSKWrapper) PRODOSGetCatalog(startblock int, pattern string) (*VDH, []P
var e error var e error
var vtoc *VDH var vtoc *VDH
if d.Format.ID == DF_PRODOS_800KB { fmt.Printf("FormatID = %s", d.Format.String())
if d.Format.ID == DF_PRODOS_800KB || d.Format.ID == DF_PRODOS_CUSTOM {
fmt.Println("HC VDH")
vtoc, e = d.PRODOS800GetVDH(startblock) vtoc, e = d.PRODOS800GetVDH(startblock)
} else { } else {
fmt.Println("LC VDH")
vtoc, e = d.PRODOSGetVDH(startblock) vtoc, e = d.PRODOSGetVDH(startblock)
} }
if e != nil { if e != nil {
@ -993,7 +1029,7 @@ func (d *DSKWrapper) PRODOSGetCatalog(startblock int, pattern string) (*VDH, []P
refnum := startblock refnum := startblock
var data []byte var data []byte
if d.Format.ID == DF_PRODOS_800KB { if d.Format.ID == DF_PRODOS_800KB || d.Format.ID == DF_PRODOS_CUSTOM {
data, _ = d.PRODOS800GetBlock(refnum) data, _ = d.PRODOS800GetBlock(refnum)
} else { } else {
data, _ = d.PRODOSGetBlock(refnum) data, _ = d.PRODOSGetBlock(refnum)
@ -1001,7 +1037,7 @@ func (d *DSKWrapper) PRODOSGetCatalog(startblock int, pattern string) (*VDH, []P
nextblock := int(data[2]) + 256*int(data[3]) nextblock := int(data[2]) + 256*int(data[3])
//fmt.Printf("ActiveCount = %d\n", filecount) fmt.Printf("ActiveCount = %d\n", filecount)
entrypointer := 4 + PRODOS_ENTRY_SIZE entrypointer := 4 + PRODOS_ENTRY_SIZE
@ -1017,7 +1053,7 @@ func (d *DSKWrapper) PRODOSGetCatalog(startblock int, pattern string) (*VDH, []P
var skipname bool = false var skipname bool = false
if re != nil { if re != nil {
//fmt.Printf("Checking [%s] against regex /%s/\n", fd.Name(), patterntmp) fmt.Printf("Checking [%s] against regex /%s/\n", fd.Name(), patterntmp)
skipname = !re.MatchString(fd.Name()) skipname = !re.MatchString(fd.Name())
} }
@ -1033,7 +1069,7 @@ func (d *DSKWrapper) PRODOSGetCatalog(startblock int, pattern string) (*VDH, []P
if activeentries < filecount { if activeentries < filecount {
if blockentries == entriesperblock { if blockentries == entriesperblock {
refnum = nextblock refnum = nextblock
if d.Format.ID == DF_PRODOS_800KB { if d.Format.ID == DF_PRODOS_800KB || d.Format.ID == DF_PRODOS_CUSTOM {
data, err = d.PRODOS800GetBlock(refnum) data, err = d.PRODOS800GetBlock(refnum)
} else { } else {
data, err = d.PRODOSGetBlock(refnum) data, err = d.PRODOSGetBlock(refnum)
@ -1063,7 +1099,7 @@ func (d *DSKWrapper) PRODOSReadFileSectors(fd ProDOSFileDescriptor, maxblocks in
switch fd.GetStorageType() { switch fd.GetStorageType() {
case StorageType_Seedling: case StorageType_Seedling:
/* single block pointed to */ /* single block pointed to */
if d.Format.ID == DF_PRODOS_800KB { if d.Format.ID == DF_PRODOS_800KB || d.Format.ID == DF_PRODOS_CUSTOM {
data, _ = d.PRODOS800GetBlock(fd.IndexBlock()) data, _ = d.PRODOS800GetBlock(fd.IndexBlock())
} else { } else {
data, _ = d.PRODOSGetBlock(fd.IndexBlock()) data, _ = d.PRODOSGetBlock(fd.IndexBlock())
@ -1074,7 +1110,7 @@ func (d *DSKWrapper) PRODOSReadFileSectors(fd ProDOSFileDescriptor, maxblocks in
} }
return data[:count], e return data[:count], e
case StorageType_Sapling: case StorageType_Sapling:
if d.Format.ID == DF_PRODOS_800KB { if d.Format.ID == DF_PRODOS_800KB || d.Format.ID == DF_PRODOS_CUSTOM {
index, _ = d.PRODOS800GetBlock(fd.IndexBlock()) index, _ = d.PRODOS800GetBlock(fd.IndexBlock())
} else { } else {
index, _ = d.PRODOSGetBlock(fd.IndexBlock()) index, _ = d.PRODOSGetBlock(fd.IndexBlock())