claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Timers are now 64-bit.

Browse Source
This commit is contained in:
OBattler
2017-10-09 01:48:36 +02:00
parent 08bf9109d7
commit 02bbfb26eb
67 changed files with 508 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/scsi/scsi_aha154x.c
View File

@@ -395,7 +395,7 @@ typedef struct {
wchar_t *nvr_path; /* path to NVR image file */
uint8_t *nvr; /* EEPROM buffer */
int ResetCB;
int64_t ResetCB;
volatile uint8_t /* for multi-threading, keep */
Status, /* these volatile */
@@ -636,7 +636,7 @@ aha_reset(aha_t *dev)
}
}
dev->ResetCB = 0;
dev->ResetCB = 0LL;
dev->Status = STAT_IDLE | STAT_INIT;
dev->Geometry = 0x80;
@@ -682,7 +682,7 @@ aha_reset_poll(void *priv)
dev->Status &= ~STAT_STST;
dev->Status |= STAT_IDLE;
dev->ResetCB = 0;
dev->ResetCB = 0LL;
}

6
src/scsi/scsi_buslogic.c
View File

@@ -515,7 +515,7 @@ typedef struct {
#pragma pack(pop)
static int BuslogicResetCallback = 0;
static int64_t BuslogicResetCallback = 0LL;
static void BuslogicCommandThread(void *p);
@@ -814,7 +814,7 @@ BuslogicReset(Buslogic_t *bl)
}
}
BuslogicResetCallback = 0;
BuslogicResetCallback = 0LL;
bl->scan_restart = 0;
bl->Geometry = 0x80;
@@ -2559,7 +2559,7 @@ BuslogicResetPoll(void *p)
bl->Status &= ~STAT_STST;
bl->Status |= STAT_IDLE;
BuslogicResetCallback = 0;
BuslogicResetCallback = 0LL;
}

6
src/scsi/scsi_ncr5380.c
View File

@@ -59,7 +59,7 @@
#define NCR_DMAINIRECV 7 /* DMA initiator receive (write only) */
#define NCR_RESETPARITY 7 /* reset parity/interrupt (read only) */
#define POLL_TIME_US 10
#define POLL_TIME_US 10LL
#define MAX_BYTES_TRANSFERRED_PER_POLL 50
/*10us poll period with 50 bytes transferred per poll = 5MB/sec*/
@@ -131,8 +131,8 @@ typedef struct {
ncr5380_t ncr;
int ncr5380_dma_enabled;
int dma_callback;
int dma_enabled;
int64_t dma_callback;
int64_t dma_enabled;
int ncr_busy;
} ncr_t;