Apple-2-SW/ProDOS-Utils
1
0
Fork 0
mirror of https://github.com/bobbimanners/ProDOS-Utils.git synced 2024-06-17 00:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Aux memory support seems to be working (disabled by default)

Browse Source
This commit is contained in:
Bobbi Webber-Manners 2020-05-25 22:51:05 -04:00
parent e36c43b7dc
commit 2eabedc761
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sortdir.c
View File

@ -1327,7 +1327,6 @@ int readdir(uint device, uint blocknum) {
copyaux(dirblkbuf, curblk->data, BLKSZ, TOAUX); copyaux(dirblkbuf, curblk->data, BLKSZ, TOAUX);
bzero(dirblkbuf + PTRSZ, BLKSZ - PTRSZ); bzero(dirblkbuf + PTRSZ, BLKSZ - PTRSZ);
copyaux(dirblkbuf, curblk->sorteddata, BLKSZ, TOAUX); copyaux(dirblkbuf, curblk->sorteddata, BLKSZ, TOAUX);
freeallaux();
#else #else
memcpy(curblk->data, dirblkbuf, BLKSZ); memcpy(curblk->data, dirblkbuf, BLKSZ);
bzero(dirblkbuf + PTRSZ, BLKSZ - PTRSZ); bzero(dirblkbuf + PTRSZ, BLKSZ - PTRSZ);
@ -1620,7 +1619,6 @@ uint blockidxtoblocknum(uint idx) {
/* /*
* Copy a file entry from one srcblk, srcent to dstblk, dstent * Copy a file entry from one srcblk, srcent to dstblk, dstent
* All indices are 1-based. * All indices are 1-based.
* TODO: HANDLE AUX MEMORY
*/ */
void copyent(uint srcblk, uint srcent, uint dstblk, uint dstent, uint device) { void copyent(uint srcblk, uint srcent, uint dstblk, uint dstent, uint device) {
struct block *source = blocks, *dest = blocks; struct block *source = blocks, *dest = blocks;
@ -1642,10 +1640,19 @@ void copyent(uint srcblk, uint srcent, uint dstblk, uint dstent, uint device) {
dest = dest->next; dest = dest->next;
srcptr = source->data + PTRSZ + (srcent-1) * entsz; srcptr = source->data + PTRSZ + (srcent-1) * entsz;
dstptr = dest->sorteddata + PTRSZ + (dstent-1) * entsz; dstptr = dest->sorteddata + PTRSZ + (dstent-1) * entsz;
#ifdef AUXMEM
copyaux(srcptr, buf2, entsz, FROMAUX);
copyaux(buf2, dstptr, entsz, TOAUX);
#else
memcpy(dstptr, srcptr, entsz); memcpy(dstptr, srcptr, entsz);
#endif
/* For directories, update the parent dir entry number */ /* For directories, update the parent dir entry number */
#ifdef AUXMEM
ent = (struct pd_dirent*)buf2;
#else
ent = (struct pd_dirent*)dstptr; ent = (struct pd_dirent*)dstptr;
#endif
if ((ent->typ_len & 0xf0) == 0xd0) { if ((ent->typ_len & 0xf0) == 0xd0) {
uint block = ent->keyptr[0] + 256U * ent->keyptr[1]; uint block = ent->keyptr[0] + 256U * ent->keyptr[1];
if (readdiskblock(device, block, buf) == -1) if (readdiskblock(device, block, buf) == -1)
@ -1920,6 +1927,9 @@ void processdir(uint device, uint blocknum) {
} }
done: done:
freeblocks(); freeblocks();
#ifdef AUXMEM
freeallaux();
#endif
} }
/* /*

BIN
sortdir.po
View File

Binary file not shown.