Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for writing data-less sectors in IMD. #336

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for writing data-less sectors in IMD. #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/greaseweazle/codec/ibm/ibm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ def decode_raw(self, raw: PLLTrack, pll: Optional[PLL],
list: List[Any]
if isinstance(a, IAM):
list = self.iams
elif isinstance(a, Sector):
elif isinstance(a, Sector) or isinstance(a, IDAM):
list = self.sectors
else:
continue
Expand Down
25 changes: 16 additions & 9 deletions src/greaseweazle/image/imd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,23 @@ def get_image(self) -> bytes:
cyl, head, nsec, sec_n = c, h, 0, None
rmap, cmap, hmap = [], [], []
for s in t.sectors:
if not isinstance(s, ibm.Sector):
if isinstance(s, ibm.Sector):
idam = s.idam
elif isinstance(s, ibm.IDAM):
idam = s
else:
continue
nsec += 1
error.check(s.idam.n == sec_n or sec_n is None,
error.check(idam.n == sec_n or sec_n is None,
'IMD: Cannot create T%d.%d: Sectors vary in size'
% (c,h))
sec_n = s.idam.n
rmap.append(s.idam.r)
cmap.append(s.idam.c)
hmap.append(s.idam.h)
if s.idam.c != c:
sec_n = idam.n
rmap.append(idam.r)
cmap.append(idam.c)
hmap.append(idam.h)
if idam.c != c:
head |= 0x80
if s.idam.h != h:
if idam.h != h:
head |= 0x40
if sec_n is None:
sec_n = 0
Expand All @@ -187,7 +191,10 @@ def get_image(self) -> bytes:
if head & 0x40:
tdat += bytes(hmap)
for s in t.sectors:
if not isinstance(s, ibm.Sector):
if isinstance(s, ibm.IDAM):
tdat += bytes([0])
continue
elif not isinstance(s, ibm.Sector):
continue
rec = 0
if s.dam.data.count(s.dam.data[0]) == secsz:
Expand Down