diff options
| author | kato <kato@FreeBSD.org> | 1998-04-20 13:50:21 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-04-20 13:50:21 +0000 |
| commit | aede69f3c2275fbcdf76f7902fe54f93cecf3a65 (patch) | |
| tree | e3e0f81668358ed6c979e63bd4e6bf886278b2cd | |
| parent | 41f2b5a06ee2ec78cd1afb5721929976c3f47a1f (diff) | |
| download | FreeBSD-src-aede69f3c2275fbcdf76f7902fe54f93cecf3a65.zip FreeBSD-src-aede69f3c2275fbcdf76f7902fe54f93cecf3a65.tar.gz | |
Sync with sys/i386/isa/npx.c revision 1.60.
| -rw-r--r-- | sys/pc98/pc98/npx.c | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c index 8bca26e..272fba0 100644 --- a/sys/pc98/pc98/npx.c +++ b/sys/pc98/pc98/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.34 1998/04/07 09:09:41 kato Exp $ + * $Id: npx.c,v 1.35 1998/04/16 16:34:46 kato Exp $ */ #include "npx.h" @@ -168,43 +168,40 @@ static volatile u_int npx_traps_while_probing; * latch stuff in probeintr() can be moved to npxprobe(). */ inthand_t probeintr; - -__asm -(" - .text - .p2align 2,0x90 -" __XSTRING(CNAME(probeintr)) ": - ss - incl " __XSTRING(CNAME(npx_intrs_while_probing)) " - pushl %eax - movb $0x20,%al # EOI (asm in strings loses cpp features) +__asm(" \n\ + .text \n\ + .p2align 2,0x90 \n\ +" __XSTRING(CNAME(probeintr)) ": \n\ + ss \n\ + incl " __XSTRING(CNAME(npx_intrs_while_probing)) " \n\ + pushl %eax \n\ + movb $0x20,%al # EOI (asm in strings loses cpp features) \n\ #ifdef PC98 - outb %al,$0x08 # IO_ICU2 - outb %al,$0x0 # IO_ICU1 + outb %al,$0x08 # IO_ICU2 \n\ + outb %al,$0x00 # IO_ICU1 \n\ #else - outb %al,$0xa0 # IO_ICU2 - outb %al,$0x20 # IO_ICU1 + outb %al,$0xa0 # IO_ICU2 \n\ + outb %al,$0x20 # IO_ICU1 \n\ #endif - movb $0,%al + movb $0,%al \n\ #ifdef PC98 - outb %al,$0xf8 # clear BUSY# latch + outb %al,$0xf8 # clear BUSY# latch \n\ #else - outb %al,$0xf0 # clear BUSY# latch + outb %al,$0xf0 # clear BUSY# latch \n\ #endif - popl %eax - iret + popl %eax \n\ + iret \n\ "); inthand_t probetrap; -__asm -(" - .text - .p2align 2,0x90 -" __XSTRING(CNAME(probetrap)) ": - ss - incl " __XSTRING(CNAME(npx_traps_while_probing)) " - fnclex - iret +__asm(" \n\ + .text \n\ + .p2align 2,0x90 \n\ +" __XSTRING(CNAME(probetrap)) ": \n\ + ss \n\ + incl " __XSTRING(CNAME(npx_traps_while_probing)) " \n\ + fnclex \n\ + iret \n\ "); #endif /* SMP */ @@ -753,7 +750,7 @@ timezero(funcname, func) usec = 1; if (bootverbose) printf("%s bandwidth = %ld bytes/sec\n", - funcname, (long)(BUFSIZE * 1000000ll / usec)); + funcname, (long)(BUFSIZE * (int64_t)1000000 / usec)); free(buf, M_TEMP); return (usec); } |
