mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 09:58:19 -07:00
Code Issues Packages Projects Releases Activity

Merge branch '86Box:master' into master

Browse Source
This commit is contained in:
starfrost
2025-03-29 19:07:16 +00:00
committed by GitHub
parent 7234b432ac b6b840b67e
commit be97f8d3c5
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/86box.c
View File

@@ -1624,6 +1624,8 @@ set_screen_size_monitor(int x, int y, int monitor_index)
{
int temp_overscan_x = monitors[monitor_index].mon_overscan_x;
int temp_overscan_y = monitors[monitor_index].mon_overscan_y;
int is_svga = (video_get_type_monitor(monitor_index) == VIDEO_FLAG_TYPE_SPECIAL) ||
(video_get_type_monitor(monitor_index) == VIDEO_FLAG_TYPE_8514);
double dx;
double dy;
double dtx;
@@ -1657,19 +1659,19 @@ set_screen_size_monitor(int x, int y, int monitor_index)
dty = (double) temp_overscan_y;
/* Account for possible overscan. */
if (video_get_type_monitor(monitor_index) != VIDEO_FLAG_TYPE_SPECIAL && (temp_overscan_y == 16)) {
if (!is_svga && (temp_overscan_y == 16)) {
/* CGA */
dy = (((dx - dtx) / 4.0) * 3.0) + dty;
} else if (video_get_type_monitor(monitor_index) != VIDEO_FLAG_TYPE_SPECIAL && (temp_overscan_y < 16)) {
} else if (!is_svga && (temp_overscan_y < 16)) {
/* MDA/Hercules */
dy = (x / 4.0) * 3.0;
dy = (dx / 4.0) * 3.0;
} else {
if (enable_overscan) {
/* EGA/(S)VGA with overscan */
dy = (((dx - dtx) / 4.0) * 3.0) + dty;
} else {
/* EGA/(S)VGA without overscan */
dy = (x / 4.0) * 3.0;
dy = (dx / 4.0) * 3.0;
}
}
monitors[monitor_index].mon_unscaled_size_y = (int) dy;

4
src/machine/m_at.c
View File

@@ -187,7 +187,7 @@ static const device_config_t ibmat_config[] = {
};
const device_t ibmat_device = {
.name = " IBM AT Devices",
.name = "IBM AT",
.internal_name = "ibmat_device",
.flags = 0,
.local = 0,
@@ -294,7 +294,7 @@ static const device_config_t ibmxt286_config[] = {
};
const device_t ibmxt286_device = {
.name = "IBM XT Model 286 Devices",
.name = "IBM XT Model 286",
.internal_name = "ibmxt286_device",
.flags = 0,
.local = 0,

8
src/machine/m_at_386dx_486.c
View File

@@ -691,12 +691,12 @@ static const device_config_t pb450_config[] = {
.name = "bios",
.description = "BIOS Version",
.type = CONFIG_BIOS,
.default_string = "pci10a",
.default_string = "pb450a",
.default_int = 0,
.file_filter = "",
.spinner = { 0 },
.bios = {
{ .name = "PCI 1.0A", .internal_name = "pb450" /*"pci10a"*/, .bios_type = BIOS_NORMAL,
{ .name = "PCI 1.0A", .internal_name = "pb450a" /*"pci10a"*/, .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/OPTI802.bin", "" } },
{ .name = "PNP 1.1A", .internal_name = "pnp11a", .bios_type = BIOS_NORMAL,
.files_no = 1, .local = 0, .size = 131072, .files = { "roms/machines/pb450/PNP11A.bin", "" } },
@@ -708,7 +708,7 @@ static const device_config_t pb450_config[] = {
};
const device_t pb450_device = {
.name = "Packard Bell PB450 Devices",
.name = "Packard Bell PB450",
.internal_name = "pb450_device",
.flags = 0,
.local = 0,
@@ -732,7 +732,7 @@ machine_at_pb450_init(const machine_t *model)
return ret;
device_context(model->device);
fn = device_get_bios_file(model->device, device_get_config_bios("bios"), 0);
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
device_context_restore();

2
src/machine/m_ps1.c
View File

@@ -290,7 +290,7 @@ const device_t ps1_2011_device = {
.available = NULL,
.speed_changed = NULL,
.force_redraw = NULL,
.config = &ps1_2011_config[0]
.config = ps1_2011_config
};
static void

12
src/machine/m_xt.c
View File

@@ -108,7 +108,7 @@ static const device_config_t ibmpc_config[] = {
};
const device_t ibmpc_device = {
.name = "IBM PC (1981) Device",
.name = "IBM PC (1981)",
.internal_name = "ibmpc_device",
.flags = 0,
.local = 0,
@@ -218,7 +218,7 @@ static const device_config_t ibmpc82_config[] = {
};
const device_t ibmpc82_device = {
.name = "IBM PC (1982) Devices",
.name = "IBM PC (1982)",
.internal_name = "ibmpc82_device",
.flags = 0,
.local = 0,
@@ -331,7 +331,7 @@ static const device_config_t ibmxt_config[] = {
};
const device_t ibmxt_device = {
.name = "IBM XT (1982) Device",
.name = "IBM XT (1982)",
.internal_name = "ibmxt_device",
.flags = 0,
.local = 0,
@@ -451,7 +451,7 @@ static const device_config_t ibmxt86_config[] = {
};
const device_t ibmxt86_device = {
.name = "IBM XT (1986) Device",
.name = "IBM XT (1986)",
.internal_name = "ibmxt86_device",
.flags = 0,
.local = 0,
@@ -624,7 +624,7 @@ static const device_config_t jukopc_config[] = {
};
const device_t jukopc_device = {
.name = "Juko ST Devices",
.name = "Juko ST",
.internal_name = "jukopc_device",
.flags = 0,
.local = 0,
@@ -949,7 +949,7 @@ static const device_config_t vendex_config[] = {
};
const device_t vendex_device = {
.name = "Vendex 888T Devices",
.name = "Vendex 888T",
.internal_name = "vendex_device",
.flags = 0,
.local = 0,

6
src/machine/m_xt_laserxt.c
View File

@@ -154,6 +154,8 @@ machine_xt_laserxt_common_init(const machine_t *model,int is_lxt3)
standalone_gameport_type = &gameport_device;
laserxt_init(is_lxt3);
device_add(&keyboard_xt_lxt3_device);
}
int
@@ -167,8 +169,6 @@ machine_xt_laserxt_init(const machine_t *model)
if (bios_only || !ret)
return ret;
device_add(&keyboard_xt_device);
machine_xt_laserxt_common_init(model, 0);
return ret;
@@ -185,8 +185,6 @@ machine_xt_lxt3_init(const machine_t *model)
if (bios_only || !ret)
return ret;
device_add(&keyboard_xt_lxt3_device);
machine_xt_laserxt_common_init(model, 1);
return ret;