Commit ad6571a7 authored by Becky Bruce's avatar Becky Bruce Committed by Paul Mackerras
Browse files

[PATCH] Move 3 more headers to asm-powerpc 



Merged several nearly-identical header files from asm-ppc and asm-ppc64
into asm-powerpc.

Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarBecky Bruce <becky.bruce@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b2c0ab17

include/asm-ppc64/mman.h→include/asm-powerpc/mman.h

+3 −3
Original line number Diff line number Diff line 
#ifndef __PPC64_MMAN_H__

#define __PPC64_MMAN_H__

#ifndef _POWERPC_MMAN_H

#define _POWERPC_MMAN_H



/*

 * This program is free software; you can redistribute it and/or
@@ -49,4 +49,4 @@ 
#define MAP_ANON	MAP_ANONYMOUS

#define MAP_FILE	0



#endif /* __PPC64_MMAN_H__ */
 
#endif /* _POWERPC_MMAN_H */

include/asm-ppc64/termbits.h→include/asm-powerpc/termbits.h

+3 −5
Original line number Diff line number Diff line 
#ifndef _PPC64_TERMBITS_H

#define _PPC64_TERMBITS_H

#ifndef _POWERPC_TERMBITS_H

#define _POWERPC_TERMBITS_H



/*

 * This program is free software; you can redistribute it and/or
@@ -8,8 +8,6 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#include <linux/posix_types.h>



typedef unsigned char	cc_t;

typedef unsigned int	speed_t;

typedef unsigned int	tcflag_t;
@@ -190,4 +188,4 @@ struct termios { 
#define	TCSADRAIN	1

#define	TCSAFLUSH	2



#endif /* _PPC64_TERMBITS_H */
 
#endif /* _POWERPC_TERMBITS_H */

include/asm-ppc64/termios.h→include/asm-powerpc/termios.h

+4 −3
Original line number Diff line number Diff line 
#ifndef _PPC64_TERMIOS_H

#define _PPC64_TERMIOS_H

#ifndef _POWERPC_TERMIOS_H

#define _POWERPC_TERMIOS_H



/*

 * Liberally adapted from alpha/termios.h.  In particular, the c_cc[]
@@ -87,6 +87,7 @@ struct termio { 
#define N_SMSBLOCK	12	/* SMS block mode - for talking to GSM data cards about SMS messages */

#define N_HDLC		13	/* synchronous HDLC */

#define N_SYNC_PPP	14

#define N_HCI		15  /* Bluetooth HCI UART */



#ifdef __KERNEL__

