diff options
Diffstat (limited to 'src/tools/imgtool/modules/os9.cpp')
-rw-r--r-- | src/tools/imgtool/modules/os9.cpp | 196 |
1 files changed, 98 insertions, 98 deletions
diff --git a/src/tools/imgtool/modules/os9.cpp b/src/tools/imgtool/modules/os9.cpp index 2ec56b7cbc1..9055c483f6f 100644 --- a/src/tools/imgtool/modules/os9.cpp +++ b/src/tools/imgtool/modules/os9.cpp @@ -24,18 +24,18 @@ enum creation_policy_t struct os9_diskinfo { - UINT32 total_sectors; - UINT32 sectors_per_track; - UINT32 allocation_bitmap_bytes; - UINT32 cluster_size; - UINT32 root_dir_lsn; - UINT32 owner_id; - UINT32 attributes; - UINT32 disk_id; - UINT32 format_flags; - UINT32 bootstrap_lsn; - UINT32 bootstrap_size; - UINT32 sector_size; + uint32_t total_sectors; + uint32_t sectors_per_track; + uint32_t allocation_bitmap_bytes; + uint32_t cluster_size; + uint32_t root_dir_lsn; + uint32_t owner_id; + uint32_t attributes; + uint32_t disk_id; + uint32_t format_flags; + uint32_t bootstrap_lsn; + uint32_t bootstrap_size; + uint32_t sector_size; unsigned int sides : 2; unsigned int double_density : 1; @@ -44,7 +44,7 @@ struct os9_diskinfo unsigned int octal_track_density : 1; char name[33]; - UINT8 *allocation_bitmap; + uint8_t *allocation_bitmap; }; @@ -59,15 +59,15 @@ struct os9_fileinfo unsigned int user_write : 1; unsigned int user_read : 1; - UINT32 lsn; - UINT32 owner_id; - UINT32 link_count; - UINT32 file_size; + uint32_t lsn; + uint32_t owner_id; + uint32_t link_count; + uint32_t file_size; struct { - UINT32 lsn; - UINT32 count; + uint32_t lsn; + uint32_t count; } sector_map[48]; }; @@ -75,18 +75,18 @@ struct os9_fileinfo struct os9_direnum { struct os9_fileinfo dir_info; - UINT32 index; + uint32_t index; }; static void pick_string(const void *ptr, size_t offset, size_t length, char *dest) { - UINT8 b; + uint8_t b; while(length--) { - b = ((UINT8 *) ptr)[offset++]; + b = ((uint8_t *) ptr)[offset++]; *(dest++) = b & 0x7F; if (b & 0x80) length = 0; @@ -99,17 +99,17 @@ static void pick_string(const void *ptr, size_t offset, size_t length, char *des static void place_string(void *ptr, size_t offset, size_t length, const char *s) { size_t i; - UINT8 b; - UINT8 *bptr; + uint8_t b; + uint8_t *bptr; - bptr = (UINT8 *) ptr; + bptr = (uint8_t *) ptr; bptr += offset; bptr[0] = 0x80; for (i = 0; s[i] && (i < length); i++) { - b = ((UINT8) s[i]) & 0x7F; + b = ((uint8_t) s[i]) & 0x7F; if (s[i+1] == '\0') b |= 0x80; bptr[i] = b; @@ -132,7 +132,7 @@ static struct os9_direnum *os9_get_dirinfo(imgtool::directory &directory) -static imgtoolerr_t os9_locate_lsn(imgtool::image &image, UINT32 lsn, UINT32 *head, UINT32 *track, UINT32 *sector) +static imgtoolerr_t os9_locate_lsn(imgtool::image &image, uint32_t lsn, uint32_t *head, uint32_t *track, uint32_t *sector) { const os9_diskinfo *disk_info; @@ -148,11 +148,11 @@ static imgtoolerr_t os9_locate_lsn(imgtool::image &image, UINT32 lsn, UINT32 *he -static imgtoolerr_t os9_read_lsn(imgtool::image &img, UINT32 lsn, int offset, void *buffer, size_t buffer_len) +static imgtoolerr_t os9_read_lsn(imgtool::image &img, uint32_t lsn, int offset, void *buffer, size_t buffer_len) { imgtoolerr_t err; floperr_t ferr; - UINT32 head, track, sector; + uint32_t head, track, sector; err = os9_locate_lsn(img, lsn, &head, &track, §or); if (err) @@ -167,11 +167,11 @@ static imgtoolerr_t os9_read_lsn(imgtool::image &img, UINT32 lsn, int offset, vo -static imgtoolerr_t os9_write_lsn(imgtool::image &img, UINT32 lsn, int offset, const void *buffer, size_t buffer_len) +static imgtoolerr_t os9_write_lsn(imgtool::image &img, uint32_t lsn, int offset, const void *buffer, size_t buffer_len) { imgtoolerr_t err; floperr_t ferr; - UINT32 head, track, sector; + uint32_t head, track, sector; err = os9_locate_lsn(img, lsn, &head, &track, §or); if (err) @@ -186,11 +186,11 @@ static imgtoolerr_t os9_write_lsn(imgtool::image &img, UINT32 lsn, int offset, c -static UINT32 os9_lookup_lsn(imgtool::image &img, - const struct os9_fileinfo *file_info, UINT32 *index) +static uint32_t os9_lookup_lsn(imgtool::image &img, + const struct os9_fileinfo *file_info, uint32_t *index) { int i; - UINT32 lsn; + uint32_t lsn; const os9_diskinfo *disk_info; disk_info = os9_get_diskinfo(img); @@ -207,7 +207,7 @@ static UINT32 os9_lookup_lsn(imgtool::image &img, -static int os9_interpret_dirent(void *entry, char **filename, UINT32 *lsn, int *corrupt) +static int os9_interpret_dirent(void *entry, char **filename, uint32_t *lsn, int *corrupt) { int i; char *entry_b = (char *) entry; @@ -245,10 +245,10 @@ static imgtoolerr_t os9_decode_file_header(imgtool::image &image, int lsn, struct os9_fileinfo *info) { imgtoolerr_t err; - UINT32 attributes, count; + uint32_t attributes, count; int max_entries, i; const os9_diskinfo *disk_info; - UINT8 header[256]; + uint8_t header[256]; disk_info = os9_get_diskinfo(image); @@ -293,11 +293,11 @@ static imgtoolerr_t os9_decode_file_header(imgtool::image &image, -static imgtoolerr_t os9_allocate_lsn(imgtool::image &image, UINT32 *lsn) +static imgtoolerr_t os9_allocate_lsn(imgtool::image &image, uint32_t *lsn) { - UINT32 i; + uint32_t i; os9_diskinfo *disk_info; - UINT8 b, mask; + uint8_t b, mask; disk_info = os9_get_diskinfo(image); @@ -318,9 +318,9 @@ static imgtoolerr_t os9_allocate_lsn(imgtool::image &image, UINT32 *lsn) -static imgtoolerr_t os9_deallocate_lsn(imgtool::image &image, UINT32 lsn) +static imgtoolerr_t os9_deallocate_lsn(imgtool::image &image, uint32_t lsn) { - UINT8 mask; + uint8_t mask; os9_diskinfo *disk_info; disk_info = os9_get_diskinfo(image); @@ -331,11 +331,11 @@ static imgtoolerr_t os9_deallocate_lsn(imgtool::image &image, UINT32 lsn) -static UINT32 os9_get_free_lsns(imgtool::image &image) +static uint32_t os9_get_free_lsns(imgtool::image &image) { const os9_diskinfo *disk_info; - UINT32 i, free_lsns; - UINT8 b; + uint32_t i, free_lsns; + uint8_t b; disk_info = os9_get_diskinfo(image); free_lsns = 0; @@ -365,14 +365,14 @@ static imgtoolerr_t os9_corrupt_file_error(const struct os9_fileinfo *file_info) static imgtoolerr_t os9_set_file_size(imgtool::image &image, - struct os9_fileinfo *file_info, UINT32 new_size) + struct os9_fileinfo *file_info, uint32_t new_size) { imgtoolerr_t err; const os9_diskinfo *disk_info; - UINT32 new_lsn_count, current_lsn_count; - UINT32 free_lsns, lsn, i; + uint32_t new_lsn_count, current_lsn_count; + uint32_t free_lsns, lsn, i; int sector_map_length = -1; - UINT8 header[256]; + uint8_t header[256]; /* easy way out? */ if (file_info->file_size == new_size) @@ -485,17 +485,17 @@ static imgtoolerr_t os9_set_file_size(imgtool::image &image, static imgtoolerr_t os9_lookup_path(imgtool::image &img, const char *path, creation_policy_t create, struct os9_fileinfo *file_info, - UINT32 *parent_lsn, UINT32 *dirent_lsn, UINT32 *dirent_index) + uint32_t *parent_lsn, uint32_t *dirent_lsn, uint32_t *dirent_index) { imgtoolerr_t err = IMGTOOLERR_SUCCESS; struct os9_fileinfo dir_info; - UINT32 index, current_lsn, dir_size; - UINT32 entry_index = 0; - UINT32 free_entry_index = 0xffffffff; - UINT32 entry_lsn = 0; - UINT32 allocated_lsn = 0; - UINT8 entry[32]; - UINT8 block[64]; + uint32_t index, current_lsn, dir_size; + uint32_t entry_index = 0; + uint32_t free_entry_index = 0xffffffff; + uint32_t entry_lsn = 0; + uint32_t allocated_lsn = 0; + uint8_t entry[32]; + uint8_t block[64]; char *filename; const os9_diskinfo *disk_info; @@ -627,10 +627,10 @@ static imgtoolerr_t os9_diskimage_open(imgtool::image &image, imgtool::stream::p imgtoolerr_t err; floperr_t ferr; os9_diskinfo *info; - UINT32 track_size_in_sectors, i; //, attributes; - UINT8 header[256]; - UINT32 allocation_bitmap_lsns; - UINT8 b, mask; + uint32_t track_size_in_sectors, i; //, attributes; + uint8_t header[256]; + uint32_t allocation_bitmap_lsns; + uint8_t b, mask; info = os9_get_diskinfo(image); @@ -670,7 +670,7 @@ static imgtoolerr_t os9_diskimage_open(imgtool::image &image, imgtool::stream::p return IMGTOOLERR_CORRUPTIMAGE; /* is the allocation bitmap too big? */ - info->allocation_bitmap = (UINT8*)image.malloc(info->allocation_bitmap_bytes); + info->allocation_bitmap = (uint8_t*)image.malloc(info->allocation_bitmap_bytes); if (!info->allocation_bitmap) return IMGTOOLERR_OUTOFMEMORY; memset(info->allocation_bitmap, 0, info->allocation_bitmap_bytes); @@ -713,13 +713,13 @@ static imgtoolerr_t os9_diskimage_open(imgtool::image &image, imgtool::stream::p static imgtoolerr_t os9_diskimage_create(imgtool::image &img, imgtool::stream::ptr &&stream, util::option_resolution *opts) { imgtoolerr_t err; - std::vector<UINT8> header; - UINT32 heads, tracks, sectors, sector_bytes, first_sector_id; - UINT32 cluster_size, owner_id; - UINT32 allocation_bitmap_bits, allocation_bitmap_lsns; - UINT32 attributes, format_flags, disk_id; - UINT32 i; - INT32 total_allocated_sectors; + std::vector<uint8_t> header; + uint32_t heads, tracks, sectors, sector_bytes, first_sector_id; + uint32_t cluster_size, owner_id; + uint32_t allocation_bitmap_bits, allocation_bitmap_lsns; + uint32_t attributes, format_flags, disk_id; + uint32_t i; + int32_t total_allocated_sectors; const char *title; time_t t; struct tm *ltime; @@ -790,7 +790,7 @@ static imgtoolerr_t os9_diskimage_create(imgtool::image &img, imgtool::stream::p else if (total_allocated_sectors > 1 ) { int offset; - UINT8 mask; + uint8_t mask; while( total_allocated_sectors >= 0 ) { @@ -811,19 +811,19 @@ static imgtoolerr_t os9_diskimage_create(imgtool::image &img, imgtool::stream::p header[0x00] = 0xBF; header[0x01] = 0x00; header[0x02] = 0x00; - header[0x03] = (UINT8) ltime->tm_year; - header[0x04] = (UINT8) ltime->tm_mon + 1; - header[0x05] = (UINT8) ltime->tm_mday; - header[0x06] = (UINT8) ltime->tm_hour; - header[0x07] = (UINT8) ltime->tm_min; + header[0x03] = (uint8_t) ltime->tm_year; + header[0x04] = (uint8_t) ltime->tm_mon + 1; + header[0x05] = (uint8_t) ltime->tm_mday; + header[0x06] = (uint8_t) ltime->tm_hour; + header[0x07] = (uint8_t) ltime->tm_min; header[0x08] = 0x02; header[0x09] = 0x00; header[0x0A] = 0x00; header[0x0B] = 0x00; header[0x0C] = 0x40; - header[0x0D] = (UINT8) (ltime->tm_year % 100); - header[0x0E] = (UINT8) ltime->tm_mon; - header[0x0F] = (UINT8) ltime->tm_mday; + header[0x0D] = (uint8_t) (ltime->tm_year % 100); + header[0x0E] = (uint8_t) ltime->tm_mon; + header[0x0F] = (uint8_t) ltime->tm_mday; place_integer_be(&header[0], 0x10, 3, 1 + allocation_bitmap_lsns + 1); place_integer_be(&header[0], 0x13, 2, 8); @@ -875,9 +875,9 @@ done: static imgtoolerr_t os9_diskimage_nextenum(imgtool::directory &enumeration, imgtool_dirent &ent) { struct os9_direnum *os9enum; - UINT32 lsn, index; + uint32_t lsn, index; imgtoolerr_t err; - UINT8 dir_entry[32]; + uint8_t dir_entry[32]; char filename[29]; struct os9_fileinfo file_info; imgtool::image &image(enumeration.image()); @@ -971,11 +971,11 @@ static imgtoolerr_t os9_diskimage_nextenum(imgtool::directory &enumeration, imgt -static imgtoolerr_t os9_diskimage_freespace(imgtool::partition &partition, UINT64 *size) +static imgtoolerr_t os9_diskimage_freespace(imgtool::partition &partition, uint64_t *size) { imgtool::image &image(partition.image()); const os9_diskinfo *disk_info; - UINT32 free_lsns; + uint32_t free_lsns; disk_info = os9_get_diskinfo(image); free_lsns = os9_get_free_lsns(image); @@ -992,10 +992,10 @@ static imgtoolerr_t os9_diskimage_readfile(imgtool::partition &partition, const imgtool::image &img(partition.image()); const os9_diskinfo *disk_info; struct os9_fileinfo file_info; - UINT8 buffer[256]; + uint8_t buffer[256]; int i, j; - UINT32 file_size; - UINT32 used_size; + uint32_t file_size; + uint32_t used_size; disk_info = os9_get_diskinfo(img); @@ -1030,11 +1030,11 @@ static imgtoolerr_t os9_diskimage_writefile(imgtool::partition &partition, const imgtool::image &image(partition.image()); struct os9_fileinfo file_info; size_t write_size; - std::vector<UINT8> buf; + std::vector<uint8_t> buf; int i = -1; - UINT32 lsn = 0; - UINT32 count = 0; - UINT32 sz; + uint32_t lsn = 0; + uint32_t count = 0; + uint32_t sz; const os9_diskinfo *disk_info; disk_info = os9_get_diskinfo(image); @@ -1045,7 +1045,7 @@ static imgtoolerr_t os9_diskimage_writefile(imgtool::partition &partition, const if (err) goto done; - sz = (UINT32) sourcef.size(); + sz = (uint32_t) sourcef.size(); err = os9_set_file_size(image, &file_info, sz); if (err) @@ -1053,7 +1053,7 @@ static imgtoolerr_t os9_diskimage_writefile(imgtool::partition &partition, const while(sz > 0) { - write_size = (std::min<UINT64>)(sz, disk_info->sector_size); + write_size = (std::min<uint64_t>)(sz, disk_info->sector_size); sourcef.read(&buf[0], write_size); @@ -1085,10 +1085,10 @@ static imgtoolerr_t os9_diskimage_delete(imgtool::partition &partition, const ch imgtoolerr_t err; imgtool::image &image(partition.image()); struct os9_fileinfo file_info; - UINT32 dirent_lsn, dirent_index; - UINT32 entry_lsn, entry_index; - UINT32 i, j, lsn; - UINT8 b; + uint32_t dirent_lsn, dirent_index; + uint32_t entry_lsn, entry_index; + uint32_t i, j, lsn; + uint8_t b; //disk_info = os9_get_diskinfo(image); @@ -1172,8 +1172,8 @@ static imgtoolerr_t os9_diskimage_createdir(imgtool::partition &partition, const imgtoolerr_t err; imgtool::image &image(partition.image()); struct os9_fileinfo file_info; - UINT8 dir_data[64]; - UINT32 parent_lsn; + uint8_t dir_data[64]; + uint32_t parent_lsn; err = os9_lookup_path(image, path, CREATE_DIR, &file_info, &parent_lsn, NULL, NULL); if (err) @@ -1207,7 +1207,7 @@ static imgtoolerr_t os9_diskimage_deletedir(imgtool::partition &partition, const -void os9_get_info(const imgtool_class *imgclass, UINT32 state, union imgtoolinfo *info) +void os9_get_info(const imgtool_class *imgclass, uint32_t state, union imgtoolinfo *info) { switch(state) { |