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

src/include/86box/cdrom.h

@@ -102,7 +102,7 @@ typedef struct cdrom {
                          media status. */
         speed, cur_speed;
 
-    FILE *img_fp;
+    int   is_dir;
     void *priv;
 
     char image_path[1024],

src/include/86box/cdrom_image_backend.h

@@ -52,6 +52,7 @@ typedef struct {
 
     char  fn[260];
     FILE *file;
+    void *priv;
 } track_file_t;
 
 typedef struct {
@@ -88,4 +89,10 @@ extern int  cdi_load_cue(cd_img_t *cdi, const char *cuefile);
 extern int  cdi_has_data_track(cd_img_t *cdi);
 extern int  cdi_has_audio_track(cd_img_t *cdi);
 
+/* Virtual ISO functions. */
+extern int           viso_read(void *p, uint8_t *buffer, uint64_t seek, size_t count);
+extern uint64_t      viso_get_length(void *p);
+extern void          viso_close(void *p);
+extern track_file_t *viso_init(const char *dirname, int *error);
+
 #endif /*CDROM_IMAGE_BACKEND_H*/

src/include/86box/fdd.h

@@ -22,6 +22,7 @@
 #define EMU_FDD_H
 
 #define FDD_NUM          4
+#define FLOPPY_IMAGE_HISTORY         4
 #define SEEK_RECALIBRATE -999
 
 #ifdef __cplusplus
@@ -84,6 +85,7 @@ typedef struct {
 
 extern DRIVE      drives[FDD_NUM];
 extern char       floppyfns[FDD_NUM][512];
+extern char       *fdd_image_history[FDD_NUM][FLOPPY_IMAGE_HISTORY];
 extern pc_timer_t fdd_poll_time[FDD_NUM];
 extern int        ui_writeprot[FDD_NUM];
 

src/include/86box/hdd.h

@@ -203,13 +203,13 @@ extern int image_is_hdi(const char *s);
 extern int image_is_hdx(const char *s, int check_signature);
 extern int image_is_vhd(const char *s, int check_signature);
 
-extern double hdd_timing_write(hard_disk_t *hdd, uint32_t addr, uint32_t len);
-extern double hdd_timing_read(hard_disk_t *hdd, uint32_t addr, uint32_t len);
-extern double hdd_seek_get_time(hard_disk_t *hdd, uint32_t dst_addr, uint8_t operation, uint8_t continuous, double max_seek_time);
-int           hdd_preset_get_num();
-char         *hdd_preset_getname(int preset);
-extern char  *hdd_preset_get_internal_name(int preset);
-extern int    hdd_preset_get_from_internal_name(char *s);
-extern void   hdd_preset_apply(int hdd_id);
+extern double      hdd_timing_write(hard_disk_t *hdd, uint32_t addr, uint32_t len);
+extern double      hdd_timing_read(hard_disk_t *hdd, uint32_t addr, uint32_t len);
+extern double      hdd_seek_get_time(hard_disk_t *hdd, uint32_t dst_addr, uint8_t operation, uint8_t continuous, double max_seek_time);
+int                hdd_preset_get_num();
+const char        *hdd_preset_getname(int preset);
+extern const char *hdd_preset_get_internal_name(int preset);
+extern int         hdd_preset_get_from_internal_name(char *s);
+extern void        hdd_preset_apply(int hdd_id);
 
 #endif /*EMU_HDD_H*/

src/include/86box/machine.h

@@ -787,6 +787,7 @@ extern int machine_xt_sansx16_init(const machine_t *);
 extern int machine_xt_bw230_init(const machine_t *);
 
 extern int machine_xt_iskra3104_init(const machine_t *);
+extern int machine_xt_pravetz16_imko4_init(const machine_t *);
 
 /* m_xt_compaq.c */
 extern int machine_xt_compaq_deskpro_init(const machine_t *);

src/include/86box/plat.h

@@ -76,6 +76,10 @@ extern "C" {
 #    define atomic_bool_t atomic_bool
 #endif
 
+#if defined(_MSC_VER)
+#    define ssize_t intptr_t
+#endif
+
 /* Global variables residing in the platform module. */
 extern int dopause,          /* system is paused */
     mouse_capture;           /* mouse is captured in app */

src/include/86box/plat_dir.h

@@ -17,6 +17,8 @@
 #ifndef PLAT_DIR_H
 #define PLAT_DIR_H
 
+/* Windows needs the POSIX re-implementations */
+#if defined(_WIN32)
 #ifdef _MAX_FNAME
 #    define MAXNAMLEN _MAX_FNAME
 #else
@@ -63,5 +65,10 @@ extern void           seekdir(DIR *, long);
 extern int            closedir(DIR *);
 
 #define rewinddir(dirp) seekdir(dirp, 0L)
+#else
+/* On linux and macOS, use the standard functions and types */
+#include <sys/dir.h>
+#endif
+
 
 #endif /*PLAT_DIR_H*/

src/include/86box/resource.h

@@ -445,7 +445,8 @@
 #define IDM_CDROM_EMPTY                0x4300
 #define IDM_CDROM_RELOAD               0x4400
 #define IDM_CDROM_IMAGE                0x4500
-#define IDM_CDROM_HOST_DRIVE           0x4600
+#define IDM_CDROM_DIR                  0x4600
+#define IDM_CDROM_HOST_DRIVE           0x4700
 
 #define IDM_ZIP_IMAGE_NEW              0x5200
 #define IDM_ZIP_IMAGE_EXISTING         0x5300

src/include/86box/video.h

@@ -509,6 +509,7 @@ extern const device_t ibm_ps1_2121_device;
 extern const device_t tvga8900b_device;
 extern const device_t tvga8900d_device;
 extern const device_t tvga9000b_device;
+extern const device_t nec_sv9000_device;
 
 /* IBM VGA */
 extern const device_t vga_device;