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>
330 lines
9.8 KiB
C
330 lines
9.8 KiB
C
#ifndef __LINUX_FBIO_H
|
|
#define __LINUX_FBIO_H
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/types.h>
|
|
|
|
/* Constants used for fbio SunOS compatibility */
|
|
/* (C) 1996 Miguel de Icaza */
|
|
|
|
/* Frame buffer types */
|
|
#define FBTYPE_NOTYPE -1
|
|
#define FBTYPE_SUN1BW 0 /* mono */
|
|
#define FBTYPE_SUN1COLOR 1
|
|
#define FBTYPE_SUN2BW 2
|
|
#define FBTYPE_SUN2COLOR 3
|
|
#define FBTYPE_SUN2GP 4
|
|
#define FBTYPE_SUN5COLOR 5
|
|
#define FBTYPE_SUN3COLOR 6
|
|
#define FBTYPE_MEMCOLOR 7
|
|
#define FBTYPE_SUN4COLOR 8
|
|
|
|
#define FBTYPE_NOTSUN1 9
|
|
#define FBTYPE_NOTSUN2 10
|
|
#define FBTYPE_NOTSUN3 11
|
|
|
|
#define FBTYPE_SUNFAST_COLOR 12 /* cg6 */
|
|
#define FBTYPE_SUNROP_COLOR 13
|
|
#define FBTYPE_SUNFB_VIDEO 14
|
|
#define FBTYPE_SUNGIFB 15
|
|
#define FBTYPE_SUNGPLAS 16
|
|
#define FBTYPE_SUNGP3 17
|
|
#define FBTYPE_SUNGT 18
|
|
#define FBTYPE_SUNLEO 19 /* zx Leo card */
|
|
#define FBTYPE_MDICOLOR 20 /* cg14 */
|
|
#define FBTYPE_TCXCOLOR 21 /* SUNW,tcx card */
|
|
|
|
#define FBTYPE_LASTPLUSONE 21 /* This is not last + 1 in fact... */
|
|
|
|
/* Does not seem to be listed in the Sun file either */
|
|
#define FBTYPE_CREATOR 22
|
|
#define FBTYPE_PCI_IGA1682 23
|
|
#define FBTYPE_P9100COLOR 24
|
|
|
|
#define FBTYPE_PCI_GENERIC 1000
|
|
#define FBTYPE_PCI_MACH64 1001
|
|
|
|
/* fbio ioctls */
|
|
/* Returned by FBIOGTYPE */
|
|
struct fbtype {
|
|
int fb_type; /* fb type, see above */
|
|
int fb_height; /* pixels */
|
|
int fb_width; /* pixels */
|
|
int fb_depth;
|
|
int fb_cmsize; /* color map entries */
|
|
int fb_size; /* fb size in bytes */
|
|
};
|
|
#define FBIOGTYPE _IOR('F', 0, struct fbtype)
|
|
|
|
struct fbcmap {
|
|
int index; /* first element (0 origin) */
|
|
int count;
|
|
unsigned char __user *red;
|
|
unsigned char __user *green;
|
|
unsigned char __user *blue;
|
|
};
|
|
|
|
#ifdef __KERNEL__
|
|
#define FBIOPUTCMAP_SPARC _IOW('F', 3, struct fbcmap)
|
|
#define FBIOGETCMAP_SPARC _IOW('F', 4, struct fbcmap)
|
|
#else
|
|
#define FBIOPUTCMAP _IOW('F', 3, struct fbcmap)
|
|
#define FBIOGETCMAP _IOW('F', 4, struct fbcmap)
|
|
#endif
|
|
|
|
/* # of device specific values */
|
|
#define FB_ATTR_NDEVSPECIFIC 8
|
|
/* # of possible emulations */
|
|
#define FB_ATTR_NEMUTYPES 4
|
|
|
|
struct fbsattr {
|
|
int flags;
|
|
int emu_type; /* -1 if none */
|
|
int dev_specific[FB_ATTR_NDEVSPECIFIC];
|
|
};
|
|
|
|
struct fbgattr {
|
|
int real_type; /* real frame buffer type */
|
|
int owner; /* unknown */
|
|
struct fbtype fbtype; /* real frame buffer fbtype */
|
|
struct fbsattr sattr;
|
|
int emu_types[FB_ATTR_NEMUTYPES]; /* supported emulations */
|
|
};
|
|
#define FBIOSATTR _IOW('F', 5, struct fbgattr) /* Unsupported: */
|
|
#define FBIOGATTR _IOR('F', 6, struct fbgattr) /* supported */
|
|
|
|
#define FBIOSVIDEO _IOW('F', 7, int)
|
|
#define FBIOGVIDEO _IOR('F', 8, int)
|
|
|
|
struct fbcursor {
|
|
short set; /* what to set, choose from the list above */
|
|
short enable; /* cursor on/off */
|
|
struct fbcurpos pos; /* cursor position */
|
|
struct fbcurpos hot; /* cursor hot spot */
|
|
struct fbcmap cmap; /* color map info */
|
|
struct fbcurpos size; /* cursor bit map size */
|
|
char __user *image; /* cursor image bits */
|
|
char __user *mask; /* cursor mask bits */
|
|
};
|
|
|
|
/* set/get cursor attributes/shape */
|
|
#define FBIOSCURSOR _IOW('F', 24, struct fbcursor)
|
|
#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor)
|
|
|
|
/* set/get cursor position */
|
|
#define FBIOSCURPOS _IOW('F', 26, struct fbcurpos)
|
|
#define FBIOGCURPOS _IOW('F', 27, struct fbcurpos)
|
|
|
|
/* get max cursor size */
|
|
#define FBIOGCURMAX _IOR('F', 28, struct fbcurpos)
|
|
|
|
/* wid manipulation */
|
|
struct fb_wid_alloc {
|
|
#define FB_WID_SHARED_8 0
|
|
#define FB_WID_SHARED_24 1
|
|
#define FB_WID_DBL_8 2
|
|
#define FB_WID_DBL_24 3
|
|
__u32 wa_type;
|
|
__s32 wa_index; /* Set on return */
|
|
__u32 wa_count;
|
|
};
|
|
struct fb_wid_item {
|
|
__u32 wi_type;
|
|
__s32 wi_index;
|
|
__u32 wi_attrs;
|
|
__u32 wi_values[32];
|
|
};
|
|
struct fb_wid_list {
|
|
__u32 wl_flags;
|
|
__u32 wl_count;
|
|
struct fb_wid_item *wl_list;
|
|
};
|
|
|
|
#define FBIO_WID_ALLOC _IOWR('F', 30, struct fb_wid_alloc)
|
|
#define FBIO_WID_FREE _IOW('F', 31, struct fb_wid_alloc)
|
|
#define FBIO_WID_PUT _IOW('F', 32, struct fb_wid_list)
|
|
#define FBIO_WID_GET _IOWR('F', 33, struct fb_wid_list)
|
|
|
|
/* Creator ioctls */
|
|
#define FFB_IOCTL ('F'<<8)
|
|
#define FFB_SYS_INFO (FFB_IOCTL|80)
|
|
#define FFB_CLUTREAD (FFB_IOCTL|81)
|
|
#define FFB_CLUTPOST (FFB_IOCTL|82)
|
|
#define FFB_SETDIAGMODE (FFB_IOCTL|83)
|
|
#define FFB_GETMONITORID (FFB_IOCTL|84)
|
|
#define FFB_GETVIDEOMODE (FFB_IOCTL|85)
|
|
#define FFB_SETVIDEOMODE (FFB_IOCTL|86)
|
|
#define FFB_SETSERVER (FFB_IOCTL|87)
|
|
#define FFB_SETOVCTL (FFB_IOCTL|88)
|
|
#define FFB_GETOVCTL (FFB_IOCTL|89)
|
|
#define FFB_GETSAXNUM (FFB_IOCTL|90)
|
|
#define FFB_FBDEBUG (FFB_IOCTL|91)
|
|
|
|
/* Cg14 ioctls */
|
|
#define MDI_IOCTL ('M'<<8)
|
|
#define MDI_RESET (MDI_IOCTL|1)
|
|
#define MDI_GET_CFGINFO (MDI_IOCTL|2)
|
|
#define MDI_SET_PIXELMODE (MDI_IOCTL|3)
|
|
# define MDI_32_PIX 32
|
|
# define MDI_16_PIX 16
|
|
# define MDI_8_PIX 8
|
|
|
|
struct mdi_cfginfo {
|
|
int mdi_ncluts; /* Number of implemented CLUTs in this MDI */
|
|
int mdi_type; /* FBTYPE name */
|
|
int mdi_height; /* height */
|
|
int mdi_width; /* widht */
|
|
int mdi_size; /* available ram */
|
|
int mdi_mode; /* 8bpp, 16bpp or 32bpp */
|
|
int mdi_pixfreq; /* pixel clock (from PROM) */
|
|
};
|
|
|
|
/* SparcLinux specific ioctl for the MDI, should be replaced for
|
|
* the SET_XLUT/SET_CLUTn ioctls instead
|
|
*/
|
|
#define MDI_CLEAR_XLUT (MDI_IOCTL|9)
|
|
|
|
/* leo & ffb ioctls */
|
|
struct fb_clut_alloc {
|
|
__u32 clutid; /* Set on return */
|
|
__u32 flag;
|
|
__u32 index;
|
|
};
|
|
|
|
struct fb_clut {
|
|
#define FB_CLUT_WAIT 0x00000001 /* Not yet implemented */
|
|
__u32 flag;
|
|
__u32 clutid;
|
|
__u32 offset;
|
|
__u32 count;
|
|
char * red;
|
|
char * green;
|
|
char * blue;
|
|
};
|
|
|
|
struct fb_clut32 {
|
|
__u32 flag;
|
|
__u32 clutid;
|
|
__u32 offset;
|
|
__u32 count;
|
|
__u32 red;
|
|
__u32 green;
|
|
__u32 blue;
|
|
};
|
|
|
|
#define LEO_CLUTALLOC _IOWR('L', 53, struct fb_clut_alloc)
|
|
#define LEO_CLUTFREE _IOW('L', 54, struct fb_clut_alloc)
|
|
#define LEO_CLUTREAD _IOW('L', 55, struct fb_clut)
|
|
#define LEO_CLUTPOST _IOW('L', 56, struct fb_clut)
|
|
#define LEO_SETGAMMA _IOW('L', 68, int) /* Not yet implemented */
|
|
#define LEO_GETGAMMA _IOR('L', 69, int) /* Not yet implemented */
|
|
|
|
#ifdef __KERNEL__
|
|
/* Addresses on the fd of a cgsix that are mappable */
|
|
#define CG6_FBC 0x70000000
|
|
#define CG6_TEC 0x70001000
|
|
#define CG6_BTREGS 0x70002000
|
|
#define CG6_FHC 0x70004000
|
|
#define CG6_THC 0x70005000
|
|
#define CG6_ROM 0x70006000
|
|
#define CG6_RAM 0x70016000
|
|
#define CG6_DHC 0x80000000
|
|
|
|
#define CG3_MMAP_OFFSET 0x4000000
|
|
|
|
/* Addresses on the fd of a tcx that are mappable */
|
|
#define TCX_RAM8BIT 0x00000000
|
|
#define TCX_RAM24BIT 0x01000000
|
|
#define TCX_UNK3 0x10000000
|
|
#define TCX_UNK4 0x20000000
|
|
#define TCX_CONTROLPLANE 0x28000000
|
|
#define TCX_UNK6 0x30000000
|
|
#define TCX_UNK7 0x38000000
|
|
#define TCX_TEC 0x70000000
|
|
#define TCX_BTREGS 0x70002000
|
|
#define TCX_THC 0x70004000
|
|
#define TCX_DHC 0x70008000
|
|
#define TCX_ALT 0x7000a000
|
|
#define TCX_SYNC 0x7000e000
|
|
#define TCX_UNK2 0x70010000
|
|
|
|
/* CG14 definitions */
|
|
|
|
/* Offsets into the OBIO space: */
|
|
#define CG14_REGS 0 /* registers */
|
|
#define CG14_CURSORREGS 0x1000 /* cursor registers */
|
|
#define CG14_DACREGS 0x2000 /* DAC registers */
|
|
#define CG14_XLUT 0x3000 /* X Look Up Table -- ??? */
|
|
#define CG14_CLUT1 0x4000 /* Color Look Up Table */
|
|
#define CG14_CLUT2 0x5000 /* Color Look Up Table */
|
|
#define CG14_CLUT3 0x6000 /* Color Look Up Table */
|
|
#define CG14_AUTO 0xf000
|
|
|
|
#endif /* KERNEL */
|
|
|
|
/* These are exported to userland for applications to use */
|
|
/* Mappable offsets for the cg14: control registers */
|
|
#define MDI_DIRECT_MAP 0x10000000
|
|
#define MDI_CTLREG_MAP 0x20000000
|
|
#define MDI_CURSOR_MAP 0x30000000
|
|
#define MDI_SHDW_VRT_MAP 0x40000000
|
|
|
|
/* Mappable offsets for the cg14: frame buffer resolutions */
|
|
/* 32 bits */
|
|
#define MDI_CHUNKY_XBGR_MAP 0x50000000
|
|
#define MDI_CHUNKY_BGR_MAP 0x60000000
|
|
|
|
/* 16 bits */
|
|
#define MDI_PLANAR_X16_MAP 0x70000000
|
|
#define MDI_PLANAR_C16_MAP 0x80000000
|
|
|
|
/* 8 bit is done as CG3 MMAP offset */
|
|
/* 32 bits, planar */
|
|
#define MDI_PLANAR_X32_MAP 0x90000000
|
|
#define MDI_PLANAR_B32_MAP 0xa0000000
|
|
#define MDI_PLANAR_G32_MAP 0xb0000000
|
|
#define MDI_PLANAR_R32_MAP 0xc0000000
|
|
|
|
/* Mappable offsets on leo */
|
|
#define LEO_SS0_MAP 0x00000000
|
|
#define LEO_LC_SS0_USR_MAP 0x00800000
|
|
#define LEO_LD_SS0_MAP 0x00801000
|
|
#define LEO_LX_CURSOR_MAP 0x00802000
|
|
#define LEO_SS1_MAP 0x00803000
|
|
#define LEO_LC_SS1_USR_MAP 0x01003000
|
|
#define LEO_LD_SS1_MAP 0x01004000
|
|
#define LEO_UNK_MAP 0x01005000
|
|
#define LEO_LX_KRN_MAP 0x01006000
|
|
#define LEO_LC_SS0_KRN_MAP 0x01007000
|
|
#define LEO_LC_SS1_KRN_MAP 0x01008000
|
|
#define LEO_LD_GBL_MAP 0x01009000
|
|
#define LEO_UNK2_MAP 0x0100a000
|
|
|
|
#ifdef __KERNEL__
|
|
struct fbcmap32 {
|
|
int index; /* first element (0 origin) */
|
|
int count;
|
|
u32 red;
|
|
u32 green;
|
|
u32 blue;
|
|
};
|
|
|
|
#define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32)
|
|
#define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32)
|
|
|
|
struct fbcursor32 {
|
|
short set; /* what to set, choose from the list above */
|
|
short enable; /* cursor on/off */
|
|
struct fbcurpos pos; /* cursor position */
|
|
struct fbcurpos hot; /* cursor hot spot */
|
|
struct fbcmap32 cmap; /* color map info */
|
|
struct fbcurpos size; /* cursor bit map size */
|
|
u32 image; /* cursor image bits */
|
|
u32 mask; /* cursor mask bits */
|
|
};
|
|
|
|
#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)
|
|
#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)
|
|
#endif
|
|
|
|
#endif /* __LINUX_FBIO_H */
|