diff options
Diffstat (limited to 'src/tools/imgtool/modules/macbin.cpp')
-rw-r--r-- | src/tools/imgtool/modules/macbin.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/tools/imgtool/modules/macbin.cpp b/src/tools/imgtool/modules/macbin.cpp index 24368e3320e..32f5af0e5de 100644 --- a/src/tools/imgtool/modules/macbin.cpp +++ b/src/tools/imgtool/modules/macbin.cpp @@ -54,7 +54,7 @@ -static UINT32 pad128(UINT32 length) +static uint32_t pad128(uint32_t length) { if (length % 128) length += 128 - (length % 128); @@ -65,7 +65,7 @@ static UINT32 pad128(UINT32 length) static imgtoolerr_t macbinary_readfile(imgtool::partition &partition, const char *filename, const char *fork, imgtool::stream &destf) { - static const UINT32 attrs[] = + static const uint32_t attrs[] = { IMGTOOLATTR_TIME_CREATED, IMGTOOLATTR_TIME_LASTMODIFIED, @@ -80,24 +80,24 @@ static imgtoolerr_t macbinary_readfile(imgtool::partition &partition, const char 0 }; imgtoolerr_t err; - UINT8 header[128]; + uint8_t header[128]; const char *basename; int i; - UINT32 type_code = 0x3F3F3F3F; - UINT32 creator_code = 0x3F3F3F3F; - UINT16 finder_flags = 0; - UINT16 coord_x = 0; - UINT16 coord_y = 0; - UINT16 finder_folder = 0; - UINT8 script_code = 0; - UINT8 extended_flags = 0; + uint32_t type_code = 0x3F3F3F3F; + uint32_t creator_code = 0x3F3F3F3F; + uint16_t finder_flags = 0; + uint16_t coord_x = 0; + uint16_t coord_y = 0; + uint16_t finder_folder = 0; + uint8_t script_code = 0; + uint8_t extended_flags = 0; imgtool_forkent fork_entries[4]; const imgtool_forkent *data_fork = NULL; const imgtool_forkent *resource_fork = NULL; - UINT32 creation_time = 0; - UINT32 lastmodified_time = 0; + uint32_t creation_time = 0; + uint32_t lastmodified_time = 0; imgtool_attribute attr_values[10]; /* get the forks */ @@ -182,7 +182,7 @@ static imgtoolerr_t macbinary_readfile(imgtool::partition &partition, const char static imgtoolerr_t write_fork(imgtool::partition &partition, const char *filename, const char *fork, - imgtool::stream &sourcef, UINT64 pos, UINT64 fork_len, util::option_resolution *opts) + imgtool::stream &sourcef, uint64_t pos, uint64_t fork_len, util::option_resolution *opts) { imgtoolerr_t err = IMGTOOLERR_SUCCESS; imgtool::stream *mem_stream = NULL; @@ -218,7 +218,7 @@ done: static imgtoolerr_t macbinary_writefile(imgtool::partition &partition, const char *filename, const char *fork, imgtool::stream &sourcef, util::option_resolution *opts) { - static const UINT32 attrs[] = + static const uint32_t attrs[] = { IMGTOOLATTR_TIME_CREATED, IMGTOOLATTR_TIME_LASTMODIFIED, @@ -234,23 +234,23 @@ static imgtoolerr_t macbinary_writefile(imgtool::partition &partition, const cha }; imgtoolerr_t err; imgtool::image *image = &partition.image(); - UINT8 header[128]; - UINT32 datafork_size; - UINT32 resourcefork_size; - UINT64 total_size; - UINT32 creation_time; - UINT32 lastmodified_time; + uint8_t header[128]; + uint32_t datafork_size; + uint32_t resourcefork_size; + uint64_t total_size; + uint32_t creation_time; + uint32_t lastmodified_time; //int version; imgtool_attribute attr_values[10]; - UINT32 type_code; - UINT32 creator_code; - UINT16 finder_flags; - UINT16 coord_x; - UINT16 coord_y; - UINT16 finder_folder; - UINT8 script_code = 0; - UINT8 extended_flags = 0; + uint32_t type_code; + uint32_t creator_code; + uint16_t finder_flags; + uint16_t coord_x; + uint16_t coord_y; + uint16_t finder_folder; + uint8_t script_code = 0; + uint8_t extended_flags = 0; /* read in the header */ memset(header, 0, sizeof(header)); @@ -365,7 +365,7 @@ static imgtoolerr_t macbinary_checkstream(imgtool::stream &stream, imgtool_sugge -void filter_macbinary_getinfo(UINT32 state, union filterinfo *info) +void filter_macbinary_getinfo(uint32_t state, union filterinfo *info) { switch(state) { |