From 65b1111c11865fb15db6495c8e40e71f34af51ba Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 17 Oct 2020 01:52:46 -0300 Subject: [PATCH] Restore always-on LPT status bits, except ERROR --- src/include/86box/net_plip.h | 2 +- src/lpt.c | 6 +++--- src/network/network.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/include/86box/net_plip.h b/src/include/86box/net_plip.h index 6f26d85e4..d45b80091 100644 --- a/src/include/86box/net_plip.h +++ b/src/include/86box/net_plip.h @@ -21,4 +21,4 @@ extern const lpt_device_t lpt_plip_device; extern const device_t plip_device; -#endif /*NET_PLIP_H*/ +#endif /*NET_PLIP_H*/ diff --git a/src/lpt.c b/src/lpt.c index b304f03a1..bf0cc339e 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -93,8 +93,8 @@ lpt_devices_close(void) for (i = 0; i < 3; i++) { dev = &lpt_ports[i]; - if (dev->dt) - dev->dt->close(dev->priv); + if (dev->dt) + dev->dt->close(dev->priv); dev->dt = NULL; } @@ -142,7 +142,7 @@ lpt_read(uint16_t port, void *priv) case 1: if (dev->dt && dev->dt->read_status) - ret = dev->dt->read_status(dev->priv); + ret = dev->dt->read_status(dev->priv) | 0x07; else ret = 0xdf; break; diff --git a/src/network/network.c b/src/network/network.c index 913bb101a..1e7dfa308 100644 --- a/src/network/network.c +++ b/src/network/network.c @@ -351,7 +351,7 @@ network_rx_queue(void *priv) network_queue_get(0, &pkt); if ((pkt != NULL) && (pkt->len > 0)) { - network_dump_packet(pkt); + network_dump_packet(pkt); net_cards[network_card].rx(pkt->priv, pkt->data, pkt->len); if (pkt->len >= 128) timer_on_auto(&network_rx_queue_timer, 0.762939453125 * 2.0 * ((double) pkt->len)); @@ -554,7 +554,7 @@ network_do_tx(void) network_queue_get(1, &pkt); if ((pkt != NULL) && (pkt->len > 0)) { - network_dump_packet(pkt); + network_dump_packet(pkt); switch(network_type) { case NET_TYPE_PCAP: net_pcap_in(pkt->data, pkt->len);