| 1 | *** /usr/src_3.1/drivers/tty/tty.c crc=60884 60807 Thu Sep 22 17:18:02 2005
|
|---|
| 2 | --- tty.c crc=38354 60780 Thu Oct 13 04:49:17 2005
|
|---|
| 3 | ***************
|
|---|
| 4 | *** 285,292 ****
|
|---|
| 5 | case DEV_SELECT: do_select(tp, &tty_mess); break;
|
|---|
| 6 | case CANCEL: do_cancel(tp, &tty_mess); break;
|
|---|
| 7 | default:
|
|---|
| 8 | ! printf("Warning, TTY got unexpected request %d from %d (open is %d)\n",
|
|---|
| 9 | ! tty_mess.m_type, tty_mess.m_source, DEV_OPEN);
|
|---|
| 10 | tty_reply(TASK_REPLY, tty_mess.m_source,
|
|---|
| 11 | tty_mess.PROC_NR, EINVAL);
|
|---|
| 12 | }
|
|---|
| 13 | --- 285,292 ----
|
|---|
| 14 | case DEV_SELECT: do_select(tp, &tty_mess); break;
|
|---|
| 15 | case CANCEL: do_cancel(tp, &tty_mess); break;
|
|---|
| 16 | default:
|
|---|
| 17 | ! printf("Warning, TTY got unexpected request %d from %d\n",
|
|---|
| 18 | ! tty_mess.m_type, tty_mess.m_source);
|
|---|
| 19 | tty_reply(TASK_REPLY, tty_mess.m_source,
|
|---|
| 20 | tty_mess.PROC_NR, EINVAL);
|
|---|
| 21 | }
|
|---|
| 22 | ***************
|
|---|
| 23 | *** 1516,1522 ****
|
|---|
| 24 | tp->tty_minor = RS232_MINOR + s-NR_CONS;
|
|---|
| 25 | } else {
|
|---|
| 26 | pty_init(tp);
|
|---|
| 27 | ! tp->tty_minor = s + TTYPX_MINOR + s-(NR_CONS+RS232_MINOR);
|
|---|
| 28 | }
|
|---|
| 29 | }
|
|---|
| 30 |
|
|---|
| 31 | --- 1516,1522 ----
|
|---|
| 32 | tp->tty_minor = RS232_MINOR + s-NR_CONS;
|
|---|
| 33 | } else {
|
|---|
| 34 | pty_init(tp);
|
|---|
| 35 | ! tp->tty_minor = s - (NR_CONS+NR_RS_LINES) + TTYPX_MINOR;
|
|---|
| 36 | }
|
|---|
| 37 | }
|
|---|
| 38 |
|
|---|
