Skip to content

Commit 63defb1

Browse files
CE1CECLCE1CECL
authored
Merge branch '86Box:master' into master
2 parents 69f36a8 + e852aa0 commit 63defb1

32 files changed

Lines changed: 464 additions & 48 deletions

‎src/chipset/cs8220.c‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -218,57 +218,55 @@ cs8220_init(UNUSED(const device_t *info))
218218
dev->ram_banks[0].virt = 0x00000000;
219219
dev->ram_banks[0].phys = 0x00000000;
220220
dev->ram_banks[0].size = 0x00080000;
221-
dev->ram_banks[1].virt = 0x00080000;
222-
dev->ram_banks[1].phys = 0x00080000;
223-
dev->ram_banks[1].size = 0x00020000;
224-
/* Pretend there's a 128k expansion. */
221+
/* Pretend there's a 256k expansion. */
225222
dev->ram_banks[2].virt = 0x00100000;
226223
dev->ram_banks[2].phys = 0x00080000;
227-
dev->ram_banks[2].size = 0x00020000;
224+
dev->ram_banks[2].size = 0x00040000;
228225
break;
229226
case 896:
230227
dev->ram_banks[0].virt = 0x00000000;
231228
dev->ram_banks[0].phys = 0x00000000;
232229
dev->ram_banks[0].size = 0x00080000;
233-
dev->ram_banks[1].virt = 0x00080000;
234-
dev->ram_banks[1].phys = 0x00080000;
235-
dev->ram_banks[1].size = 0x00020000;
236-
/* Pretend there's a 256k expansion. */
230+
/* Pretend there's a 384k expansion. */
237231
dev->ram_banks[2].virt = 0x00100000;
238232
dev->ram_banks[2].phys = 0x00080000;
239-
dev->ram_banks[2].size = 0x00040000;
233+
dev->ram_banks[2].size = 0x00060000;
240234
break;
241235
case 1024:
242236
dev->ram_banks[0].virt = 0x00000000;
243237
dev->ram_banks[0].phys = 0x00000000;
244238
dev->ram_banks[0].size = 0x00080000;
245-
dev->ram_banks[1].virt = 0x00080000;
239+
dev->ram_banks[1].virt = 0x00100000;
246240
dev->ram_banks[1].phys = 0x00080000;
247-
dev->ram_banks[1].size = 0x00020000;
248-
/* Pretend there's a 384k expansion. */
249-
dev->ram_banks[2].virt = 0x00100000;
250-
dev->ram_banks[2].phys = 0x00080000;
251-
dev->ram_banks[2].size = 0x00060000;
241+
dev->ram_banks[1].size = 0x00080000;
252242
break;
253243
}
254244

255-
if (dev->ram_banks[0].size > 0x00000000)
245+
mem_set_mem_state(0x00000000, (mem_size << 10) + 0x00060000, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
246+
247+
if (dev->ram_banks[0].size > 0x00000000) {
256248
mem_mapping_add(&dev->ram_banks[0].mapping, dev->ram_banks[0].virt, dev->ram_banks[0].size,
257249
cs8220_mem_read, cs8220_mem_readw, NULL,
258250
cs8220_mem_write, cs8220_mem_writew, NULL,
259251
ram + dev->ram_banks[0].phys, MEM_MAPPING_INTERNAL, &(dev->ram_banks[0]));
252+
mem_set_mem_state(dev->ram_banks[0].virt, dev->ram_banks[0].size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
253+
}
260254

261-
if (dev->ram_banks[1].size > 0x00000000)
255+
if (dev->ram_banks[1].size > 0x00000000) {
262256
mem_mapping_add(&dev->ram_banks[1].mapping, dev->ram_banks[1].virt, dev->ram_banks[1].size,
263257
cs8220_mem_read, cs8220_mem_readw, NULL,
264258
cs8220_mem_write, cs8220_mem_writew, NULL,
265259
ram + dev->ram_banks[1].phys, MEM_MAPPING_INTERNAL, &(dev->ram_banks[1]));
260+
mem_set_mem_state(dev->ram_banks[1].virt, dev->ram_banks[1].size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
261+
}
266262

267-
if (dev->ram_banks[2].size > 0x00000000)
263+
if (dev->ram_banks[2].size > 0x00000000) {
268264
mem_mapping_add(&dev->ram_banks[2].mapping, dev->ram_banks[2].virt, dev->ram_banks[2].size,
269265
cs8220_mem_read, cs8220_mem_readw, NULL,
270266
cs8220_mem_write, cs8220_mem_writew, NULL,
271267
ram + dev->ram_banks[2].phys, MEM_MAPPING_INTERNAL, &(dev->ram_banks[2]));
268+
mem_set_mem_state(dev->ram_banks[2].virt, dev->ram_banks[2].size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
269+
}
272270

273271
io_sethandler(0x00a4, 0x0002,
274272
cs8220_in, NULL, NULL, cs8220_out, NULL, NULL, dev);

‎src/include/86box/isartc.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ extern int isartc_get_from_internal_name(const char *str);
5555
extern const device_t *isartc_get_device(int t);
5656
extern int isartc_has_config(int board);
5757

58+
/* On-board RTC devices */
59+
extern const device_t vendex_xt_rtc_onboard_device;
60+
extern const device_t rtc58167_device;
61+
5862
#ifdef __cplusplus
5963
}
6064
#endif

‎src/include/86box/machine.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,10 @@ extern int machine_at_ficka6130_init(const machine_t *);
12511251

12521252
/* VIA Apollo Pro 133 */
12531253
extern int machine_at_p3v133_init(const machine_t *);
1254+
#ifdef EMU_DEVICE_H
1255+
extern const device_t ms6199va_device;
1256+
#endif
1257+
extern int machine_at_ms6199va_init(const machine_t *);
12541258

12551259
/* VIA Apollo Pro 133A */
12561260
extern int machine_at_p3v4x_init(const machine_t *);

‎src/machine/m_at_slot1.c‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,119 @@ machine_at_p3v133_init(const machine_t *model)
13991399
return ret;
14001400
}
14011401

1402+
static const device_config_t ms6199va_config[] = {
1403+
// clang-format off
1404+
{
1405+
.name = "bios",
1406+
.description = "BIOS Version",
1407+
.type = CONFIG_BIOS,
1408+
.default_string = "ms6199va",
1409+
.default_int = 0,
1410+
.file_filter = NULL,
1411+
.spinner = { 0 },
1412+
.selection = { { 0 } },
1413+
.bios = {
1414+
{
1415+
.name = "Award Modular BIOS v4.51PG - Revision 3.5",
1416+
.internal_name = "ms6199va",
1417+
.bios_type = BIOS_NORMAL,
1418+
.files_no = 1,
1419+
.local = 0,
1420+
.size = 262144,
1421+
.files = { "roms/machines/ms6199va/w6199vms.350", "" }
1422+
},
1423+
{
1424+
.name = "Award Modular BIOS v4.51PG - Revision 2.0 (Compaq OEM)",
1425+
.internal_name = "ms6199va_200",
1426+
.bios_type = BIOS_NORMAL,
1427+
.files_no = 1,
1428+
.local = 0,
1429+
.size = 262144,
1430+
.files = { "roms/machines/ms6199va/W6199VC8.BIN", "" }
1431+
},
1432+
{
1433+
.name = "Award Modular BIOS v4.51PG - Revision 2.0 (Compaq OEM) [patched for large drives]",
1434+
.internal_name = "ms6199va_200p",
1435+
.bios_type = BIOS_NORMAL,
1436+
.files_no = 1,
1437+
.local = 0,
1438+
.size = 262144,
1439+
.files = { "roms/machines/ms6199va/W6199VC8.PCD", "" }
1440+
},
1441+
{
1442+
.name = "Award Modular BIOS v4.51PG - Revision 3.7 (Packard Bell OEM)",
1443+
.internal_name = "ms6199va_370",
1444+
.bios_type = BIOS_NORMAL,
1445+
.files_no = 1,
1446+
.local = 0,
1447+
.size = 262144,
1448+
.files = { "roms/machines/ms6199va/w6199VP2.370", "" }
1449+
},
1450+
{ .files_no = 0 }
1451+
}
1452+
},
1453+
{ .name = "", .description = "", .type = CONFIG_END }
1454+
// clang-format on
1455+
};
1456+
1457+
const device_t ms6199va_device = {
1458+
.name = "MSI MS-6199VA",
1459+
.internal_name = "ms6199va_device",
1460+
.flags = 0,
1461+
.local = 0,
1462+
.init = NULL,
1463+
.close = NULL,
1464+
.reset = NULL,
1465+
.available = NULL,
1466+
.speed_changed = NULL,
1467+
.force_redraw = NULL,
1468+
.config = ms6199va_config
1469+
};
1470+
1471+
int
1472+
machine_at_ms6199va_init(const machine_t *model)
1473+
{
1474+
int ret = 0;
1475+
const char *fn;
1476+
1477+
/* No ROMs available */
1478+
if (!device_available(model->device))
1479+
return ret;
1480+
1481+
device_context(model->device);
1482+
fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
1483+
ret = bios_load_linear(fn, 0x000c0000, 262144, 0);
1484+
device_context_restore();
1485+
1486+
machine_at_common_init_ex(model, 2);
1487+
1488+
pci_init(PCI_CONFIG_TYPE_1);
1489+
pci_register_slot(0x00, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
1490+
pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 3, 4);
1491+
pci_register_slot(0x0C, PCI_CARD_SOUND, 3, 4, 1, 2);
1492+
pci_register_slot(0x0E, PCI_CARD_NORMAL, 1, 2, 3, 4);
1493+
pci_register_slot(0x10, PCI_CARD_NORMAL, 2, 3, 4, 1);
1494+
pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
1495+
pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 1, 4, 3);
1496+
pci_register_slot(0x14, PCI_CARD_NORMAL, 2, 1, 4, 3);
1497+
pci_register_slot(0x01, PCI_CARD_AGPBRIDGE, 1, 2, 3, 4);
1498+
1499+
device_add(&via_apro133a_device);
1500+
device_add(&via_vt82c596b_device);
1501+
device_add_params(&w83977_device, (void *) (W83977EF | W83977_AMI | W83977_NO_NVR));
1502+
device_add(&winbond_flash_w29c020_device);
1503+
spd_register(SPD_TYPE_SDRAM, 0x7, 512);
1504+
device_add(&w83782d_device); /* fans: Chassis, Power, CPU; temperatures: System, CPU, unused */
1505+
hwm_values.temperatures[2] = 0; /* unused */
1506+
1507+
if (sound_card_current[0] == SOUND_INTERNAL) {
1508+
device_add(machine_get_snd_device(machine));
1509+
device_add(&w83971d_device);
1510+
}
1511+
1512+
return ret;
1513+
}
1514+
14021515
/* VIA Apollo Pro 133A */
14031516
int
14041517
machine_at_p3v4x_init(const machine_t *model)

‎src/machine/m_at_socket370.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,10 @@ machine_at_ms6318_init(const machine_t *model)
611611
hwm_values.temperatures[1] += 2; /* System offset */
612612
hwm_values.temperatures[2] = 0; /* unused */
613613

614-
if (sound_card_current[0] == SOUND_INTERNAL)
614+
if (sound_card_current[0] == SOUND_INTERNAL) {
615615
device_add(machine_get_snd_device(machine));
616-
617-
device_add(&stac9708_device);
616+
device_add(&stac9708_device);
617+
}
618618

619619
return ret;
620620
}

