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

A bit more clang-format

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-11-19 08:49:04 -05:00
parent b04dd8cc8b
commit 3fe4f75108
223 changed files with 8047 additions and 7456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/network/net_pcnet.c
View File

@@ -756,11 +756,11 @@ padr_match(nic_t *dev, const uint8_t *buf, int size)
result = !CSR_DRCVPA(dev) && !memcmp(hdr->ether_dhost, padr, 6);
pcnet_log(3, "%s: packet dhost=%02x:%02x:%02x:%02x:%02x:%02x, "
"padr=%02x:%02x:%02x:%02x:%02x:%02x => %d\n",
dev->name,
hdr->ether_dhost[0], hdr->ether_dhost[1], hdr->ether_dhost[2],
hdr->ether_dhost[3], hdr->ether_dhost[4], hdr->ether_dhost[5],
padr[0], padr[1], padr[2], padr[3], padr[4], padr[5], result);
"padr=%02x:%02x:%02x:%02x:%02x:%02x => %d\n",
dev->name,
hdr->ether_dhost[0], hdr->ether_dhost[1], hdr->ether_dhost[2],
hdr->ether_dhost[3], hdr->ether_dhost[4], hdr->ether_dhost[5],
padr[0], padr[1], padr[2], padr[3], padr[4], padr[5], result);
return result;
}
@@ -944,13 +944,13 @@ pcnetInit(nic_t *dev)
dev->GCUpperPhys = 0;
PCNET_INIT();
pcnet_log(3, "%s: initblk.rlen=%#04x, initblk.tlen=%#04x\n",
dev->name, initblk.rlen, initblk.tlen);
dev->name, initblk.rlen, initblk.tlen);
} else {
struct INITBLK16 initblk;
dev->GCUpperPhys = (0xff00 & (uint32_t) dev->aCSR[2]) << 16;
PCNET_INIT();
pcnet_log(3, "%s: initblk.rlen=%#04x, initblk.tlen=%#04x\n",
dev->name, initblk.rlen, initblk.tlen);
dev->name, initblk.rlen, initblk.tlen);
}
#undef PCNET_INIT
@@ -985,9 +985,9 @@ pcnetInit(nic_t *dev)
CSR_CXST(dev) = CSR_CXBC(dev) = CSR_NXST(dev) = CSR_NXBC(dev) = 0;
pcnet_log(1, "%s: Init: SWSTYLE=%d GCRDRA=%#010x[%d] GCTDRA=%#010x[%d]%s\n",
dev->name, BCR_SWSTYLE(dev),
dev->GCRDRA, CSR_RCVRL(dev), dev->GCTDRA, CSR_XMTRL(dev),
!dev->fSignalRxMiss ? " (CSR0_MISS disabled)" : "");
dev->name, BCR_SWSTYLE(dev),
dev->GCRDRA, CSR_RCVRL(dev), dev->GCTDRA, CSR_XMTRL(dev),
!dev->fSignalRxMiss ? " (CSR0_MISS disabled)" : "");
if (dev->GCRDRA & (dev->iLog2DescSize - 1))
pcnet_log(1, "%s: Warning: Misaligned RDRA\n", dev->name);
@@ -1072,7 +1072,7 @@ pcnetRdtePoll(nic_t *dev)
*/
if (++dev->uCntBadRMD < 50)
pcnet_log(1, "%s: BAD RMD ENTRIES AT %#010x (i=%d)\n",
dev->name, addr, i);
dev->name, addr, i);
return;
}
@@ -1098,7 +1098,7 @@ pcnetRdtePoll(nic_t *dev)
*/
if (++dev->uCntBadRMD < 50)
pcnet_log(1, "%s: BAD RMD ENTRIES + AT %#010x (i=%d)\n",
dev->name, addr, i);
dev->name, addr, i);
return;
}
@@ -1126,7 +1126,7 @@ pcnetTdtePoll(nic_t *dev, TMD *tmd)
if (tmd->tmd1.ones != 15) {
pcnet_log(1, "%s: BAD TMD XDA=%#010x\n",
dev->name, PHYSADDR(dev, cxda));
dev->name, PHYSADDR(dev, cxda));
return 0;
}
@@ -1182,7 +1182,7 @@ pcnetCalcPacketLen(nic_t *dev, int cb)
}
if (tmd.tmd1.ones != 15) {
pcnet_log(1, "%s: BAD TMD XDA=%#010x\n",
dev->name, PHYSADDR(dev, addrDesc));
dev->name, PHYSADDR(dev, addrDesc));
pcnet_log(3, "%s: pcnetCalcPacketLen: bad TMD, return %u\n", dev->name, cbPacket);
return cbPacket;
}
@@ -1228,9 +1228,9 @@ pcnetReceiveNoSync(void *priv, uint8_t *buf, int size)
return 0;
pcnet_log(1, "%s: pcnetReceiveNoSync: RX %x:%x:%x:%x:%x:%x > %x:%x:%x:%x:%x:%x len %d\n", dev->name,
buf[6], buf[7], buf[8], buf[9], buf[10], buf[11],
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
size);
buf[6], buf[7], buf[8], buf[9], buf[10], buf[11],
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
size);
/*
* Perform address matching.
@@ -1411,7 +1411,7 @@ pcnetReceiveNoSync(void *priv, uint8_t *buf, int size)
dev->aCSR[0] |= 0x0400;
pcnet_log(1, "%s: RINT set, RCVRC=%d CRDA=%#010x\n", dev->name,
CSR_RCVRC(dev), PHYSADDR(dev, CSR_CRDA(dev)));
CSR_RCVRC(dev), PHYSADDR(dev, CSR_CRDA(dev)));
/* guest driver is owner: force repoll of current and next RDTEs */
CSR_CRST(dev) = 0;
@@ -1574,7 +1574,7 @@ pcnetAsyncTransmit(nic_t *dev)
CSR_XMTRC(dev) = CSR_XMTRL(dev);
else
CSR_XMTRC(dev)
--;
--;
TMD dummy;
if (!pcnetTdtePoll(dev, &dummy)) {
@@ -1629,7 +1629,7 @@ pcnetAsyncTransmit(nic_t *dev)
CSR_XMTRC(dev) = CSR_XMTRL(dev);
else
CSR_XMTRC(dev)
--;
--;
break;
}
} /* the loop */
@@ -1897,7 +1897,7 @@ pcnet_csr_writew(nic_t *dev, uint16_t rap, uint16_t val)
return;
}
pcnet_log(3, "%s: WRITE CSR%d, %#06x (hacked %#06x) (alt init)\n", dev->name,
rap, val, 1 + ~val);
rap, val, 1 + ~val);
val = 1 + ~val;
/*
@@ -2984,12 +2984,12 @@ pcnet_init(const device_t *info)
}
pcnet_log(2, "%s: I/O=%04x, IRQ=%d, MAC=%02x:%02x:%02x:%02x:%02x:%02x\n",
dev->name, dev->base_address, dev->base_irq,
dev->aPROM[0], dev->aPROM[1], dev->aPROM[2],
dev->aPROM[3], dev->aPROM[4], dev->aPROM[5]);
dev->name, dev->base_address, dev->base_irq,
dev->aPROM[0], dev->aPROM[1], dev->aPROM[2],
dev->aPROM[3], dev->aPROM[4], dev->aPROM[5]);
pcnet_log(1, "%s: %s attached IO=0x%X IRQ=%d\n", dev->name,
dev->is_pci ? "PCI" : "VLB/ISA", dev->base_address, dev->base_irq);
dev->is_pci ? "PCI" : "VLB/ISA", dev->base_address, dev->base_irq);
/* Reset the board. */
pcnetHardReset(dev);

