From ec2ae6e95ab536500bba43100ed181c2720ee999 Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Tue, 26 Mar 2019 15:43:34 +0000 Subject: [PATCH] Line Endings --- src/devices/EmuNVNet.h | 30 +++++++++++++++--------------- src/gui/ResCxbx.h | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/devices/EmuNVNet.h b/src/devices/EmuNVNet.h index 19180a7a2..69744ea3d 100644 --- a/src/devices/EmuNVNet.h +++ b/src/devices/EmuNVNet.h @@ -179,11 +179,11 @@ typedef struct _ethernet_header typedef struct _arp_packet { - uint16_t hw_type; - uint16_t protocol; - uint8_t h_addr_len; - uint8_t p_addr_len; - uint16_t operation; + uint16_t hw_type; + uint16_t protocol; + uint8_t h_addr_len; + uint8_t p_addr_len; + uint16_t operation; mac_address h_src; ip_address p_src; mac_address h_dst; @@ -191,16 +191,16 @@ typedef struct _arp_packet } arp_packet; typedef struct _ip_header { - uint8_t ver_hlen; /* version << 4 | header length >> 2 */ - uint8_t type; /* type of service */ - uint16_t len; /* total length */ - uint16_t id; /* identification */ - uint16_t offset; /* fragment offset field */ - uint8_t ttl; /* time to live */ - uint8_t proto; /* protocol */ - uint16_t hdr_csum; /* checksum */ - ip_address src; /* source and dest address */ - ip_address dst; + uint8_t ver_hlen; /* version << 4 | header length >> 2 */ + uint8_t type; /* type of service */ + uint16_t len; /* total length */ + uint16_t id; /* identification */ + uint16_t offset; /* fragment offset field */ + uint8_t ttl; /* time to live */ + uint8_t proto; /* protocol */ + uint16_t hdr_csum; /* checksum */ + ip_address src; /* source and dest address */ + ip_address dst; } ip_header; class NVNetDevice : public PCIDevice { diff --git a/src/gui/ResCxbx.h b/src/gui/ResCxbx.h index c9c74f5d7..3551f1947 100644 --- a/src/gui/ResCxbx.h +++ b/src/gui/ResCxbx.h @@ -356,9 +356,9 @@ #define ID_SETTINGS_CONFIG_LOGGING 40108 #define ID_SYNC_CONFIG_LOGGING 40109 #define ID_LOG 40110 -#define ID_SETTINGS_CONFIG_NETWORK 40111 -#define IDC_NETWORK_ADAPTER 1276 -#define IDD_NETWORK_CFG 40112 +#define ID_SETTINGS_CONFIG_NETWORK 40111 +#define IDC_NETWORK_ADAPTER 1276 +#define IDD_NETWORK_CFG 40112 #define IDC_STATIC -1 // Next default values for new objects