Commit 73ecf3a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (49 commits)
  serial8250: ratelimit "too much work" error
  serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster
  serial: abstraction for 8250 legacy ports
  serial/imx: check that the buffer is non-empty before sending it out
  serial: mfd: add more baud rates support
  jsm: Remove the uart port on errors
  Alchemy: Add UART PM methods.
  8250: allow platforms to override PM hook.
  altera_uart: Don't use plain integer as NULL pointer
  altera_uart: Fix missing prototype for registering an early console
  altera_uart: Fixup type usage of port flags
  altera_uart: Make it possible to use Altera UART and 8250 ports together
  altera_uart: Add support for different address strides
  altera_uart: Add support for getting mapbase and IRQ from resources
  altera_uart: Add support for polling mode (IRQ-less)
  serial: Factor out uart_poll_timeout() from 8250 driver
  serial: mark the 8250 driver as maintained
  serial: 8250: Don't delay after transmitter is ready.
  tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver
  vcs: invoke the vt update callback when /dev/vcs* is written to
  ...
parents b9da0571 cd3ecad1

Documentation/devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ Your cooperation is appreciated. 
		  0 = /dev/tty		Current TTY device

		  1 = /dev/console	System console

		  2 = /dev/ptmx		PTY master multiplex

		  3 = /dev/ttyprintk	User messages via printk TTY device

		 64 = /dev/cua0		Callout device for ttyS0

		    ...

		255 = /dev/cua191	Callout device for ttyS191

Documentation/filesystems/proc.txt

+32 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,7 @@ Table 1-11: Files in /proc/tty 
 drivers       list of drivers and their usage                

 ldiscs        registered line disciplines                    

 driver/serial usage statistic and status of single tty lines 

 consoles      registered system console lines

..............................................................................



To see  which  tty's  are  currently in use, you can simply look into the file
@@ -1093,6 +1094,37 @@ To see which tty's are currently in use, you can simply look into the file 
  /dev/tty             /dev/tty        5       0 system:/dev/tty 

  unknown              /dev/tty        4    1-63 console 



To see which character device lines are currently used for the system console

/dev/console, you may simply look into the file /proc/tty/consoles:



  > cat /proc/tty/consoles

  tty0                 -WU (ECp)       4:7

  ttyS0                -W- (Ep)        4:64



The columns are:



  device               name of the device

  operations           R = can do read operations

                       W = can do write operations

                       U = can do unblank

  flags                E = it is enabled

                       C = it is prefered console

                       B = it is primary boot console

                       p = it is used for printk buffer

                       b = it is not a TTY but a Braille device

                       a = it is safe to use when cpu is offline

                       * = it is standard input of the reading process

  major:minor          major and minor number of the device separated by a colon



If the reading process holds /dev/console open at the regular standard input

stream the active device will be marked by an asterisk:



  > cat /proc/tty/consoles < /dev/console

  tty0                 -WU (ECp*)      4:7

  ttyS0                -W- (Ep)        4:64

  > tty

  /dev/pts/3





1.8 Miscellaneous kernel statistics in /proc/stat

-------------------------------------------------

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -157,9 +157,11 @@ S: Maintained 
F:	drivers/net/r8169.c



8250/16?50 (AND CLONE UARTS) SERIAL DRIVER

M:	Greg Kroah-Hartman <gregkh@suse.de>

L:	linux-serial@vger.kernel.org

W:	http://serial.sourceforge.net

S:	Orphan

S:	Maintained

T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/

F:	drivers/serial/8250*

F:	include/linux/serial_8250.h
@@ -3353,6 +3355,12 @@ F: fs/jbd*/ 
F:	include/linux/ext*jbd*.h

F:	include/linux/jbd*.h



JSM Neo PCI based serial card

M:	Breno Leitao <leitao@linux.vnet.ibm.com>

L:	linux-serial@vger.kernel.org

S:	Maintained

F:	drivers/serial/jsm/



K8TEMP HARDWARE MONITORING DRIVER

