diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/lib/formats/hpi_dsk.h | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/lib/formats/hpi_dsk.h')
-rw-r--r-- | src/lib/formats/hpi_dsk.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/formats/hpi_dsk.h b/src/lib/formats/hpi_dsk.h index 8457db1ea24..287f37fd302 100644 --- a/src/lib/formats/hpi_dsk.h +++ b/src/lib/formats/hpi_dsk.h @@ -36,6 +36,7 @@ public: private: typedef std::array<uint8_t , HPI_SECTORS> sector_list_t; + static bool geometry_from_size(uint64_t image_size , unsigned& heads , unsigned& tracks); static void interleaved_sectors(unsigned il_factor , sector_list_t& sector_list); void write_mmfm_bit(std::vector<uint32_t> &buffer , bool data_bit , bool clock_bit); void write_mmfm_byte(std::vector<uint32_t> &buffer , uint8_t data , uint8_t clock = 0); @@ -43,7 +44,7 @@ private: void write_crc(std::vector<uint32_t> &buffer , uint16_t crc); void write_sector(std::vector<uint32_t> &buffer , uint8_t track_no , uint8_t sect_head_no , const uint8_t *sect_data); void fill_with_gap3(std::vector<uint32_t> &buffer); - static unsigned chs_to_lba(unsigned cylinder , unsigned head , unsigned sector); + static unsigned chs_to_lba(unsigned cylinder , unsigned head , unsigned sector , unsigned heads); std::vector<uint8_t> get_next_id_n_block(const uint8_t *bitstream , int bitstream_size , int& pos , int& start_pos); bool get_next_sector(const uint8_t *bitstream , int bitstream_size , int& pos , unsigned& track , unsigned& head , unsigned& sector , uint8_t *sector_data); |