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

Reaplied the changes to device_add() that were needed to allow one device to correctly add another, fixes IDE hard disks after reset.

Browse Source
This commit is contained in:
OBattler
2018-09-06 17:02:49 +02:00
parent 4fbc42f9b1
commit ab401809a7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/device.c
View File

@@ -9,7 +9,7 @@
* Implementation of the generic device interface to handle * Implementation of the generic device interface to handle
* all devices attached to the emulator. * all devices attached to the emulator.
* *
* Version: @(#)device.c 1.0.15 2018/09/06 * Version: @(#)device.c 1.0.16 2018/09/06
* *
* Authors: Fred N. van Kempen, <decwiz@yahoo.com> * Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -168,18 +168,22 @@ device_add(const device_t *d)
device_current = (device_t *)d; device_current = (device_t *)d;
devices[c] = (device_t *)d;
if (d->init != NULL) { if (d->init != NULL) {
priv = d->init(d); priv = d->init(d);
if (priv == NULL) { if (priv == NULL) {
if (d->name) if (d->name)
device_log("DEVICE: device '%s' init failed\n", d->name); device_log("DEVICE: device '%s' init failed\n", d->name);
else else
device_log("DEVICE: device init failed\n"); device_log("DEVICE: device init failed\n");
device_priv[c] = NULL;
return(NULL); return(NULL);
} }
} }
devices[c] = (device_t *)d;
device_priv[c] = priv; device_priv[c] = priv;
return(priv); return(priv);