Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-12-25 03:29:38 +00:00
Code Issues Projects Releases Wiki Activity

Superdrive: method for retrieving disk data.

Browse Source
This commit is contained in:
Maxim Poliakovski 2022-02-15 15:49:12 +01:00
parent 9da4a9ec6a
commit e91843034b
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
devices/floppy/superdrive.cpp
View File

@ -187,8 +187,8 @@ void MacSuperDrive::switch_drive_mode(int mode)
for (int trk = 0; trk < 16; trk++) { for (int trk = 0; trk < 16; trk++) {
this->sectors_per_track[grp * 16 + trk] = 12 - grp; this->sectors_per_track[grp * 16 + trk] = 12 - grp;
this->rpm_per_track[grp * 16 + trk] = gcr_rpm_per_group[grp]; this->rpm_per_track[grp * 16 + trk] = gcr_rpm_per_group[grp];
this->track_start_block[grp * 16 + trk] = blk_num; this->track2lblk[grp * 16 + trk] = blk_num;
blk_num += 12 - grp; blk_num += (12 - grp) * this->num_sides;
} }
} }
@ -201,7 +201,7 @@ void MacSuperDrive::switch_drive_mode(int mode)
for (int trk = 0; trk < 80; trk++) { for (int trk = 0; trk < 80; trk++) {
this->sectors_per_track[trk] = sectors_per_track; this->sectors_per_track[trk] = sectors_per_track;
this->rpm_per_track[trk] = 300; this->rpm_per_track[trk] = 300;
this->track_start_block[trk] = trk * sectors_per_track; this->track2lblk[trk] = trk * sectors_per_track * 2;
} }
this->drive_mode = RecMethod::MFM; this->drive_mode = RecMethod::MFM;
@ -230,10 +230,27 @@ void MacSuperDrive::init_track_search(int pos)
SectorHdr MacSuperDrive::next_sector_header() SectorHdr MacSuperDrive::next_sector_header()
{ {
this->cur_sector++;
if (this->cur_sector >= this->sectors_per_track[this->cur_track]) {
this->cur_sector = 0;
}
// MFM sector numbering is 1-based so we need to bump sector number
int sector_num = this->cur_sector + ((this->rec_method == RecMethod::MFM) ? 1 : 0);
return SectorHdr { return SectorHdr {
this->cur_track, this->cur_track,
this->cur_head, this->cur_head,
this->cur_sector++, sector_num,
this->format_byte this->format_byte
}; };
} }
char* MacSuperDrive::get_sector_data_ptr(int sector_num)
{
return this->disk_data.get() +
((this->track2lblk[this->cur_track] +
(this->cur_head * this->sectors_per_track[this->cur_track]) +
sector_num - 1) * 512
);
}

3
devices/floppy/superdrive.h
View File

@ -91,6 +91,7 @@ public:
double get_sector_delay(); double get_sector_delay();
void init_track_search(int pos); void init_track_search(int pos);
SectorHdr next_sector_header(); SectorHdr next_sector_header();
char* get_sector_data_ptr(int sector_num);
protected: protected:
void set_disk_phys_params(); void set_disk_phys_params();
@ -117,7 +118,7 @@ private:
int num_sides; int num_sides;
int sectors_per_track[80]; int sectors_per_track[80];
int rpm_per_track[80]; int rpm_per_track[80];
int track_start_block[80]; // logical block number of the first sector in a track int track2lblk[80]; // convert track number to first logical block number
std::unique_ptr<FloppyImgConverter> img_conv; std::unique_ptr<FloppyImgConverter> img_conv;