diff options
| author | nate <nate@FreeBSD.org> | 1996-09-07 17:41:22 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1996-09-07 17:41:22 +0000 |
| commit | abcc6bffc7a93be876053ffad066b301881ed3f5 (patch) | |
| tree | 730ea4ed1b067aa9f5974bf01f415c3dbfb5bf2e | |
| parent | 90e771f1d5ba272aed45310a1ecbef96ebf2cb67 (diff) | |
| download | FreeBSD-src-abcc6bffc7a93be876053ffad066b301881ed3f5.zip FreeBSD-src-abcc6bffc7a93be876053ffad066b301881ed3f5.tar.gz | |
APM_DSVALUE_BUS is no longer with the addition of the correct fix to
machdep.c. We no longer walk on the data segment the BIOS sets up.
| -rw-r--r-- | sys/i386/apm/apm.c | 19 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 19 |
2 files changed, 2 insertions, 36 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 9348b7c..7281b5b 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -14,7 +14,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.47 1996/08/28 17:54:17 bde Exp $ + * $Id: apm.c,v 1.48 1996/09/06 23:06:50 phk Exp $ */ #include "apm.h" @@ -661,18 +661,6 @@ apmattach(struct isa_device *dvp) { #define APM_KERNBASE KERNBASE struct apm_softc *sc = &apm_softc; -#ifdef APM_DSVALUE_BUG - caddr_t apm_bios_work; - - /* - * XXX - Malloc enough space for the APM DS, and then copy the - * current DS into the new space since the DS setup by the - * APM bios is going to get wiped out. - */ - apm_bios_work = (caddr_t)malloc(apm_ds_limit, M_DEVBUF, M_NOWAIT); - bcopy((caddr_t)((apm_ds_base << 4) + APM_KERNBASE), apm_bios_work, - apm_ds_limit); -#endif /* APM_DSVALUE_BUG */ sc->initialized = 0; @@ -687,11 +675,6 @@ apmattach(struct isa_device *dvp) sc->ds_limit = apm_ds_limit; sc->cs_entry = apm_cs_entry; -#ifdef APM_DSVALUE_BUG - /* Set the DS base to point to the newly made copy of the APM DS */ - sc->ds_base = (u_int)apm_bios_work; -#endif /* APM_DSVALUE_BUG */ - /* Always call HLT in idle loop */ sc->always_halt_cpu = 1; diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 9348b7c..7281b5b 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -14,7 +14,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.47 1996/08/28 17:54:17 bde Exp $ + * $Id: apm.c,v 1.48 1996/09/06 23:06:50 phk Exp $ */ #include "apm.h" @@ -661,18 +661,6 @@ apmattach(struct isa_device *dvp) { #define APM_KERNBASE KERNBASE struct apm_softc *sc = &apm_softc; -#ifdef APM_DSVALUE_BUG - caddr_t apm_bios_work; - - /* - * XXX - Malloc enough space for the APM DS, and then copy the - * current DS into the new space since the DS setup by the - * APM bios is going to get wiped out. - */ - apm_bios_work = (caddr_t)malloc(apm_ds_limit, M_DEVBUF, M_NOWAIT); - bcopy((caddr_t)((apm_ds_base << 4) + APM_KERNBASE), apm_bios_work, - apm_ds_limit); -#endif /* APM_DSVALUE_BUG */ sc->initialized = 0; @@ -687,11 +675,6 @@ apmattach(struct isa_device *dvp) sc->ds_limit = apm_ds_limit; sc->cs_entry = apm_cs_entry; -#ifdef APM_DSVALUE_BUG - /* Set the DS base to point to the newly made copy of the APM DS */ - sc->ds_base = (u_int)apm_bios_work; -#endif /* APM_DSVALUE_BUG */ - /* Always call HLT in idle loop */ sc->always_halt_cpu = 1; |