M:	Rudolf Marek <r.marek@assembler.cz>

L:	lm-sensors@lm-sensors.org

arch/arm/include/asm/ioctls.h

+1 −82
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_IOCTLS_H

#define __ASM_ARM_IOCTLS_H



#include <asm/ioctl.h>



/* 0x54 is just a magic number to make these relatively unique ('T') */



#define TCGETS		0x5401

#define TCSETS		0x5402

#define TCSETSW		0x5403

#define TCSETSF		0x5404

#define TCGETA		0x5405

#define TCSETA		0x5406

#define TCSETAW		0x5407

#define TCSETAF		0x5408

#define TCSBRK		0x5409

#define TCXONC		0x540A

#define TCFLSH		0x540B

#define TIOCEXCL	0x540C

#define TIOCNXCL	0x540D

#define TIOCSCTTY	0x540E

#define TIOCGPGRP	0x540F

#define TIOCSPGRP	0x5410

#define TIOCOUTQ	0x5411

#define TIOCSTI		0x5412

#define TIOCGWINSZ	0x5413

#define TIOCSWINSZ	0x5414

#define TIOCMGET	0x5415

#define TIOCMBIS	0x5416

#define TIOCMBIC	0x5417

#define TIOCMSET	0x5418

#define TIOCGSOFTCAR	0x5419

#define TIOCSSOFTCAR	0x541A

#define FIONREAD	0x541B

#define TIOCINQ		FIONREAD

#define TIOCLINUX	0x541C

#define TIOCCONS	0x541D

#define TIOCGSERIAL	0x541E

#define TIOCSSERIAL	0x541F

#define TIOCPKT		0x5420

#define FIONBIO		0x5421

#define TIOCNOTTY	0x5422

#define TIOCSETD	0x5423

#define TIOCGETD	0x5424

#define TCSBRKP		0x5425	/* Needed for POSIX tcsendbreak() */

#define TIOCSBRK	0x5427  /* BSD compatibility */

#define TIOCCBRK	0x5428  /* BSD compatibility */

#define TIOCGSID	0x5429  /* Return the session ID of FD */

#define TCGETS2		_IOR('T',0x2A, struct termios2)

#define TCSETS2		_IOW('T',0x2B, struct termios2)

#define TCSETSW2	_IOW('T',0x2C, struct termios2)

#define TCSETSF2	_IOW('T',0x2D, struct termios2)

#define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */

#define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */

#define TIOCSIG		_IOW('T',0x36, int)  /* Generate signal on Pty slave */



#define TIOCGRS485      0x542E

#define TIOCSRS485      0x542F



#define FIONCLEX	0x5450  /* these numbers need to be adjusted. */

#define FIOCLEX		0x5451

#define FIOASYNC	0x5452

#define TIOCSERCONFIG	0x5453

#define TIOCSERGWILD	0x5454

#define TIOCSERSWILD	0x5455

#define TIOCGLCKTRMIOS	0x5456

#define TIOCSLCKTRMIOS	0x5457

#define TIOCSERGSTRUCT	0x5458 /* For debugging only */

#define TIOCSERGETLSR   0x5459 /* Get line status register */

#define TIOCSERGETMULTI 0x545A /* Get multiport config  */

#define TIOCSERSETMULTI 0x545B /* Set multiport config */



#define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */

#define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */

#define FIOQSIZE	0x545E



/* Used for packet mode */

#define TIOCPKT_DATA		 0

#define TIOCPKT_FLUSHREAD	 1

#define TIOCPKT_FLUSHWRITE	 2

#define TIOCPKT_STOP		 4

#define TIOCPKT_START		 8

#define TIOCPKT_NOSTOP		16

#define TIOCPKT_DOSTOP		32

#define TIOCPKT_IOCTL		64



#define TIOCSER_TEMT	0x01	/* Transmitter physically empty */

#include <asm-generic/ioctls.h>



#endif

arch/avr32/include/asm/ioctls.h

+1 −85
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_IOCTLS_H

