80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Last minor fixes, it compile without problems now.

Browse Source
This commit is contained in:
OBattler
2020-03-24 02:50:24 +01:00
parent 5b5face08b
commit 1550a3a176
3 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/net_pcnet.c
View File

@@ -1027,13 +1027,6 @@ pcnetStop(nic_t *dev)
} }
static void
pcnetWakeupReceive(nic_t *dev)
{
/* TODO: Wake up the thread here. */
}
/** /**
* Poll Receive Descriptor Table Entry and cache the results in the appropriate registers. * Poll Receive Descriptor Table Entry and cache the results in the appropriate registers.
* Note: Once a descriptor belongs to the network card (this driver), it cannot be changed * Note: Once a descriptor belongs to the network card (this driver), it cannot be changed
@@ -2687,7 +2680,9 @@ pcnetTimerCallback(void *priv)
{ {
nic_t *dev = (nic_t *) priv; nic_t *dev = (nic_t *) priv;
pcnetlog("Timer Callback to RX\n"); #ifdef ENABLE_PCNET_LOG
pcnetlog(3, "Timer Callback to RX\n");
#endif
pcnetPollRxTx(dev); pcnetPollRxTx(dev);
timer_disable(&dev->poll_timer); timer_disable(&dev->poll_timer);

22
src/scsi/scsi_spock.c
View File

@@ -25,17 +25,17 @@
#include <stdarg.h> #include <stdarg.h>
#include <wchar.h> #include <wchar.h>
#define HAVE_STDARG_H #define HAVE_STDARG_H
#include "../86box.h" #include "86box.h"
#include "../io.h" #include "86box_io.h"
#include "../timer.h" #include "timer.h"
#include "../dma.h" #include "dma.h"
#include "../pic.h" #include "pic.h"
#include "../mca.h" #include "mca.h"
#include "../mem.h" #include "mem.h"
#include "../rom.h" #include "rom.h"
#include "../device.h" #include "device.h"
#include "../nvr.h" #include "nvr.h"
#include "../plat.h" #include "plat.h"
#include "scsi.h" #include "scsi.h"
#include "scsi_device.h" #include "scsi_device.h"
#include "scsi_spock.h" #include "scsi_spock.h"

3
src/video/vid_cl54xx.c
View File

@@ -26,6 +26,7 @@
#include "86box.h" #include "86box.h"
#include "cpu.h" #include "cpu.h"
#include "86box_io.h" #include "86box_io.h"
#include "mca.h"
#include "mem.h" #include "mem.h"
#include "pci.h" #include "pci.h"
#include "rom.h" #include "rom.h"
@@ -3126,7 +3127,7 @@ static void
if (gd54xx->mca) { if (gd54xx->mca) {
gd54xx->pos_regs[0] = 0x7b; gd54xx->pos_regs[0] = 0x7b;
gd54xx->pos_regs[1] = 0x91; gd54xx->pos_regs[1] = 0x91;
mca_add(gd5428_mca_read, gd5428_mca_write, gd5428_mca_feedb, NULL, gd54xx); mca_add(gd5428_mca_read, gd5428_mca_write, gd5428_mca_feedb, gd54xx);
} }
return gd54xx; return gd54xx;