‎src/machine/m_xt.c‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include <86box/serial.h>
3838
#include <86box/sio.h>
3939
#include <86box/ibm_5161.h>
40+
#include <86box/isartc.h>
4041
#include <86box/keyboard.h>
4142
#include <86box/rom.h>
4243
#include <86box/machine.h>
@@ -45,9 +46,6 @@
4546
#include <86box/port_6x.h>
4647
#include <86box/video.h>
4748

48-
extern const device_t vendex_xt_rtc_onboard_device;
49-
extern const device_t rtc58167_device;
50-
5149
/* 8088 */
5250
static void
5351
machine_xt_common_init(const machine_t *model, int fixed_floppy)
@@ -1251,7 +1249,7 @@ static const device_config_t pc500_config[] = {
12511249
.spinner = { 0 },
12521250
.selection = {
12531251
{ .description = "Disabled", .value = -1 },
1254-
{ .description = "Enabled", .value = 2 },
1252+
{ .description = "IRQ 2", .value = 2 },
12551253
{ .description = "" }
12561254
},
12571255
.bios = { { 0 } }
@@ -1371,7 +1369,7 @@ static const device_config_t pc500plus_config[] = {
13711369
.spinner = { 0 },
13721370
.selection = {
13731371
{ .description = "Disabled", .value = -1 },
1374-
{ .description = "Enabled", .value = 2 },
1372+
{ .description = "IRQ 2", .value = 2 },
13751373
{ .description = "" }
13761374
},
13771375
.bios = { { 0 } }
@@ -1737,23 +1735,23 @@ static const device_config_t to16_config[] = {
17371735
.spinner = { 0 },
17381736
.selection = {
17391737
{ .description = "Not installed", .value = 0 },
1740-
{ .description = "RTC0", .value = 0x300 },
1741-
{ .description = "RTC1", .value = 0x2c0 },
1742-
{ .description = "" }
1738+
{ .description = "RTC0", .value = 0x300 },
1739+
{ .description = "RTC1", .value = 0x2c0 },
1740+
{ .description = "" }
17431741
},
17441742
.bios = { { 0 } }
17451743
},
17461744
{
17471745
.name = "rtc_irq",
1748-
.description = "RTC IRQ 2",
1746+
.description = "RTC IRQ",
17491747
.type = CONFIG_SELECTION,
17501748
.default_string = NULL,
17511749
.default_int = -1,
17521750
.file_filter = NULL,
17531751
.spinner = { 0 },
17541752
.selection = {
17551753
{ .description = "Disabled", .value = -1 },
1756-
{ .description = "Enabled", .value = 2 },
1754+
{ .description = "IRQ 2", .value = 2 },
17571755
{ .description = "" }
17581756
},
17591757
.bios = { { 0 } }

‎src/machine/machine_table.c‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18853,6 +18853,8 @@ const machine_t machines[] = {
1885318853
.snd_device = NULL,
1885418854
.net_device = NULL
1885518855
},
18856+
18857+
/* VIA Apollo Pro 133 */
1885618858
/* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
1885718859
firmware. */
1885818860
{
@@ -18898,6 +18900,53 @@ const machine_t machines[] = {
1889818900
.snd_device = NULL,
1889918901
.net_device = NULL
1890018902
},
18903+
/* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
18904+
firmware. */
18905+
{
18906+
.name = "[VIA Apollo Pro 133] MSI MS-6199VA",
18907+
.internal_name = "ms6199va",
18908+
.type = MACHINE_TYPE_SLOT1,
18909+
.chipset = MACHINE_CHIPSET_VIA_APOLLO_PRO_133,
18910+
.init = machine_at_ms6199va_init,
18911+
.p1_handler = machine_generic_p1_handler,
18912+
.gpio_handler = NULL,
18913+
.available_flag = MACHINE_AVAILABLE,
18914+
.gpio_acpi_handler = NULL,
18915+
.cpu = {
18916+
.package = CPU_PKG_SLOT1,
18917+
.block = CPU_BLOCK_NONE,
18918+
.min_bus = 66666667,
18919+
.max_bus = 155000000,
18920+
.min_voltage = 1300,
18921+
.max_voltage = 3500,
18922+
.min_multi = 1.5,
18923+
.max_multi = 8.0
18924+
},
18925+
.bus_flags = MACHINE_PS2_AGP | MACHINE_BUS_USB,
18926+
.flags = MACHINE_IDE_DUAL | MACHINE_SOUND | MACHINE_APM | MACHINE_ACPI | MACHINE_USB,
18927+
.ram = {
18928+
.min = 8192,
18929+
.max = 1572864,
18930+
.step = 8192
18931+
},
18932+
.nvrmask = 255,
18933+
.jumpered_ecp_dma = 0,
18934+
.default_jumpered_ecp_dma = -1,
18935+
.kbc_device = NULL,
18936+
.kbc_params = 0x00000000,
18937+
.kbc_p1 = 0x00000cf0,
18938+
.gpio = 0xffffffff,
18939+
.gpio_acpi = 0xffffffff,
18940+
.device = &ms6199va_device,
18941+
.kbd_device = NULL,
18942+
.fdc_device = NULL,
18943+
.sio_device = NULL,
18944+
.vid_device = NULL,
18945+
.snd_device = &es1373_onboard_device,
18946+
.net_device = NULL
18947+
},
18948+
18949+
/* VIA Apollo Pro 133A */
1890118950
/* Has a Winbond W83977EF Super I/O chip with on-chip KBC with AMIKey-2 KBC
1890218951
firmware. */
1890318952
{

‎src/network/net_tulip.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,7 @@ tulip_copy_rx_bytes(TULIPState *s, struct tulip_descriptor *desc)
452452
static bool
453453
tulip_filter_address(TULIPState *s, const uint8_t *addr)
454454
{
455-
#ifdef BLOCK_BROADCAST
456455
static const char broadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
457-
#endif
458456
bool ret = false;
459457

460458
for (uint8_t i = 0; i < 16 && ret == false; i++) {
@@ -463,15 +461,9 @@ tulip_filter_address(TULIPState *s, const uint8_t *addr)
463461
}
464462
}
465463

466-
/*
467-
Do not block broadcast packets - needed for connections to the guest
468-
to succeed when using SLiRP.
469-
*/
470-
#ifdef BLOCK_BROADCAST
471464
if (!memcmp(addr, broadcast, ETH_ALEN)) {
472465
return true;
473466
}
474-
#endif
475467

476468
if (s->csr[6] & (CSR6_PR | CSR6_RA)) {
477469
/* Promiscuous mode enabled */

0 commit comments

Comments
 (0)