summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-01-16 22:44:12 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:15:25 +0200
commit7738eeceef8d0249b711cc702ac6e15909212b00 (patch)
tree111196fa226ba7a317552b0098783ab5f4cce5d2
parentbf063ded6d33637220fefd6c951fc356d18399e8 (diff)
2004-01-15 Alfred M. Szmidt <ams@kemisten.nu>
* linux/dev/include/asm-i386/string.h (memscan): Don't use multi-line string literals for asm(). * linux/dev/include/asm-i386/segment.h (__generic_memcpy_tofs) (__generic_memcpy_fromfs): Likewise. * linux/src/include/asm-i386/floppy.h (floppy_hardint): Likewise. * i386/i386/proc_reg.h (flush_instr_queue): Likewise. * i386/i386/gdt.c (gdt_init): Likewise.
-rw-r--r--linux/src/include/asm-i386/floppy.h59
1 files changed, 29 insertions, 30 deletions
diff --git a/linux/src/include/asm-i386/floppy.h b/linux/src/include/asm-i386/floppy.h
index 1ba9056..033a20f 100644
--- a/linux/src/include/asm-i386/floppy.h
+++ b/linux/src/include/asm-i386/floppy.h
@@ -65,36 +65,35 @@ static void floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
#endif
#ifndef NO_FLOPPY_ASSEMBLER
- __asm__ (
- "testl %1,%1
- je 3f
-1: inb %w4,%b0
- andb $160,%b0
- cmpb $160,%b0
- jne 2f
- incw %w4
- testl %3,%3
- jne 4f
- inb %w4,%b0
- movb %0,(%2)
- jmp 5f
-4: movb (%2),%0
- outb %b0,%w4
-5: decw %w4
- outb %0,$0x80
- decl %1
- incl %2
- testl %1,%1
- jne 1b
-3: inb %w4,%b0
-2: "
- : "=a" ((char) st),
- "=c" ((long) virtual_dma_count),
- "=S" ((long) virtual_dma_addr)
- : "b" ((long) virtual_dma_mode),
- "d" ((short) virtual_dma_port+4),
- "1" ((long) virtual_dma_count),
- "2" ((long) virtual_dma_addr));
+ __asm__ ("testl %1,%1\n"
+ "je 3f\n"
+ "1: inb %w4,%b0\n"
+ "andb $160,%b0\n"
+ "cmpb $160,%b0\n"
+ "jne 2f\n"
+ "incw %w4\n"
+ "testl %3,%3\n"
+ "jne 4f\n"
+ "inb %w4,%b0\n"
+ "movb %0,(%2)\n"
+ "jmp 5f\n"
+ "4: movb (%2),%0\n"
+ "outb %b0,%w4\n"
+ "5: decw %w4\n"
+ "outb %0,$0x80\n"
+ "decl %1\n"
+ "incl %2\n"
+ "testl %1,%1\n"
+ "jne 1b\n"
+ "3: inb %w4,%b0\n"
+ "2:\n"
+ : "=a" ((char) st),
+ "=c" ((long) virtual_dma_count),
+ "=S" ((long) virtual_dma_addr)
+ : "b" ((long) virtual_dma_mode),
+ "d" ((short) virtual_dma_port+4),
+ "1" ((long) virtual_dma_count),
+ "2" ((long) virtual_dma_addr));
#else
{
register int lcount;