Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2026-04-19 03:22:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix "re-insert" disk edge case

Browse Source
This commit is contained in:
Aaron Culliney
2016-02-17 21:51:28 -08:00
parent e073954ec8
commit 00a5f6e102
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/disk.c
+27 -5
View File
@@ -719,8 +719,9 @@ void disk6_init(void) {
stepper_phases = 0;
disk6.disk[0].phase = disk6.disk[1].phase = 0;
disk6.disk[0].track_valid = disk6.disk[1].track_valid = 0;
disk6.disk[0].track_dirty = disk6.disk[1].track_dirty = 0;
disk6.disk[0].run_byte = disk6.disk[1].run_byte = 0;
disk6.disk[0].track_valid = disk6.disk[1].track_valid = false;
disk6.disk[0].track_dirty = disk6.disk[1].track_dirty = false;
disk6.motor_time = (struct timespec){ 0 };
disk6.motor_off = 1;
disk6.drive = 0;
@@ -767,11 +768,26 @@ const char *disk6_eject(int drive) {
}
STRDUP_FREE(disk6.disk[drive].file_name);
memset(&disk6.disk[drive], 0x0, sizeof(disk6.disk[drive]));
disk6.disk[drive].fd = -1;
disk6.disk[drive].whole_len = -1;
disk6.disk[drive].mmap_image = MAP_FAILED;
disk6.disk[drive].whole_len = 0;
disk6.disk[drive].whole_image = NULL;
disk6.disk[drive].nibblized = false;
disk6.disk[drive].is_protected = false;
disk6.disk[drive].track_valid = false;
disk6.disk[drive].track_dirty = false;
disk6.disk[drive].skew_table = NULL;
disk6.disk[drive].track_width = 0;
// WARNING DO NOT RESET certain disk parameters on simple eject. We need to retain state in the case where an image
// was "re-inserted" ... e.g. Drol load screen)
//disk6.disk[drive].phase = 0;
//disk6.disk[drive].run_byte = 0;
//disk6.motor_time = (struct timespec){ 0 };
//disk6.motor_off = 1;
//disk6.drive = 0;
//disk6.ddrw = 0;
return err;
}
@@ -852,6 +868,8 @@ const char *disk6_insert(int drive, const char * const raw_file_name, int readon
disk6.disk[drive].whole_image = disk6.disk[drive].mmap_image;
disk6.disk[drive].track_width = NIB_TRACK_SIZE;
int lastphase = disk6.disk[drive].phase;
if (!disk6.disk[drive].nibblized) {
// DSK/DO/PO require nibblizing on read (and denibblizing on write) ...
@@ -886,7 +904,7 @@ const char *disk6_insert(int drive, const char * const raw_file_name, int readon
// ...
}
disk6.disk[drive].phase = 0;
disk6.disk[drive].phase = lastphase; // needed for some images when "re-inserted" ... e.g. Drol load screen
} while (0);
if (err) {
@@ -905,6 +923,10 @@ void disk6_flush(int drive) {
return;
}
if (disk6.disk[drive].mmap_image == MAP_FAILED) {
return;
}
if (disk6.disk[drive].track_dirty) {
LOG("WARNING : flushing previous session for drive (%d)...", drive+1);
save_track_data(drive);
src/zlib-helpers.c
+2 -2
View File
@@ -51,7 +51,7 @@ static const char* const _gzerr(gzFile gzf) {
}
}
/* Compress some_file to some_file.gz and unlink previous.
/* Compress some_file to some_file.gz
*
* If expected_bytecount > 0, check that byte count written matches expected.
*
@@ -142,7 +142,7 @@ const char *zlib_deflate(const char* const src, const int expected_bytecount) {
return err;
}
/* Decompress some_file.gz to some_file and unlink previous.
/* Decompress some_file.gz to some_file
*
* If expected_bytecount > 0, check that byte count read matches expected.
*