mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 09:14:19 +08:00
49148020bc
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
80 lines
2.6 KiB
C
80 lines
2.6 KiB
C
#ifndef _LINUX_FDREG_H
|
|
#define _LINUX_FDREG_H
|
|
|
|
/*
|
|
** WD1772 stuff
|
|
*/
|
|
|
|
/* register codes */
|
|
|
|
#define FDCSELREG_STP (0x80) /* command/status register */
|
|
#define FDCSELREG_TRA (0x82) /* track register */
|
|
#define FDCSELREG_SEC (0x84) /* sector register */
|
|
#define FDCSELREG_DTA (0x86) /* data register */
|
|
|
|
/* register names for FDC_READ/WRITE macros */
|
|
|
|
#define FDCREG_CMD 0
|
|
#define FDCREG_STATUS 0
|
|
#define FDCREG_TRACK 2
|
|
#define FDCREG_SECTOR 4
|
|
#define FDCREG_DATA 6
|
|
|
|
/* command opcodes */
|
|
|
|
#define FDCCMD_RESTORE (0x00) /* - */
|
|
#define FDCCMD_SEEK (0x10) /* | */
|
|
#define FDCCMD_STEP (0x20) /* | TYP 1 Commands */
|
|
#define FDCCMD_STIN (0x40) /* | */
|
|
#define FDCCMD_STOT (0x60) /* - */
|
|
#define FDCCMD_RDSEC (0x80) /* - TYP 2 Commands */
|
|
#define FDCCMD_WRSEC (0xa0) /* - " */
|
|
#define FDCCMD_RDADR (0xc0) /* - */
|
|
#define FDCCMD_RDTRA (0xe0) /* | TYP 3 Commands */
|
|
#define FDCCMD_WRTRA (0xf0) /* - */
|
|
#define FDCCMD_FORCI (0xd0) /* - TYP 4 Command */
|
|
|
|
/* command modifier bits */
|
|
|
|
#define FDCCMDADD_SR6 (0x00) /* step rate settings */
|
|
#define FDCCMDADD_SR12 (0x01)
|
|
#define FDCCMDADD_SR2 (0x02)
|
|
#define FDCCMDADD_SR3 (0x03)
|
|
#define FDCCMDADD_V (0x04) /* verify */
|
|
#define FDCCMDADD_H (0x08) /* wait for spin-up */
|
|
#define FDCCMDADD_U (0x10) /* update track register */
|
|
#define FDCCMDADD_M (0x10) /* multiple sector access */
|
|
#define FDCCMDADD_E (0x04) /* head settling flag */
|
|
#define FDCCMDADD_P (0x02) /* precompensation off */
|
|
#define FDCCMDADD_A0 (0x01) /* DAM flag */
|
|
|
|
/* status register bits */
|
|
|
|
#define FDCSTAT_MOTORON (0x80) /* motor on */
|
|
#define FDCSTAT_WPROT (0x40) /* write protected (FDCCMD_WR*) */
|
|
#define FDCSTAT_SPINUP (0x20) /* motor speed stable (Type I) */
|
|
#define FDCSTAT_DELDAM (0x20) /* sector has deleted DAM (Type II+III) */
|
|
#define FDCSTAT_RECNF (0x10) /* record not found */
|
|
#define FDCSTAT_CRC (0x08) /* CRC error */
|
|
#define FDCSTAT_TR00 (0x04) /* Track 00 flag (Type I) */
|
|
#define FDCSTAT_LOST (0x04) /* Lost Data (Type II+III) */
|
|
#define FDCSTAT_IDX (0x02) /* Index status (Type I) */
|
|
#define FDCSTAT_DRQ (0x02) /* DRQ status (Type II+III) */
|
|
#define FDCSTAT_BUSY (0x01) /* FDC is busy */
|
|
|
|
|
|
/* PSG Port A Bit Nr 0 .. Side Sel .. 0 -> Side 1 1 -> Side 2 */
|
|
#define DSKSIDE (0x01)
|
|
|
|
#define DSKDRVNONE (0x06)
|
|
#define DSKDRV0 (0x02)
|
|
#define DSKDRV1 (0x04)
|
|
|
|
/* step rates */
|
|
#define FDCSTEP_6 0x00
|
|
#define FDCSTEP_12 0x01
|
|
#define FDCSTEP_2 0x02
|
|
#define FDCSTEP_3 0x03
|
|
|
|
#endif
|