2
src/network/net_slirp.c
View File

@@ -38,7 +38,7 @@
#include <86box/config.h>
#include <86box/video.h>
# define _SSIZE_T_DEFINED
#define _SSIZE_T_DEFINED
#include <slirp/libslirp.h>
#ifdef _WIN32

4
src/network/network.c
View File

@@ -55,7 +55,7 @@
#include <wchar.h>
#include <time.h>
#ifndef _WIN32
#include <sys/time.h>
# include <sys/time.h>
#endif /* _WIN32 */
#include <stdbool.h>
#define HAVE_STDARG_H
@@ -126,7 +126,7 @@ netdev_t network_devs[NET_HOST_INTF_MAX];
/* Local variables. */
#if defined ENABLE_NETWORK_LOG && !defined(_WIN32)
#if defined ENABLE_NETWORK_LOG && !defined(_WIN32)
int network_do_log = ENABLE_NETWORK_LOG;
static FILE *network_dump = NULL;
static mutex_t *network_dump_mutex;

2
src/network/pcap_if.c
View File

@@ -288,7 +288,7 @@ main(int argc, char **argv)
return (1);
}
/* Looks good, go and listen.. */
/* Looks good, go and listen.. */
i = start_cap(interfaces[i - 1].device);
dynld_close(pcap_handle);

