diff options
| author | peter <peter@FreeBSD.org> | 1999-04-19 19:40:58 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-04-19 19:40:58 +0000 |
| commit | 21bd65ef65399392a9a24157698f3cfe7a3209f8 (patch) | |
| tree | d5c3c58d7abd23bec07167ffe59e8765539a743e /sys | |
| parent | 336f21c48d4a9d49acfca62d6854de4f81f1d635 (diff) | |
| download | FreeBSD-src-21bd65ef65399392a9a24157698f3cfe7a3209f8.zip FreeBSD-src-21bd65ef65399392a9a24157698f3cfe7a3209f8.tar.gz | |
Make userconfig saving actually work..
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/i386/userconfig.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index e9fbf80..b6add1c 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.134 1999/04/16 21:22:14 peter Exp $ + ** $Id: userconfig.c,v 1.135 1999/04/18 20:15:06 peter Exp $ **/ /** @@ -2517,7 +2517,7 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.134 1999/04/16 21:22:14 peter Exp $ + * $Id: userconfig.c,v 1.135 1999/04/18 20:15:06 peter Exp $ */ #include "scbus.h" @@ -3594,15 +3594,16 @@ save_resource(struct isa_device *idev) for (i = 0; i < count; i++) { name = resource_query_name(i); unit = resource_query_unit(i); - if (strcmp(name, idev->id_driver->name) || unit != idev->id_unit) + if (unit != idev->id_unit || strcmp(name, idev->id_driver->name) != 0) continue; - resource_set_int(i, "port", isa_devtab[i].id_iobase); - resource_set_int(i, "irq", (1 << isa_devtab[i].id_irq)); - resource_set_int(i, "drq", isa_devtab[i].id_drq); - resource_set_int(i, "maddr", (int)isa_devtab[i].id_maddr); - resource_set_int(i, "msize", isa_devtab[i].id_msize); - resource_set_int(i, "flags", isa_devtab[i].id_flags); - resource_set_int(i, "disabled", !isa_devtab[i].id_enabled); + resource_set_int(i, "port", idev->id_iobase); + resource_set_int(i, "irq", 1 << (idev->id_irq < 0 ? 0 : idev->id_irq)); + resource_set_int(i, "drq", idev->id_drq); + resource_set_int(i, "maddr", (int)idev->id_maddr); + resource_set_int(i, "msize", idev->id_msize); + resource_set_int(i, "flags", idev->id_flags); + resource_set_int(i, "disabled", !idev->id_enabled); + break; } } @@ -3625,6 +3626,7 @@ struct isa_device *idev; } id_pn = malloc(sizeof(struct isa_device),M_DEVL,M_WAITOK); bcopy(idev,id_pn,sizeof(struct isa_device)); + save_resource(idev); id_pn->id_next = isa_devlist; isa_devlist = id_pn; return 0; |
