• Sam Ravnborg's avatar
    sparc: Merge asm-sparc{,64}/termbits.h · 943d0e86
    Sam Ravnborg authored
    The type of tcflag_t differs from 32 and 64 bit.
    For 32 bit it is long
    For 64 bit it is int
    
    Altough these have same size then I was not sure that
    it was OK to change the 64 bit version to long as this
    is part of the ABI so it was made conditional.
    
    :$ diff -u include/asm-sparc/termbits.h include/asm-sparc64/termbits.h
    :-- include/asm-sparc/termbits.h	2008-06-13 06:42:07.000000000 +0200
    :++ include/asm-sparc64/termbits.h	2008-06-13 06:42:07.000000000 +0200
    :@@ -1,11 +1,11 @@
    :-#ifndef _SPARC_TERMBITS_H
    :-#define _SPARC_TERMBITS_H
    :+#ifndef _SPARC64_TERMBITS_H
    :+#define _SPARC64_TERMBITS_H
    :
    : #include <linux/posix_types.h>
    :
    : typedef unsigned char   cc_t;
    : typedef unsigned int    speed_t;
    :-typedef unsigned long   tcflag_t;
    :+typedef unsigned int    tcflag_t;
    :
    : #define NCC 8
    : struct termio {
    :@@ -102,7 +102,7 @@
    : #define IXANY	0x00000800
    : #define IXOFF	0x00001000
    : #define IMAXBEL	0x00002000
    :-#define IUTF8   0x00004000
    :+#define IUTF8	0x00004000
    :
    : /* c_oflag bits */
    : #define OPOST	0x00000001
    :@@ -171,7 +171,6 @@
    : #define HUPCL	  0x00000400
    : #define CLOCAL	  0x00000800
    : #define CBAUDEX   0x00001000
    :-/* We'll never see these speeds with the Zilogs, but for completeness... */
    : #define  BOTHER   0x00001000
    : #define  B57600   0x00001001
    : #define  B115200  0x00001002
    :@@ -199,7 +198,7 @@
    : #define B3500000  0x00001012
    : #define B4000000  0x00001013  */
    : #define CIBAUD	  0x100f0000  /* input baud rate (not used) */
    :-#define CMSPAR	  0x40000000  /* mark or space (stick) parity */
    :+#define CMSPAR    0x40000000  /* mark or space (stick) parity */
    : #define CRTSCTS	  0x80000000  /* flow control */
    :
    : #define IBSHIFT	  16		/* Shift from CBAUD to CIBAUD */
    :@@ -258,4 +257,4 @@
    : #define	TCSADRAIN	1
    : #define	TCSAFLUSH	2
    :
    :-#endif /* !(_SPARC_TERMBITS_H) */
    :+#endif /* !(_SPARC64_TERMBITS_H) */
    Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
    943d0e86
termbits.h 7 KB