/*                   ^C  ^\ del  ^U  ^D   1   0   0   0   0  ^W  ^R  ^Z  ^Q  ^S  ^V  ^U  */
@@ -232,4 +233,4 @@ struct termio { 


#endif	/* __KERNEL__ */



#endif	/* _PPC64_TERMIOS_H */
 
#endif	/* _POWERPC_TERMIOS_H */

include/asm-ppc/mman.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
#ifndef __PPC_MMAN_H__

#define __PPC_MMAN_H__



#define PROT_READ	0x1		/* page can be read */

#define PROT_WRITE	0x2		/* page can be written */

#define PROT_EXEC	0x4		/* page can be executed */

#define PROT_SEM	0x8		/* page may be used for atomic ops */

#define PROT_NONE	0x0		/* page can not be accessed */

#define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */

#define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */



#define MAP_SHARED	0x01		/* Share changes */

#define MAP_PRIVATE	0x02		/* Changes are private */

#define MAP_TYPE	0x0f		/* Mask for type of mapping */

#define MAP_FIXED	0x10		/* Interpret addr exactly */

#define MAP_ANONYMOUS	0x20		/* don't use a file */

#define MAP_RENAME      MAP_ANONYMOUS   /* In SunOS terminology */

#define MAP_NORESERVE   0x40            /* don't reserve swap pages */

#define MAP_LOCKED	0x80



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */

#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */

#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */



#define MS_ASYNC	1		/* sync memory asynchronously */

#define MS_INVALIDATE	2		/* invalidate the caches */

#define MS_SYNC		4		/* synchronous memory sync */



#define MCL_CURRENT     0x2000          /* lock all currently mapped pages */

#define MCL_FUTURE      0x4000          /* lock all additions to address space */



#define MADV_NORMAL	0x0		/* default page-in behavior */

#define MADV_RANDOM	0x1		/* page-in minimum required */

#define MADV_SEQUENTIAL	0x2		/* read-ahead aggressively */

#define MADV_WILLNEED	0x3		/* pre-fault pages */

#define MADV_DONTNEED	0x4		/* discard these pages */



/* compatibility flags */

#define MAP_ANON	MAP_ANONYMOUS

#define MAP_FILE	0



#endif /* __PPC_MMAN_H__ */

include/asm-ppc/termbits.h

deleted100644 → 0
+0 −185
Original line number Diff line number Diff line 
#ifndef _PPC_TERMBITS_H

#define _PPC_TERMBITS_H



typedef unsigned char	cc_t;

typedef unsigned int	speed_t;

typedef unsigned int	tcflag_t;



/*

 * termios type and macro definitions.  Be careful about adding stuff

 * to this file since it's used in GNU libc and there are strict rules

 * concerning namespace pollution.

 */



#define NCCS 19

struct termios {

	tcflag_t c_iflag;		/* input mode flags */

	tcflag_t c_oflag;		/* output mode flags */

	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	cc_t c_cc[NCCS];		/* control characters */

	cc_t c_line;			/* line discipline (== c_cc[19]) */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ospeed;		/* output speed */

};



/* c_cc characters */

#define VINTR 	0

#define VQUIT 	1

#define VERASE 	2

#define VKILL	3

#define VEOF	4

#define VMIN	5

#define VEOL	6

#define VTIME	7

#define VEOL2	8

#define VSWTC	9



#define VWERASE 	10

#define VREPRINT	11

#define VSUSP 		12

#define VSTART		13

#define VSTOP		14

#define VLNEXT		15

#define VDISCARD	16



/* c_iflag bits */

#define IGNBRK	0000001

#define BRKINT	0000002

#define IGNPAR	0000004

#define PARMRK	0000010

#define INPCK	0000020

#define ISTRIP	0000040

#define INLCR	0000100

#define IGNCR	0000200

#define ICRNL	0000400

#define IXON	0001000

#define IXOFF	0002000

#define IXANY		0004000

#define IUCLC		0010000

#define IMAXBEL	0020000

#define IUTF8	0040000



/* c_oflag bits */

#define OPOST	0000001

#define ONLCR	0000002

#define OLCUC	0000004



#define OCRNL	0000010

#define ONOCR	0000020

#define ONLRET	0000040



#define OFILL	00000100

#define OFDEL	00000200

#define NLDLY	00001400

#define   NL0	00000000

#define   NL1	00000400

#define   NL2	00001000

#define   NL3	00001400

#define TABDLY	00006000

#define   TAB0	00000000

#define   TAB1	00002000

#define   TAB2	00004000

#define   TAB3	00006000

#define   XTABS	00006000	/* required by POSIX to == TAB3 */

#define CRDLY	00030000

#define   CR0	00000000

#define   CR1	00010000

#define   CR2	00020000

#define   CR3	00030000

#define FFDLY	00040000

#define   FF0	00000000

#define   FF1	00040000

#define BSDLY	00100000

#define   BS0	00000000

#define   BS1	00100000

#define VTDLY	00200000

#define   VT0	00000000

#define   VT1	00200000



/* c_cflag bit meaning */

#define CBAUD	0000377

#define  B0	0000000		/* hang up */

#define  B50	0000001

#define  B75	0000002

#define  B110	0000003

#define  B134	0000004

#define  B150	0000005

#define  B200	0000006

#define  B300	0000007

#define  B600	0000010

#define  B1200	0000011

#define  B1800	0000012

#define  B2400	0000013

#define  B4800	0000014

#define  B9600	0000015

#define  B19200	0000016

#define  B38400	0000017

#define EXTA B19200

#define EXTB B38400

#define CBAUDEX 0000000

#define  B57600   00020

#define  B115200  00021

#define  B230400  00022

#define  B460800  00023

#define  B500000  00024

#define  B576000  00025

#define  B921600  00026

#define B1000000  00027

#define B1152000  00030

#define B1500000  00031

#define B2000000  00032

#define B2500000  00033

#define B3000000  00034

#define B3500000  00035

#define B4000000  00036



#define CSIZE	00001400

#define   CS5	00000000

#define   CS6	00000400

#define   CS7	00001000

#define   CS8	00001400



#define CSTOPB	00002000

#define CREAD	00004000

#define PARENB	00010000

#define PARODD	00020000

#define HUPCL	00040000



#define CLOCAL	00100000

#define CRTSCTS	  020000000000		/* flow control */



/* c_lflag bits */

#define ISIG	0x00000080

#define ICANON	0x00000100

#define XCASE	0x00004000

#define ECHO	0x00000008

#define ECHOE	0x00000002

#define ECHOK	0x00000004

#define ECHONL	0x00000010

#define NOFLSH	0x80000000

#define TOSTOP	0x00400000

#define ECHOCTL	0x00000040

#define ECHOPRT	0x00000020

#define ECHOKE	0x00000001

#define FLUSHO	0x00800000

#define PENDIN	0x20000000

#define IEXTEN	0x00000400



/* Values for the ACTION argument to `tcflow'.  */

#define	TCOOFF		0

#define	TCOON		1

#define	TCIOFF		2

#define	TCION		3



/* Values for the QUEUE_SELECTOR argument to `tcflush'.  */

#define	TCIFLUSH	0

#define	TCOFLUSH	1

#define	TCIOFLUSH	2



/* Values for the OPTIONAL_ACTIONS argument to `tcsetattr'.  */

#define	TCSANOW		0

#define	TCSADRAIN	1

#define	TCSAFLUSH	2



#endif /* _PPC_TERMBITS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE