Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
21862606
Commit
21862606
authored
May 26, 2003
by
Alexander Viro
Committed by
Linus Torvalds
May 26, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] callout removal: 68328
callout removal: 68328
parent
4a00117b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
64 deletions
+11
-64
drivers/serial/68328serial.c
drivers/serial/68328serial.c
+11
-61
drivers/serial/68328serial.h
drivers/serial/68328serial.h
+0
-3
No files found.
drivers/serial/68328serial.c
View file @
21862606
...
...
@@ -83,12 +83,11 @@ struct m68k_serial *m68k_consinfo = 0;
extern
wait_queue_head_t
keypress_wait
;
#endif
struct
tty_driver
serial_driver
,
callout_driver
;
struct
tty_driver
serial_driver
;
static
int
serial_refcount
;
/* serial subtype definitions */
#define SERIAL_TYPE_NORMAL 1
#define SERIAL_TYPE_CALLOUT 2
/* number of characters left in xmit buffer before we ask for more */
#define WAKEUP_CHARS 256
...
...
@@ -1178,8 +1177,6 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
*/
if
(
info
->
flags
&
S_NORMAL_ACTIVE
)
info
->
normal_termios
=
*
tty
->
termios
;
if
(
info
->
flags
&
S_CALLOUT_ACTIVE
)
info
->
callout_termios
=
*
tty
->
termios
;
/*
* Now we wait for the transmit buffer to clear; and we notify
* the line discipline to only process XON/XOFF characters.
...
...
@@ -1220,8 +1217,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
}
wake_up_interruptible
(
&
info
->
open_wait
);
}
info
->
flags
&=
~
(
S_NORMAL_ACTIVE
|
S_CALLOUT_ACTIVE
|
S_CLOSING
);
info
->
flags
&=
~
(
S_NORMAL_ACTIVE
|
S_CLOSING
);
wake_up_interruptible
(
&
info
->
close_wait
);
restore_flags
(
flags
);
}
...
...
@@ -1240,7 +1236,7 @@ void rs_hangup(struct tty_struct *tty)
shutdown
(
info
);
info
->
event
=
0
;
info
->
count
=
0
;
info
->
flags
&=
~
(
S_NORMAL_ACTIVE
|
S_CALLOUT_ACTIVE
)
;
info
->
flags
&=
~
S_NORMAL_ACTIVE
;
info
->
tty
=
0
;
wake_up_interruptible
(
&
info
->
open_wait
);
}
...
...
@@ -1273,44 +1269,18 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
#endif
}
/*
* If this is a callout device, then just make sure the normal
* device isn't being used.
*/
if
(
tty
->
driver
->
subtype
==
SERIAL_TYPE_CALLOUT
)
{
if
(
info
->
flags
&
S_NORMAL_ACTIVE
)
return
-
EBUSY
;
if
((
info
->
flags
&
S_CALLOUT_ACTIVE
)
&&
(
info
->
flags
&
S_SESSION_LOCKOUT
)
&&
(
info
->
session
!=
current
->
session
))
return
-
EBUSY
;
if
((
info
->
flags
&
S_CALLOUT_ACTIVE
)
&&
(
info
->
flags
&
S_PGRP_LOCKOUT
)
&&
(
info
->
pgrp
!=
current
->
pgrp
))
return
-
EBUSY
;
info
->
flags
|=
S_CALLOUT_ACTIVE
;
return
0
;
}
/*
* If non-blocking mode is set, or the port is not enabled,
* then make the check up front and then exit.
*/
if
((
filp
->
f_flags
&
O_NONBLOCK
)
||
(
tty
->
flags
&
(
1
<<
TTY_IO_ERROR
)))
{
if
(
info
->
flags
&
S_CALLOUT_ACTIVE
)
return
-
EBUSY
;
info
->
flags
|=
S_NORMAL_ACTIVE
;
return
0
;
}
if
(
info
->
flags
&
S_CALLOUT_ACTIVE
)
{
if
(
info
->
normal_termios
.
c_cflag
&
CLOCAL
)
do_clocal
=
1
;
}
else
{
if
(
tty
->
termios
->
c_cflag
&
CLOCAL
)
do_clocal
=
1
;
}
/*
* Block waiting for the carrier detect and the line to become
...
...
@@ -1326,7 +1296,6 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
info
->
blocked_open
++
;
while
(
1
)
{
cli
();
if
(
!
(
info
->
flags
&
S_CALLOUT_ACTIVE
))
m68k_rtsdtr
(
info
,
1
);
sti
();
current
->
state
=
TASK_INTERRUPTIBLE
;
...
...
@@ -1342,8 +1311,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
#endif
break
;
}
if
(
!
(
info
->
flags
&
S_CALLOUT_ACTIVE
)
&&
!
(
info
->
flags
&
S_CLOSING
)
&&
do_clocal
)
if
(
!
(
info
->
flags
&
S_CLOSING
)
&&
do_clocal
)
break
;
if
(
signal_pending
(
current
))
{
retval
=
-
ERESTARTSYS
;
...
...
@@ -1401,16 +1369,10 @@ int rs_open(struct tty_struct *tty, struct file * filp)
}
if
((
info
->
count
==
1
)
&&
(
info
->
flags
&
S_SPLIT_TERMIOS
))
{
if
(
tty
->
driver
->
subtype
==
SERIAL_TYPE_NORMAL
)
*
tty
->
termios
=
info
->
normal_termios
;
else
*
tty
->
termios
=
info
->
callout_termios
;
change_speed
(
info
);
}
info
->
session
=
current
->
session
;
info
->
pgrp
=
current
->
pgrp
;
return
0
;
}
...
...
@@ -1519,19 +1481,8 @@ rs68328_init(void)
serial_driver
.
hangup
=
rs_hangup
;
serial_driver
.
set_ldisc
=
rs_set_ldisc
;
/*
* The callout device is just like normal device except for
* major number and the subtype code.
*/
callout_driver
=
serial_driver
;
callout_driver
.
name
=
"cua"
;
callout_driver
.
major
=
TTYAUX_MAJOR
;
callout_driver
.
subtype
=
SERIAL_TYPE_CALLOUT
;
if
(
tty_register_driver
(
&
serial_driver
))
panic
(
"Couldn't register serial driver
\n
"
);
if
(
tty_register_driver
(
&
callout_driver
))
panic
(
"Couldn't register callout driver
\n
"
);
save_flags
(
flags
);
cli
();
...
...
@@ -1551,7 +1502,6 @@ rs68328_init(void)
info
->
blocked_open
=
0
;
INIT_WORK
(
&
info
->
tqueue
,
do_softint
,
info
);
INIT_WORK
(
&
info
->
tqueue_hangup
,
do_serial_hangup
,
info
);
info
->
callout_termios
=
callout_driver
.
init_termios
;
info
->
normal_termios
=
serial_driver
.
init_termios
;
init_waitqueue_head
(
&
info
->
open_wait
);
init_waitqueue_head
(
&
info
->
close_wait
);
...
...
drivers/serial/68328serial.h
View file @
21862606
...
...
@@ -155,8 +155,6 @@ struct m68k_serial {
int
line
;
int
count
;
/* # of fd on device */
int
blocked_open
;
/* # of blocked opens */
long
session
;
/* Session of opening process */
long
pgrp
;
/* pgrp of opening process */
unsigned
char
*
xmit_buf
;
int
xmit_head
;
int
xmit_tail
;
...
...
@@ -164,7 +162,6 @@ struct m68k_serial {
struct
work_struct
tqueue
;
struct
work_struct
tqueue_hangup
;
struct
termios
normal_termios
;
struct
termios
callout_termios
;
wait_queue_head_t
open_wait
;
wait_queue_head_t
close_wait
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment