mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00: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>
111 lines
2.5 KiB
C
111 lines
2.5 KiB
C
/*
|
|
** asm-m68k/pcmcia.h -- Amiga Linux PCMCIA Definitions
|
|
**
|
|
** Copyright 1997 by Alain Malek
|
|
**
|
|
** This file is subject to the terms and conditions of the GNU General Public
|
|
** License. See the file COPYING in the main directory of this archive
|
|
** for more details.
|
|
**
|
|
** Created: 12/10/97 by Alain Malek
|
|
*/
|
|
|
|
#ifndef __AMIGA_PCMCIA_H__
|
|
#define __AMIGA_PCMCIA_H__
|
|
|
|
#include <asm/amigayle.h>
|
|
|
|
/* prototypes */
|
|
|
|
void pcmcia_reset(void);
|
|
int pcmcia_copy_tuple(unsigned char tuple_id, void *tuple, int max_len);
|
|
void pcmcia_program_voltage(int voltage);
|
|
void pcmcia_access_speed(int speed);
|
|
void pcmcia_write_enable(void);
|
|
void pcmcia_write_disable(void);
|
|
|
|
static inline u_char pcmcia_read_status(void)
|
|
{
|
|
return (gayle.cardstatus & 0x7c);
|
|
}
|
|
|
|
static inline u_char pcmcia_get_intreq(void)
|
|
{
|
|
return (gayle.intreq);
|
|
}
|
|
|
|
static inline void pcmcia_ack_int(u_char intreq)
|
|
{
|
|
gayle.intreq = 0xf8;
|
|
}
|
|
|
|
static inline void pcmcia_enable_irq(void)
|
|
{
|
|
gayle.inten |= GAYLE_IRQ_IRQ;
|
|
}
|
|
|
|
static inline void pcmcia_disable_irq(void)
|
|
{
|
|
gayle.inten &= ~GAYLE_IRQ_IRQ;
|
|
}
|
|
|
|
#define PCMCIA_INSERTED (gayle.cardstatus & GAYLE_CS_CCDET)
|
|
|
|
/* valid voltages for pcmcia_ProgramVoltage */
|
|
|
|
#define PCMCIA_0V 0
|
|
#define PCMCIA_5V 5
|
|
#define PCMCIA_12V 12
|
|
|
|
/* valid speeds for pcmcia_AccessSpeed */
|
|
|
|
#define PCMCIA_SPEED_100NS 100
|
|
#define PCMCIA_SPEED_150NS 150
|
|
#define PCMCIA_SPEED_250NS 250
|
|
#define PCMCIA_SPEED_720NS 720
|
|
|
|
/* PCMCIA Tuple codes */
|
|
|
|
#define CISTPL_NULL 0x00
|
|
#define CISTPL_DEVICE 0x01
|
|
#define CISTPL_LONGLINK_CB 0x02
|
|
#define CISTPL_CONFIG_CB 0x04
|
|
#define CISTPL_CFTABLE_ENTRY_CB 0x05
|
|
#define CISTPL_LONGLINK_MFC 0x06
|
|
#define CISTPL_BAR 0x07
|
|
#define CISTPL_CHECKSUM 0x10
|
|
#define CISTPL_LONGLINK_A 0x11
|
|
#define CISTPL_LONGLINK_C 0x12
|
|
#define CISTPL_LINKTARGET 0x13
|
|
#define CISTPL_NO_LINK 0x14
|
|
#define CISTPL_VERS_1 0x15
|
|
#define CISTPL_ALTSTR 0x16
|
|
#define CISTPL_DEVICE_A 0x17
|
|
#define CISTPL_JEDEC_C 0x18
|
|
#define CISTPL_JEDEC_A 0x19
|
|
#define CISTPL_CONFIG 0x1a
|
|
#define CISTPL_CFTABLE_ENTRY 0x1b
|
|
#define CISTPL_DEVICE_OC 0x1c
|
|
#define CISTPL_DEVICE_OA 0x1d
|
|
#define CISTPL_DEVICE_GEO 0x1e
|
|
#define CISTPL_DEVICE_GEO_A 0x1f
|
|
#define CISTPL_MANFID 0x20
|
|
#define CISTPL_FUNCID 0x21
|
|
#define CISTPL_FUNCE 0x22
|
|
#define CISTPL_SWIL 0x23
|
|
#define CISTPL_END 0xff
|
|
|
|
/* FUNCID */
|
|
|
|
#define CISTPL_FUNCID_MULTI 0x00
|
|
#define CISTPL_FUNCID_MEMORY 0x01
|
|
#define CISTPL_FUNCID_SERIAL 0x02
|
|
#define CISTPL_FUNCID_PARALLEL 0x03
|
|
#define CISTPL_FUNCID_FIXED 0x04
|
|
#define CISTPL_FUNCID_VIDEO 0x05
|
|
#define CISTPL_FUNCID_NETWORK 0x06
|
|
#define CISTPL_FUNCID_AIMS 0x07
|
|
#define CISTPL_FUNCID_SCSI 0x08
|
|
|
|
#endif
|