Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3427
b: refs/heads/master
c: 6a72c7b
h: refs/heads/master
i:
  3425: 1c6e003
  3423: 76e9576
v: v3
  • Loading branch information
Nishanth Aravamudan authored and Linus Torvalds committed Jun 25, 2005
1 parent e4f3e87 commit 2da7f96
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d582b4ef6df853ca2da46135855cd6536c0205b
refs/heads/master: 6a72c7ba2e6df945484d7a85d7a82237270957fd
9 changes: 4 additions & 5 deletions trunk/drivers/serial/68328serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -992,18 +992,17 @@ static int get_lsr_info(struct m68k_serial * info, unsigned int *value)
/*
* This routine sends a break character out the serial port.
*/
static void send_break( struct m68k_serial * info, int duration)
static void send_break(struct m68k_serial * info, unsigned int duration)
{
m68328_uart *uart = &uart_addr[info->line];
unsigned long flags;
if (!info->port)
return;
set_current_state(TASK_INTERRUPTIBLE);
save_flags(flags);
cli();
#ifdef USE_INTS
uart->utx.w |= UTX_SEND_BREAK;
schedule_timeout(duration);
msleep_interruptible(duration);
uart->utx.w &= ~UTX_SEND_BREAK;
#endif
restore_flags(flags);
Expand Down Expand Up @@ -1033,14 +1032,14 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
return retval;
tty_wait_until_sent(tty, 0);
if (!arg)
send_break(info, HZ/4); /* 1/4 second */
send_break(info, 250); /* 1/4 second */
return 0;
case TCSBRKP: /* support for POSIX tcsendbreak() */
retval = tty_check_change(tty);
if (retval)
return retval;
tty_wait_until_sent(tty, 0);
send_break(info, arg ? arg*(HZ/10) : HZ/4);
send_break(info, arg ? arg*(100) : 250);
return 0;
case TIOCGSOFTCAR:
error = put_user(C_CLOCAL(tty) ? 1 : 0,
Expand Down

0 comments on commit 2da7f96

Please sign in to comment.