#define __ASM_AVR32_IOCTLS_H



#include <asm/ioctl.h>



/* 0x54 is just a magic number to make these relatively unique ('T') */



#define TCGETS		0x5401

#define TCSETS		0x5402 /* Clashes with SNDCTL_TMR_START sound ioctl */

#define TCSETSW		0x5403

#define TCSETSF		0x5404

#define TCGETA		0x5405

#define TCSETA		0x5406

#define TCSETAW		0x5407

#define TCSETAF		0x5408

#define TCSBRK		0x5409

#define TCXONC		0x540A

#define TCFLSH		0x540B

#define TIOCEXCL	0x540C

#define TIOCNXCL	0x540D

#define TIOCSCTTY	0x540E

#define TIOCGPGRP	0x540F

#define TIOCSPGRP	0x5410

#define TIOCOUTQ	0x5411

#define TIOCSTI		0x5412

#define TIOCGWINSZ	0x5413

#define TIOCSWINSZ	0x5414

#define TIOCMGET	0x5415

#define TIOCMBIS	0x5416

#define TIOCMBIC	0x5417

#define TIOCMSET	0x5418

#define TIOCGSOFTCAR	0x5419

#define TIOCSSOFTCAR	0x541A

#define FIONREAD	0x541B

#define TIOCINQ		FIONREAD

#define TIOCLINUX	0x541C

#define TIOCCONS	0x541D

#define TIOCGSERIAL	0x541E

#define TIOCSSERIAL	0x541F

#define TIOCPKT		0x5420

#define FIONBIO		0x5421

#define TIOCNOTTY	0x5422

#define TIOCSETD	0x5423

#define TIOCGETD	0x5424

#define TCSBRKP		0x5425	/* Needed for POSIX tcsendbreak() */

/* #define TIOCTTYGSTRUCT 0x5426 - Former debugging-only ioctl */

#define TIOCSBRK	0x5427  /* BSD compatibility */

#define TIOCCBRK	0x5428  /* BSD compatibility */

#define TIOCGSID	0x5429  /* Return the session ID of FD */

#define TCGETS2		_IOR('T',0x2A, struct termios2)

#define TCSETS2		_IOW('T',0x2B, struct termios2)

#define TCSETSW2	_IOW('T',0x2C, struct termios2)

#define TCSETSF2	_IOW('T',0x2D, struct termios2)

#define TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */

#define TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */

#define TIOCSIG		_IOW('T',0x36, int)  /* Generate signal on Pty slave */



#define TIOCGRS485      0x542E

#define TIOCSRS485      0x542F



#define FIONCLEX	0x5450

#define FIOCLEX		0x5451

#define FIOASYNC	0x5452

#define TIOCSERCONFIG	0x5453

#define TIOCSERGWILD	0x5454

#define TIOCSERSWILD	0x5455

#define TIOCGLCKTRMIOS	0x5456

#define TIOCSLCKTRMIOS	0x5457

#define TIOCSERGSTRUCT	0x5458 /* For debugging only */

#define TIOCSERGETLSR   0x5459 /* Get line status register */

#define TIOCSERGETMULTI 0x545A /* Get multiport config  */

#define TIOCSERSETMULTI 0x545B /* Set multiport config */



#define TIOCMIWAIT	0x545C	/* wait for a change on serial input line(s) */

#define TIOCGICOUNT	0x545D	/* read serial port inline interrupt counts */

#define FIOQSIZE	0x5460



/* Used for packet mode */

#define TIOCPKT_DATA		 0

#define TIOCPKT_FLUSHREAD	 1

#define TIOCPKT_FLUSHWRITE	 2

#define TIOCPKT_STOP		 4

#define TIOCPKT_START		 8

#define TIOCPKT_NOSTOP		16

#define TIOCPKT_DOSTOP		32

#define TIOCPKT_IOCTL		64



#define TIOCSER_TEMT    0x01	/* Transmitter physically empty */

#include <asm-generic/ioctls.h>



#endif /* __ASM_AVR32_IOCTLS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE