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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
RichardG867
2021-03-21 16:59:28 -03:00
parent 99405a41b2 10cc122925
commit 70ae42e7a0
18 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/net_pcnet.c
View File

@@ -1997,11 +1997,6 @@ pcnet_csr_readw(nic_t *dev, uint16_t rap)
return pcnet_bcr_readw(dev,BCR_SWS);
case 68: /* Custom register to pass link speed to driver */
return pcnetLinkSpd(dev->u32LinkSpeed);
case 88:
val = dev->aCSR[89];
val <<= 16;
val |= dev->aCSR[88];
break;
default:
val = dev->aCSR[rap];
break;

2
src/network/slirp/util.h
View File

@@ -48,7 +48,7 @@
#if defined(_MSC_VER) && !defined(__clang__)
#define SLIRP_PACKED
#elif defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))
#elif defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) && !defined(__clang__)
#define SLIRP_PACKED __attribute__((gcc_struct, packed))
#else
#define SLIRP_PACKED __attribute__((packed))