diff options
| author | Brian Gerst <bgerst@didntduck.org> | 2006-03-31 05:30:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:18:50 -0500 |
| commit | 3ccfb81e871b45e4af6ebb3282f3cfa0f98f1b80 (patch) | |
| tree | 92a48c57c125da95d96bb1506c6c871cb5b726d4 /include | |
| parent | bc83db4f006fcf9e9502a002b4bd448fc4511d04 (diff) | |
[PATCH] Remove long dead i386 floppy asm code
It's been disabled since v2.1.88
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/floppy.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/include/asm-i386/floppy.h b/include/asm-i386/floppy.h index 79727afb94c9..03403045c182 100644 --- a/include/asm-i386/floppy.h +++ b/include/asm-i386/floppy.h | |||
| @@ -56,7 +56,6 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | |||
| 56 | register unsigned char st; | 56 | register unsigned char st; |
| 57 | 57 | ||
| 58 | #undef TRACE_FLPY_INT | 58 | #undef TRACE_FLPY_INT |
| 59 | #define NO_FLOPPY_ASSEMBLER | ||
| 60 | 59 | ||
| 61 | #ifdef TRACE_FLPY_INT | 60 | #ifdef TRACE_FLPY_INT |
| 62 | static int calls=0; | 61 | static int calls=0; |
| @@ -71,38 +70,6 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | |||
| 71 | bytes = virtual_dma_count; | 70 | bytes = virtual_dma_count; |
| 72 | #endif | 71 | #endif |
| 73 | 72 | ||
| 74 | #ifndef NO_FLOPPY_ASSEMBLER | ||
| 75 | __asm__ ( | ||
| 76 | "testl %1,%1" | ||
| 77 | "je 3f" | ||
| 78 | "1: inb %w4,%b0" | ||
| 79 | "andb $160,%b0" | ||
| 80 | "cmpb $160,%b0" | ||
| 81 | "jne 2f" | ||
| 82 | "incw %w4" | ||
| 83 | "testl %3,%3" | ||
| 84 | "jne 4f" | ||
| 85 | "inb %w4,%b0" | ||
| 86 | "movb %0,(%2)" | ||
| 87 | "jmp 5f" | ||
| 88 | "4: movb (%2),%0" | ||
| 89 | "outb %b0,%w4" | ||
| 90 | "5: decw %w4" | ||
| 91 | "outb %0,$0x80" | ||
| 92 | "decl %1" | ||
| 93 | "incl %2" | ||
| 94 | "testl %1,%1" | ||
| 95 | "jne 1b" | ||
| 96 | "3: inb %w4,%b0" | ||
| 97 | "2: " | ||
| 98 | : "=a" ((char) st), | ||
| 99 | "=c" ((long) virtual_dma_count), | ||
| 100 | "=S" ((long) virtual_dma_addr) | ||
| 101 | : "b" ((long) virtual_dma_mode), | ||
| 102 | "d" ((short) virtual_dma_port+4), | ||
| 103 | "1" ((long) virtual_dma_count), | ||
| 104 | "2" ((long) virtual_dma_addr)); | ||
| 105 | #else | ||
| 106 | { | 73 | { |
| 107 | register int lcount; | 74 | register int lcount; |
| 108 | register char *lptr; | 75 | register char *lptr; |
| @@ -122,7 +89,6 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | |||
| 122 | virtual_dma_addr = lptr; | 89 | virtual_dma_addr = lptr; |
| 123 | st = inb(virtual_dma_port+4); | 90 | st = inb(virtual_dma_port+4); |
| 124 | } | 91 | } |
| 125 | #endif | ||
| 126 | 92 | ||
| 127 | #ifdef TRACE_FLPY_INT | 93 | #ifdef TRACE_FLPY_INT |
| 128 | calls++; | 94 | calls++; |
