From 7afe30205465fdeada5ecdf5961a177e2e804c14 Mon Sep 17 00:00:00 2001 From: Dimitar Angelov Date: Tue, 2 Apr 2024 11:22:31 +0200 Subject: [PATCH 1/3] Adding Pravetz-16S definition --- src/include/86box/machine.h | 1 + src/machine/m_xt.c | 15 ++++++++++++++ src/machine/machine_table.c | 39 +++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index f97d1a37c..7253a5656 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -918,6 +918,7 @@ extern int machine_xt_v20xt_init(const machine_t *); extern int machine_xt_iskra3104_init(const machine_t *); extern int machine_xt_pravetz16_imko4_init(const machine_t *); +extern int machine_xt_pravetz16s_cpu12_init(const machine_t *); extern int machine_xt_micoms_xl7turbo_init(const machine_t *); /* m_xt_compaq.c */ diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c index 9a0b39a89..7baaa4ef3 100644 --- a/src/machine/m_xt.c +++ b/src/machine/m_xt.c @@ -368,6 +368,21 @@ machine_xt_pravetz16_imko4_init(const machine_t *model) return ret; } +int +machine_xt_pravetz16s_cpu12_init(const machine_t *model) +{ + int ret; + + ret = bios_load_linear("roms/machines/pravetz16s/PR16S.BIN", + 0x000fe000, 8192, 0); + + if (bios_only || !ret) + return ret; + + machine_xt_init_ex(model); + return ret; +} + int machine_xt_micoms_xl7turbo_init(const machine_t *model) { diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index c2bb3925b..6238bcbb5 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -1339,6 +1339,45 @@ const machine_t machines[] = { .snd_device = NULL, .net_device = NULL }, + { + .name = "[8088] Pravetz 16S / CPU12", + .internal_name = "pravetz16s", + .type = MACHINE_TYPE_8088, + .chipset = MACHINE_CHIPSET_DISCRETE, + .init = machine_xt_pravetz16s_cpu12_init, + .p1_handler = NULL, + .gpio_handler = NULL, + .available_flag = MACHINE_AVAILABLE, + .gpio_acpi_handler = NULL, + .cpu = { + .package = CPU_PKG_8088, + .block = CPU_BLOCK_NONE, + .min_bus = 0, + .max_bus = 0, + .min_voltage = 0, + .max_voltage = 0, + .min_multi = 0, + .max_multi = 0 + }, + .bus_flags = MACHINE_PC, + .flags = MACHINE_FLAGS_NONE, + .ram = { + .min = 64, + .max = 640, + .step = 64 + }, + .nvrmask = 0, + .kbc_device = &keyboard_xt_device, + .kbc_p1 = 0xff, + .gpio = 0xffffffff, + .gpio_acpi = 0xffffffff, + .device = NULL, + .fdc_device = NULL, + .sio_device = NULL, + .vid_device = NULL, + .snd_device = NULL, + .net_device = NULL + }, { .name = "[8088] Sanyo SX-16", .internal_name = "sansx16", From b9a39d07f865d730d712860ec12e0685c6805348 Mon Sep 17 00:00:00 2001 From: Dimitar Angelov Date: Tue, 2 Apr 2024 15:44:57 +0200 Subject: [PATCH 2/3] Update of min/max bus and min/max RAM --- src/machine/machine_table.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 6238bcbb5..4ac38f607 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -1340,7 +1340,7 @@ const machine_t machines[] = { .net_device = NULL }, { - .name = "[8088] Pravetz 16S / CPU12", + .name = "[8088] Pravetz 16S / CPU12+", .internal_name = "pravetz16s", .type = MACHINE_TYPE_8088, .chipset = MACHINE_CHIPSET_DISCRETE, @@ -1352,8 +1352,8 @@ const machine_t machines[] = { .cpu = { .package = CPU_PKG_8088, .block = CPU_BLOCK_NONE, - .min_bus = 0, - .max_bus = 0, + .min_bus = 4772728, + .max_bus = 12000000, .min_voltage = 0, .max_voltage = 0, .min_multi = 0, @@ -1362,9 +1362,9 @@ const machine_t machines[] = { .bus_flags = MACHINE_PC, .flags = MACHINE_FLAGS_NONE, .ram = { - .min = 64, - .max = 640, - .step = 64 + .min = 512, + .max = 1024, + .step = 128 }, .nvrmask = 0, .kbc_device = &keyboard_xt_device, From 7aa3728c3f49c9f196601f2811c439ac376fe4ce Mon Sep 17 00:00:00 2001 From: Dimitar Angelov Date: Tue, 2 Apr 2024 17:02:26 +0200 Subject: [PATCH 3/3] Corrected for CPU12 Plus --- src/include/86box/machine.h | 2 +- src/machine/m_xt.c | 2 +- src/machine/machine_table.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h index 7253a5656..6690a46c2 100644 --- a/src/include/86box/machine.h +++ b/src/include/86box/machine.h @@ -918,7 +918,7 @@ extern int machine_xt_v20xt_init(const machine_t *); extern int machine_xt_iskra3104_init(const machine_t *); extern int machine_xt_pravetz16_imko4_init(const machine_t *); -extern int machine_xt_pravetz16s_cpu12_init(const machine_t *); +extern int machine_xt_pravetz16s_cpu12p_init(const machine_t *); extern int machine_xt_micoms_xl7turbo_init(const machine_t *); /* m_xt_compaq.c */ diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c index 7baaa4ef3..3c1539016 100644 --- a/src/machine/m_xt.c +++ b/src/machine/m_xt.c @@ -369,7 +369,7 @@ machine_xt_pravetz16_imko4_init(const machine_t *model) } int -machine_xt_pravetz16s_cpu12_init(const machine_t *model) +machine_xt_pravetz16s_cpu12p_init(const machine_t *model) { int ret; diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c index 4ac38f607..9f084d723 100644 --- a/src/machine/machine_table.c +++ b/src/machine/machine_table.c @@ -1340,11 +1340,11 @@ const machine_t machines[] = { .net_device = NULL }, { - .name = "[8088] Pravetz 16S / CPU12+", + .name = "[8088] Pravetz 16S / CPU12 Plus", .internal_name = "pravetz16s", .type = MACHINE_TYPE_8088, .chipset = MACHINE_CHIPSET_DISCRETE, - .init = machine_xt_pravetz16s_cpu12_init, + .init = machine_xt_pravetz16s_cpu12p_init, .p1_handler = NULL, .gpio_handler = NULL, .available_flag = MACHINE_AVAILABLE,