Merge remote-tracking branch 'upstream/master' into feature/mtrr

src/include/86box/hdd.h

@@ -154,8 +154,8 @@ typedef struct {
 
     void *priv;
 
-    char fn[1024],     /* Name of current image file */
-        prev_fn[1024]; /* Name of previous image file */
+    char fn[1024];         /* Name of current image file */
+    char vhd_parent[1041]; /* Differential VHD parent file */
 
     uint32_t res0, pad1,
         base,
@@ -176,6 +176,7 @@ typedef struct {
     uint32_t cur_addr;
 
     uint32_t speed_preset;
+    uint32_t vhd_blocksize;
 
     double avg_rotation_lat_usec;
     double full_stroke_usec;

src/include/86box/language.h

@@ -163,6 +163,8 @@
 #    define IDS_DYNAREC IDS_2163
 #endif
 #define IDS_2166      2166 // "Video card #2 ""%hs"" is not..."
+#define IDS_2167      2167 // "Network driver initialization failed"
+#define IDS_2168      2168 // "The network configuration will be switched to the null driver"
 
 #define IDS_4096      4096 // "Hard disk (%s)"
 #define IDS_4097      4097 // "%01i:%01i"
@@ -271,7 +273,7 @@
 
 #define IDS_LANG_ENUS IDS_7168
 
-#define STR_NUM_2048  118
+#define STR_NUM_2048  120
 // UNUSED: #define STR_NUM_3072  11
 #define STR_NUM_4096 40
 #define STR_NUM_4352 6

src/include/86box/network.h

@@ -64,6 +64,9 @@
 #define NET_PERIOD_10M     0.8
 #define NET_PERIOD_100M    0.08
 
+/* Error buffers for network driver init */
+#define NET_DRV_ERRBUF_SIZE 384
+
 enum {
     NET_LINK_DOWN      = (1 << 1),
     NET_LINK_TEMP_DOWN = (1 << 2),
@@ -118,7 +121,7 @@ typedef struct _netcard_t netcard_t;
 
 typedef struct netdrv_t {
     void (*notify_in)(void *priv);
-    void *(*init)(const netcard_t *card, const uint8_t *mac_addr, void *priv);
+    void *(*init)(const netcard_t *card, const uint8_t *mac_addr, void *priv, char *netdrv_errbuf);
     void (*close)(void *priv);
     void *priv;
 } netdrv_t;

src/include/86box/pit.h

@@ -23,7 +23,7 @@ typedef struct {
     uint8_t m, ctrl,
         read_status, latch,
         s1_det, l_det,
-        bcd, pad;
+        bcd, incomplete;
 
     uint16_t rl;