80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #1449 from lemondrops/master

Browse Source 
Various small fixes
This commit is contained in:
Miran Grča
2021-05-27 06:24:18 +02:00
committed by GitHub
parent df7efb933d 046aa86ffa
commit 8189e3cc12
7 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config.c
View File

@@ -1040,6 +1040,10 @@ load_storage_controllers(void)
hdc_current = hdc_get_from_internal_name("st506_xt_dtc5150x"); hdc_current = hdc_get_from_internal_name("st506_xt_dtc5150x");
else if (!strcmp(p, "mfm_at")) else if (!strcmp(p, "mfm_at"))
hdc_current = hdc_get_from_internal_name("st506_at"); hdc_current = hdc_get_from_internal_name("st506_at");
else if (!strcmp(p, "vlb_isa"))
hdc_current = hdc_get_from_internal_name("ide_vlb");
else if (!strcmp(p, "vlb_isa_2ch"))
hdc_current = hdc_get_from_internal_name("ide_vlb_2ch");
else else
hdc_current = hdc_get_from_internal_name(p); hdc_current = hdc_get_from_internal_name(p);
@@ -1741,6 +1745,10 @@ load_other_peripherals(void)
hdc_current = hdc_get_from_internal_name("st506_xt_dtc5150x"); hdc_current = hdc_get_from_internal_name("st506_xt_dtc5150x");
else if (!strcmp(p, "mfm_at")) else if (!strcmp(p, "mfm_at"))
hdc_current = hdc_get_from_internal_name("st506_at"); hdc_current = hdc_get_from_internal_name("st506_at");
else if (!strcmp(p, "vlb_isa"))
hdc_current = hdc_get_from_internal_name("ide_vlb");
else if (!strcmp(p, "vlb_isa_2ch"))
hdc_current = hdc_get_from_internal_name("ide_vlb_2ch");
else else
hdc_current = hdc_get_from_internal_name(p); hdc_current = hdc_get_from_internal_name(p);
config_delete_var(cat, "hdc"); config_delete_var(cat, "hdc");

4
src/disk/hdc.c
View File

@@ -118,8 +118,8 @@ static const struct {
{ "esdi_mca", &esdi_ps2_device }, { "esdi_mca", &esdi_ps2_device },
{ "ide_pci", &ide_pci_device }, { "ide_pci", &ide_pci_device },
{ "ide_pci_2ch", &ide_pci_2ch_device }, { "ide_pci_2ch", &ide_pci_2ch_device },
{ "vlb_isa", &ide_vlb_device }, { "ide_vlb", &ide_vlb_device },
{ "vlb_isa_2ch", &ide_vlb_2ch_device }, { "ide_vlb_2ch", &ide_vlb_2ch_device },
{ "", NULL } { "", NULL }
}; };

2
src/printer/prt_escp.c
View File

@@ -595,7 +595,7 @@ update_font(escp_t *dev)
/* Create a full pathname for the ROM file. */ /* Create a full pathname for the ROM file. */
strcpy(path, dev->fontpath); strcpy(path, dev->fontpath);
plat_path_slash(path); plat_path_slash(path);
strcpy(path, fn); strcat(path, fn);
escp_log("Temp file=%s\n", path); escp_log("Temp file=%s\n", path);

2
src/printer/prt_ps.c
View File

@@ -145,7 +145,7 @@ convert_to_pdf(ps_t *dev)
strcat(input_fn, dev->filename); strcat(input_fn, dev->filename);
strcpy(output_fn, input_fn); strcpy(output_fn, input_fn);
strcat(output_fn + strlen(output_fn) - 3, ".pdf"); strcpy(output_fn + strlen(output_fn) - 3, ".pdf");
gsargv[0] = ""; gsargv[0] = "";
gsargv[1] = "-dNOPAUSE"; gsargv[1] = "-dNOPAUSE";

2
src/printer/prt_text.c
View File

@@ -154,7 +154,7 @@ dump_page(prnt_t *dev)
if (! plat_dir_check(path)) if (! plat_dir_check(path))
plat_dir_create(path); plat_dir_create(path);
plat_path_slash(path); plat_path_slash(path);
strcpy(path, dev->filename); strcat(path, dev->filename);
/* Create the file. */ /* Create the file. */
fp = plat_fopen(path, "a"); fp = plat_fopen(path, "a");

6
src/win/win_media_menu.c
View File

@@ -293,7 +293,7 @@ is_valid_fdd(int i)
static inline int static inline int
is_valid_cdrom(int i) is_valid_cdrom(int i)
{ {
if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !MACHINE_HAS_IDE) if ((cdrom[i].bus_type == CDROM_BUS_ATAPI) && !MACHINE_HAS_IDE && memcmp(hdc_get_internal_name(hdc_current), "ide", 3))
return 0; return 0;
if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0)) if ((cdrom[i].bus_type == CDROM_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0))
return 0; return 0;
@@ -303,7 +303,7 @@ is_valid_cdrom(int i)
static inline int static inline int
is_valid_zip(int i) is_valid_zip(int i)
{ {
if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !MACHINE_HAS_IDE) if ((zip_drives[i].bus_type == ZIP_BUS_ATAPI) && !MACHINE_HAS_IDE && memcmp(hdc_get_internal_name(hdc_current), "ide", 3))
return 0; return 0;
if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0)) if ((zip_drives[i].bus_type == ZIP_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0))
return 0; return 0;
@@ -313,7 +313,7 @@ is_valid_zip(int i)
static inline int static inline int
is_valid_mo(int i) is_valid_mo(int i)
{ {
if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !MACHINE_HAS_IDE) if ((mo_drives[i].bus_type == MO_BUS_ATAPI) && !MACHINE_HAS_IDE && memcmp(hdc_get_internal_name(hdc_current), "ide", 3))
return 0; return 0;
if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0)) if ((mo_drives[i].bus_type == MO_BUS_SCSI) && !MACHINE_HAS_SCSI && (scsi_card_current == 0))
return 0; return 0;

1
src/win/win_stbar.c
View File

@@ -51,7 +51,6 @@
#include <86box/plat.h> #include <86box/plat.h>
#include <86box/ui.h> #include <86box/ui.h>
#include <86box/win.h> #include <86box/win.h>
#include <86box/mo.h>
#ifndef GWL_WNDPROC #ifndef GWL_WNDPROC
#define GWL_WNDPROC GWLP_WNDPROC #define GWL_WNDPROC GWLP_WNDPROC