97
src/network/slirp/tinyglib.c
View File

@@ -28,18 +28,16 @@ g_spawn_async_with_fds(const gchar *working_directory, gchar **argv,
return 0;
}
/* Needs bounds checking, but not really used by libslirp. */
GString *
g_string_new(gchar *base)
{
char *ret = malloc(4096);
if (base)
strcpy(ret, base);
strcpy(ret, base);
return ret;
}
/* Unimplemented, as with anything related to GString. */
gchar *
g_string_free(GString *string, gboolean free_segment)
@@ -47,87 +45,84 @@ g_string_free(GString *string, gboolean free_segment)
return (free_segment ? NULL : string);
}
/* Implementation borrowed from GLib itself. */
gchar *
g_strstr_len(const gchar *haystack, gssize haystack_len, const gchar *needle)
{
if (haystack_len < 0)
return strstr(haystack, needle);
return strstr(haystack, needle);
else {
const gchar *p = haystack;
gsize needle_len = strlen(needle);
gsize haystack_len_unsigned = haystack_len;
const gchar *end;
gsize i;
const gchar *p = haystack;
gsize needle_len = strlen(needle);
gsize haystack_len_unsigned = haystack_len;
const gchar *end;
gsize i;
if (needle_len == 0)
return (gchar *) haystack;
if (needle_len == 0)
return (gchar *) haystack;
if (haystack_len_unsigned < needle_len)
return NULL;
if (haystack_len_unsigned < needle_len)
return NULL;
end = haystack + haystack_len - needle_len;
end = haystack + haystack_len - needle_len;
while (p <= end && *p) {
for (i = 0; i < needle_len; i++)
if (p[i] != needle[i])
goto next;
while (p <= end && *p) {
for (i = 0; i < needle_len; i++)
if (p[i] != needle[i])
goto next;
return (gchar *)p;
return (gchar *) p;
next:
p++;
}
p++;
}
return NULL;
return NULL;
}
}
/* Implementation borrowed from GLib itself. */
guint
g_strv_length(gchar **str_array)
{
guint i = 0;
while (str_array[i] != NULL)
++i;
++i;
return i;
}
/* Implementation borrowed from GLib itself. */
gsize
g_strlcpy (gchar *dest,
const gchar *src,
gsize dest_size)
g_strlcpy(gchar *dest,
const gchar *src,
gsize dest_size)
{
gchar *d = dest;
const gchar *s = src;
gsize n = dest_size;
gchar *d = dest;
const gchar *s = src;
gsize n = dest_size;
if (dest == NULL) return 0;
if (src == NULL) return 0;
if (dest == NULL)
return 0;
if (src == NULL)
return 0;
/* Copy as many bytes as will fit */
if (n != 0 && --n != 0)
do
{
gchar c = *s++;
/* Copy as many bytes as will fit */
if (n != 0 && --n != 0)
do {
gchar c = *s++;
*d++ = c;
if (c == 0)
break;
}
while (--n != 0);
*d++ = c;
if (c == 0)
break;
} while (--n != 0);
/* If not enough room in dest, add NUL and traverse rest of src */
if (n == 0)
{
if (dest_size != 0)
*d = 0;
while (*s++)
;
/* If not enough room in dest, add NUL and traverse rest of src */
if (n == 0) {
if (dest_size != 0)
*d = 0;
while (*s++)
;
}
return s - src - 1; /* count does not include NUL */
return s - src - 1; /* count does not include NUL */
}