From 97c122ca4f8c475d01cfe0739054281966d96b39 Mon Sep 17 00:00:00 2001 From: Nigel Barnes Date: Sat, 16 Jul 2016 18:37:46 +0100 Subject: [PATCH] fsd_dsk: more logging (nw) --- src/lib/formats/fsd_dsk.cpp | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/lib/formats/fsd_dsk.cpp b/src/lib/formats/fsd_dsk.cpp index 0896c47d8ac..2d31be1123c 100644 --- a/src/lib/formats/fsd_dsk.cpp +++ b/src/lib/formats/fsd_dsk.cpp @@ -98,6 +98,11 @@ int fsd_format::identify(io_generic *io, UINT32 form_factor) bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) { + const char* result[255]; + result[0x00] = "OK"; + result[0x0e] = "Data CRC Error"; + result[0x20] = "Deleted Data"; + UINT64 size = io_generic_size(io); dynamic_buffer img(size); io_generic_read(io, &img[0], 0, size); @@ -105,28 +110,32 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) UINT64 pos; std::string title; for(pos=8; pos < size && img[pos] != '\0'; pos++) - title += char(img[pos]); + title.append(1, img[pos]); pos++; if(pos >= size) return false; - //popmessage("Loading image of '%s'\n", title); + LOG_FORMATS("FSD Title: %s\n", title.c_str()); + LOG_FORMATS("FSD Created: %02d/%02d/%4d\n", (img[3] & 0xf8) / 8, img[5] & 0x0f, (img[3] & 0x07) * 256 + img[4]); + LOG_FORMATS("FSD Creator: %d\n", (img[5] & 0xf0) / 16); + LOG_FORMATS("FSD Release: %d\n", ((img[7] & 0xc0) / 64) * 256 + img[6]); desc_pc_sector sects[256]; UINT8 total_tracks = img[pos++]; UINT8 tnum, hnum, snum, ssize, error; hnum = 0; - LOG_FORMATS("%02d Tracks\n", total_tracks+1); + LOG_FORMATS("FSD Tracks: %02d\n", total_tracks+1); LOG_FORMATS("Tr.# No.S Sec.# Tr.ID Head# SecID IDsiz REsiz Error\n"); for(int curr_track=0; curr_track <= total_tracks; curr_track++) { UINT8 track = img[pos++]; UINT8 spt = img[pos++]; - LOG_FORMATS("%02X %02X\n", track, spt); + if (spt > 0) // formatted { + LOG_FORMATS("%02X %02X\n", track, spt); UINT8 readable = img[pos++]; for (int i = 0; i < spt; i++) { @@ -140,22 +149,23 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) sects[i].size = ssize; if (readable == 0xff) { - sects[i].actual_size = 1 << (img[pos++] + 7); + sects[i].actual_size = 128 << img[pos++]; error = img[pos++]; sects[i].deleted = (error & 0x20) == 0x20; sects[i].bad_crc = (error & 0x0e) == 0x0e; sects[i].data = &img[pos]; pos += sects[i].actual_size; - LOG_FORMATS("Read %02X %02X %02X %02X %02X %02X %02X\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, error); + LOG_FORMATS("Read %02X %02X %02X %02X %04X %04X %s\n", i, sects[i].track, sects[i].head, sects[i].sector, 128 << sects[i].size, sects[i].actual_size, result[error]); } else { - LOG_FORMATS("Unreadable sector on track %02d sector %02X head %02d", track, i, hnum); + LOG_FORMATS("Unreadable sector on track %02d sector %02X head %02d\n", track, i, hnum); sects[i].actual_size = 0; sects[i].deleted = false; sects[i].bad_crc = false; sects[i].data = nullptr; - LOG_FORMATS("Unread %02X %02X %02X %02X %02X %02X %02X\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, 0); + LOG_FORMATS("Unread %02X %02X %02X %02X %04X %04X %s\n", i, sects[i].track, sects[i].head, sects[i].sector, sects[i].size, sects[i].actual_size, "Unreadable"); + //return false; } } } @@ -165,7 +175,7 @@ bool fsd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) sects[0].head = hnum; sects[0].sector = 0; sects[0].size = 0; - LOG_FORMATS("Unform %02X %02X %02X %02X %02X %02X %02X\n", 0, sects[0].track, sects[0].head, sects[0].sector, sects[0].size, sects[0].actual_size, 0); + LOG_FORMATS("Unform %02X %02X %02X %02X %04X %04X %s\n", 0, sects[0].track, sects[0].head, sects[0].sector, sects[0].size, sects[0].actual_size, "Unformatted"); } build_wd_track_fm(curr_track, hnum, image, 50000, spt, sects, 10, 40, 10); }