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>
136 lines
3.3 KiB
C
136 lines
3.3 KiB
C
#ifndef __ASM_MACINTOSH_H
|
|
#define __ASM_MACINTOSH_H
|
|
|
|
#include <linux/seq_file.h>
|
|
#include <linux/interrupt.h>
|
|
|
|
/*
|
|
* Apple Macintoshisms
|
|
*/
|
|
|
|
extern void mac_reset(void);
|
|
extern void mac_poweroff(void);
|
|
extern void mac_init_IRQ(void);
|
|
extern int mac_irq_pending(unsigned int);
|
|
|
|
/*
|
|
* Floppy driver magic hook - probably shouldnt be here
|
|
*/
|
|
|
|
extern void via1_set_head(int);
|
|
|
|
/*
|
|
* Macintosh Table
|
|
*/
|
|
|
|
struct mac_model
|
|
{
|
|
short ident;
|
|
char *name;
|
|
char adb_type;
|
|
char via_type;
|
|
char scsi_type;
|
|
char ide_type;
|
|
char scc_type;
|
|
char ether_type;
|
|
char nubus_type;
|
|
};
|
|
|
|
#define MAC_ADB_NONE 0
|
|
#define MAC_ADB_II 1
|
|
#define MAC_ADB_IISI 2
|
|
#define MAC_ADB_CUDA 3
|
|
#define MAC_ADB_PB1 4
|
|
#define MAC_ADB_PB2 5
|
|
#define MAC_ADB_IOP 6
|
|
|
|
#define MAC_VIA_II 1
|
|
#define MAC_VIA_IIci 2
|
|
#define MAC_VIA_QUADRA 3
|
|
|
|
#define MAC_SCSI_NONE 0
|
|
#define MAC_SCSI_OLD 1
|
|
#define MAC_SCSI_QUADRA 2
|
|
#define MAC_SCSI_QUADRA2 3
|
|
#define MAC_SCSI_QUADRA3 4
|
|
|
|
#define MAC_IDE_NONE 0
|
|
#define MAC_IDE_QUADRA 1
|
|
#define MAC_IDE_PB 2
|
|
#define MAC_IDE_BABOON 3
|
|
|
|
#define MAC_SCC_II 1
|
|
#define MAC_SCC_IOP 2
|
|
#define MAC_SCC_QUADRA 3
|
|
#define MAC_SCC_PSC 4
|
|
|
|
#define MAC_ETHER_NONE 0
|
|
#define MAC_ETHER_SONIC 1
|
|
#define MAC_ETHER_MACE 2
|
|
|
|
#define MAC_NO_NUBUS 0
|
|
#define MAC_NUBUS 1
|
|
|
|
/*
|
|
* Gestalt numbers
|
|
*/
|
|
|
|
#define MAC_MODEL_II 6
|
|
#define MAC_MODEL_IIX 7
|
|
#define MAC_MODEL_IICX 8
|
|
#define MAC_MODEL_SE30 9
|
|
#define MAC_MODEL_IICI 11
|
|
#define MAC_MODEL_IIFX 13 /* And well numbered it is too */
|
|
#define MAC_MODEL_IISI 18
|
|
#define MAC_MODEL_LC 19
|
|
#define MAC_MODEL_Q900 20
|
|
#define MAC_MODEL_PB170 21
|
|
#define MAC_MODEL_Q700 22
|
|
#define MAC_MODEL_CLII 23 /* aka: P200 */
|
|
#define MAC_MODEL_PB140 25
|
|
#define MAC_MODEL_Q950 26 /* aka: WGS95 */
|
|
#define MAC_MODEL_LCIII 27 /* aka: P450 */
|
|
#define MAC_MODEL_PB210 29
|
|
#define MAC_MODEL_C650 30
|
|
#define MAC_MODEL_PB230 32
|
|
#define MAC_MODEL_PB180 33
|
|
#define MAC_MODEL_PB160 34
|
|
#define MAC_MODEL_Q800 35 /* aka: WGS80 */
|
|
#define MAC_MODEL_Q650 36
|
|
#define MAC_MODEL_LCII 37 /* aka: P400/405/410/430 */
|
|
#define MAC_MODEL_PB250 38
|
|
#define MAC_MODEL_IIVI 44
|
|
#define MAC_MODEL_P600 45 /* aka: P600CD */
|
|
#define MAC_MODEL_IIVX 48
|
|
#define MAC_MODEL_CCL 49 /* aka: P250 */
|
|
#define MAC_MODEL_PB165C 50
|
|
#define MAC_MODEL_C610 52 /* aka: WGS60 */
|
|
#define MAC_MODEL_Q610 53
|
|
#define MAC_MODEL_PB145 54 /* aka: PB145B */
|
|
#define MAC_MODEL_P520 56 /* aka: LC520 */
|
|
#define MAC_MODEL_C660 60
|
|
#define MAC_MODEL_P460 62 /* aka: LCIII+, P466/P467 */
|
|
#define MAC_MODEL_PB180C 71
|
|
#define MAC_MODEL_PB520 72 /* aka: PB520C, PB540, PB540C, PB550C */
|
|
#define MAC_MODEL_PB270C 77
|
|
#define MAC_MODEL_Q840 78
|
|
#define MAC_MODEL_P550 80 /* aka: LC550, P560 */
|
|
#define MAC_MODEL_CCLII 83 /* aka: P275 */
|
|
#define MAC_MODEL_PB165 84
|
|
#define MAC_MODEL_PB190 85 /* aka: PB190CS */
|
|
#define MAC_MODEL_TV 88
|
|
#define MAC_MODEL_P475 89 /* aka: LC475, P476 */
|
|
#define MAC_MODEL_P475F 90 /* aka: P475 w/ FPU (no LC040) */
|
|
#define MAC_MODEL_P575 92 /* aka: LC575, P577/P578 */
|
|
#define MAC_MODEL_Q605 94
|
|
#define MAC_MODEL_Q605_ACC 95 /* Q605 accelerated to 33 MHz */
|
|
#define MAC_MODEL_Q630 98 /* aka: LC630, P630/631/635/636/637/638/640 */
|
|
#define MAC_MODEL_P588 99 /* aka: LC580, P580 */
|
|
#define MAC_MODEL_PB280 102
|
|
#define MAC_MODEL_PB280C 103
|
|
#define MAC_MODEL_PB150 115
|
|
|
|
extern struct mac_model *macintosh_config;
|
|
|
|
#endif
|