e2032464fe
FDC registers FD_STATUS, FD_DATA, FD_DOR, FD_DIR and FD_DCR used to be defined relative to FD_IOPORT, which is the FDC's base address, itself a macro depending on the "fdc" local or global variable. This patch changes this so that the register macros above now only reference the address offset, and that the FDC's address is explicitly passed in each call to fd_inb() and fd_outb(), thus removing the macro. With this change there is no more implicit usage of the local/global "fdc" variable. One place in the ARM code used to check if the port was equal to FD_DOR, this was changed to testing the register by applying a mask to the port, as was already done in the sparc code. There are still occurrences of fd_inb() and fd_outb() in the PARISC code and these ones remain unaffected since they already used to work with a base address and a register offset. The sparc, m68k and parisc code could now be slightly cleaned up to benefit from the macro definitions above instead of the equivalent hard-coded values. Link: https://lore.kernel.org/r/20200301195555.11154-6-w@1wt.eu Cc: Ian Molton <spyro@f2s.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Denis Efremov <efremov@linux.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
83 lines
2.2 KiB
C
83 lines
2.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* arch/arm/include/asm/floppy.h
|
|
*
|
|
* Copyright (C) 1996-2000 Russell King
|
|
*
|
|
* Note that we don't touch FLOPPY_DMA nor FLOPPY_IRQ here
|
|
*/
|
|
#ifndef __ASM_ARM_FLOPPY_H
|
|
#define __ASM_ARM_FLOPPY_H
|
|
|
|
#define fd_outb(val,port) \
|
|
do { \
|
|
int new_val = (val); \
|
|
if (((port) & 7) == FD_DOR) { \
|
|
if (new_val & 0xf0) \
|
|
new_val = (new_val & 0x0c) | \
|
|
floppy_selects[new_val & 3]; \
|
|
else \
|
|
new_val &= 0x0c; \
|
|
} \
|
|
outb(new_val, (port)); \
|
|
} while(0)
|
|
|
|
#define fd_inb(port) inb((port))
|
|
#define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\
|
|
0,"floppy",NULL)
|
|
#define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL)
|
|
#define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK)
|
|
#define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK)
|
|
|
|
static inline int fd_dma_setup(void *data, unsigned int length,
|
|
unsigned int mode, unsigned long addr)
|
|
{
|
|
set_dma_mode(DMA_FLOPPY, mode);
|
|
__set_dma_addr(DMA_FLOPPY, data);
|
|
set_dma_count(DMA_FLOPPY, length);
|
|
virtual_dma_port = addr;
|
|
enable_dma(DMA_FLOPPY);
|
|
return 0;
|
|
}
|
|
#define fd_dma_setup fd_dma_setup
|
|
|
|
#define fd_request_dma() request_dma(DMA_FLOPPY,"floppy")
|
|
#define fd_free_dma() free_dma(DMA_FLOPPY)
|
|
#define fd_disable_dma() disable_dma(DMA_FLOPPY)
|
|
|
|
/* need to clean up dma.h */
|
|
#define DMA_FLOPPYDISK DMA_FLOPPY
|
|
|
|
/* Floppy_selects is the list of DOR's to select drive fd
|
|
*
|
|
* On initialisation, the floppy list is scanned, and the drives allocated
|
|
* in the order that they are found. This is done by seeking the drive
|
|
* to a non-zero track, and then restoring it to track 0. If an error occurs,
|
|
* then there is no floppy drive present. [to be put back in again]
|
|
*/
|
|
static unsigned char floppy_selects[4] = { 0x10, 0x21, 0x23, 0x33 };
|
|
|
|
#define FDC1 (0x3f0)
|
|
|
|
#define FLOPPY0_TYPE 4
|
|
#define FLOPPY1_TYPE 4
|
|
|
|
#define N_FDC 1
|
|
#define N_DRIVE 4
|
|
|
|
#define CROSS_64KB(a,s) (0)
|
|
|
|
/*
|
|
* This allows people to reverse the order of
|
|
* fd0 and fd1, in case their hardware is
|
|
* strangely connected (as some RiscPCs
|
|
* and A5000s seem to be).
|
|
*/
|
|
static void driveswap(int *ints, int dummy, int dummy2)
|
|
{
|
|
swap(floppy_selects[0], floppy_selects[1]);
|
|
}
|
|
|
|
#define EXTRA_FLOPPY_PARAMS ,{ "driveswap", &driveswap, NULL, 0, 0 }
|
|
|
|
#endif
|