![Sam Ravnborg](/assets/img/avatar_default.png)
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>
313 lines
7.9 KiB
C
313 lines
7.9 KiB
C
#ifndef __SPARC_OPENPROM_H
|
|
#define __SPARC_OPENPROM_H
|
|
|
|
/* openprom.h: Prom structures and defines for access to the OPENBOOT
|
|
* prom routines and data areas.
|
|
*
|
|
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
|
|
*/
|
|
|
|
|
|
/* Empirical constants... */
|
|
#ifdef CONFIG_SUN3
|
|
#define KADB_DEBUGGER_BEGVM 0x0fee0000 /* There is no kadb yet but...*/
|
|
#define LINUX_OPPROM_BEGVM 0x0fef0000
|
|
#define LINUX_OPPROM_ENDVM 0x0ff10000 /* I think this is right - tm */
|
|
#else
|
|
#define KADB_DEBUGGER_BEGVM 0xffc00000 /* Where kern debugger is in virt-mem */
|
|
#define LINUX_OPPROM_BEGVM 0xffd00000
|
|
#define LINUX_OPPROM_ENDVM 0xfff00000
|
|
#define LINUX_OPPROM_MAGIC 0x10010407
|
|
#endif
|
|
|
|
#ifndef __ASSEMBLY__
|
|
/* V0 prom device operations. */
|
|
struct linux_dev_v0_funcs {
|
|
int (*v0_devopen)(char *device_str);
|
|
int (*v0_devclose)(int dev_desc);
|
|
int (*v0_rdblkdev)(int dev_desc, int num_blks, int blk_st, char *buf);
|
|
int (*v0_wrblkdev)(int dev_desc, int num_blks, int blk_st, char *buf);
|
|
int (*v0_wrnetdev)(int dev_desc, int num_bytes, char *buf);
|
|
int (*v0_rdnetdev)(int dev_desc, int num_bytes, char *buf);
|
|
int (*v0_rdchardev)(int dev_desc, int num_bytes, int dummy, char *buf);
|
|
int (*v0_wrchardev)(int dev_desc, int num_bytes, int dummy, char *buf);
|
|
int (*v0_seekdev)(int dev_desc, long logical_offst, int from);
|
|
};
|
|
|
|
/* V2 and later prom device operations. */
|
|
struct linux_dev_v2_funcs {
|
|
int (*v2_inst2pkg)(int d); /* Convert ihandle to phandle */
|
|
char * (*v2_dumb_mem_alloc)(char *va, unsigned sz);
|
|
void (*v2_dumb_mem_free)(char *va, unsigned sz);
|
|
|
|
/* To map devices into virtual I/O space. */
|
|
char * (*v2_dumb_mmap)(char *virta, int which_io, unsigned paddr, unsigned sz);
|
|
void (*v2_dumb_munmap)(char *virta, unsigned size);
|
|
|
|
int (*v2_dev_open)(char *devpath);
|
|
void (*v2_dev_close)(int d);
|
|
int (*v2_dev_read)(int d, char *buf, int nbytes);
|
|
int (*v2_dev_write)(int d, char *buf, int nbytes);
|
|
int (*v2_dev_seek)(int d, int hi, int lo);
|
|
|
|
/* Never issued (multistage load support) */
|
|
void (*v2_wheee2)(void);
|
|
void (*v2_wheee3)(void);
|
|
};
|
|
|
|
struct linux_mlist_v0 {
|
|
struct linux_mlist_v0 *theres_more;
|
|
char *start_adr;
|
|
unsigned num_bytes;
|
|
};
|
|
|
|
struct linux_mem_v0 {
|
|
struct linux_mlist_v0 **v0_totphys;
|
|
struct linux_mlist_v0 **v0_prommap;
|
|
struct linux_mlist_v0 **v0_available; /* What we can use */
|
|
};
|
|
|
|
/* Arguments sent to the kernel from the boot prompt. */
|
|
struct linux_arguments_v0 {
|
|
char *argv[8];
|
|
char args[100];
|
|
char boot_dev[2];
|
|
int boot_dev_ctrl;
|
|
int boot_dev_unit;
|
|
int dev_partition;
|
|
char *kernel_file_name;
|
|
void *aieee1; /* XXX */
|
|
};
|
|
|
|
/* V2 and up boot things. */
|
|
struct linux_bootargs_v2 {
|
|
char **bootpath;
|
|
char **bootargs;
|
|
int *fd_stdin;
|
|
int *fd_stdout;
|
|
};
|
|
|
|
#if defined(CONFIG_SUN3) || defined(CONFIG_SUN3X)
|
|
struct linux_romvec {
|
|
char *pv_initsp;
|
|
int (*pv_startmon)(void);
|
|
|
|
int *diagberr;
|
|
|
|
struct linux_arguments_v0 **pv_v0bootargs;
|
|
unsigned *pv_sun3mem;
|
|
|
|
unsigned char (*pv_getchar)(void);
|
|
int (*pv_putchar)(int ch);
|
|
int (*pv_nbgetchar)(void);
|
|
int (*pv_nbputchar)(int ch);
|
|
unsigned char *pv_echo;
|
|
unsigned char *pv_insource;
|
|
unsigned char *pv_outsink;
|
|
|
|
int (*pv_getkey)(void);
|
|
int (*pv_initgetkey)(void);
|
|
unsigned int *pv_translation;
|
|
unsigned char *pv_keybid;
|
|
int *pv_screen_x;
|
|
int *pv_screen_y;
|
|
struct keybuf *pv_keybuf;
|
|
|
|
char *pv_monid;
|
|
|
|
/*
|
|
* Frame buffer output and terminal emulation
|
|
*/
|
|
|
|
int (*pv_fbwritechar)(char);
|
|
int *pv_fbaddr;
|
|
char **pv_font;
|
|
int (*pv_fbwritestr)(char);
|
|
|
|
void (*pv_reboot)(char *bootstr);
|
|
|
|
/*
|
|
* Line input and parsing
|
|
*/
|
|
|
|
unsigned char *pv_linebuf;
|
|
unsigned char **pv_lineptr;
|
|
int *pv_linesize;
|
|
int (*pv_getline)(void);
|
|
unsigned char (*pv_getnextchar)(void);
|
|
unsigned char (*pv_peeknextchar)(void);
|
|
int *pv_fbthere;
|
|
int (*pv_getnum)(void);
|
|
|
|
void (*pv_printf)(const char *fmt, ...);
|
|
int (*pv_printhex)(void);
|
|
|
|
unsigned char *pv_leds;
|
|
int (*pv_setleds)(void);
|
|
|
|
/*
|
|
* Non-maskable interrupt (nmi) information
|
|
*/
|
|
|
|
int (*pv_nmiaddr)(void);
|
|
int (*pv_abortentry)(void);
|
|
int *pv_nmiclock;
|
|
|
|
int *pv_fbtype;
|
|
|
|
/*
|
|
* Assorted other things
|
|
*/
|
|
|
|
unsigned pv_romvers;
|
|
struct globram *pv_globram;
|
|
char *pv_kbdzscc;
|
|
|
|
int *pv_keyrinit;
|
|
unsigned char *pv_keyrtick;
|
|
unsigned *pv_memoryavail;
|
|
long *pv_resetaddr;
|
|
long *pv_resetmap;
|
|
|
|
void (*pv_halt)(void);
|
|
unsigned char *pv_memorybitmap;
|
|
|
|
#ifdef CONFIG_SUN3
|
|
void (*pv_setctxt)(int ctxt, char *va, int pmeg);
|
|
void (*pv_vector_cmd)(void);
|
|
int dummy1z;
|
|
int dummy2z;
|
|
int dummy3z;
|
|
int dummy4z;
|
|
#endif
|
|
};
|
|
#else
|
|
/* The top level PROM vector. */
|
|
struct linux_romvec {
|
|
/* Version numbers. */
|
|
unsigned int pv_magic_cookie;
|
|
unsigned int pv_romvers;
|
|
unsigned int pv_plugin_revision;
|
|
unsigned int pv_printrev;
|
|
|
|
/* Version 0 memory descriptors. */
|
|
struct linux_mem_v0 pv_v0mem;
|
|
|
|
/* Node operations. */
|
|
struct linux_nodeops *pv_nodeops;
|
|
|
|
char **pv_bootstr;
|
|
struct linux_dev_v0_funcs pv_v0devops;
|
|
|
|
char *pv_stdin;
|
|
char *pv_stdout;
|
|
#define PROMDEV_KBD 0 /* input from keyboard */
|
|
#define PROMDEV_SCREEN 0 /* output to screen */
|
|
#define PROMDEV_TTYA 1 /* in/out to ttya */
|
|
#define PROMDEV_TTYB 2 /* in/out to ttyb */
|
|
|
|
/* Blocking getchar/putchar. NOT REENTRANT! (grr) */
|
|
int (*pv_getchar)(void);
|
|
void (*pv_putchar)(int ch);
|
|
|
|
/* Non-blocking variants. */
|
|
int (*pv_nbgetchar)(void);
|
|
int (*pv_nbputchar)(int ch);
|
|
|
|
void (*pv_putstr)(char *str, int len);
|
|
|
|
/* Miscellany. */
|
|
void (*pv_reboot)(char *bootstr);
|
|
void (*pv_printf)(__const__ char *fmt, ...);
|
|
void (*pv_abort)(void);
|
|
__volatile__ int *pv_ticks;
|
|
void (*pv_halt)(void);
|
|
void (**pv_synchook)(void);
|
|
|
|
/* Evaluate a forth string, not different proto for V0 and V2->up. */
|
|
union {
|
|
void (*v0_eval)(int len, char *str);
|
|
void (*v2_eval)(char *str);
|
|
} pv_fortheval;
|
|
|
|
struct linux_arguments_v0 **pv_v0bootargs;
|
|
|
|
/* Get ether address. */
|
|
unsigned int (*pv_enaddr)(int d, char *enaddr);
|
|
|
|
struct linux_bootargs_v2 pv_v2bootargs;
|
|
struct linux_dev_v2_funcs pv_v2devops;
|
|
|
|
int filler[15];
|
|
|
|
/* This one is sun4c/sun4 only. */
|
|
void (*pv_setctxt)(int ctxt, char *va, int pmeg);
|
|
|
|
/* Prom version 3 Multiprocessor routines. This stuff is crazy.
|
|
* No joke. Calling these when there is only one cpu probably
|
|
* crashes the machine, have to test this. :-)
|
|
*/
|
|
|
|
/* v3_cpustart() will start the cpu 'whichcpu' in mmu-context
|
|
* 'thiscontext' executing at address 'prog_counter'
|
|
*/
|
|
int (*v3_cpustart)(unsigned int whichcpu, int ctxtbl_ptr,
|
|
int thiscontext, char *prog_counter);
|
|
|
|
/* v3_cpustop() will cause cpu 'whichcpu' to stop executing
|
|
* until a resume cpu call is made.
|
|
*/
|
|
int (*v3_cpustop)(unsigned int whichcpu);
|
|
|
|
/* v3_cpuidle() will idle cpu 'whichcpu' until a stop or
|
|
* resume cpu call is made.
|
|
*/
|
|
int (*v3_cpuidle)(unsigned int whichcpu);
|
|
|
|
/* v3_cpuresume() will resume processor 'whichcpu' executing
|
|
* starting with whatever 'pc' and 'npc' were left at the
|
|
* last 'idle' or 'stop' call.
|
|
*/
|
|
int (*v3_cpuresume)(unsigned int whichcpu);
|
|
};
|
|
#endif
|
|
|
|
/* Routines for traversing the prom device tree. */
|
|
struct linux_nodeops {
|
|
int (*no_nextnode)(int node);
|
|
int (*no_child)(int node);
|
|
int (*no_proplen)(int node, char *name);
|
|
int (*no_getprop)(int node, char *name, char *val);
|
|
int (*no_setprop)(int node, char *name, char *val, int len);
|
|
char * (*no_nextprop)(int node, char *name);
|
|
};
|
|
|
|
/* More fun PROM structures for device probing. */
|
|
#define PROMREG_MAX 16
|
|
#define PROMVADDR_MAX 16
|
|
#define PROMINTR_MAX 15
|
|
|
|
struct linux_prom_registers {
|
|
int which_io; /* is this in OBIO space? */
|
|
char *phys_addr; /* The physical address of this register */
|
|
int reg_size; /* How many bytes does this register take up? */
|
|
};
|
|
|
|
struct linux_prom_irqs {
|
|
int pri; /* IRQ priority */
|
|
int vector; /* This is foobar, what does it do? */
|
|
};
|
|
|
|
/* Element of the "ranges" vector */
|
|
struct linux_prom_ranges {
|
|
unsigned int ot_child_space;
|
|
unsigned int ot_child_base; /* Bus feels this */
|
|
unsigned int ot_parent_space;
|
|
unsigned int ot_parent_base; /* CPU looks from here */
|
|
unsigned int or_size;
|
|
};
|
|
|
|
#endif /* !(__ASSEMBLY__) */
|
|
|
|
#endif /* !(__SPARC_OPENPROM_H) */
|