diff options
| author | nate <nate@FreeBSD.org> | 1996-07-10 15:09:48 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1996-07-10 15:09:48 +0000 |
| commit | d62eaacadcfc09253842471b76b08ae806fd9f6b (patch) | |
| tree | 272d9789b4a33201507a071d29affa7b32b9767f /sys | |
| parent | 9e15f9a31f4d8a51406b555accf7c66520a583c8 (diff) | |
| download | FreeBSD-src-d62eaacadcfc09253842471b76b08ae806fd9f6b.zip FreeBSD-src-d62eaacadcfc09253842471b76b08ae806fd9f6b.tar.gz | |
Whee. Fix two bugs which ended up cancelling each other out.
apm_setup.s was storing apm_cs16_base and apm_cs32_base addresses in
each others slots, and apm.c was reversing the result so the bugs
cancelled out, but the code looked wrong.
No functional differences unfortunately.
Submitted by: dave edmondson <davided@sco.com>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/apm/apm.c | 6 | ||||
| -rw-r--r-- | sys/i386/apm/apm_setup.s | 6 | ||||
| -rw-r--r-- | sys/i386/bios/apm.c | 6 | ||||
| -rw-r--r-- | sys/i386/bios/apm_setup.s | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 76e4d67..c2e8617 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.43 1996/06/04 17:50:28 nate Exp $ + * $Id: apm.c,v 1.44 1996/06/18 01:21:54 bde Exp $ */ #include "apm.h" @@ -700,8 +700,8 @@ apmattach(struct isa_device *dvp) sc->active = 0; /* setup APM parameters */ - sc->cs16_base = (apm_cs32_base << 4) + APM_KERNBASE; - sc->cs32_base = (apm_cs16_base << 4) + APM_KERNBASE; + sc->cs16_base = (apm_cs16_base << 4) + APM_KERNBASE; + sc->cs32_base = (apm_cs32_base << 4) + APM_KERNBASE; sc->ds_base = (apm_ds_base << 4) + APM_KERNBASE; sc->cs_limit = apm_cs_limit; sc->ds_limit = apm_ds_limit; diff --git a/sys/i386/apm/apm_setup.s b/sys/i386/apm/apm_setup.s index e33260f..d1a1567 100644 --- a/sys/i386/apm/apm_setup.s +++ b/sys/i386/apm/apm_setup.s @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_setup.s,v 1.5 1995/02/17 02:22:23 phk Exp $ + * $Id: apm_setup.s,v 1.6 1996/03/11 06:48:48 nate Exp $ */ #include "apm.h" @@ -166,9 +166,9 @@ _apm_setup: movl %eax, PADDR(_apm_version) movl %ebx, PADDR(_apm_cs_entry) - movw %cx, PADDR(_apm_cs32_base) - shrl $16, %ecx movw %cx, PADDR(_apm_cs16_base) + shrl $16, %ecx + movw %cx, PADDR(_apm_cs32_base) movw %dx, PADDR(_apm_ds_base) movw %si, PADDR(_apm_cs_limit) shrl $16, %esi diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 76e4d67..c2e8617 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.43 1996/06/04 17:50:28 nate Exp $ + * $Id: apm.c,v 1.44 1996/06/18 01:21:54 bde Exp $ */ #include "apm.h" @@ -700,8 +700,8 @@ apmattach(struct isa_device *dvp) sc->active = 0; /* setup APM parameters */ - sc->cs16_base = (apm_cs32_base << 4) + APM_KERNBASE; - sc->cs32_base = (apm_cs16_base << 4) + APM_KERNBASE; + sc->cs16_base = (apm_cs16_base << 4) + APM_KERNBASE; + sc->cs32_base = (apm_cs32_base << 4) + APM_KERNBASE; sc->ds_base = (apm_ds_base << 4) + APM_KERNBASE; sc->cs_limit = apm_cs_limit; sc->ds_limit = apm_ds_limit; diff --git a/sys/i386/bios/apm_setup.s b/sys/i386/bios/apm_setup.s index e33260f..d1a1567 100644 --- a/sys/i386/bios/apm_setup.s +++ b/sys/i386/bios/apm_setup.s @@ -12,7 +12,7 @@ * * Sep., 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_setup.s,v 1.5 1995/02/17 02:22:23 phk Exp $ + * $Id: apm_setup.s,v 1.6 1996/03/11 06:48:48 nate Exp $ */ #include "apm.h" @@ -166,9 +166,9 @@ _apm_setup: movl %eax, PADDR(_apm_version) movl %ebx, PADDR(_apm_cs_entry) - movw %cx, PADDR(_apm_cs32_base) - shrl $16, %ecx movw %cx, PADDR(_apm_cs16_base) + shrl $16, %ecx + movw %cx, PADDR(_apm_cs32_base) movw %dx, PADDR(_apm_ds_base) movw %si, PADDR(_apm_cs_limit) shrl $16, %esi |
