From nobody Tue Feb 10 00:59:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1579227223; cv=none; d=zohomail.com; s=zohoarc; b=YRcuxkEQABYuzzM7sGg6GU7/emcpgHZqxeMJBHOtLiqbPB7tlVOnm5UynGDMSAepRqu9ZbEH9zYrM3GMaxCmpzr07pcmggK1tcqTf+mD1/FCtIsO9FaAGl/I9s3lu1u7Iz6zQWY+/yUhT05ORz2tsbJR78fb+WvJDQDAcmPovHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579227223; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=LH0xqIMBlQ7hhxbASw0YchaJq5Vn2z+f3hcozcT9szc=; b=mr9NVwoNoXrGseSQc8HIgkkpXTpK0yA9a+l8V6uKmevxMUPAulgSLmqrNTv0EEdSdU0oeEZrgLTPTGJV3p7uH1pIQ9PP7/wkFXGhnG77ZQMQgGpQO7ccFo045hPQeRdYqBfdiOBCRSc9Y6SNbDBeVuK7OgGjpiBEFHi5/XGehHg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579227223613508.52770620391027; Thu, 16 Jan 2020 18:13:43 -0800 (PST) Received: from localhost ([::1]:51376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isH8o-00088u-4H for importer@patchew.org; Thu, 16 Jan 2020 21:13:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49082) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isH7S-0006nV-4i for qemu-devel@nongnu.org; Thu, 16 Jan 2020 21:12:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isH7Q-0003Gm-5W for qemu-devel@nongnu.org; Thu, 16 Jan 2020 21:12:18 -0500 Received: from mx2.rt-rk.com ([89.216.37.149]:35010 helo=mail.rt-rk.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isH7P-0003Dm-QD for qemu-devel@nongnu.org; Thu, 16 Jan 2020 21:12:16 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 269031A207E; Fri, 17 Jan 2020 03:12:12 +0100 (CET) Received: from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local [10.10.14.106]) by mail.rt-rk.com (Postfix) with ESMTPSA id CB1F91A210F; Fri, 17 Jan 2020 03:12:11 +0100 (CET) X-Virus-Scanned: amavisd-new at rt-rk.com From: Aleksandar Markovic To: qemu-devel@nongnu.org Subject: [PATCH 3/4] linux-user: xtensa: Fix some constants in termbits.h Date: Fri, 17 Jan 2020 03:11:56 +0100 Message-Id: <1579227117-6310-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1579227117-6310-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1579227117-6310-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 89.216.37.149 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu, amarkovic@wavecomp.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Aleksandar Markovic Some constants were defined in terms of host, instead of target, as they should be. Some additional trivial changes in this patch were forced by checkpatch.pl. Reviewed-by: Max Filippov Signed-off-by: Aleksandar Markovic --- linux-user/xtensa/termbits.h | 207 +++++++++++++++++++++++----------------= ---- 1 file changed, 113 insertions(+), 94 deletions(-) diff --git a/linux-user/xtensa/termbits.h b/linux-user/xtensa/termbits.h index d1e09e6..abc8666 100644 --- a/linux-user/xtensa/termbits.h +++ b/linux-user/xtensa/termbits.h @@ -15,40 +15,41 @@ =20 #include =20 -typedef unsigned char cc_t; -typedef unsigned int speed_t; -typedef unsigned int tcflag_t; +typedef unsigned char target_cc_t; +typedef unsigned int target_speed_t; +typedef unsigned int target_tcflag_t; =20 #define TARGET_NCCS 19 + struct target_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_line; /* line discipline */ - cc_t c_cc[TARGET_NCCS]; /* control characters */ + target_tcflag_t c_iflag; /* input mode flags */ + target_tcflag_t c_oflag; /* output mode flags */ + target_tcflag_t c_cflag; /* control mode flags */ + target_tcflag_t c_lflag; /* local mode flags */ + target_cc_t c_line; /* line discipline */ + target_cc_t c_cc[TARGET_NCCS]; /* control characters */ }; =20 struct target_termios2 { - 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_line; /* line discipline */ - cc_t c_cc[TARGET_NCCS]; /* control characters */ - speed_t c_ispeed; /* input speed */ - speed_t c_ospeed; /* output speed */ + target_tcflag_t c_iflag; /* input mode flags */ + target_tcflag_t c_oflag; /* output mode flags */ + target_tcflag_t c_cflag; /* control mode flags */ + target_tcflag_t c_lflag; /* local mode flags */ + target_cc_t c_line; /* line discipline */ + target_cc_t c_cc[TARGET_NCCS]; /* control characters */ + target_speed_t c_ispeed; /* input speed */ + target_speed_t c_ospeed; /* output speed */ }; =20 struct target_ktermios { - 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_line; /* line discipline */ - cc_t c_cc[TARGET_NCCS]; /* control characters */ - speed_t c_ispeed; /* input speed */ - speed_t c_ospeed; /* output speed */ + target_tcflag_t c_iflag; /* input mode flags */ + target_tcflag_t c_oflag; /* output mode flags */ + target_tcflag_t c_cflag; /* control mode flags */ + target_tcflag_t c_lflag; /* local mode flags */ + target_cc_t c_line; /* line discipline */ + target_cc_t c_cc[TARGET_NCCS]; /* control characters */ + target_speed_t c_ispeed; /* input speed */ + target_speed_t c_ospeed; /* output speed */ }; =20 /* c_cc characters */ @@ -142,8 +143,8 @@ struct target_ktermios { #define TARGET_B9600 0000015 #define TARGET_B19200 0000016 #define TARGET_B38400 0000017 -#define TARGET_EXTA B19200 -#define TARGET_EXTB B38400 +#define TARGET_EXTA TARGET_B19200 +#define TARGET_EXTB TARGET_B38400 #define TARGET_CSIZE 0000060 #define TARGET_CS5 0000000 #define TARGET_CS6 0000020 @@ -217,13 +218,13 @@ struct target_ktermios { =20 /* from arch/xtensa/include/uapi/asm/ioctls.h */ =20 -#define TARGET_FIOCLEX _IO('f', 1) -#define TARGET_FIONCLEX _IO('f', 2) -#define TARGET_FIOASYNC _IOW('f', 125, int) -#define TARGET_FIONBIO _IOW('f', 126, int) -#define TARGET_FIONREAD _IOR('f', 127, int) -#define TARGET_TIOCINQ FIONREAD -#define TARGET_FIOQSIZE _IOR('f', 128, loff_t) +#define TARGET_FIOCLEX TARGET_IO('f', 1) +#define TARGET_FIONCLEX TARGET_IO('f', 2) +#define TARGET_FIOASYNC TARGET_IOW('f', 125, int) +#define TARGET_FIONBIO TARGET_IOW('f', 126, int) +#define TARGET_FIONREAD TARGET_IOR('f', 127, int) +#define TARGET_TIOCINQ TARGET_FIONREAD +#define TARGET_FIOQSIZE TARGET_IOR('f', 128, loff_t) =20 #define TARGET_TCGETS 0x5401 #define TARGET_TCSETS 0x5402 @@ -235,28 +236,28 @@ struct target_ktermios { #define TARGET_TCSETAW 0x40127419 /* _IOW('t', 25, struct termio) */ #define TARGET_TCSETAF 0x4012741C /* _IOW('t', 28, struct termio) */ =20 -#define TARGET_TCSBRK _IO('t', 29) -#define TARGET_TCXONC _IO('t', 30) -#define TARGET_TCFLSH _IO('t', 31) +#define TARGET_TCSBRK TARGET_IO('t', 29) +#define TARGET_TCXONC TARGET_IO('t', 30) +#define TARGET_TCFLSH TARGET_IO('t', 31) =20 #define TARGET_TIOCSWINSZ 0x40087467 /* _IOW('t', 103, struct winsize) */ #define TARGET_TIOCGWINSZ 0x80087468 /* _IOR('t', 104, struct winsize) */ -#define TARGET_TIOCSTART _IO('t', 110) /* start output, like ^Q */ -#define TARGET_TIOCSTOP _IO('t', 111) /* stop output, like ^S */ -#define TARGET_TIOCOUTQ _IOR('t', 115, int) /* output queue siz= e */ - -#define TARGET_TIOCSPGRP _IOW('t', 118, int) -#define TARGET_TIOCGPGRP _IOR('t', 119, int) - -#define TARGET_TIOCEXCL _IO('T', 12) -#define TARGET_TIOCNXCL _IO('T', 13) -#define TARGET_TIOCSCTTY _IO('T', 14) - -#define TARGET_TIOCSTI _IOW('T', 18, char) -#define TARGET_TIOCMGET _IOR('T', 21, unsigned int) -#define TARGET_TIOCMBIS _IOW('T', 22, unsigned int) -#define TARGET_TIOCMBIC _IOW('T', 23, unsigned int) -#define TARGET_TIOCMSET _IOW('T', 24, unsigned int) +#define TARGET_TIOCSTART TARGET_IO('t', 110) /* start output, like= ^Q */ +#define TARGET_TIOCSTOP TARGET_IO('t', 111) /* stop output, like = ^S */ +#define TARGET_TIOCOUTQ TARGET_IOR('t', 115, int) /* output queue size = */ + +#define TARGET_TIOCSPGRP TARGET_IOW('t', 118, int) +#define TARGET_TIOCGPGRP TARGET_IOR('t', 119, int) + +#define TARGET_TIOCEXCL TARGET_IO('T', 12) +#define TARGET_TIOCNXCL TARGET_IO('T', 13) +#define TARGET_TIOCSCTTY TARGET_IO('T', 14) + +#define TARGET_TIOCSTI TARGET_IOW('T', 18, char) +#define TARGET_TIOCMGET TARGET_IOR('T', 21, unsigned int) +#define TARGET_TIOCMBIS TARGET_IOW('T', 22, unsigned int) +#define TARGET_TIOCMBIC TARGET_IOW('T', 23, unsigned int) +#define TARGET_TIOCMSET TARGET_IOW('T', 24, unsigned int) # define TARGET_TIOCM_LE 0x001 # define TARGET_TIOCM_DTR 0x002 # define TARGET_TIOCM_RTS 0x004 @@ -266,16 +267,16 @@ struct target_ktermios { # define TARGET_TIOCM_CAR 0x040 # define TARGET_TIOCM_RNG 0x080 # define TARGET_TIOCM_DSR 0x100 -# define TARGET_TIOCM_CD TIOCM_CAR -# define TARGET_TIOCM_RI TIOCM_RNG +# define TARGET_TIOCM_CD TARGET_TIOCM_CAR +# define TARGET_TIOCM_RI TARGET_TIOCM_RNG =20 -#define TARGET_TIOCGSOFTCAR _IOR('T', 25, unsigned int) -#define TARGET_TIOCSSOFTCAR _IOW('T', 26, unsigned int) -#define TARGET_TIOCLINUX _IOW('T', 28, char) -#define TARGET_TIOCCONS _IO('T', 29) +#define TARGET_TIOCGSOFTCAR TARGET_IOR('T', 25, unsigned int) +#define TARGET_TIOCSSOFTCAR TARGET_IOW('T', 26, unsigned int) +#define TARGET_TIOCLINUX TARGET_IOW('T', 28, char) +#define TARGET_TIOCCONS TARGET_IO('T', 29) #define TARGET_TIOCGSERIAL 0x803C541E /*_IOR('T', 30, struct serial_struc= t)*/ #define TARGET_TIOCSSERIAL 0x403C541F /*_IOW('T', 31, struct serial_struc= t)*/ -#define TARGET_TIOCPKT _IOW('T', 32, int) +#define TARGET_TIOCPKT TARGET_IOW('T', 32, int) # define TARGET_TIOCPKT_DATA 0 # define TARGET_TIOCPKT_FLUSHREAD 1 # define TARGET_TIOCPKT_FLUSHWRITE 2 @@ -286,43 +287,61 @@ struct target_ktermios { # define TARGET_TIOCPKT_IOCTL 64 =20 =20 -#define TARGET_TIOCNOTTY _IO('T', 34) -#define TARGET_TIOCSETD _IOW('T', 35, int) -#define TARGET_TIOCGETD _IOR('T', 36, int) -#define TARGET_TCSBRKP _IOW('T', 37, int) /* Needed for POSIX tcsend= break()*/ -#define TARGET_TIOCSBRK _IO('T', 39) /* BSD compatibility */ -#define TARGET_TIOCCBRK _IO('T', 40) /* BSD compatibility */ -#define TARGET_TIOCGSID _IOR('T', 41, pid_t) /* Return the session ID o= f FD*/ -#define TARGET_TCGETS2 _IOR('T', 42, struct termios2) -#define TARGET_TCSETS2 _IOW('T', 43, struct termios2) -#define TARGET_TCSETSW2 _IOW('T', 44, struct termios2) -#define TARGET_TCSETSF2 _IOW('T', 45, struct termios2) -#define TARGET_TIOCGRS485 _IOR('T', 46, struct serial_rs485) -#define TARGET_TIOCSRS485 _IOWR('T', 47, struct serial_rs485) -#define TARGET_TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number = (of pty-mux device) */ -#define TARGET_TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ -#define TARGET_TIOCGDEV _IOR('T',0x32, unsigned int) /* Get primary dev= ice node of /dev/console */ -#define TARGET_TIOCSIG _IOW('T',0x36, int) /* Generate signal on Pty = slave */ -#define TARGET_TIOCVHANGUP _IO('T', 0x37) -#define TARGET_TIOCGPKT _IOR('T', 0x38, int) /* Get packet mode state */ -#define TARGET_TIOCGPTLCK _IOR('T', 0x39, int) /* Get Pty lock state */ -#define TARGET_TIOCGEXCL _IOR('T', 0x40, int) /* Get exclusive mode stat= e */ -#define TARGET_TIOCGPTPEER _IO('T', 0x41) /* Safely open the slave */ - -#define TARGET_TIOCSERCONFIG _IO('T', 83) -#define TARGET_TIOCSERGWILD _IOR('T', 84, int) -#define TARGET_TIOCSERSWILD _IOW('T', 85, int) +#define TARGET_TIOCNOTTY TARGET_IO('T', 34) +#define TARGET_TIOCSETD TARGET_IOW('T', 35, int) +#define TARGET_TIOCGETD TARGET_IOR('T', 36, int) +/* Needed for POSIX tcsendbreak()*/ +#define TARGET_TCSBRKP TARGET_IOW('T', 37, int) +/* BSD compatibility */ +#define TARGET_TIOCSBRK TARGET_IO('T', 39) +/* BSD compatibility */ +#define TARGET_TIOCCBRK TARGET_IO('T', 40) +/* Return the session ID of FD*/ +#define TARGET_TIOCGSID TARGET_IOR('T', 41, pid_t) +#define TARGET_TCGETS2 TARGET_IOR('T', 42, struct target_termios2) +#define TARGET_TCSETS2 TARGET_IOW('T', 43, struct target_termios2) +#define TARGET_TCSETSW2 TARGET_IOW('T', 44, struct target_termios2) +#define TARGET_TCSETSF2 TARGET_IOW('T', 45, struct target_termios2) +#define TARGET_TIOCGRS485 TARGET_IOR('T', 46, struct serial_rs485) +#define TARGET_TIOCSRS485 TARGET_IOWR('T', 47, struct serial_rs485) +/* Get Pty Number (of pty-mux device) */ +#define TARGET_TIOCGPTN TARGET_IOR('T', 0x30, unsigned int) +/* Lock/unlock Pty */ +#define TARGET_TIOCSPTLCK TARGET_IOW('T', 0x31, int) +/* Get primary device node of /dev/console */ +#define TARGET_TIOCGDEV TARGET_IOR('T', 0x32, unsigned int) +/* Generate signal on Pty slave */ +#define TARGET_TIOCSIG TARGET_IOW('T', 0x36, int) +#define TARGET_TIOCVHANGUP TARGET_IO('T', 0x37) +/* Get packet mode state */ +#define TARGET_TIOCGPKT TARGET_IOR('T', 0x38, int) +/* Get Pty lock state */ +#define TARGET_TIOCGPTLCK TARGET_IOR('T', 0x39, int) +/* Get exclusive mode state */ +#define TARGET_TIOCGEXCL TARGET_IOR('T', 0x40, int) +/* Safely open the slave */ +#define TARGET_TIOCGPTPEER TARGET_IO('T', 0x41) + +#define TARGET_TIOCSERCONFIG TARGET_IO('T', 83) +#define TARGET_TIOCSERGWILD TARGET_IOR('T', 84, int) +#define TARGET_TIOCSERSWILD TARGET_IOW('T', 85, int) #define TARGET_TIOCGLCKTRMIOS 0x5456 #define TARGET_TIOCSLCKTRMIOS 0x5457 -#define TARGET_TIOCSERGSTRUCT 0x5458 /* For debugging only */ -#define TARGET_TIOCSERGETLSR _IOR('T', 89, unsigned int) /* Get line sta= tus reg. */ +/* For debugging only */ +#define TARGET_TIOCSERGSTRUCT 0x5458 +/* Get line status reg. */ +#define TARGET_TIOCSERGETLSR TARGET_IOR('T', 89, unsigned int) /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */ -# define TARGET_TIOCSER_TEMT 0x01 /* Transmitter physically = empty */ -#define TARGET_TIOCSERGETMULTI 0x80a8545a /* Get multiport config */ +/* Transmitter physically empty */ +# define TARGET_TIOCSER_TEMT 0x01 +/* Get multiport config */ +#define TARGET_TIOCSERGETMULTI 0x80a8545a /* _IOR('T', 90, struct serial_multiport_struct) */ -#define TARGET_TIOCSERSETMULTI 0x40a8545b /* Set multiport config */ +/* Set multiport config */ +#define TARGET_TIOCSERSETMULTI 0x40a8545b /* _IOW('T', 91, struct serial_multiport_struct) */ - -#define TARGET_TIOCMIWAIT _IO('T', 92) /* wait for a change on serial inp= ut line(s) */ -#define TARGET_TIOCGICOUNT 0x545D /* read serial port inline interrupt co= unts */ +/* wait for a change on serial input line(s) */ +#define TARGET_TIOCMIWAIT TARGET_IO('T', 92) +/* read serial port inline interrupt counts */ +#define TARGET_TIOCGICOUNT 0x545D #endif /* XTENSA_TERMBITS_H */ --=20 2.7.4