| si_obio.c (1.5) | si_obio.c (1.6) |
|---|---|
| 1/* $NetBSD: si_obio.c,v 1.5 1996/10/30 00:24:39 gwr Exp $ */ | 1/* $NetBSD: si_obio.c,v 1.6 1996/10/30 00:31:39 gwr Exp $ */ |
| 2 3/* 4 * Copyright (c) 1995 David Jones, Gordon W. Ross 5 * Copyright (c) 1994 Adam Glass 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 145 unchanged lines hidden (view full) --- 155 void *args; 156{ 157 struct si_softc *sc = (struct si_softc *) self; 158 struct ncr5380_softc *ncr_sc = &sc->ncr_sc; 159 struct cfdata *cf = self->dv_cfdata; 160 struct confargs *ca = args; 161 162 /* Get options from config flags... */ | 2 3/* 4 * Copyright (c) 1995 David Jones, Gordon W. Ross 5 * Copyright (c) 1994 Adam Glass 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 145 unchanged lines hidden (view full) --- 155 void *args; 156{ 157 struct si_softc *sc = (struct si_softc *) self; 158 struct ncr5380_softc *ncr_sc = &sc->ncr_sc; 159 struct cfdata *cf = self->dv_cfdata; 160 struct confargs *ca = args; 161 162 /* Get options from config flags... */ |
| 163 sc->sc_options = si_obio_options; | 163 sc->sc_options = cf->cf_flags | si_obio_options; |
| 164 printf(": options=%d\n", sc->sc_options); 165 166 sc->sc_adapter_type = ca->ca_bustype; 167 sc->sc_regs = (struct si_regs *) 168 obio_alloc(ca->ca_paddr, sizeof(struct si_regs)); 169 170 /* 171 * MD function pointers used by the MI code. --- 349 unchanged lines hidden --- | 164 printf(": options=%d\n", sc->sc_options); 165 166 sc->sc_adapter_type = ca->ca_bustype; 167 sc->sc_regs = (struct si_regs *) 168 obio_alloc(ca->ca_paddr, sizeof(struct si_regs)); 169 170 /* 171 * MD function pointers used by the MI code. --- 349 unchanged lines hidden --- |