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

ISA RTC cards no longer initialize their own NVR instance if used on a machine with a built-in RTC, fixes #1928.

Browse Source
This commit is contained in:
OBattler
2022-02-11 00:30:52 +01:00
parent 1864a61b3e
commit b3b294e1a0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/device/isartc.c
View File

@@ -498,6 +498,8 @@ static void *
isartc_init(const device_t *info) isartc_init(const device_t *info)
{ {
rtcdev_t *dev; rtcdev_t *dev;
int is_at = IS_AT(machine);
is_at = is_at || !strcmp(machine_get_internal_name(), "xi8088");
/* Create a device instance. */ /* Create a device instance. */
dev = (rtcdev_t *)malloc(sizeof(rtcdev_t)); dev = (rtcdev_t *)malloc(sizeof(rtcdev_t));
@@ -567,7 +569,8 @@ isartc_init(const device_t *info)
/* Hook into the NVR backend. */ /* Hook into the NVR backend. */
dev->nvr.fn = isartc_get_internal_name(isartc_type); dev->nvr.fn = isartc_get_internal_name(isartc_type);
dev->nvr.irq = dev->irq; dev->nvr.irq = dev->irq;
nvr_init(&dev->nvr); if (!is_at)
nvr_init(&dev->nvr);
/* Let them know our device instance. */ /* Let them know our device instance. */
return((void *)dev); return((void *)dev);