Merge branch 'master' of https://github.com/86Box/86Box
This commit is contained in:
@@ -898,7 +898,6 @@ cdrom_get_audio_status_pioneer(cdrom_t *dev, uint8_t *b)
|
||||
{
|
||||
uint8_t ret;
|
||||
subchannel_t subc;
|
||||
uint32_t dat;
|
||||
|
||||
dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
|
||||
|
||||
@@ -960,7 +959,6 @@ cdrom_get_audio_status_sony(cdrom_t *dev, uint8_t *b, int msf)
|
||||
void
|
||||
cdrom_get_current_subcodeq(cdrom_t *dev, uint8_t *b)
|
||||
{
|
||||
uint8_t ret;
|
||||
subchannel_t subc;
|
||||
|
||||
dev->ops->get_subchannel(dev, dev->seek_pos, &subc);
|
||||
|
@@ -92,9 +92,6 @@ static uint16_t mem_addr = 0;
|
||||
static int schedule_fetch = 1;
|
||||
static int pasv = 0;
|
||||
|
||||
static int pfq_idle = 1;
|
||||
static int pfq_delay = 0;
|
||||
|
||||
#define BUS_OUT 1
|
||||
#define BUS_HIGH 2
|
||||
#define BUS_WIDE 4
|
||||
@@ -1268,7 +1265,6 @@ intr_routine(uint16_t intr, int skip_first)
|
||||
uint16_t tempf = cpu_state.flags & (is_nec ? 0x8fd7 : 0x0fd7);
|
||||
uint16_t new_cs;
|
||||
uint16_t new_ip;
|
||||
uint16_t old_ip;
|
||||
|
||||
if (!skip_first)
|
||||
wait(1, 0);
|
||||
@@ -1368,7 +1364,6 @@ custom_nmi(void)
|
||||
uint16_t tempf = cpu_state.flags & (is_nec ? 0x8fd7 : 0x0fd7);
|
||||
uint16_t new_cs;
|
||||
uint16_t new_ip;
|
||||
uint16_t old_ip;
|
||||
|
||||
wait(1, 0);
|
||||
wait(2, 0);
|
||||
@@ -2155,7 +2150,6 @@ execx86(int cycs)
|
||||
uint16_t old_flags;
|
||||
uint16_t tmpa;
|
||||
int bits;
|
||||
uint32_t dest_seg;
|
||||
uint32_t i;
|
||||
uint32_t carry;
|
||||
uint32_t nibble;
|
||||
|
@@ -54,7 +54,6 @@ static pc_timer_t pic_timer;
|
||||
static int shadow = 0;
|
||||
static int elcr_enabled = 0;
|
||||
static int tmr_inited = 0;
|
||||
static int latched = 0;
|
||||
static int pic_pci = 0;
|
||||
static int kbd_latch = 0;
|
||||
static int mouse_latch = 0;
|
||||
|
@@ -1499,7 +1499,6 @@ xga_bitblt(svga_t *svga)
|
||||
int mix = 0;
|
||||
int xdir;
|
||||
int ydir;
|
||||
int skip = 0;
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
|
||||
|
Reference in New Issue
Block a user