Module Name: src
Committed By: christos
Date: Thu Jul 11 16:46:06 UTC 2013
Modified Files:
src/sys/sys: termios.h
Log Message:
make all constants that are used in unsigned variables unsigned.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/sys/termios.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/termios.h
diff -u src/sys/sys/termios.h:1.31 src/sys/sys/termios.h:1.32
--- src/sys/sys/termios.h:1.31 Sat Dec 26 14:31:34 2009
+++ src/sys/sys/termios.h Thu Jul 11 12:46:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: termios.h,v 1.31 2009/12/26 19:31:34 mrg Exp $ */
+/* $NetBSD: termios.h,v 1.32 2013/07/11 16:46:06 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1993, 1994
@@ -87,64 +87,64 @@
/*
* Input flags - software input processing
*/
-#define IGNBRK 0x00000001 /* ignore BREAK condition */
-#define BRKINT 0x00000002 /* map BREAK to SIGINT */
-#define IGNPAR 0x00000004 /* ignore (discard) parity errors */
-#define PARMRK 0x00000008 /* mark parity and framing errors */
-#define INPCK 0x00000010 /* enable checking of parity errors */
-#define ISTRIP 0x00000020 /* strip 8th bit off chars */
-#define INLCR 0x00000040 /* map NL into CR */
-#define IGNCR 0x00000080 /* ignore CR */
-#define ICRNL 0x00000100 /* map CR to NL (ala CRMOD) */
-#define IXON 0x00000200 /* enable output flow control */
-#define IXOFF 0x00000400 /* enable input flow control */
+#define IGNBRK 0x00000001U /* ignore BREAK condition */
+#define BRKINT 0x00000002U /* map BREAK to SIGINT */
+#define IGNPAR 0x00000004U /* ignore (discard) parity errors */
+#define PARMRK 0x00000008U /* mark parity and framing errors */
+#define INPCK 0x00000010U /* enable checking of parity errors */
+#define ISTRIP 0x00000020U /* strip 8th bit off chars */
+#define INLCR 0x00000040U /* map NL into CR */
+#define IGNCR 0x00000080U /* ignore CR */
+#define ICRNL 0x00000100U /* map CR to NL (ala CRMOD) */
+#define IXON 0x00000200U /* enable output flow control */
+#define IXOFF 0x00000400U /* enable input flow control */
#if defined(_NETBSD_SOURCE)
-#define IXANY 0x00000800 /* any char will restart after stop */
+#define IXANY 0x00000800U /* any char will restart after stop */
#endif
#if defined(_NETBSD_SOURCE)
-#define IMAXBEL 0x00002000 /* ring bell on input queue full */
+#define IMAXBEL 0x00002000U /* ring bell on input queue full */
#endif
/*
* Output flags - software output processing
*/
-#define OPOST 0x00000001 /* enable following output processing */
+#define OPOST 0x00000001U /* enable following output processing */
#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
-#define ONLCR 0x00000002 /* map NL to CR-NL (ala CRMOD) */
+#define ONLCR 0x00000002U /* map NL to CR-NL (ala CRMOD) */
#endif
#if defined(_NETBSD_SOURCE)
-#define OXTABS 0x00000004 /* expand tabs to spaces */
-#define ONOEOT 0x00000008 /* discard EOT's (^D) on output */
+#define OXTABS 0x00000004U /* expand tabs to spaces */
+#define ONOEOT 0x00000008U /* discard EOT's (^D) on output */
#endif
#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
-#define OCRNL 0x00000010 /* map CR to NL */
-#define ONOCR 0x00000020 /* discard CR's when on column 0 */
-#define ONLRET 0x00000040 /* move to column 0 on CR */
+#define OCRNL 0x00000010U /* map CR to NL */
+#define ONOCR 0x00000020U /* discard CR's when on column 0 */
+#define ONLRET 0x00000040U /* move to column 0 on CR */
#endif /* defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) */
/*
* Control flags - hardware control of terminal
*/
#if defined(_NETBSD_SOURCE)
-#define CIGNORE 0x00000001 /* ignore control flags */
+#define CIGNORE 0x00000001U /* ignore control flags */
#endif
-#define CSIZE 0x00000300 /* character size mask */
-#define CS5 0x00000000 /* 5 bits (pseudo) */
-#define CS6 0x00000100 /* 6 bits */
-#define CS7 0x00000200 /* 7 bits */
-#define CS8 0x00000300 /* 8 bits */
-#define CSTOPB 0x00000400 /* send 2 stop bits */
-#define CREAD 0x00000800 /* enable receiver */
-#define PARENB 0x00001000 /* parity enable */
-#define PARODD 0x00002000 /* odd parity, else even */
-#define HUPCL 0x00004000 /* hang up on last close */
-#define CLOCAL 0x00008000 /* ignore modem status lines */
+#define CSIZE 0x00000300U /* character size mask */
+#define CS5 0x00000000U /* 5 bits (pseudo) */
+#define CS6 0x00000100U /* 6 bits */
+#define CS7 0x00000200U /* 7 bits */
+#define CS8 0x00000300U /* 8 bits */
+#define CSTOPB 0x00000400U /* send 2 stop bits */
+#define CREAD 0x00000800U /* enable receiver */
+#define PARENB 0x00001000U /* parity enable */
+#define PARODD 0x00002000U /* odd parity, else even */
+#define HUPCL 0x00004000U /* hang up on last close */
+#define CLOCAL 0x00008000U /* ignore modem status lines */
#if defined(_NETBSD_SOURCE)
-#define CRTSCTS 0x00010000 /* RTS/CTS full-duplex flow control */
+#define CRTSCTS 0x00010000U /* RTS/CTS full-duplex flow control */
#define CRTS_IFLOW CRTSCTS /* XXX compat */
#define CCTS_OFLOW CRTSCTS /* XXX compat */
-#define CDTRCTS 0x00020000 /* DTR/CTS full-duplex flow control */
-#define MDMBUF 0x00100000 /* DTR/DCD hardware flow control */
+#define CDTRCTS 0x00020000U /* DTR/CTS full-duplex flow control */
+#define MDMBUF 0x00100000U /* DTR/DCD hardware flow control */
#define CHWFLOW (MDMBUF|CRTSCTS|CDTRCTS) /* all types of hw flow control */
#endif
@@ -158,32 +158,32 @@
*/
#if defined(_NETBSD_SOURCE)
-#define ECHOKE 0x00000001 /* visual erase for line kill */
+#define ECHOKE 0x00000001U /* visual erase for line kill */
#endif
-#define ECHOE 0x00000002 /* visually erase chars */
-#define ECHOK 0x00000004 /* echo NL after line kill */
-#define ECHO 0x00000008 /* enable echoing */
-#define ECHONL 0x00000010 /* echo NL even if ECHO is off */
+#define ECHOE 0x00000002U /* visually erase chars */
+#define ECHOK 0x00000004U /* echo NL after line kill */
+#define ECHO 0x00000008U /* enable echoing */
+#define ECHONL 0x00000010U /* echo NL even if ECHO is off */
#if defined(_NETBSD_SOURCE)
-#define ECHOPRT 0x00000020 /* visual erase mode for hardcopy */
-#define ECHOCTL 0x00000040 /* echo control chars as ^(Char) */
+#define ECHOPRT 0x00000020U /* visual erase mode for hardcopy */
+#define ECHOCTL 0x00000040U /* echo control chars as ^(Char) */
#endif /* defined(_NETBSD_SOURCE) */
-#define ISIG 0x00000080 /* enable signals INT, QUIT, [D]SUSP */
-#define ICANON 0x00000100 /* canonicalize input lines */
+#define ISIG 0x00000080U /* enable signals INT, QUIT, [D]SUSP */
+#define ICANON 0x00000100U /* canonicalize input lines */
#if defined(_NETBSD_SOURCE)
-#define ALTWERASE 0x00000200 /* use alternate WERASE algorithm */
+#define ALTWERASE 0x00000200U /* use alternate WERASE algorithm */
#endif /* defined(_NETBSD_SOURCE) */
-#define IEXTEN 0x00000400 /* enable DISCARD and LNEXT */
+#define IEXTEN 0x00000400U /* enable DISCARD and LNEXT */
#if defined(_NETBSD_SOURCE)
-#define EXTPROC 0x00000800 /* external processing */
+#define EXTPROC 0x00000800U /* external processing */
#endif /* defined(_NETBSD_SOURCE) */
-#define TOSTOP 0x00400000 /* stop background jobs on output */
+#define TOSTOP 0x00400000U /* stop background jobs on output */
#if defined(_NETBSD_SOURCE)
-#define FLUSHO 0x00800000 /* output being flushed (state) */
-#define NOKERNINFO 0x02000000 /* no kernel output from VSTATUS */
-#define PENDIN 0x20000000 /* re-echo input buffer at next read */
+#define FLUSHO 0x00800000U /* output being flushed (state) */
+#define NOKERNINFO 0x02000000U /* no kernel output from VSTATUS */
+#define PENDIN 0x20000000U /* re-echo input buffer at next read */
#endif /* defined(_NETBSD_SOURCE) */
-#define NOFLSH 0x80000000 /* don't flush output on signal */
+#define NOFLSH 0x80000000U /* don't flush output on signal */
typedef unsigned int tcflag_t;
typedef unsigned char cc_t;
@@ -212,34 +212,34 @@ struct termios {
/*
* Standard speeds
*/
-#define B0 0
-#define B50 50
-#define B75 75
-#define B110 110
-#define B134 134
-#define B150 150
-#define B200 200
-#define B300 300
-#define B600 600
-#define B1200 1200
-#define B1800 1800
-#define B2400 2400
-#define B4800 4800
-#define B9600 9600
-#define B19200 19200
-#define B38400 38400
-#if defined(_NETBSD_SOURCE)
-#define B7200 7200
-#define B14400 14400
-#define B28800 28800
-#define B57600 57600
-#define B76800 76800
-#define B115200 115200
-#define B230400 230400
-#define B460800 460800
-#define B921600 921600
-#define EXTA 19200
-#define EXTB 38400
+#define B0 0U
+#define B50 50U
+#define B75 75U
+#define B110 110U
+#define B134 134U
+#define B150 150U
+#define B200 200U
+#define B300 300U
+#define B600 600U
+#define B1200 1200U
+#define B1800 1800U
+#define B2400 2400U
+#define B4800 4800U
+#define B9600 9600U
+#define B19200 19200U
+#define B38400 38400U
+#if defined(_NETBSD_SOURCE)
+#define B7200 7200U
+#define B14400 14400U
+#define B28800 28800U
+#define B57600 57600U
+#define B76800 76800U
+#define B115200 115200U
+#define B230400 230400U
+#define B460800 460800U
+#define B921600 921600U
+#define EXTA 19200U
+#define EXTB 38400U
#endif /* defined(_NETBSD_SOURCE) */
#ifndef _KERNEL
