diff options
Diffstat (limited to 'src/mess/tools')
| -rw-r--r-- | src/mess/tools/imgtool/charconv.h | 2 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/imgterrs.h | 2 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/library.h | 18 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/amiga.c | 4 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/concept.c | 12 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/fat.c | 4 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/mac.c | 72 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/macutil.h | 4 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/os9.c | 2 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/prodos.c | 2 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/ti99.c | 48 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/ti990hd.c | 32 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/modules/vzdos.c | 4 | ||||
| -rw-r--r-- | src/mess/tools/imgtool/stream.c | 2 |
14 files changed, 104 insertions, 104 deletions
diff --git a/src/mess/tools/imgtool/charconv.h b/src/mess/tools/imgtool/charconv.h index 6a2b3042ff3..1d811eef99a 100644 --- a/src/mess/tools/imgtool/charconv.h +++ b/src/mess/tools/imgtool/charconv.h @@ -12,7 +12,7 @@ /* Supported character sets */ -enum imgtool_charset +enum imgtool_charset { IMGTOOL_CHARSET_UTF8, IMGTOOL_CHARSET_ISO_8859_1, diff --git a/src/mess/tools/imgtool/imgterrs.h b/src/mess/tools/imgtool/imgterrs.h index fe75b46c273..6b17631c5fc 100644 --- a/src/mess/tools/imgtool/imgterrs.h +++ b/src/mess/tools/imgtool/imgterrs.h @@ -10,7 +10,7 @@ #define IMGTERRS_H /* Error codes */ -enum imgtoolerr_t +enum imgtoolerr_t { IMGTOOLERR_SUCCESS, IMGTOOLERR_OUTOFMEMORY, diff --git a/src/mess/tools/imgtool/library.h b/src/mess/tools/imgtool/library.h index 9717e52e088..f46344ce578 100644 --- a/src/mess/tools/imgtool/library.h +++ b/src/mess/tools/imgtool/library.h @@ -30,7 +30,7 @@ struct imgtool_partition; struct imgtool_directory; struct imgtool_library; -enum imgtool_suggestion_viability_t +enum imgtool_suggestion_viability_t { SUGGESTION_END, SUGGESTION_POSSIBLE, @@ -51,13 +51,13 @@ union filterinfo typedef void (*filter_getinfoproc)(UINT32 state, union filterinfo *info); -enum imgtool_libsort_t +enum imgtool_libsort_t { ITLS_NAME, ITLS_DESCRIPTION }; -struct imgtool_dirent +struct imgtool_dirent { char filename[1024]; char attr[64]; @@ -77,13 +77,13 @@ struct imgtool_dirent unsigned int hardlink : 1; }; -struct imgtool_chainent +struct imgtool_chainent { UINT8 level; UINT64 block; }; -enum imgtool_forktype_t +enum imgtool_forktype_t { FORK_END, FORK_DATA, @@ -91,14 +91,14 @@ enum imgtool_forktype_t FORK_ALTERNATE }; -struct imgtool_forkent +struct imgtool_forkent { imgtool_forktype_t type; UINT64 size; char forkname[64]; }; -struct imgtool_transfer_suggestion +struct imgtool_transfer_suggestion { imgtool_suggestion_viability_t viability; filter_getinfoproc filter; @@ -134,13 +134,13 @@ enum IMGTOOLATTR_TIME_LASTMODIFIED }; -union imgtool_attribute +union imgtool_attribute { INT64 i; time_t t; }; -struct imgtool_iconinfo +struct imgtool_iconinfo { unsigned icon16x16_specified : 1; unsigned icon32x32_specified : 1; diff --git a/src/mess/tools/imgtool/modules/amiga.c b/src/mess/tools/imgtool/modules/amiga.c index df6af54426f..40670767f46 100644 --- a/src/mess/tools/imgtool/modules/amiga.c +++ b/src/mess/tools/imgtool/modules/amiga.c @@ -33,7 +33,7 @@ #define MSIZE ((BSIZE/4) - 1) /* Size of bitmaps */ -enum disk_type +enum disk_type { DT_UNKNOWN = -1, DT_OFS = 0, @@ -55,7 +55,7 @@ enum }; -enum sec_type +enum sec_type { ST_INVALID = 0, ST_ROOT = 1, diff --git a/src/mess/tools/imgtool/modules/concept.c b/src/mess/tools/imgtool/modules/concept.c index 0aa608e983e..94dcd3b38cc 100644 --- a/src/mess/tools/imgtool/modules/concept.c +++ b/src/mess/tools/imgtool/modules/concept.c @@ -12,7 +12,7 @@ #include <limits.h> #include "imgtool.h" -struct UINT16xE +struct UINT16xE { UINT8 bytes[2]; }; @@ -69,7 +69,7 @@ INLINE void set_UINT16xE(int little_endian, UINT16xE *word, UINT16 data) device directory record (Disk sector 2-5) */ -struct concept_vol_hdr_entry +struct concept_vol_hdr_entry { UINT16xE first_block; UINT16xE next_block; @@ -85,7 +85,7 @@ struct concept_vol_hdr_entry UINT16xE unused; }; -struct concept_file_dir_entry +struct concept_file_dir_entry { UINT16xE first_block; UINT16xE next_block; @@ -96,7 +96,7 @@ struct concept_file_dir_entry UINT16xE last_access; }; -struct concept_dev_dir +struct concept_dev_dir { concept_vol_hdr_entry vol_hdr; concept_file_dir_entry file_dir[77]; @@ -106,7 +106,7 @@ struct concept_dev_dir /* concept disk image descriptor */ -struct concept_image +struct concept_image { imgtool_stream *file_handle; /* imgtool file handle */ concept_dev_dir dev_dir; /* cached copy of device directory */ @@ -115,7 +115,7 @@ struct concept_image /* concept catalog iterator, used when imgtool reads the catalog */ -struct concept_iterator +struct concept_iterator { concept_image *image; int index; /* current index */ diff --git a/src/mess/tools/imgtool/modules/fat.c b/src/mess/tools/imgtool/modules/fat.c index 5bd21f2ba02..e03a2d70601 100644 --- a/src/mess/tools/imgtool/modules/fat.c +++ b/src/mess/tools/imgtool/modules/fat.c @@ -201,7 +201,7 @@ struct fat_mediatype UINT8 sectors; }; -enum creation_policy_t +enum creation_policy_t { CREATE_NONE, CREATE_FILE, @@ -1395,7 +1395,7 @@ static imgtoolerr_t fat_read_dirent(imgtool_partition *partition, fat_file *file -enum sfn_disposition_t +enum sfn_disposition_t { SFN_SUFFICIENT, /* name fully representable in short file name */ SFN_DERIVATIVE, /* name not fully representable in short file name, but no need to tildize */ diff --git a/src/mess/tools/imgtool/modules/mac.c b/src/mess/tools/imgtool/modules/mac.c index 00039986c3f..24a9421cc74 100644 --- a/src/mess/tools/imgtool/modules/mac.c +++ b/src/mess/tools/imgtool/modules/mac.c @@ -114,17 +114,17 @@ #pragma mark MISCELLANEOUS UTILITIES #endif -struct UINT16BE +struct UINT16BE { UINT8 bytes[2]; }; -struct UINT24BE +struct UINT24BE { UINT8 bytes[3]; }; -struct UINT32BE +struct UINT32BE { UINT8 bytes[4]; }; @@ -181,7 +181,7 @@ typedef UINT32BE mac_type; /* point record, with the y and x coordinates */ -struct mac_point +struct mac_point { UINT16BE v; /* actually signed */ UINT16BE h; /* actually signed */ @@ -190,7 +190,7 @@ struct mac_point /* rect record, with the corner coordinates */ -struct mac_rect +struct mac_rect { UINT16BE top; /* actually signed */ UINT16BE left; /* actually signed */ @@ -226,7 +226,7 @@ struct mac_FInfo /* FXInfo (Finder extended file info) record -- not found in MFS */ -struct mac_FXInfo +struct mac_FXInfo { UINT16BE iconID; /* System 7: An ID number for the file???s icon; the numbers that identify icons are assigned by the @@ -264,7 +264,7 @@ struct mac_DInfo /* DXInfo (Finder extended folder info) record -- not found in MFS */ -struct mac_DXInfo +struct mac_DXInfo { mac_point scroll; /* Scroll position */ UINT32BE openChain; /* System 7: chain of directory IDs for open folders */ @@ -609,7 +609,7 @@ static void mac_strncpy(UINT8 *dest, int n, const UINT8 *src) /* disk image reference */ -struct mac_l1_imgref +struct mac_l1_imgref { imgtool_image *image; UINT32 heads; @@ -744,7 +744,7 @@ static imgtoolerr_t image_write_tag(mac_l1_imgref *image, UINT32 block, const vo #pragma mark MFS/HFS WRAPPERS #endif -enum mac_format +enum mac_format { L2I_MFS, L2I_HFS @@ -755,7 +755,7 @@ enum mac_forkID { data_fork = 0x00, rsrc_fork = 0xff }; /* MFS image ref */ -struct mfs_l2_imgref +struct mfs_l2_imgref { UINT16 dir_num_files; UINT16 dir_start; @@ -772,7 +772,7 @@ struct mfs_l2_imgref /* HFS extent descriptor */ -struct hfs_extent +struct hfs_extent { UINT16BE stABN; /* first allocation block */ UINT16BE numABlks; /* number of allocation blocks */ @@ -787,7 +787,7 @@ typedef hfs_extent hfs_extent_3[3]; /* MFS open file ref */ -struct mfs_fileref +struct mfs_fileref { UINT16 stBlk; /* first allocation block of file */ }; @@ -795,7 +795,7 @@ struct mfs_fileref /* HFS open file ref */ -struct hfs_fileref +struct hfs_fileref { hfs_extent_3 extents; /* first 3 file extents */ @@ -834,7 +834,7 @@ struct mac_fileref /* open BT ref */ -struct mac_BTref +struct mac_BTref { struct mac_fileref fileref; /* open B-tree file ref */ @@ -864,7 +864,7 @@ enum /* HFS image ref */ -struct hfs_l2_imgref +struct hfs_l2_imgref { UINT16 VBM_start; @@ -998,7 +998,7 @@ struct hfs_mdb }; /* to save a little stack space, we use the same buffer for MDB and next blocks */ -union img_open_buf +union img_open_buf { struct mfs_mdb mfs_mdb; struct hfs_mdb hfs_mdb; @@ -1008,7 +1008,7 @@ union img_open_buf /* Information extracted from catalog/directory */ -struct mac_dirent +struct mac_dirent { UINT16 dataRecType; /* type of data record */ @@ -1033,7 +1033,7 @@ struct mac_dirent And, no, I don't know the format of the 20-byte tag record of the HD20 */ -struct floppy_tag_record +struct floppy_tag_record { UINT32BE fileID; /* a.k.a. CNID */ /* a value of 1 seems to be the default for non-AB blocks, but this is not consistent */ @@ -1452,7 +1452,7 @@ static imgtoolerr_t mac_file_seteof(struct mac_fileref *fileref, UINT32 newEof) files appear does not match file names, and it does not always match file IDs. */ -struct mfs_dir_entry +struct mfs_dir_entry { UINT8 flags; /* bit 7=1 if entry used, bit 0=1 if file locked */ /* 0x00 means end of block: if we are not done @@ -1527,7 +1527,7 @@ struct mfs_FOBJ /* MFS open dir ref */ -struct mfs_dirref +struct mfs_dirref { struct mac_l2_imgref *l2_img; /* image pointer */ UINT16 index; /* current file index in the disk directory */ @@ -2770,7 +2770,7 @@ static int mfs_hashString(const mac_str255 string) /* HFS extents B-tree key */ -struct hfs_extentKey +struct hfs_extentKey { UINT8 keyLength; /* length of key, excluding this field */ UINT8 forkType; /* 0 = data fork, FF = resource fork */ @@ -2785,7 +2785,7 @@ enum /* HFS catalog B-tree key */ -struct hfs_catKey +struct hfs_catKey { UINT8 keyLen; /* key length */ UINT8 resrv1; /* reserved */ @@ -2798,7 +2798,7 @@ struct hfs_catKey /* HFS catalog data record for a folder - 70 bytes */ -struct hfs_catFolderData +struct hfs_catFolderData { UINT16BE recordType; /* record type */ UINT16BE flags; /* folder flags */ @@ -2815,7 +2815,7 @@ struct hfs_catFolderData /* HFS catalog data record for a file - 102 bytes */ -struct hfs_catFileData +struct hfs_catFileData { UINT16BE recordType; /* record type */ UINT8 flags; /* file flags */ @@ -2844,7 +2844,7 @@ struct hfs_catFileData The key for a thread record features the CNID of the item and an empty name, instead of the CNID of the parent and the item name. */ -struct hfs_catThreadData +struct hfs_catThreadData { UINT16BE recordType; /* record type */ UINT32BE reserved[2]; /* reserved - set to zero */ @@ -2855,7 +2855,7 @@ struct hfs_catThreadData /* union for all types at once */ -union hfs_catData +union hfs_catData { UINT16BE dataType; hfs_catFolderData folder; @@ -2890,7 +2890,7 @@ enum /* BT functions used by HFS functions */ -struct BT_leaf_rec_enumerator +struct BT_leaf_rec_enumerator { mac_BTref *BTref; UINT32 cur_node; @@ -2907,7 +2907,7 @@ static imgtoolerr_t BT_get_keyed_record_data(mac_BTref *BTref, void *rec_ptr, in static imgtoolerr_t BT_leaf_rec_enumerator_open(mac_BTref *BTref, BT_leaf_rec_enumerator *enumerator); static imgtoolerr_t BT_leaf_rec_enumerator_read(BT_leaf_rec_enumerator *enumerator, void **record_ptr, int *rec_len); -struct hfs_cat_enumerator +struct hfs_cat_enumerator { struct mac_l2_imgref *l2_img; BT_leaf_rec_enumerator BT_enumerator; @@ -3640,7 +3640,7 @@ static imgtoolerr_t hfs_file_get_nth_block_address(struct mac_fileref *fileref, Header of a node record */ -struct BTNodeHeader +struct BTNodeHeader { UINT32BE fLink; /* (index of) next node at this level */ UINT32BE bLink; /* (index of) previous node at this level */ @@ -3672,7 +3672,7 @@ enum BTHeaderRecord: first record of a B-tree header node (second record is unused, and third is node allocation bitmap). */ -struct BTHeaderRecord +struct BTHeaderRecord { UINT16BE treeDepth; /* maximum height (usually leaf nodes) */ UINT32BE rootNode; /* node number of root node */ @@ -3955,7 +3955,7 @@ static imgtoolerr_t BT_get_keyed_record_data(mac_BTref *BTref, void *rec_ptr, in Return imgtool error code */ -struct data_nodes_t +struct data_nodes_t { void *buf; UINT32 node_num; @@ -4842,7 +4842,7 @@ static imgtoolerr_t BT_leaf_rec_enumerator_read(BT_leaf_rec_enumerator *enumerat /* Resource header */ -struct rsrc_header +struct rsrc_header { UINT32BE data_offs; /* Offset from beginning of resource fork to resource data */ UINT32BE map_offs; /* Offset from beginning of resource fork to resource map */ @@ -4858,7 +4858,7 @@ struct rsrc_header /* Resource map: */ -struct rsrc_map_header +struct rsrc_map_header { rsrc_header reserved0; /* Reserved for copy of resource header */ UINT32BE reserved1; /* Reserved for handle to next resource map */ @@ -4874,7 +4874,7 @@ struct rsrc_map_header /* Resource type list entry */ -struct rsrc_type_entry +struct rsrc_type_entry { UINT32BE type; /* Resource type */ UINT16BE ref_count; /* Number of resources of this type in map minus 1 */ @@ -4884,7 +4884,7 @@ struct rsrc_type_entry /* Resource reference list entry */ -struct rsrc_ref_entry +struct rsrc_ref_entry { UINT16BE id; /* Resource ID */ UINT16BE name_offs; /* Offset from beginning of resource name list to resource name */ @@ -4898,7 +4898,7 @@ struct rsrc_ref_entry Resource name list entry: this is just a standard macintosh string */ -struct mac_resfileref +struct mac_resfileref { mac_fileref fileref; /* open resource fork ref (you may open resources files in data fork, too, if you ever need to, diff --git a/src/mess/tools/imgtool/modules/macutil.h b/src/mess/tools/imgtool/modules/macutil.h index 1156a08bc05..f40017b5c77 100644 --- a/src/mess/tools/imgtool/modules/macutil.h +++ b/src/mess/tools/imgtool/modules/macutil.h @@ -12,13 +12,13 @@ #include "imgtool.h" -enum mac_fork_t +enum mac_fork_t { MAC_FORK_DATA, MAC_FORK_RESOURCE }; -enum mac_filecategory_t +enum mac_filecategory_t { MAC_FILECATEGORY_DATA, MAC_FILECATEGORY_TEXT, diff --git a/src/mess/tools/imgtool/modules/os9.c b/src/mess/tools/imgtool/modules/os9.c index 0a099bff9db..1e4bc27e554 100644 --- a/src/mess/tools/imgtool/modules/os9.c +++ b/src/mess/tools/imgtool/modules/os9.c @@ -13,7 +13,7 @@ #include "formats/coco_dsk.h" #include "iflopimg.h" -enum creation_policy_t +enum creation_policy_t { CREATE_NONE, CREATE_FILE, diff --git a/src/mess/tools/imgtool/modules/prodos.c b/src/mess/tools/imgtool/modules/prodos.c index 788c028ff9a..d15d9f615a4 100644 --- a/src/mess/tools/imgtool/modules/prodos.c +++ b/src/mess/tools/imgtool/modules/prodos.c @@ -175,7 +175,7 @@ struct prodos_dirent UINT32 putaway_directory; }; -enum creation_policy_t +enum creation_policy_t { CREATE_NONE, CREATE_FILE, diff --git a/src/mess/tools/imgtool/modules/ti99.c b/src/mess/tools/imgtool/modules/ti99.c index 24227d2ccf6..514e5aa7344 100644 --- a/src/mess/tools/imgtool/modules/ti99.c +++ b/src/mess/tools/imgtool/modules/ti99.c @@ -266,12 +266,12 @@ will accept paths of such length). */ Miscellaneous utilities that are used to handle TI data types */ -struct UINT16BE +struct UINT16BE { UINT8 bytes[2]; }; -struct UINT16LE +struct UINT16LE { UINT8 bytes[2]; }; @@ -456,7 +456,7 @@ static int check_fpath(const char *fpath) /* Disk geometry */ -struct ti99_geometry +struct ti99_geometry { int secspertrack; int cylinders; @@ -466,7 +466,7 @@ struct ti99_geometry /* Physical sector address */ -struct ti99_sector_address +struct ti99_sector_address { int sector; int cylinder; @@ -476,7 +476,7 @@ struct ti99_sector_address /* Time stamp (used in fdr, and WIN VIB/DDR) */ -struct ti99_date_time +struct ti99_date_time { UINT8 time_MSB, time_LSB;/* 0-4: hour, 5-10: minutes, 11-15: seconds/2 */ UINT8 date_MSB, date_LSB;/* 0-6: year, 7-10: month, 11-15: day */ @@ -487,7 +487,7 @@ struct ti99_date_time The HFDC supports up to 3 subdirectories. */ -struct dsk_subdir +struct dsk_subdir { char name[10]; /* subdirectory name (10 characters, pad with spaces) */ UINT16BE fdir_aphysrec; /* aphysrec address of fdir record for this subdirectory */ @@ -499,7 +499,7 @@ struct dsk_subdir Most fields in this record are only revelant to level 2 routines, but level 1 routines need the disk geometry information extracted from the VIB. */ -struct dsk_vib +struct dsk_vib { char name[10]; /* disk volume name (10 characters, pad with spaces) */ UINT16BE totphysrecs; /* total number of physrecs on disk (usually 360, */ @@ -528,7 +528,7 @@ struct dsk_vib /* of byte 1, etc.) */ }; -enum ti99_img_format +enum ti99_img_format { if_mess, if_v9t9, @@ -540,7 +540,7 @@ enum ti99_img_format /* level-1 disk image descriptor */ -struct ti99_lvl1_imgref +struct ti99_lvl1_imgref { ti99_img_format img_format; /* tells the image format */ imgtool_stream *file_handle; /* imgtool file handle */ @@ -1442,7 +1442,7 @@ struct win_vib_ddr /* AU format */ -struct ti99_AUformat +struct ti99_AUformat { int totAUs; /* total number of AUs */ int physrecsperAU; /* number of 256-byte physical records per AU */ @@ -1457,21 +1457,21 @@ struct ti99_AUformat /* catalog entry (used for in-memory catalog) */ -struct dir_entry +struct dir_entry { UINT16 dir_ptr; /* DSK: unused */ /* WIN: AU address of the DDR for this directory */ char name[10]; /* name of this directory (copied from the VIB for DSK, DDR for WIN) */ }; -struct file_entry +struct file_entry { UINT16 fdr_ptr; /* DSK: aphysrec address of the FDR for this file */ /* WIN: AU address of the FDR for this file */ char name[10]; /* name of this file (copied from FDR) */ }; -struct ti99_catalog +struct ti99_catalog { int num_subdirs; /* number of subdirectories */ int num_files; /* number of files */ @@ -1482,7 +1482,7 @@ struct ti99_catalog /* level-2 disk image descriptor */ -struct ti99_lvl2_imgref_dsk +struct ti99_lvl2_imgref_dsk { UINT16 totphysrecs; /* total number of aphysrecs (extracted from vib record in aphysrec 0) */ ti99_catalog catalogs[4]; /* catalog of root directory and up to 3 subdirectories */ @@ -1495,7 +1495,7 @@ enum win_vib_t win_vib_v1, win_vib_v2 }; -struct ti99_lvl2_imgref_win +struct ti99_lvl2_imgref_win { win_vib_t vib_version; /* version of the vib record in aphysrec 0 (see win_vib_ddr) */ }; @@ -1555,7 +1555,7 @@ enum /* DSK FDR record */ -struct dsk_fdr +struct dsk_fdr { char name[10]; /* file name (10 characters, pad with spaces) */ UINT16BE xreclen; /* extended record len: if record len is >= 256, */ @@ -1601,7 +1601,7 @@ struct dsk_fdr /* WIN FDR record */ -struct win_fdr +struct win_fdr { char name[10]; /* file name (10 characters, pad with spaces) */ UINT16BE xreclen; /* extended record len: if record len is >= 256, */ @@ -1663,7 +1663,7 @@ struct win_fdr /* tifile header: stand-alone file */ -struct tifile_header +struct tifile_header { char tifiles[8]; /* always '\7TIFILES' */ UINT16BE fphysrecs; /* file length in physrecs */ @@ -1703,14 +1703,14 @@ struct tifile_header /* level-2 file descriptor */ -struct ti99_lvl2_fileref_dsk +struct ti99_lvl2_fileref_dsk { struct ti99_lvl2_imgref *l2_img; int fdr_aphysrec; dsk_fdr fdr; }; -struct ti99_lvl2_fileref_win +struct ti99_lvl2_fileref_win { struct ti99_lvl2_imgref *l2_img; unsigned fphysrecs; /* copy of field in the eldest FDR */ @@ -1719,7 +1719,7 @@ struct ti99_lvl2_fileref_win win_fdr curfdr; /* buffer with currently open sibling FDR */ }; -struct ti99_lvl2_fileref_tifiles +struct ti99_lvl2_fileref_tifiles { imgtool_stream *file_handle; tifile_header hdr; @@ -3696,7 +3696,7 @@ static void current_date_time(ti99_date_time *reply) * files with variable-size records (sequential-access) */ -struct ti99_lvl3_fileref +struct ti99_lvl3_fileref { ti99_lvl2_fileref l2_file; @@ -3827,7 +3827,7 @@ static int read_next_record(ti99_lvl3_fileref *l3_file, void *dest, int *out_rec /* ti99 catalog iterator, used when imgtool reads the catalog */ -struct dsk_iterator +struct dsk_iterator { struct ti99_lvl2_imgref *image; int level; @@ -3836,7 +3836,7 @@ struct dsk_iterator ti99_catalog *cur_catalog; /* current catalog */ }; -struct win_iterator +struct win_iterator { struct ti99_lvl2_imgref *image; int level; diff --git a/src/mess/tools/imgtool/modules/ti990hd.c b/src/mess/tools/imgtool/modules/ti990hd.c index 44fde6df08b..5be89a0f928 100644 --- a/src/mess/tools/imgtool/modules/ti990hd.c +++ b/src/mess/tools/imgtool/modules/ti990hd.c @@ -35,12 +35,12 @@ that is longer than 39 characters. */ #define MAX_DIR_LEVEL 25 /* We need to put a recursion limit to avoid endless recursion hazard */ -struct UINT16BE +struct UINT16BE { UINT8 bytes[2]; }; -struct UINT32BE +struct UINT32BE { UINT8 bytes[4]; }; @@ -72,7 +72,7 @@ INLINE void set_UINT32BE(UINT32BE *word, UINT32 data) /* disk image header */ -struct disk_image_header +struct disk_image_header { UINT32BE cylinders; /* number of cylinders on hard disk (big-endian) */ UINT32BE heads; /* number of heads on hard disk (big-endian) */ @@ -101,7 +101,7 @@ enum /* SC0 record (Disk sector 0) */ -struct ti990_sc0 +struct ti990_sc0 { char vnm[8]; /* volume name */ UINT16BE tna; /* total number of ADUs */ @@ -153,7 +153,7 @@ struct ti990_sc0 /* DOR (Directory Overhead Record) */ -struct ti990_dor +struct ti990_dor { UINT16BE nrc; /* # records in directory (minus DOR) nrc = nfl + nar (+ tfc???) */ UINT16BE nfl; /* # files currently in directory */ @@ -198,7 +198,7 @@ enum /* ACE subrecord found in FDR */ -struct ti990_ace +struct ti990_ace { char agn[8]; /* access group name */ UINT16BE flg; /* flags */ @@ -207,7 +207,7 @@ struct ti990_ace /* FDR record */ -struct ti990_fdr +struct ti990_fdr { UINT16BE hkc; /* hask key count: the number of file descriptor records that are present in the directory that hashed to this record number */ UINT16BE hkv; /* hask key value: the result of the hash algorithm for the file name actually covered in this record */ @@ -251,7 +251,7 @@ struct ti990_fdr The fields marked here with *** are in the ADR template to maintain compatability with the FDR template. */ -struct ti990_adr +struct ti990_adr { UINT16BE hkc; /* hask key count */ UINT16BE hkv; /* hask key value */ @@ -274,7 +274,7 @@ struct ti990_adr The CDR is the permanent record of a channel. It is carried as an alias of the program file in which the channel owner task resides. */ -struct ti990_cdr +struct ti990_cdr { UINT16BE hkc; /* hask key count */ UINT16BE hkv; /* hask key value */ @@ -305,7 +305,7 @@ struct ti990_cdr field starts at offset 4, and therefore if we try to interpret a KDR as an FDR (or ADR, CDR), we will find fnm[0] and assume the FDR is empty. */ -union directory_entry +union directory_entry { ti990_fdr fdr; ti990_adr adr; @@ -317,7 +317,7 @@ union directory_entry /* tifile header: stand-alone file */ -struct tifile_header +struct tifile_header { char tifiles[8]; /* always '\7TIFILES' */ UINT8 secsused_MSB; /* file length in sectors (big-endian) */ @@ -335,7 +335,7 @@ struct tifile_header /* catalog entry (used for in-memory catalog) */ -struct catalog_entry +struct catalog_entry { UINT16 fdr_secnum; char filename[10]; @@ -346,7 +346,7 @@ struct catalog_entry /* Disk geometry */ -struct ti990_geometry +struct ti990_geometry { unsigned int cylinders, heads, sectors_per_track, bytes_per_sector; }; @@ -354,7 +354,7 @@ struct ti990_geometry /* Physical sector address */ -struct ti990_phys_sec_address +struct ti990_phys_sec_address { int cylinder; int head; @@ -364,7 +364,7 @@ struct ti990_phys_sec_address /* ti99 disk image descriptor */ -struct ti990_image +struct ti990_image { imgtool_stream *file_handle; /* imgtool file handle */ ti990_geometry geometry; /* geometry */ @@ -374,7 +374,7 @@ struct ti990_image /* ti990 catalog iterator, used when imgtool reads the catalog */ -struct ti990_iterator +struct ti990_iterator { ti990_image *image; int level; /* current recursion level */ diff --git a/src/mess/tools/imgtool/modules/vzdos.c b/src/mess/tools/imgtool/modules/vzdos.c index 5c93a3b94d4..28e27873e66 100644 --- a/src/mess/tools/imgtool/modules/vzdos.c +++ b/src/mess/tools/imgtool/modules/vzdos.c @@ -40,7 +40,7 @@ as track map, with one bit for each sector used. #define MAX_DIRENTS (15*8) /* vzdos directry entry */ -struct vzdos_dirent +struct vzdos_dirent { char ftype; char delimitor; @@ -51,7 +51,7 @@ struct vzdos_dirent UINT16 end_address; }; -struct vz_iterator +struct vz_iterator { int index; int eof; diff --git a/src/mess/tools/imgtool/stream.c b/src/mess/tools/imgtool/stream.c index 5b7c22148aa..e7532650ab4 100644 --- a/src/mess/tools/imgtool/stream.c +++ b/src/mess/tools/imgtool/stream.c @@ -14,7 +14,7 @@ #include "osdcore.h" #include "imgtool.h" -enum imgtype_t +enum imgtype_t { IMG_FILE, IMG_MEM |
