diff options
| author | 2011-07-26 22:38:10 +0000 | |
|---|---|---|
| committer | 2011-07-26 22:38:10 +0000 | |
| commit | c6e2fca80a223d168c5118d0c2d7d4d2cbb410a2 (patch) | |
| tree | 2d4d4b6016d9f52cf5ca7b678434adcb7dac9746 /src/lib/formats | |
| parent | 1ba8f0ec727487eda5ec114f7718d029b0c82f71 (diff) | |
Cleanups and version bumpmame0143u2
Diffstat (limited to 'src/lib/formats')
| -rw-r--r-- | src/lib/formats/ami_dsk.c | 10 | ||||
| -rw-r--r-- | src/lib/formats/ami_dsk.h | 4 | ||||
| -rw-r--r-- | src/lib/formats/flopimg.h | 14 | ||||
| -rw-r--r-- | src/lib/formats/hxcmfm_dsk.c | 16 | ||||
| -rw-r--r-- | src/lib/formats/hxcmfm_dsk.h | 4 |
5 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/formats/ami_dsk.c b/src/lib/formats/ami_dsk.c index cb4e95f37af..f66fecbc169 100644 --- a/src/lib/formats/ami_dsk.c +++ b/src/lib/formats/ami_dsk.c @@ -16,7 +16,7 @@ adf_format::adf_format(const char *name,const char *extensions,const char *descr int adf_format::identify(floppy_image *image) { UINT64 size = image->image_size(); - if ((size == 901120) || (size == 1802240)) + if ((size == 901120) || (size == 1802240)) { return 100; } @@ -38,13 +38,13 @@ bool adf_format::load(floppy_image *image) UINT8 *mfm = NULL; UINT8 temp_cyl[512*11]; UINT16 sector_len = 512*11; - image->set_meta_data(80,2,300,(UINT16)253360); + image->set_meta_data(80,2,300,(UINT16)253360); for(int track=0; track < 80; track++) { for(int side=0; side < 2; side++) { UINT16 offset = ((track<<1)+side); - mfm = image->get_buffer(track,side); - image->set_track_size(track, side, MAX_MFM_TRACK_LEN); - image->image_read(temp_cyl, offset*sector_len, sector_len); + mfm = image->get_buffer(track,side); + image->set_track_size(track, side, MAX_MFM_TRACK_LEN); + image->image_read(temp_cyl, offset*sector_len, sector_len); memset( &mfm[ONE_SECTOR_BYTES*11], 0xaa, GAP_TRACK_BYTES ); for (int sector = 0; sector < 11; sector++ ) { diff --git a/src/lib/formats/ami_dsk.h b/src/lib/formats/ami_dsk.h index 3377050be34..5a3a91edc85 100644 --- a/src/lib/formats/ami_dsk.h +++ b/src/lib/formats/ami_dsk.h @@ -11,11 +11,11 @@ #include "flopimg.h" -class adf_format : public floppy_image_format_t +class adf_format : public floppy_image_format_t { public: adf_format(const char *name,const char *extensions,const char *description,const char *param_guidelines); - + virtual int identify(floppy_image *image); virtual bool load(floppy_image *image); }; diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h index 06cd989f1da..04c62e8625a 100644 --- a/src/lib/formats/flopimg.h +++ b/src/lib/formats/flopimg.h @@ -224,10 +224,10 @@ class floppy_image_format_t public: floppy_image_format_t(const char *name,const char *extensions,const char *description,const char *param_guidelines); virtual ~floppy_image_format_t(); - + virtual int identify(floppy_image *image) = 0; virtual bool load(floppy_image *image) = 0; -protected: +protected: const char *m_name; const char *m_extensions; const char *m_description; @@ -272,7 +272,7 @@ struct floppy_format_def #define FLOPPY_OPTIONS_END \ FLOPPY_OPTIONS_END0 - + // ======================> floppy_image #define MAX_FLOPPY_SIDES 2 @@ -286,13 +286,13 @@ public: // construction/destruction floppy_image(void *fp, const struct io_procs *procs,const struct floppy_format_def *formats); virtual ~floppy_image(); - + void image_read(void *buffer, UINT64 offset, size_t length); void image_write(const void *buffer, UINT64 offset, size_t length); void image_write_filler(UINT8 filler, UINT64 offset, size_t length); UINT64 image_size(); void close(); - + void set_meta_data(UINT16 tracks, UINT8 sides, UINT16 rpm, UINT16 bitrate); void set_track_size(UINT16 track, UINT8 side, UINT16 size) { m_track_size[(track << 1) + side] = size; } const struct floppy_format_def *identify(int *best); @@ -301,13 +301,13 @@ public: bool load(int num); private: void close_internal(bool close_file); - struct io_generic m_io; + struct io_generic m_io; const struct floppy_format_def *m_formats; UINT16 m_tracks; UINT8 m_sides; UINT16 m_rpm; UINT16 m_bitrate; - + UINT8 m_native_data[MAX_FLOPPY_SIDES * MAX_FLOPPY_TRACKS][MAX_TRACK_DATA]; UINT16 m_track_size[MAX_FLOPPY_SIDES * MAX_FLOPPY_TRACKS]; }; diff --git a/src/lib/formats/hxcmfm_dsk.c b/src/lib/formats/hxcmfm_dsk.c index 8e293940871..9e6e18c5a50 100644 --- a/src/lib/formats/hxcmfm_dsk.c +++ b/src/lib/formats/hxcmfm_dsk.c @@ -23,7 +23,7 @@ struct MFMTRACKIMG UINT16 track_number; UINT8 side_number; UINT32 mfmtracksize; - UINT32 mfmtrackoffset; + UINT32 mfmtrackoffset; }; #pragma pack() @@ -48,17 +48,17 @@ bool mfm_format::load(floppy_image *image) { MFMIMG header; MFMTRACKIMG trackdesc; - + // read header - image->image_read(&header,0, sizeof(header)); - + image->image_read(&header,0, sizeof(header)); + image->set_meta_data(header.number_of_track,header.number_of_side,header.floppyRPM,header.floppyBitRate); - + for(int track=0; track < header.number_of_track; track++) { for(int side=0; side < header.number_of_side; side++) { - // read location of + // read location of image->image_read(&trackdesc,(header.mfmtracklistoffset)+((( track << 1 ) + side)*sizeof(trackdesc)),sizeof(trackdesc)); - + image->set_track_size(track, side, trackdesc.mfmtracksize); // actual data read image->image_read(image->get_buffer(track,side), trackdesc.mfmtrackoffset, trackdesc.mfmtracksize); @@ -67,4 +67,4 @@ bool mfm_format::load(floppy_image *image) return FALSE; } -const floppy_format_type FLOPPY_MFM_FORMAT = &floppy_image_format_creator<mfm_format>;
\ No newline at end of file +const floppy_format_type FLOPPY_MFM_FORMAT = &floppy_image_format_creator<mfm_format>; diff --git a/src/lib/formats/hxcmfm_dsk.h b/src/lib/formats/hxcmfm_dsk.h index dd3247e49d0..e29c10aca75 100644 --- a/src/lib/formats/hxcmfm_dsk.h +++ b/src/lib/formats/hxcmfm_dsk.h @@ -11,11 +11,11 @@ #include "flopimg.h" -class mfm_format : public floppy_image_format_t +class mfm_format : public floppy_image_format_t { public: mfm_format(const char *name,const char *extensions,const char *description,const char *param_guidelines); - + virtual int identify(floppy_image *image); virtual bool load(floppy_image *image); }; |
