summaryrefslogtreecommitdiffstats
path: root/src/tools/imgtool/modules/vzdos.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/imgtool/modules/vzdos.cpp')
-rw-r--r--src/tools/imgtool/modules/vzdos.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/tools/imgtool/modules/vzdos.cpp b/src/tools/imgtool/modules/vzdos.cpp
index 6fe44f4d760..bf46863bb28 100644
--- a/src/tools/imgtool/modules/vzdos.cpp
+++ b/src/tools/imgtool/modules/vzdos.cpp
@@ -47,10 +47,10 @@ struct vzdos_dirent
char ftype;
char delimitor;
char fname[8];
- UINT8 start_track;
- UINT8 start_sector;
- UINT16 start_address;
- UINT16 end_address;
+ uint8_t start_track;
+ uint8_t start_sector;
+ uint16_t start_address;
+ uint16_t end_address;
};
struct vz_iterator
@@ -59,7 +59,7 @@ struct vz_iterator
int eof;
};
-static const UINT8 sector_order[] =
+static const uint8_t sector_order[] =
{
0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14, 1, 4, 7, 10, 13
};
@@ -81,10 +81,10 @@ static int vzdos_get_fname_len(const char *fname)
}
/* calculate checksum-16 of buffer */
-static UINT16 chksum16(UINT8 *buffer, int len)
+static uint16_t chksum16(uint8_t *buffer, int len)
{
int i;
- UINT16 sum = 0;
+ uint16_t sum = 0;
for (i = 0; i < len; i++)
sum += buffer[i];
@@ -96,7 +96,7 @@ static UINT16 chksum16(UINT8 *buffer, int len)
static imgtoolerr_t vzdos_get_data_start(imgtool::image &img, int track, int sector, int *start)
{
imgtoolerr_t ret;
- UINT8 buffer[25]; /* enough to read the sector header */
+ uint8_t buffer[25]; /* enough to read the sector header */
ret = (imgtoolerr_t)floppy_read_sector(imgtool_floppy(img), 0, track, sector_order[sector], 0, &buffer, sizeof(buffer));
if (ret) return ret;
@@ -115,10 +115,10 @@ static imgtoolerr_t vzdos_get_data_start(imgtool::image &img, int track, int sec
}
/* return the actual data of a sector */
-static imgtoolerr_t vzdos_read_sector_data(imgtool::image &img, int track, int sector, UINT8 *data)
+static imgtoolerr_t vzdos_read_sector_data(imgtool::image &img, int track, int sector, uint8_t *data)
{
int ret, data_start;
- UINT8 buffer[DATA_SIZE + 4]; /* data + checksum */
+ uint8_t buffer[DATA_SIZE + 4]; /* data + checksum */
ret = vzdos_get_data_start(img, track, sector, &data_start);
if (ret) return (imgtoolerr_t)ret;
@@ -136,10 +136,10 @@ static imgtoolerr_t vzdos_read_sector_data(imgtool::image &img, int track, int s
}
/* write data to sector */
-static imgtoolerr_t vzdos_write_sector_data(imgtool::image &img, int track, int sector, UINT8 *data)
+static imgtoolerr_t vzdos_write_sector_data(imgtool::image &img, int track, int sector, uint8_t *data)
{
int ret, data_start;
- UINT8 buffer[DATA_SIZE + 4]; /* data + checksum */
+ uint8_t buffer[DATA_SIZE + 4]; /* data + checksum */
ret = vzdos_get_data_start(img, track, sector, &data_start);
if (ret) return (imgtoolerr_t)ret;
@@ -156,7 +156,7 @@ static imgtoolerr_t vzdos_write_sector_data(imgtool::image &img, int track, int
/* write formatted empty sector */
static imgtoolerr_t vzdos_clear_sector(imgtool::image &img, int track, int sector)
{
- UINT8 data[DATA_SIZE + 2];
+ uint8_t data[DATA_SIZE + 2];
memset(data, 0x00, sizeof(data));
@@ -167,7 +167,7 @@ static imgtoolerr_t vzdos_clear_sector(imgtool::image &img, int track, int secto
static imgtoolerr_t vzdos_get_dirent(imgtool::image &img, int index, vzdos_dirent *ent)
{
int ret, entry;
- UINT8 buffer[DATA_SIZE + 2];
+ uint8_t buffer[DATA_SIZE + 2];
ret = vzdos_read_sector_data(img, 0, (int) index / 8, buffer);
if (ret) return (imgtoolerr_t)ret;
@@ -197,7 +197,7 @@ static imgtoolerr_t vzdos_get_dirent(imgtool::image &img, int index, vzdos_diren
static imgtoolerr_t vzdos_set_dirent(imgtool::image &img, int index, vzdos_dirent ent)
{
int ret, entry;
- UINT8 buffer[DATA_SIZE + 2];
+ uint8_t buffer[DATA_SIZE + 2];
/* read current sector with entries */
ret = vzdos_read_sector_data(img, 0, (int) index / 8, buffer);
@@ -288,7 +288,7 @@ static imgtoolerr_t vzdos_get_dirent_fname(imgtool::image &img, const char *fnam
static imgtoolerr_t vzdos_toggle_trackmap(imgtool::image &img, int track, int sector, int clear)
{
int ret, value, bit;
- UINT8 buffer[DATA_SIZE + 2];
+ uint8_t buffer[DATA_SIZE + 2];
/* get trackmap from image */
ret = vzdos_read_sector_data(img, 0, 15, buffer);
@@ -324,7 +324,7 @@ static imgtoolerr_t vzdos_set_trackmap(imgtool::image &img, int track, int secto
static imgtoolerr_t vzdos_get_trackmap(imgtool::image &img, int track, int sector, int *used)
{
int ret, value, bit;
- UINT8 buffer[DATA_SIZE + 2];
+ uint8_t buffer[DATA_SIZE + 2];
/* get trackmap from image */
ret = vzdos_read_sector_data(img, 0, 15, buffer);
@@ -360,9 +360,9 @@ static imgtoolerr_t vzdos_free_trackmap(imgtool::image &img, int *track, int *se
static imgtoolerr_t vzdos_write_formatted_sector(imgtool::image &img, int track, int sector)
{
int ret;
- UINT8 sector_data[DATA_SIZE + 4 + 24];
+ uint8_t sector_data[DATA_SIZE + 4 + 24];
- static const UINT8 sector_header[24] = {
+ static const uint8_t sector_header[24] = {
0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0xFE, 0xE7,
0x18, 0xC3, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80,
0x80, 0x80, 0x80, 0x00, 0xC3, 0x18, 0xE7, 0xFE
@@ -371,9 +371,9 @@ static imgtoolerr_t vzdos_write_formatted_sector(imgtool::image &img, int track,
memset(sector_data, 0x00, sizeof(sector_data));
memcpy(sector_data, sector_header, sizeof(sector_header));
- sector_data[10] = (UINT8) track; /* current track */
- sector_data[11] = (UINT8) sector; /* current sector */
- sector_data[12] = (UINT8) track + sector; /* checksum-8 */
+ sector_data[10] = (uint8_t) track; /* current track */
+ sector_data[11] = (uint8_t) sector; /* current sector */
+ sector_data[12] = (uint8_t) track + sector; /* checksum-8 */
ret = floppy_write_sector(imgtool_floppy(img), 0, track, sector_order[sector], 0, sector_data, sizeof(sector_data), 0); /* TODO: pass ddam argument from imgtool */
if (ret) return (imgtoolerr_t)ret;
@@ -455,12 +455,12 @@ static imgtoolerr_t vzdos_diskimage_nextenum(imgtool::directory &enumeration, im
/* TRK 0 sector 15 is used to hold the track map of the disk with one bit
corresponding to a sector used. */
-static imgtoolerr_t vzdos_diskimage_freespace(imgtool::partition &partition, UINT64 *size)
+static imgtoolerr_t vzdos_diskimage_freespace(imgtool::partition &partition, uint64_t *size)
{
imgtoolerr_t ret;
int i;
imgtool::image &image(partition.image());
- UINT8 c, v, buffer[DATA_SIZE + 2];
+ uint8_t c, v, buffer[DATA_SIZE + 2];
*size = 0;
ret = vzdos_read_sector_data(image, 0, 15, buffer);
@@ -484,7 +484,7 @@ static imgtoolerr_t vzdos_diskimage_readfile(imgtool::partition &partition, cons
imgtool::image &image(partition.image());
int filesize, track, sector;
vzdos_dirent ent;
- UINT8 buffer[DATA_SIZE + 2];
+ uint8_t buffer[DATA_SIZE + 2];
ret = vzdos_get_dirent_fname(image, filename, &ent);
if (ret) return ret;
@@ -530,7 +530,7 @@ static imgtoolerr_t vzdos_diskimage_deletefile(imgtool::partition &partition, co
imgtool::image &img(partition.image());
int index, filesize, track, sector, next_track, next_sector;
vzdos_dirent entry, next_entry;
- UINT8 buffer[DATA_SIZE + 2];
+ uint8_t buffer[DATA_SIZE + 2];
ret = vzdos_get_dirent_fname(img, fname, &entry);
if (ret) return ret;
@@ -608,8 +608,8 @@ static imgtoolerr_t vzdos_writefile(imgtool::partition &partition, int offset, i
imgtool::image &img(partition.image());
int index, track, sector, toread, next_track, next_sector;
vzdos_dirent temp_entry;
- UINT64 filesize = 0, freespace = 0;
- UINT8 buffer[DATA_SIZE + 2];
+ uint64_t filesize = 0, freespace = 0;
+ uint8_t buffer[DATA_SIZE + 2];
char filename[9];
/* is the image writeable? */
@@ -813,7 +813,7 @@ static imgtoolerr_t vzsnapshot_readfile(imgtool::partition &partition, const cha
imgtoolerr_t ret;
imgtool::image &image(partition.image());
vzdos_dirent entry;
- UINT8 header[24];
+ uint8_t header[24];
/* get directory entry from disk */
ret = vzdos_get_dirent_fname(image, filename, &entry);
@@ -857,7 +857,7 @@ static imgtoolerr_t vzsnapshot_writefile(imgtool::partition &partition, const ch
imgtoolerr_t ret;
int fnameopt;
vzdos_dirent entry;
- UINT8 header[24];
+ uint8_t header[24];
/* get header infos from file */
sourcef.read(header, sizeof(header));
@@ -887,7 +887,7 @@ static imgtoolerr_t vzsnapshot_writefile(imgtool::partition &partition, const ch
return IMGTOOLERR_SUCCESS;
}
-void filter_vzsnapshot_getinfo(UINT32 state, union filterinfo *info)
+void filter_vzsnapshot_getinfo(uint32_t state, union filterinfo *info)
{
switch(state)
{
@@ -928,7 +928,7 @@ W E & F Word Pro with Patch 3.3 File End Addr D000H
W Russell Harrison Word Pro File Except above two
*/
-void vzdos_get_info(const imgtool_class *imgclass, UINT32 state, union imgtoolinfo *info)
+void vzdos_get_info(const imgtool_class *imgclass, uint32_t state, union imgtoolinfo *info)
{
switch(state)
{