From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, linux-arch@vger.kernel.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH v2 09/11] m68k: switch to using the asm-generic termios.h
Date: Mon, 29 Oct 2012 15:49:32 +1000 [thread overview]
Message-ID: <1351489774-14263-10-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1351489774-14263-1-git-send-email-gerg@snapgear.com>
From: Greg Ungerer <gerg@uclinux.org>
We don't need a local termios.h, switch to using the asm-generic version.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/include/asm/Kbuild | 1 +
arch/m68k/include/asm/termios.h | 50 ----------------------------------
arch/m68k/include/uapi/asm/Kbuild | 1 -
arch/m68k/include/uapi/asm/termios.h | 44 -----------------------------
4 files changed, 1 insertions(+), 95 deletions(-)
delete mode 100644 arch/m68k/include/asm/termios.h
delete mode 100644 arch/m68k/include/uapi/asm/termios.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 8867342..63ed062 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -31,6 +31,7 @@ generic-y += siginfo.h
generic-y += spinlock.h
generic-y += statfs.h
generic-y += termbits.h
+generic-y += termios.h
generic-y += topology.h
generic-y += types.h
generic-y += word-at-a-time.h
diff --git a/arch/m68k/include/asm/termios.h b/arch/m68k/include/asm/termios.h
deleted file mode 100644
index ad8efb0..0000000
--- a/arch/m68k/include/asm/termios.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef _M68K_TERMIOS_H
-#define _M68K_TERMIOS_H
-
-#include <uapi/asm/termios.h>
-
-/* intr=^C quit=^| erase=del kill=^U
- eof=^D vtime=\0 vmin=\1 sxtc=\0
- start=^Q stop=^S susp=^Z eol=\0
- reprint=^R discard=^U werase=^W lnext=^V
- eol2=\0
-*/
-#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
-
-/*
- * Translate a "termio" structure into a "termios". Ugh.
- */
-#define user_termio_to_kernel_termios(termios, termio) \
-({ \
- unsigned short tmp; \
- get_user(tmp, &(termio)->c_iflag); \
- (termios)->c_iflag = (0xffff0000 & ((termios)->c_iflag)) | tmp; \
- get_user(tmp, &(termio)->c_oflag); \
- (termios)->c_oflag = (0xffff0000 & ((termios)->c_oflag)) | tmp; \
- get_user(tmp, &(termio)->c_cflag); \
- (termios)->c_cflag = (0xffff0000 & ((termios)->c_cflag)) | tmp; \
- get_user(tmp, &(termio)->c_lflag); \
- (termios)->c_lflag = (0xffff0000 & ((termios)->c_lflag)) | tmp; \
- get_user((termios)->c_line, &(termio)->c_line); \
- copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
-})
-
-/*
- * Translate a "termios" structure into a "termio". Ugh.
- */
-#define kernel_termios_to_user_termio(termio, termios) \
-({ \
- put_user((termios)->c_iflag, &(termio)->c_iflag); \
- put_user((termios)->c_oflag, &(termio)->c_oflag); \
- put_user((termios)->c_cflag, &(termio)->c_cflag); \
- put_user((termios)->c_lflag, &(termio)->c_lflag); \
- put_user((termios)->c_line, &(termio)->c_line); \
- copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
-})
-
-#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
-#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
-#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
-#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
-
-#endif /* _M68K_TERMIOS_H */
diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
index 2b774c7..19bd052 100644
--- a/arch/m68k/include/uapi/asm/Kbuild
+++ b/arch/m68k/include/uapi/asm/Kbuild
@@ -17,5 +17,4 @@ header-y += socket.h
header-y += sockios.h
header-y += stat.h
header-y += swab.h
-header-y += termios.h
header-y += unistd.h
diff --git a/arch/m68k/include/uapi/asm/termios.h b/arch/m68k/include/uapi/asm/termios.h
deleted file mode 100644
index ce2142c..0000000
--- a/arch/m68k/include/uapi/asm/termios.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _UAPI_M68K_TERMIOS_H
-#define _UAPI_M68K_TERMIOS_H
-
-#include <asm/termbits.h>
-#include <asm/ioctls.h>
-
-struct winsize {
- unsigned short ws_row;
- unsigned short ws_col;
- unsigned short ws_xpixel;
- unsigned short ws_ypixel;
-};
-
-#define NCC 8
-struct termio {
- unsigned short c_iflag; /* input mode flags */
- unsigned short c_oflag; /* output mode flags */
- unsigned short c_cflag; /* control mode flags */
- unsigned short c_lflag; /* local mode flags */
- unsigned char c_line; /* line discipline */
- unsigned char c_cc[NCC]; /* control characters */
-};
-
-
-/* modem lines */
-#define TIOCM_LE 0x001
-#define TIOCM_DTR 0x002
-#define TIOCM_RTS 0x004
-#define TIOCM_ST 0x008
-#define TIOCM_SR 0x010
-#define TIOCM_CTS 0x020
-#define TIOCM_CAR 0x040
-#define TIOCM_RNG 0x080
-#define TIOCM_DSR 0x100
-#define TIOCM_CD TIOCM_CAR
-#define TIOCM_RI TIOCM_RNG
-#define TIOCM_OUT1 0x2000
-#define TIOCM_OUT2 0x4000
-#define TIOCM_LOOP 0x8000
-
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
-
-#endif /* _UAPI_M68K_TERMIOS_H */
--
1.7.0.4
next prev parent reply other threads:[~2012-10-29 5:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-29 5:49 [PATCH v2 00/11] m68k: use asm-generic headers when possible gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 02/11] m68k: switch to using the asm-generic hw_irq.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 03/11] m68k: switch to using the asm-generic shmparam.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 04/11] m68k: switch to using the asm-generic msgbuf.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 05/11] m68k: switch to using the asm-generic shmbuf.h gerg
2012-10-29 5:49 ` [PATCH v2 06/11] m68k: switch to using the asm-generic sembuf.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 07/11] m68k: switch to using the asm-generic spinlock.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 08/11] m68k: switch to using the asm-generic termbits.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` gerg [this message]
2012-10-29 5:49 ` [PATCH v2 10/11] m68k: switch to using the asm-generic sockios.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 5:49 ` [PATCH v2 11/11] m68k: switch to using the asm-generic socket.h gerg
2012-10-29 5:49 ` gerg
2012-10-29 10:42 ` [PATCH v2 01/11] m68k: switch to using the asm-generic auxvec.h David Howells
2012-10-29 10:42 ` David Howells
2012-10-30 6:21 ` Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351489774-14263-10-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).