From 5d65037dc6c28b8bcad52f71f8f0f51775999a34 Mon Sep 17 00:00:00 2001
From: Melissa Goad <alegend45@gmail.com>
Date: Tue, 27 Mar 2018 00:50:59 -0500
Subject: [PATCH] Some warning fixes for MSVC15

---
 src/cdrom/cdrom.c  |  4 ++--
 src/cdrom/cdrom.h  |  2 +-
 src/disk/hdc_ide.c | 22 +++++++++++-----------
 src/disk/hdc_ide.h |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index 27138b1..134f614 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -809,11 +809,11 @@ uint32_t cdrom_mode_sense(uint8_t id, uint8_t *buf, uint32_t pos, uint8_t type,
 	return pos;
 }
 
-void cdrom_update_request_length(uint8_t id, int len, int block_len)
+void cdrom_update_request_length(uint8_t id, uint32_t len, uint32_t block_len)
 {
 	cdrom_t *dev = cdrom[id];
 	uint32_t min_len = 0;
-	int bt;
+	uint32_t bt;
 
 	dev->max_transfer_len = dev->request_length;
 
diff --git a/src/cdrom/cdrom.h b/src/cdrom/cdrom.h
index 5d80039..499ad8c 100644
--- a/src/cdrom/cdrom.h
+++ b/src/cdrom/cdrom.h
@@ -145,7 +145,7 @@ typedef struct {
 
 	uint32_t pos;
 
-	int callback;
+	int64_t callback;
 
 	int data_pos;
 	uint32_t seek_diff;
diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c
index e3e6474..cefd1b7 100644
--- a/src/disk/hdc_ide.c
+++ b/src/disk/hdc_ide.c
@@ -358,9 +358,9 @@ static void ide_identify(IDE *ide)
 
 	/* Specify default CHS translation */
 	if (full_size <= 16514064) {
-		ide->buffer[1] = d_tracks;	/* Tracks in default CHS translation. */
-		ide->buffer[3] = d_hpc;		/* Heads in default CHS translation. */
-		ide->buffer[6] = d_spt;		/* Heads in default CHS translation. */
+		ide->buffer[1] = (uint16_t)d_tracks;	/* Tracks in default CHS translation. */
+		ide->buffer[3] = (uint16_t)d_hpc;		/* Heads in default CHS translation. */
+		ide->buffer[6] = (uint16_t)d_spt;		/* Heads in default CHS translation. */
 	} else {
 		ide->buffer[1] = 16383;		/* Tracks in default CHS translation. */
 		ide->buffer[3] = 16;		/* Heads in default CHS translation. */
@@ -398,14 +398,14 @@ static void ide_identify(IDE *ide)
 		ide->buffer[53] |= 1;
 
 		if (ide->specify_success) {
-			ide->buffer[54] = (full_size / ide->t_hpc) / ide->t_spt;
-			ide->buffer[55] = ide->t_hpc;
-			ide->buffer[56] = ide->t_spt;
+			ide->buffer[54] = (uint16_t)((full_size / ide->t_hpc) / ide->t_spt);
+			ide->buffer[55] = (uint16_t)ide->t_hpc;
+			ide->buffer[56] = (uint16_t)ide->t_spt;
 		} else {
 			if (full_size <= 16514064) {
-				ide->buffer[54] = d_tracks;
-				ide->buffer[55] = d_hpc;
-				ide->buffer[56] = d_spt;
+				ide->buffer[54] = (uint16_t)d_tracks;
+				ide->buffer[55] = (uint16_t)d_hpc;
+				ide->buffer[56] = (uint16_t)d_spt;
 			} else {
 				ide->buffer[54] = 16383;
 				ide->buffer[55] = 16;
@@ -795,9 +795,9 @@ static int ide_set_features(IDE *ide)
 	return 1;
 }
 
-void ide_set_sector(IDE *ide, int64_t sector_num)
+void ide_set_sector(IDE *ide, int sector_num)
 {
-	unsigned int cyl, r;
+	uint64_t cyl, r;
 	if (ide->lba)
 	{
 		ide->head = (sector_num >> 24);
diff --git a/src/disk/hdc_ide.h b/src/disk/hdc_ide.h
index 8f73c0b..f0ee337 100644
--- a/src/disk/hdc_ide.h
+++ b/src/disk/hdc_ide.h
@@ -50,9 +50,9 @@ typedef struct {
 	uint8_t fdisk;
 	int pos;
 	int packlen;
-	int spt,hpc;
-	int t_spt,t_hpc;
-	int tracks;
+	uint64_t spt,hpc;
+	uint64_t t_spt,t_hpc;
+	uint64_t tracks;
 	int packetstatus;
 	uint8_t asc;
 	int reset;