Skip to content

L
linux
Commit fb100b6e authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

esp: clean up to modern coding style 

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 191260a0
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 308 deletions
drivers/char/esp.c
View file @ fb100b6e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* Extensively rewritten by Theodore Ts'o, 8/16/92 -- 9/14/92. Now * Extensively rewritten by Theodore Ts'o, 8/16/92 -- 9/14/92. Now
* much more extensible to support other serial cards based on the * much more extensible to support other serial cards based on the
* 16450/16550A UART's. Added support for the AST FourPort and the * 16450/16550A UART's. Added support for the AST FourPort and the
* Accent Async board. * Accent Async board.
* *
* set_serial_info fixed to set the flags, custom divisor, and uart * set_serial_info fixed to set the flags, custom divisor, and uart
* type fields. Fix suggested by Michael K. Johnson 12/12/92. * type fields. Fix suggested by Michael K. Johnson 12/12/92.
...@@ -61,11 +61,11 @@ ...@@ -61,11 +61,11 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <linux/io.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <linux/hayesesp.h> #include <linux/hayesesp.h>
...@@ -127,8 +127,10 @@ static struct tty_driver *esp_driver; ...@@ -127,8 +127,10 @@ static struct tty_driver *esp_driver;
#undef SERIAL_DEBUG_FLOW #undef SERIAL_DEBUG_FLOW
#if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT) #if defined(MODULE) && defined(SERIAL_DEBUG_MCOUNT)
#define DBG_CNT(s) printk("(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \ #define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] refc=%d, serc=%d, ttyc=%d -> %s\n", \
tty->name, (info->flags), serial_driver.refcount,info->count,tty->count,s) tty->name, info->flags, \
serial_driver.refcount, \
info->count, tty->count, s)
#else #else
#define DBG_CNT(s) #define DBG_CNT(s)
#endif #endif
...@@ -189,7 +191,7 @@ static inline void serial_out(struct esp_struct *info, int offset, ...@@ -189,7 +191,7 @@ static inline void serial_out(struct esp_struct *info, int offset,
*/ */
static void rs_stop(struct tty_struct *tty) static void rs_stop(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, "rs_stop")) if (serial_paranoia_check(info, tty->name, "rs_stop"))
...@@ -206,12 +208,12 @@ static void rs_stop(struct tty_struct *tty) ...@@ -206,12 +208,12 @@ static void rs_stop(struct tty_struct *tty)
static void rs_start(struct tty_struct *tty) static void rs_start(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, "rs_start")) if (serial_paranoia_check(info, tty->name, "rs_start"))
return; return;
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
if (info->xmit_cnt && info->xmit_buf && !(info->IER & UART_IER_THRI)) { if (info->xmit_cnt && info->xmit_buf && !(info->IER & UART_IER_THRI)) {
info->IER |= UART_IER_THRI; info->IER |= UART_IER_THRI;
...@@ -233,7 +235,7 @@ static void rs_start(struct tty_struct *tty) ...@@ -233,7 +235,7 @@ static void rs_start(struct tty_struct *tty)
* rs_interrupt() should try to keep the interrupt handler as fast as * rs_interrupt() should try to keep the interrupt handler as fast as
* possible. After you are done making modifications, it is not a bad * possible. After you are done making modifications, it is not a bad
* idea to do: * idea to do:
* *
* gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c * gcc -S -DKERNEL -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer serial.c
* *
* and look at the resulting assemble code in serial.s. * and look at the resulting assemble code in serial.s.
...@@ -290,7 +292,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes) ...@@ -290,7 +292,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
} }
status_mask = (info->read_status_mask >> 2) & 0x07; status_mask = (info->read_status_mask >> 2) & 0x07;
for (i = 0; i < num_bytes - 1; i += 2) { for (i = 0; i < num_bytes - 1; i += 2) {
*((unsigned short *)(pio_buf->data + i)) = *((unsigned short *)(pio_buf->data + i)) =
inw(info->port + UART_ESI_RX); inw(info->port + UART_ESI_RX);
...@@ -325,8 +327,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes) ...@@ -325,8 +327,7 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
flag = TTY_BREAK; flag = TTY_BREAK;
if (info->flags & ASYNC_SAK) if (info->flags & ASYNC_SAK)
do_SAK(tty); do_SAK(tty);
} } else if (err_buf->data[i] & 0x02)
else if (err_buf->data[i] & 0x02)
flag = TTY_FRAME; flag = TTY_FRAME;
else if (err_buf->data[i] & 0x01) else if (err_buf->data[i] & 0x01)
flag = TTY_PARITY; flag = TTY_PARITY;
...@@ -341,23 +342,29 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes) ...@@ -341,23 +342,29 @@ static inline void receive_chars_pio(struct esp_struct *info, int num_bytes)
release_pio_buffer(err_buf); release_pio_buffer(err_buf);
} }
static inline void receive_chars_dma(struct esp_struct *info, int num_bytes) static void program_isa_dma(int dma, int dir, unsigned long addr, int len)
{ {
unsigned long flags; unsigned long flags;
flags = claim_dma_lock();
disable_dma(dma);
clear_dma_ff(dma);
set_dma_mode(dma, dir);
set_dma_addr(dma, addr);
set_dma_count(dma, len);
enable_dma(dma);
release_dma_lock(flags);
}
static void receive_chars_dma(struct esp_struct *info, int num_bytes)
{
info->stat_flags &= ~ESP_STAT_RX_TIMEOUT; info->stat_flags &= ~ESP_STAT_RX_TIMEOUT;
dma_bytes = num_bytes; dma_bytes = num_bytes;
info->stat_flags |= ESP_STAT_DMA_RX; info->stat_flags |= ESP_STAT_DMA_RX;
flags=claim_dma_lock(); program_isa_dma(dma, DMA_MODE_READ, isa_virt_to_bus(dma_buffer),
disable_dma(dma); dma_bytes);
clear_dma_ff(dma); serial_out(info, UART_ESI_CMD1, ESI_START_DMA_RX);
set_dma_mode(dma, DMA_MODE_READ);
set_dma_addr(dma, isa_virt_to_bus(dma_buffer));
set_dma_count(dma, dma_bytes);
enable_dma(dma);
release_dma_lock(flags);
serial_out(info, UART_ESI_CMD1, ESI_START_DMA_RX);
} }
static inline void receive_chars_dma_done(struct esp_struct *info, static inline void receive_chars_dma_done(struct esp_struct *info,
...@@ -366,22 +373,22 @@ static inline void receive_chars_dma_done(struct esp_struct *info, ...@@ -366,22 +373,22 @@ static inline void receive_chars_dma_done(struct esp_struct *info,
struct tty_struct *tty = info->tty; struct tty_struct *tty = info->tty;
int num_bytes; int num_bytes;
unsigned long flags; unsigned long flags;
flags=claim_dma_lock(); flags = claim_dma_lock();
disable_dma(dma); disable_dma(dma);
clear_dma_ff(dma); clear_dma_ff(dma);
info->stat_flags &= ~ESP_STAT_DMA_RX; info->stat_flags &= ~ESP_STAT_DMA_RX;
num_bytes = dma_bytes - get_dma_residue(dma); num_bytes = dma_bytes - get_dma_residue(dma);
release_dma_lock(flags); release_dma_lock(flags);
info->icount.rx += num_bytes; info->icount.rx += num_bytes;
if (num_bytes > 0) { if (num_bytes > 0) {
tty_insert_flip_string(tty, dma_buffer, num_bytes - 1); tty_insert_flip_string(tty, dma_buffer, num_bytes - 1);
status &= (0x1c & info->read_status_mask); status &= (0x1c & info->read_status_mask);
/* Is the status significant or do we throw the last byte ? */ /* Is the status significant or do we throw the last byte ? */
if (!(status & info->ignore_status_mask)) { if (!(status & info->ignore_status_mask)) {
int statflag = 0; int statflag = 0;
...@@ -393,13 +400,13 @@ static inline void receive_chars_dma_done(struct esp_struct *info, ...@@ -393,13 +400,13 @@ static inline void receive_chars_dma_done(struct esp_struct *info,
do_SAK(tty); do_SAK(tty);
} else if (status & 0x08) { } else if (status & 0x08) {
statflag = TTY_FRAME; statflag = TTY_FRAME;
(info->icount.frame)++; info->icount.frame++;
} } else if (status & 0x04) {
else if (status & 0x04) {
statflag = TTY_PARITY; statflag = TTY_PARITY;
(info->icount.parity)++; info->icount.parity++;
} }
tty_insert_flip_char(tty, dma_buffer[num_bytes - 1], statflag); tty_insert_flip_char(tty, dma_buffer[num_bytes - 1],
statflag);
} }
tty_schedule_flip(tty); tty_schedule_flip(tty);
} }
...@@ -484,8 +491,6 @@ static inline void transmit_chars_pio(struct esp_struct *info, ...@@ -484,8 +491,6 @@ static inline void transmit_chars_pio(struct esp_struct *info,
/* Caller must hold info->lock */ /* Caller must hold info->lock */
static inline void transmit_chars_dma(struct esp_struct *info, int num_bytes) static inline void transmit_chars_dma(struct esp_struct *info, int num_bytes)
{ {
unsigned long flags;
dma_bytes = num_bytes; dma_bytes = num_bytes;
if (info->xmit_tail + dma_bytes <= ESP_XMIT_SIZE) { if (info->xmit_tail + dma_bytes <= ESP_XMIT_SIZE) {
...@@ -517,26 +522,18 @@ static inline void transmit_chars_dma(struct esp_struct *info, int num_bytes) ...@@ -517,26 +522,18 @@ static inline void transmit_chars_dma(struct esp_struct *info, int num_bytes)
} }
info->stat_flags |= ESP_STAT_DMA_TX; info->stat_flags |= ESP_STAT_DMA_TX;
flags=claim_dma_lock(); program_isa_dma(dma, DMA_MODE_WRITE, isa_virt_to_bus(dma_buffer),
disable_dma(dma); dma_bytes);
clear_dma_ff(dma); serial_out(info, UART_ESI_CMD1, ESI_START_DMA_TX);
set_dma_mode(dma, DMA_MODE_WRITE);
set_dma_addr(dma, isa_virt_to_bus(dma_buffer));
set_dma_count(dma, dma_bytes);
enable_dma(dma);
release_dma_lock(flags);
serial_out(info, UART_ESI_CMD1, ESI_START_DMA_TX);
} }
static inline void transmit_chars_dma_done(struct esp_struct *info) static inline void transmit_chars_dma_done(struct esp_struct *info)
{ {
int num_bytes; int num_bytes;
unsigned long flags; unsigned long flags;
flags=claim_dma_lock(); flags = claim_dma_lock();
disable_dma(dma); disable_dma(dma);
clear_dma_ff(dma); clear_dma_ff(dma);
...@@ -547,27 +544,21 @@ static inline void transmit_chars_dma_done(struct esp_struct *info) ...@@ -547,27 +544,21 @@ static inline void transmit_chars_dma_done(struct esp_struct *info)
if (dma_bytes != num_bytes) { if (dma_bytes != num_bytes) {
dma_bytes -= num_bytes; dma_bytes -= num_bytes;
memmove(dma_buffer, dma_buffer + num_bytes, dma_bytes); memmove(dma_buffer, dma_buffer + num_bytes, dma_bytes);
flags=claim_dma_lock(); program_isa_dma(dma, DMA_MODE_WRITE,
disable_dma(dma); isa_virt_to_bus(dma_buffer), dma_bytes);
clear_dma_ff(dma);
set_dma_mode(dma, DMA_MODE_WRITE); serial_out(info, UART_ESI_CMD1, ESI_START_DMA_TX);
set_dma_addr(dma, isa_virt_to_bus(dma_buffer));
set_dma_count(dma, dma_bytes);
enable_dma(dma);
release_dma_lock(flags);
serial_out(info, UART_ESI_CMD1, ESI_START_DMA_TX);
} else { } else {
dma_bytes = 0; dma_bytes = 0;
info->stat_flags &= ~ESP_STAT_DMA_TX; info->stat_flags &= ~ESP_STAT_DMA_TX;
} }
} }
static inline void check_modem_status(struct esp_struct *info) static void check_modem_status(struct esp_struct *info)
{ {
int status; int status;
serial_out(info, UART_ESI_CMD1, ESI_GET_UART_STAT); serial_out(info, UART_ESI_CMD1, ESI_GET_UART_STAT);
status = serial_in(info, UART_ESI_STAT2); status = serial_in(info, UART_ESI_STAT2);
...@@ -588,7 +579,7 @@ static inline void check_modem_status(struct esp_struct *info) ...@@ -588,7 +579,7 @@ static inline void check_modem_status(struct esp_struct *info)
#if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR)) #if (defined(SERIAL_DEBUG_OPEN) || defined(SERIAL_DEBUG_INTR))
printk("ttys%d CD now %s...", info->line, printk("ttys%d CD now %s...", info->line,
(status & UART_MSR_DCD) ? "on" : "off"); (status & UART_MSR_DCD) ? "on" : "off");
#endif #endif
if (status & UART_MSR_DCD) if (status & UART_MSR_DCD)
wake_up_interruptible(&info->open_wait); wake_up_interruptible(&info->open_wait);
else { else {
...@@ -605,7 +596,7 @@ static inline void check_modem_status(struct esp_struct *info) ...@@ -605,7 +596,7 @@ static inline void check_modem_status(struct esp_struct *info)
*/ */
static irqreturn_t rs_interrupt_single(int irq, void *dev_id) static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
{ {
struct esp_struct * info; struct esp_struct *info;
unsigned err_status; unsigned err_status;
unsigned int scratch; unsigned int scratch;
...@@ -617,7 +608,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id) ...@@ -617,7 +608,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
scratch = serial_in(info, UART_ESI_SID); scratch = serial_in(info, UART_ESI_SID);
spin_lock(&info->lock); spin_lock(&info->lock);
if (!info->tty) { if (!info->tty) {
spin_unlock(&info->lock); spin_unlock(&info->lock);
return IRQ_NONE; return IRQ_NONE;
...@@ -637,7 +628,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id) ...@@ -637,7 +628,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
if (err_status & 0x80) /* Start break */ if (err_status & 0x80) /* Start break */
wake_up_interruptible(&info->break_wait); wake_up_interruptible(&info->break_wait);
} }
if ((scratch & 0x88) || /* DMA completed or timed out */ if ((scratch & 0x88) || /* DMA completed or timed out */
(err_status & 0x1c) /* receive error */) { (err_status & 0x1c) /* receive error */) {
if (info->stat_flags & ESP_STAT_DMA_RX) if (info->stat_flags & ESP_STAT_DMA_RX)
...@@ -667,7 +658,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id) ...@@ -667,7 +658,7 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
receive_chars_dma(info, num_bytes); receive_chars_dma(info, num_bytes);
} }
} }
if (!(info->stat_flags & (ESP_STAT_DMA_RX | ESP_STAT_DMA_TX)) && if (!(info->stat_flags & (ESP_STAT_DMA_RX | ESP_STAT_DMA_TX)) &&
(scratch & 0x02) && (info->IER & UART_IER_THRI)) { (scratch & 0x02) && (info->IER & UART_IER_THRI)) {
if ((info->xmit_cnt <= 0) || info->tty->stopped) { if ((info->xmit_cnt <= 0) || info->tty->stopped) {
...@@ -722,11 +713,11 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id) ...@@ -722,11 +713,11 @@ static irqreturn_t rs_interrupt_single(int irq, void *dev_id)
* --------------------------------------------------------------- * ---------------------------------------------------------------
*/ */
static inline void esp_basic_init(struct esp_struct * info) static void esp_basic_init(struct esp_struct *info)
{ {
/* put ESPC in enhanced mode */ /* put ESPC in enhanced mode */
serial_out(info, UART_ESI_CMD1, ESI_SET_MODE); serial_out(info, UART_ESI_CMD1, ESI_SET_MODE);
if (info->stat_flags & ESP_STAT_NEVER_DMA) if (info->stat_flags & ESP_STAT_NEVER_DMA)
serial_out(info, UART_ESI_CMD2, 0x01); serial_out(info, UART_ESI_CMD2, 0x01);
else else
...@@ -783,13 +774,13 @@ static inline void esp_basic_init(struct esp_struct * info) ...@@ -783,13 +774,13 @@ static inline void esp_basic_init(struct esp_struct * info)
serial_out(info, UART_ESI_CMD2, 0xff); serial_out(info, UART_ESI_CMD2, 0xff);
} }
static int startup(struct esp_struct * info) static int startup(struct esp_struct *info)
{ {
unsigned long flags; unsigned long flags;
int retval=0; int retval = 0;
unsigned int num_chars; unsigned int num_chars;
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
if (info->flags & ASYNC_INITIALIZED) if (info->flags & ASYNC_INITIALIZED)
goto out; goto out;
...@@ -802,7 +793,8 @@ static int startup(struct esp_struct * info) ...@@ -802,7 +793,8 @@ static int startup(struct esp_struct * info)
} }
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("starting up ttys%d (irq %d)...", info->line, info->irq); printk(KERN_DEBUG "starting up ttys%d (irq %d)...",
info->line, info->irq);
#endif #endif
/* Flush the RX buffer. Using the ESI flush command may cause */ /* Flush the RX buffer. Using the ESI flush command may cause */
...@@ -863,7 +855,7 @@ static int startup(struct esp_struct * info) ...@@ -863,7 +855,7 @@ static int startup(struct esp_struct * info)
dma_buffer = NULL; dma_buffer = NULL;
info->stat_flags |= ESP_STAT_USE_PIO; info->stat_flags |= ESP_STAT_USE_PIO;
} }
} }
info->MCR = UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2; info->MCR = UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2;
...@@ -872,7 +864,7 @@ static int startup(struct esp_struct * info) ...@@ -872,7 +864,7 @@ static int startup(struct esp_struct * info)
serial_out(info, UART_ESI_CMD1, ESI_WRITE_UART); serial_out(info, UART_ESI_CMD1, ESI_WRITE_UART);
serial_out(info, UART_ESI_CMD2, UART_MCR); serial_out(info, UART_ESI_CMD2, UART_MCR);
serial_out(info, UART_ESI_CMD2, info->MCR); serial_out(info, UART_ESI_CMD2, info->MCR);
/* /*
* Finally, enable interrupts * Finally, enable interrupts
*/ */
...@@ -881,7 +873,7 @@ static int startup(struct esp_struct * info) ...@@ -881,7 +873,7 @@ static int startup(struct esp_struct * info)
UART_IER_DMA_TC; UART_IER_DMA_TC;
serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK); serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK);
serial_out(info, UART_ESI_CMD2, info->IER); serial_out(info, UART_ESI_CMD2, info->IER);
if (info->tty) if (info->tty)
clear_bit(TTY_IO_ERROR, &info->tty->flags); clear_bit(TTY_IO_ERROR, &info->tty->flags);
info->xmit_cnt = info->xmit_head = info->xmit_tail = 0; info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
...@@ -900,7 +892,7 @@ static int startup(struct esp_struct * info) ...@@ -900,7 +892,7 @@ static int startup(struct esp_struct * info)
if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP) if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
info->tty->alt_speed = 460800; info->tty->alt_speed = 460800;
} }
/* /*
* set the speed of the serial port * set the speed of the serial port
*/ */
...@@ -918,7 +910,7 @@ static int startup(struct esp_struct * info) ...@@ -918,7 +910,7 @@ static int startup(struct esp_struct * info)
* This routine will shutdown a serial port; interrupts are disabled, and * This routine will shutdown a serial port; interrupts are disabled, and
* DTR is dropped if the hangup on close termio flag is on. * DTR is dropped if the hangup on close termio flag is on.
*/ */
static void shutdown(struct esp_struct * info) static void shutdown(struct esp_struct *info)
{ {
unsigned long flags, f; unsigned long flags, f;
...@@ -929,7 +921,7 @@ static void shutdown(struct esp_struct * info) ...@@ -929,7 +921,7 @@ static void shutdown(struct esp_struct * info)
printk("Shutting down serial port %d (irq %d)....", info->line, printk("Shutting down serial port %d (irq %d)....", info->line,
info->irq); info->irq);
#endif #endif
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
/* /*
* clear delta_msr_wait queue to avoid mem leaks: we may free the irq * clear delta_msr_wait queue to avoid mem leaks: we may free the irq
...@@ -941,14 +933,14 @@ static void shutdown(struct esp_struct * info) ...@@ -941,14 +933,14 @@ static void shutdown(struct esp_struct * info)
/* stop a DMA transfer on the port being closed */ /* stop a DMA transfer on the port being closed */
/* DMA lock is higher priority always */ /* DMA lock is higher priority always */
if (info->stat_flags & (ESP_STAT_DMA_RX | ESP_STAT_DMA_TX)) { if (info->stat_flags & (ESP_STAT_DMA_RX | ESP_STAT_DMA_TX)) {
f=claim_dma_lock(); f = claim_dma_lock();
disable_dma(dma); disable_dma(dma);
clear_dma_ff(dma); clear_dma_ff(dma);
release_dma_lock(f); release_dma_lock(f);
dma_bytes = 0; dma_bytes = 0;
} }
/* /*
* Free the IRQ * Free the IRQ
*/ */
...@@ -970,7 +962,7 @@ static void shutdown(struct esp_struct * info) ...@@ -970,7 +962,7 @@ static void shutdown(struct esp_struct * info)
free_pages((unsigned long)dma_buffer, free_pages((unsigned long)dma_buffer,
get_order(DMA_BUFFER_SZ)); get_order(DMA_BUFFER_SZ));
dma_buffer = NULL; dma_buffer = NULL;
} }
} }
if (info->xmit_buf) { if (info->xmit_buf) {
...@@ -992,7 +984,7 @@ static void shutdown(struct esp_struct * info) ...@@ -992,7 +984,7 @@ static void shutdown(struct esp_struct * info)
if (info->tty) if (info->tty)
set_bit(TTY_IO_ERROR, &info->tty->flags); set_bit(TTY_IO_ERROR, &info->tty->flags);
info->flags &= ~ASYNC_INITIALIZED; info->flags &= ~ASYNC_INITIALIZED;
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
} }
...@@ -1005,7 +997,7 @@ static void change_speed(struct esp_struct *info) ...@@ -1005,7 +997,7 @@ static void change_speed(struct esp_struct *info)
{ {
unsigned short port; unsigned short port;
int quot = 0; int quot = 0;
unsigned cflag,cval; unsigned cflag, cval;
int baud, bits; int baud, bits;
unsigned char flow1 = 0, flow2 = 0; unsigned char flow1 = 0, flow2 = 0;
unsigned long flags; unsigned long flags;
...@@ -1014,14 +1006,14 @@ static void change_speed(struct esp_struct *info) ...@@ -1014,14 +1006,14 @@ static void change_speed(struct esp_struct *info)
return; return;
cflag = info->tty->termios->c_cflag; cflag = info->tty->termios->c_cflag;
port = info->port; port = info->port;
/* byte size and parity */ /* byte size and parity */
switch (cflag & CSIZE) { switch (cflag & CSIZE) {
case CS5: cval = 0x00; bits = 7; break; case CS5: cval = 0x00; bits = 7; break;
case CS6: cval = 0x01; bits = 8; break; case CS6: cval = 0x01; bits = 8; break;
case CS7: cval = 0x02; bits = 9; break; case CS7: cval = 0x02; bits = 9; break;
case CS8: cval = 0x03; bits = 10; break; case CS8: cval = 0x03; bits = 10; break;
default: cval = 0x00; bits = 7; break; default: cval = 0x00; bits = 7; break;
} }
if (cflag & CSTOPB) { if (cflag & CSTOPB) {
cval |= 0x04; cval |= 0x04;
...@@ -1037,14 +1029,12 @@ static void change_speed(struct esp_struct *info) ...@@ -1037,14 +1029,12 @@ static void change_speed(struct esp_struct *info)
if (cflag & CMSPAR) if (cflag & CMSPAR)
cval |= UART_LCR_SPAR; cval |= UART_LCR_SPAR;
#endif #endif
baud = tty_get_baud_rate(info->tty); baud = tty_get_baud_rate(info->tty);
if (baud == 38400 && if (baud == 38400 &&
((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST)) ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST))
quot = info->custom_divisor; quot = info->custom_divisor;
else { else {
if (baud == 134) if (baud == 134) /* Special case since 134 is really 134.5 */
/* Special case since 134 is really 134.5 */
quot = (2*BASE_BAUD / 269); quot = (2*BASE_BAUD / 269);
else if (baud) else if (baud)
quot = BASE_BAUD / baud; quot = BASE_BAUD / baud;
...@@ -1052,7 +1042,12 @@ static void change_speed(struct esp_struct *info) ...@@ -1052,7 +1042,12 @@ static void change_speed(struct esp_struct *info)
/* If the quotient is ever zero, default to 9600 bps */ /* If the quotient is ever zero, default to 9600 bps */
if (!quot) if (!quot)
quot = BASE_BAUD / 9600; quot = BASE_BAUD / 9600;
if (baud) {
/* Actual rate */
baud = BASE_BAUD/quot;
tty_encode_baud_rate(info->tty, baud, baud);
}
info->timeout = ((1024 * HZ * bits * quot) / BASE_BAUD) + (HZ / 50); info->timeout = ((1024 * HZ * bits * quot) / BASE_BAUD) + (HZ / 50);
/* CTS flow control flag and modem status interrupts */ /* CTS flow control flag and modem status interrupts */
...@@ -1066,10 +1061,8 @@ static void change_speed(struct esp_struct *info) ...@@ -1066,10 +1061,8 @@ static void change_speed(struct esp_struct *info)
info->flags &= ~ASYNC_CTS_FLOW; info->flags &= ~ASYNC_CTS_FLOW;
if (cflag & CLOCAL) if (cflag & CLOCAL)
info->flags &= ~ASYNC_CHECK_CD; info->flags &= ~ASYNC_CHECK_CD;
else { else
info->flags |= ASYNC_CHECK_CD; info->flags |= ASYNC_CHECK_CD;
/* info->IER |= UART_IER_MSI; */
}
/* /*
* Set up parity check flag * Set up parity check flag
...@@ -1079,7 +1072,7 @@ static void change_speed(struct esp_struct *info) ...@@ -1079,7 +1072,7 @@ static void change_speed(struct esp_struct *info)
info->read_status_mask |= UART_LSR_FE | UART_LSR_PE; info->read_status_mask |= UART_LSR_FE | UART_LSR_PE;
if (I_BRKINT(info->tty) || I_PARMRK(info->tty)) if (I_BRKINT(info->tty) || I_PARMRK(info->tty))
info->read_status_mask |= UART_LSR_BI; info->read_status_mask |= UART_LSR_BI;
info->ignore_status_mask = 0; info->ignore_status_mask = 0;
#if 0 #if 0
/* This should be safe, but for some broken bits of hardware... */ /* This should be safe, but for some broken bits of hardware... */
...@@ -1092,7 +1085,7 @@ static void change_speed(struct esp_struct *info) ...@@ -1092,7 +1085,7 @@ static void change_speed(struct esp_struct *info)
info->ignore_status_mask |= UART_LSR_BI; info->ignore_status_mask |= UART_LSR_BI;
info->read_status_mask |= UART_LSR_BI; info->read_status_mask |= UART_LSR_BI;
/* /*
* If we're ignore parity and break indicators, ignore * If we're ignore parity and break indicators, ignore
* overruns too. (For real raw support). * overruns too. (For real raw support).
*/ */
if (I_IGNPAR(info->tty)) { if (I_IGNPAR(info->tty)) {
...@@ -1130,19 +1123,19 @@ static void change_speed(struct esp_struct *info) ...@@ -1130,19 +1123,19 @@ static void change_speed(struct esp_struct *info)
serial_out(info, UART_ESI_CMD2, 0x10); serial_out(info, UART_ESI_CMD2, 0x10);
serial_out(info, UART_ESI_CMD2, 0x21); serial_out(info, UART_ESI_CMD2, 0x21);
switch (cflag & CSIZE) { switch (cflag & CSIZE) {
case CS5: case CS5:
serial_out(info, UART_ESI_CMD2, 0x1f); serial_out(info, UART_ESI_CMD2, 0x1f);
break; break;
case CS6: case CS6:
serial_out(info, UART_ESI_CMD2, 0x3f); serial_out(info, UART_ESI_CMD2, 0x3f);
break; break;
case CS7: case CS7:
case CS8: case CS8:
serial_out(info, UART_ESI_CMD2, 0x7f); serial_out(info, UART_ESI_CMD2, 0x7f);
break; break;
default: default:
serial_out(info, UART_ESI_CMD2, 0xff); serial_out(info, UART_ESI_CMD2, 0xff);
break; break;
} }
} }
...@@ -1158,7 +1151,7 @@ static void change_speed(struct esp_struct *info) ...@@ -1158,7 +1151,7 @@ static void change_speed(struct esp_struct *info)
static int rs_put_char(struct tty_struct *tty, unsigned char ch) static int rs_put_char(struct tty_struct *tty, unsigned char ch)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
int ret = 0; int ret = 0;
...@@ -1181,9 +1174,9 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -1181,9 +1174,9 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch)
static void rs_flush_chars(struct tty_struct *tty) static void rs_flush_chars(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, "rs_flush_chars")) if (serial_paranoia_check(info, tty->name, "rs_flush_chars"))
return; return;
...@@ -1201,11 +1194,11 @@ static void rs_flush_chars(struct tty_struct *tty) ...@@ -1201,11 +1194,11 @@ static void rs_flush_chars(struct tty_struct *tty)
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
} }
static int rs_write(struct tty_struct * tty, static int rs_write(struct tty_struct *tty,
const unsigned char *buf, int count) const unsigned char *buf, int count)
{ {
int c, t, ret = 0; int c, t, ret = 0;
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, "rs_write")) if (serial_paranoia_check(info, tty->name, "rs_write"))
...@@ -1213,19 +1206,19 @@ static int rs_write(struct tty_struct * tty, ...@@ -1213,19 +1206,19 @@ static int rs_write(struct tty_struct * tty,
if (!info->xmit_buf) if (!info->xmit_buf)
return 0; return 0;
while (1) { while (1) {
/* Thanks to R. Wolff for suggesting how to do this with */ /* Thanks to R. Wolff for suggesting how to do this with */
/* interrupts enabled */ /* interrupts enabled */
c = count; c = count;
t = ESP_XMIT_SIZE - info->xmit_cnt - 1; t = ESP_XMIT_SIZE - info->xmit_cnt - 1;
if (t < c) if (t < c)
c = t; c = t;
t = ESP_XMIT_SIZE - info->xmit_head; t = ESP_XMIT_SIZE - info->xmit_head;
if (t < c) if (t < c)
c = t; c = t;
...@@ -1255,10 +1248,10 @@ static int rs_write(struct tty_struct * tty, ...@@ -1255,10 +1248,10 @@ static int rs_write(struct tty_struct * tty,
static int rs_write_room(struct tty_struct *tty) static int rs_write_room(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
int ret; int ret;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, "rs_write_room")) if (serial_paranoia_check(info, tty->name, "rs_write_room"))
return 0; return 0;
...@@ -1273,8 +1266,8 @@ static int rs_write_room(struct tty_struct *tty) ...@@ -1273,8 +1266,8 @@ static int rs_write_room(struct tty_struct *tty)
static int rs_chars_in_buffer(struct tty_struct *tty) static int rs_chars_in_buffer(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer")) if (serial_paranoia_check(info, tty->name, "rs_chars_in_buffer"))
return 0; return 0;
return info->xmit_cnt; return info->xmit_cnt;
...@@ -1282,9 +1275,9 @@ static int rs_chars_in_buffer(struct tty_struct *tty) ...@@ -1282,9 +1275,9 @@ static int rs_chars_in_buffer(struct tty_struct *tty)
static void rs_flush_buffer(struct tty_struct *tty) static void rs_flush_buffer(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, "rs_flush_buffer")) if (serial_paranoia_check(info, tty->name, "rs_flush_buffer"))
return; return;
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
...@@ -1296,20 +1289,20 @@ static void rs_flush_buffer(struct tty_struct *tty) ...@@ -1296,20 +1289,20 @@ static void rs_flush_buffer(struct tty_struct *tty)
/* /*
* ------------------------------------------------------------ * ------------------------------------------------------------
* rs_throttle() * rs_throttle()
* *
* This routine is called by the upper-layer tty layer to signal that * This routine is called by the upper-layer tty layer to signal that
* incoming characters should be throttled. * incoming characters should be throttled.
* ------------------------------------------------------------ * ------------------------------------------------------------
*/ */
static void rs_throttle(struct tty_struct * tty) static void rs_throttle(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
#ifdef SERIAL_DEBUG_THROTTLE #ifdef SERIAL_DEBUG_THROTTLE
char buf[64]; char buf[64];
printk("throttle %s: %d....\n", tty_name(tty, buf), printk("throttle %s: %d....\n", tty_name(tty, buf),
tty->ldisc.chars_in_buffer(tty)); tty_chars_in_buffer(tty));
#endif #endif
if (serial_paranoia_check(info, tty->name, "rs_throttle")) if (serial_paranoia_check(info, tty->name, "rs_throttle"))
...@@ -1324,20 +1317,20 @@ static void rs_throttle(struct tty_struct * tty) ...@@ -1324,20 +1317,20 @@ static void rs_throttle(struct tty_struct * tty)
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
} }
static void rs_unthrottle(struct tty_struct * tty) static void rs_unthrottle(struct tty_struct *tty)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
#ifdef SERIAL_DEBUG_THROTTLE #ifdef SERIAL_DEBUG_THROTTLE
char buf[64]; char buf[64];
printk("unthrottle %s: %d....\n", tty_name(tty, buf), printk(KERN_DEBUG "unthrottle %s: %d....\n", tty_name(tty, buf),
tty->ldisc.chars_in_buffer(tty)); tty_chars_in_buffer(tty));
#endif #endif
if (serial_paranoia_check(info, tty->name, "rs_unthrottle")) if (serial_paranoia_check(info, tty->name, "rs_unthrottle"))
return; return;
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
info->IER |= UART_IER_RDI; info->IER |= UART_IER_RDI;
serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK); serial_out(info, UART_ESI_CMD1, ESI_SET_SRV_MASK);
...@@ -1353,11 +1346,11 @@ static void rs_unthrottle(struct tty_struct * tty) ...@@ -1353,11 +1346,11 @@ static void rs_unthrottle(struct tty_struct * tty)
* ------------------------------------------------------------ * ------------------------------------------------------------
*/ */
static int get_serial_info(struct esp_struct * info, static int get_serial_info(struct esp_struct *info,
struct serial_struct __user *retinfo) struct serial_struct __user *retinfo)
{ {
struct serial_struct tmp; struct serial_struct tmp;
lock_kernel(); lock_kernel();
memset(&tmp, 0, sizeof(tmp)); memset(&tmp, 0, sizeof(tmp));
tmp.type = PORT_16550A; tmp.type = PORT_16550A;
...@@ -1372,16 +1365,16 @@ static int get_serial_info(struct esp_struct * info, ...@@ -1372,16 +1365,16 @@ static int get_serial_info(struct esp_struct * info,
tmp.custom_divisor = info->custom_divisor; tmp.custom_divisor = info->custom_divisor;
tmp.hub6 = 0; tmp.hub6 = 0;
unlock_kernel(); unlock_kernel();
if (copy_to_user(retinfo,&tmp,sizeof(*retinfo))) if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
static int get_esp_config(struct esp_struct * info, static int get_esp_config(struct esp_struct *info,
struct hayes_esp_config __user *retinfo) struct hayes_esp_config __user *retinfo)
{ {
struct hayes_esp_config tmp; struct hayes_esp_config tmp;
if (!retinfo) if (!retinfo)
return -EFAULT; return -EFAULT;
...@@ -1399,7 +1392,7 @@ static int get_esp_config(struct esp_struct * info, ...@@ -1399,7 +1392,7 @@ static int get_esp_config(struct esp_struct * info,
return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0; return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
} }
static int set_serial_info(struct esp_struct * info, static int set_serial_info(struct esp_struct *info,
struct serial_struct __user *new_info) struct serial_struct __user *new_info)
{ {
struct serial_struct new_serial; struct serial_struct new_serial;
...@@ -1408,7 +1401,7 @@ static int set_serial_info(struct esp_struct * info, ...@@ -1408,7 +1401,7 @@ static int set_serial_info(struct esp_struct * info,
int retval = 0; int retval = 0;
struct esp_struct *current_async; struct esp_struct *current_async;
if (copy_from_user(&new_serial,new_info,sizeof(new_serial))) if (copy_from_user(&new_serial, new_info, sizeof(new_serial)))
return -EFAULT; return -EFAULT;
old_info = *info; old_info = *info;
...@@ -1429,7 +1422,7 @@ static int set_serial_info(struct esp_struct * info, ...@@ -1429,7 +1422,7 @@ static int set_serial_info(struct esp_struct * info,
return -EINVAL; return -EINVAL;
if (!capable(CAP_SYS_ADMIN)) { if (!capable(CAP_SYS_ADMIN)) {
if (change_irq || if (change_irq ||
(new_serial.close_delay != info->close_delay) || (new_serial.close_delay != info->close_delay) ||
((new_serial.flags & ~ASYNC_USR_MASK) != ((new_serial.flags & ~ASYNC_USR_MASK) !=
(info->flags & ~ASYNC_USR_MASK))) (info->flags & ~ASYNC_USR_MASK)))
...@@ -1514,8 +1507,8 @@ static int set_serial_info(struct esp_struct * info, ...@@ -1514,8 +1507,8 @@ static int set_serial_info(struct esp_struct * info,
return retval; return retval;
} }
static int set_esp_config(struct esp_struct * info, static int set_esp_config(struct esp_struct *info,
struct hayes_esp_config __user * new_info) struct hayes_esp_config __user *new_info)
{ {
struct hayes_esp_config new_config; struct hayes_esp_config new_config;
unsigned int change_dma; unsigned int change_dma;
...@@ -1557,7 +1550,6 @@ static int set_esp_config(struct esp_struct * info, ...@@ -1557,7 +1550,6 @@ static int set_esp_config(struct esp_struct * info,
if (new_config.dma_channel) { if (new_config.dma_channel) {
/* PIO mode to DMA mode transition OR */ /* PIO mode to DMA mode transition OR */
/* change current DMA channel */ /* change current DMA channel */
current_async = ports; current_async = ports;
while (current_async) { while (current_async) {
...@@ -1566,16 +1558,15 @@ static int set_esp_config(struct esp_struct * info, ...@@ -1566,16 +1558,15 @@ static int set_esp_config(struct esp_struct * info,
return -EBUSY; return -EBUSY;
} else if (current_async->count) } else if (current_async->count)
return -EBUSY; return -EBUSY;
current_async = current_async = current_async->next_port;
current_async->next_port;
} }
shutdown(info); shutdown(info);
dma = new_config.dma_channel; dma = new_config.dma_channel;
info->stat_flags &= ~ESP_STAT_NEVER_DMA; info->stat_flags &= ~ESP_STAT_NEVER_DMA;
/* all ports must use the same DMA channel */ /* all ports must use the same DMA channel */
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
current_async = ports; current_async = ports;
...@@ -1587,7 +1578,6 @@ static int set_esp_config(struct esp_struct * info, ...@@ -1587,7 +1578,6 @@ static int set_esp_config(struct esp_struct * info,
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
} else { } else {
/* DMA mode to PIO mode only */ /* DMA mode to PIO mode only */
if (info->count > 1) if (info->count > 1)
return -EBUSY; return -EBUSY;
...@@ -1658,9 +1648,9 @@ static int set_esp_config(struct esp_struct * info, ...@@ -1658,9 +1648,9 @@ static int set_esp_config(struct esp_struct * info,
* release the bus after transmitting. This must be done when * release the bus after transmitting. This must be done when
* the transmit shift register is empty, not be done when the * the transmit shift register is empty, not be done when the
* transmit holding register is empty. This functionality * transmit holding register is empty. This functionality
* allows an RS485 driver to be written in user space. * allows an RS485 driver to be written in user space.
*/ */
static int get_lsr_info(struct esp_struct * info, unsigned int __user *value) static int get_lsr_info(struct esp_struct *info, unsigned int __user *value)
{ {
unsigned char status; unsigned char status;
unsigned int result; unsigned int result;
...@@ -1671,13 +1661,13 @@ static int get_lsr_info(struct esp_struct * info, unsigned int __user *value) ...@@ -1671,13 +1661,13 @@ static int get_lsr_info(struct esp_struct * info, unsigned int __user *value)
status = serial_in(info, UART_ESI_STAT1); status = serial_in(info, UART_ESI_STAT1);
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0); result = ((status & UART_LSR_TEMT) ? TIOCSER_TEMT : 0);
return put_user(result,value); return put_user(result, value);
} }
static int esp_tiocmget(struct tty_struct *tty, struct file *file) static int esp_tiocmget(struct tty_struct *tty, struct file *file)
{ {
struct esp_struct * info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned char control, status; unsigned char control, status;
unsigned long flags; unsigned long flags;
...@@ -1704,7 +1694,7 @@ static int esp_tiocmget(struct tty_struct *tty, struct file *file) ...@@ -1704,7 +1694,7 @@ static int esp_tiocmget(struct tty_struct *tty, struct file *file)
static int esp_tiocmset(struct tty_struct *tty, struct file *file, static int esp_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear) unsigned int set, unsigned int clear)
{ {
struct esp_struct * info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, __FUNCTION__)) if (serial_paranoia_check(info, tty->name, __FUNCTION__))
...@@ -1737,9 +1727,9 @@ static int esp_tiocmset(struct tty_struct *tty, struct file *file, ...@@ -1737,9 +1727,9 @@ static int esp_tiocmset(struct tty_struct *tty, struct file *file,
*/ */
static void esp_break(struct tty_struct *tty, int break_state) static void esp_break(struct tty_struct *tty, int break_state)
{ {
struct esp_struct * info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (serial_paranoia_check(info, tty->name, "esp_break")) if (serial_paranoia_check(info, tty->name, "esp_break"))
return; return;
...@@ -1759,10 +1749,10 @@ static void esp_break(struct tty_struct *tty, int break_state) ...@@ -1759,10 +1749,10 @@ static void esp_break(struct tty_struct *tty, int break_state)
} }
} }
static int rs_ioctl(struct tty_struct *tty, struct file * file, static int rs_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct esp_struct * info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
struct async_icount cprev, cnow; /* kernel counter temps */ struct async_icount cprev, cnow; /* kernel counter temps */
struct serial_icounter_struct __user *p_cuser; /* user space */ struct serial_icounter_struct __user *p_cuser; /* user space */
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
...@@ -1780,102 +1770,93 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, ...@@ -1780,102 +1770,93 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
if (tty->flags & (1 << TTY_IO_ERROR)) if (tty->flags & (1 << TTY_IO_ERROR))
return -EIO; return -EIO;
} }
switch (cmd) {
case TIOCGSERIAL:
return get_serial_info(info, argp);
case TIOCSSERIAL:
lock_kernel();
ret = set_serial_info(info, argp);
unlock_kernel();
return ret;
case TIOCSERCONFIG:
/* do not reconfigure after initial configuration */
return 0;
case TIOCSERGWILD:
return put_user(0L, (unsigned long __user *)argp);
case TIOCSERGETLSR: /* Get line status register */ switch (cmd) {
return get_lsr_info(info, argp); case TIOCGSERIAL:
return get_serial_info(info, argp);
case TIOCSERSWILD: case TIOCSSERIAL:
if (!capable(CAP_SYS_ADMIN)) lock_kernel();
return -EPERM; ret = set_serial_info(info, argp);
return 0; unlock_kernel();
return ret;
/* case TIOCSERGWILD:
* Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change return put_user(0L, (unsigned long __user *)argp);
* - mask passed in arg for lines of interest case TIOCSERGETLSR: /* Get line status register */
* (use |'ed TIOCM_RNG/DSR/CD/CTS for masking) return get_lsr_info(info, argp);
* Caller should use TIOCGICOUNT to see which one it was case TIOCSERSWILD:
*/ if (!capable(CAP_SYS_ADMIN))
case TIOCMIWAIT: return -EPERM;
return 0;
/*
* Wait for any of the 4 modem inputs (DCD,RI,DSR,CTS) to change
* - mask passed in arg for lines of interest
* (use |'ed TIOCM_RNG/DSR/CD/CTS for masking)
* Caller should use TIOCGICOUNT to see which one it was
*/
case TIOCMIWAIT:
spin_lock_irqsave(&info->lock, flags);
cprev = info->icount; /* note the counters on entry */
spin_unlock_irqrestore(&info->lock, flags);
while (1) {
/* FIXME: convert to new style wakeup */
interruptible_sleep_on(&info->delta_msr_wait);
/* see if a signal did it */
if (signal_pending(current))
return -ERESTARTSYS;
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
cprev = info->icount; /* note the counters on entry */ cnow = info->icount; /* atomic copy */
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
while (1) { if (cnow.rng == cprev.rng &&
/* FIXME: convert to new style wakeup */ cnow.dsr == cprev.dsr &&
interruptible_sleep_on(&info->delta_msr_wait); cnow.dcd == cprev.dcd &&
/* see if a signal did it */ cnow.cts == cprev.cts)
if (signal_pending(current)) return -EIO; /* no change => error */
return -ERESTARTSYS; if (((arg & TIOCM_RNG) &&
spin_lock_irqsave(&info->lock, flags); (cnow.rng != cprev.rng)) ||
cnow = info->icount; /* atomic copy */ ((arg & TIOCM_DSR) &&
spin_unlock_irqrestore(&info->lock, flags); (cnow.dsr != cprev.dsr)) ||
if (cnow.rng == cprev.rng && ((arg & TIOCM_CD) &&
cnow.dsr == cprev.dsr && (cnow.dcd != cprev.dcd)) ||
cnow.dcd == cprev.dcd && ((arg & TIOCM_CTS) &&
cnow.cts == cprev.cts) (cnow.cts != cprev.cts))) {
return -EIO; /* no change => error */ return 0;
if (((arg & TIOCM_RNG) &&
(cnow.rng != cprev.rng)) ||
((arg & TIOCM_DSR) &&
(cnow.dsr != cprev.dsr)) ||
((arg & TIOCM_CD) &&
(cnow.dcd != cprev.dcd)) ||
((arg & TIOCM_CTS) &&
(cnow.cts != cprev.cts)) ) {
return 0;
}
cprev = cnow;
} }
/* NOTREACHED */ cprev = cnow;
/*
* Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
* Return: write counters to the user passed counter struct
* NB: both 1->0 and 0->1 transitions are counted except for
* RI where only 0->1 is counted.
*/
case TIOCGICOUNT:
spin_lock_irqsave(&info->lock, flags);
cnow = info->icount;
spin_unlock_irqrestore(&info->lock, flags);
p_cuser = argp;
if (put_user(cnow.cts, &p_cuser->cts) ||
put_user(cnow.dsr, &p_cuser->dsr) ||
put_user(cnow.rng, &p_cuser->rng) ||
put_user(cnow.dcd, &p_cuser->dcd))
return -EFAULT;
return 0;
case TIOCGHAYESESP:
return get_esp_config(info, argp);
case TIOCSHAYESESP:
lock_kernel();
ret = set_esp_config(info, argp);
unlock_kernel();
return ret;
default:
return -ENOIOCTLCMD;
} }
/* NOTREACHED */
/*
* Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
* Return: write counters to the user passed counter struct
* NB: both 1->0 and 0->1 transitions are counted except for
* RI where only 0->1 is counted.
*/
case TIOCGICOUNT:
spin_lock_irqsave(&info->lock, flags);
cnow = info->icount;
spin_unlock_irqrestore(&info->lock, flags);
p_cuser = argp;
if (put_user(cnow.cts, &p_cuser->cts) ||
put_user(cnow.dsr, &p_cuser->dsr) ||
put_user(cnow.rng, &p_cuser->rng) ||
put_user(cnow.dcd, &p_cuser->dcd))
return -EFAULT;
return 0;
case TIOCGHAYESESP:
return get_esp_config(info, argp);
case TIOCSHAYESESP:
lock_kernel();
ret = set_esp_config(info, argp);
unlock_kernel();
return ret;
default:
return -ENOIOCTLCMD;
}
return 0; return 0;
} }
static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
change_speed(info); change_speed(info);
...@@ -1912,32 +1893,33 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios) ...@@ -1912,32 +1893,33 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
/* /*
* ------------------------------------------------------------ * ------------------------------------------------------------
* rs_close() * rs_close()
* *
* This routine is called when the serial port gets closed. First, we * This routine is called when the serial port gets closed. First, we
* wait for the last remaining data to be sent. Then, we unlink its * wait for the last remaining data to be sent. Then, we unlink its
* async structure from the interrupt chain if necessary, and we free * async structure from the interrupt chain if necessary, and we free
* that IRQ if nothing is left in the chain. * that IRQ if nothing is left in the chain.
* ------------------------------------------------------------ * ------------------------------------------------------------
*/ */
static void rs_close(struct tty_struct *tty, struct file * filp) static void rs_close(struct tty_struct *tty, struct file *filp)
{ {
struct esp_struct * info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (!info || serial_paranoia_check(info, tty->name, "rs_close")) if (!info || serial_paranoia_check(info, tty->name, "rs_close"))
return; return;
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
DBG_CNT("before DEC-hung"); DBG_CNT("before DEC-hung");
goto out; goto out;
} }
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("rs_close ttys%d, count = %d\n", info->line, info->count); printk(KERN_DEBUG "rs_close ttys%d, count = %d\n",
info->line, info->count);
#endif #endif
if ((tty->count == 1) && (info->count != 1)) { if (tty->count == 1 && info->count != 1) {
/* /*
* Uh, oh. tty->count is 1, which means that the tty * Uh, oh. tty->count is 1, which means that the tty
* structure will be freed. Info->count should always * structure will be freed. Info->count should always
...@@ -1945,12 +1927,11 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -1945,12 +1927,11 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
* one, we've got real problems, since it means the * one, we've got real problems, since it means the
* serial port won't be shutdown. * serial port won't be shutdown.
*/ */
printk("rs_close: bad serial port count; tty->count is 1, " printk(KERN_DEBUG "rs_close: bad serial port count; tty->count is 1, info->count is %d\n", info->count);
"info->count is %d\n", info->count);
info->count = 1; info->count = 1;
} }
if (--info->count < 0) { if (--info->count < 0) {
printk("rs_close: bad serial port count for ttys%d: %d\n", printk(KERN_ERR "rs_close: bad serial port count for ttys%d: %d\n",
info->line, info->count); info->line, info->count);
info->count = 0; info->count = 0;
} }
...@@ -1962,7 +1943,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -1962,7 +1943,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
/* /*
* Now we wait for the transmit buffer to clear; and we notify * Now we wait for the transmit buffer to clear; and we notify
* the line discipline to only process XON/XOFF characters. * the line discipline to only process XON/XOFF characters.
*/ */
tty->closing = 1; tty->closing = 1;
...@@ -2003,9 +1984,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -2003,9 +1984,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
info->tty = NULL; info->tty = NULL;
if (info->blocked_open) { if (info->blocked_open) {
if (info->close_delay) { if (info->close_delay)
msleep_interruptible(jiffies_to_msecs(info->close_delay)); msleep_interruptible(jiffies_to_msecs(info->close_delay));
}
wake_up_interruptible(&info->open_wait); wake_up_interruptible(&info->open_wait);
} }
info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING); info->flags &= ~(ASYNC_NORMAL_ACTIVE|ASYNC_CLOSING);
...@@ -2018,7 +1998,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp) ...@@ -2018,7 +1998,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
static void rs_wait_until_sent(struct tty_struct *tty, int timeout) static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
{ {
struct esp_struct *info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
unsigned long orig_jiffies, char_time; unsigned long orig_jiffies, char_time;
unsigned long flags; unsigned long flags;
...@@ -2060,11 +2040,11 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) ...@@ -2060,11 +2040,11 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
*/ */
static void esp_hangup(struct tty_struct *tty) static void esp_hangup(struct tty_struct *tty)
{ {
struct esp_struct * info = (struct esp_struct *)tty->driver_data; struct esp_struct *info = tty->driver_data;
if (serial_paranoia_check(info, tty->name, "esp_hangup")) if (serial_paranoia_check(info, tty->name, "esp_hangup"))
return; return;
rs_flush_buffer(tty); rs_flush_buffer(tty);
shutdown(info); shutdown(info);
info->count = 0; info->count = 0;
...@@ -2078,7 +2058,7 @@ static void esp_hangup(struct tty_struct *tty) ...@@ -2078,7 +2058,7 @@ static void esp_hangup(struct tty_struct *tty)
* esp_open() and friends * esp_open() and friends
* ------------------------------------------------------------ * ------------------------------------------------------------
*/ */
static int block_til_ready(struct tty_struct *tty, struct file * filp, static int block_til_ready(struct tty_struct *tty, struct file *filp,
struct esp_struct *info) struct esp_struct *info)
{ {
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
...@@ -2127,11 +2107,11 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, ...@@ -2127,11 +2107,11 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
retval = 0; retval = 0;
add_wait_queue(&info->open_wait, &wait); add_wait_queue(&info->open_wait, &wait);
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("block_til_ready before block: ttys%d, count = %d\n", printk(KERN_DEBUG "block_til_ready before block: ttys%d, count = %d\n",
info->line, info->count); info->line, info->count);
#endif #endif
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
if (!tty_hung_up_p(filp)) if (!tty_hung_up_p(filp))
info->count--; info->count--;
info->blocked_open++; info->blocked_open++;
while (1) { while (1) {
...@@ -2153,7 +2133,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, ...@@ -2153,7 +2133,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
if (info->flags & ASYNC_HUP_NOTIFY) if (info->flags & ASYNC_HUP_NOTIFY)
retval = -EAGAIN; retval = -EAGAIN;
else else
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
#else #else
retval = -EAGAIN; retval = -EAGAIN;
#endif #endif
...@@ -2172,7 +2152,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, ...@@ -2172,7 +2152,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
break; break;
} }
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("block_til_ready blocking: ttys%d, count = %d\n", printk(KERN_DEBUG "block_til_ready blocking: ttys%d, count = %d\n",
info->line, info->count); info->line, info->count);
#endif #endif
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
...@@ -2186,14 +2166,14 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, ...@@ -2186,14 +2166,14 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
info->blocked_open--; info->blocked_open--;
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("block_til_ready after blocking: ttys%d, count = %d\n", printk(KERN_DEBUG "block_til_ready after blocking: ttys%d, count = %d\n",
info->line, info->count); info->line, info->count);
#endif #endif
if (retval) if (retval)
return retval; return retval;
info->flags |= ASYNC_NORMAL_ACTIVE; info->flags |= ASYNC_NORMAL_ACTIVE;
return 0; return 0;
} }
/* /*
* This routine is called whenever a serial port is opened. It * This routine is called whenever a serial port is opened. It
...@@ -2201,7 +2181,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, ...@@ -2201,7 +2181,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
* the IRQ chain. It also performs the serial-specific * the IRQ chain. It also performs the serial-specific
* initialization for the tty structure. * initialization for the tty structure.
*/ */
static int esp_open(struct tty_struct *tty, struct file * filp) static int esp_open(struct tty_struct *tty, struct file *filp)
{ {
struct esp_struct *info; struct esp_struct *info;
int retval, line; int retval, line;
...@@ -2224,7 +2204,7 @@ static int esp_open(struct tty_struct *tty, struct file * filp) ...@@ -2224,7 +2204,7 @@ static int esp_open(struct tty_struct *tty, struct file * filp)
} }
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("esp_open %s, count = %d\n", tty->name, info->count); printk(KERN_DEBUG "esp_open %s, count = %d\n", tty->name, info->count);
#endif #endif
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
info->count++; info->count++;
...@@ -2232,7 +2212,7 @@ static int esp_open(struct tty_struct *tty, struct file * filp) ...@@ -2232,7 +2212,7 @@ static int esp_open(struct tty_struct *tty, struct file * filp)
info->tty = tty; info->tty = tty;
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
/* /*
* Start up serial port * Start up serial port
*/ */
...@@ -2243,14 +2223,13 @@ static int esp_open(struct tty_struct *tty, struct file * filp) ...@@ -2243,14 +2223,13 @@ static int esp_open(struct tty_struct *tty, struct file * filp)
retval = block_til_ready(tty, filp, info); retval = block_til_ready(tty, filp, info);
if (retval) { if (retval) {
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("esp_open returning after block_til_ready with %d\n", printk(KERN_DEBUG "esp_open returning after block_til_ready with %d\n",
retval); retval);
#endif #endif
return retval; return retval;
} }
#ifdef SERIAL_DEBUG_OPEN #ifdef SERIAL_DEBUG_OPEN
printk("esp_open %s successful...", tty->name); printk(KERN_DEBUG "esp_open %s successful...", tty->name);
#endif #endif
return 0; return 0;
} }
...@@ -2268,10 +2247,10 @@ static int esp_open(struct tty_struct *tty, struct file * filp) ...@@ -2268,10 +2247,10 @@ static int esp_open(struct tty_struct *tty, struct file * filp)
* number, and identifies which options were configured into this * number, and identifies which options were configured into this
* driver. * driver.
*/ */
static inline void show_serial_version(void) static void show_serial_version(void)
{ {
printk(KERN_INFO "%s version %s (DMA %u)\n", printk(KERN_INFO "%s version %s (DMA %u)\n",
serial_name, serial_version, dma); serial_name, serial_version, dma);
} }
...@@ -2279,7 +2258,7 @@ static inline void show_serial_version(void) ...@@ -2279,7 +2258,7 @@ static inline void show_serial_version(void)
* This routine is called by espserial_init() to initialize a specific serial * This routine is called by espserial_init() to initialize a specific serial
* port. * port.
*/ */
static inline int autoconfig(struct esp_struct * info) static int autoconfig(struct esp_struct *info)
{ {
int port_detected = 0; int port_detected = 0;
unsigned long flags; unsigned long flags;
...@@ -2355,14 +2334,14 @@ static const struct tty_operations esp_ops = { ...@@ -2355,14 +2334,14 @@ static const struct tty_operations esp_ops = {
static int __init espserial_init(void) static int __init espserial_init(void)
{ {
int i, offset; int i, offset;
struct esp_struct * info; struct esp_struct *info;
struct esp_struct *last_primary = NULL; struct esp_struct *last_primary = NULL;
int esp[] = {0x100,0x140,0x180,0x200,0x240,0x280,0x300,0x380}; int esp[] = { 0x100, 0x140, 0x180, 0x200, 0x240, 0x280, 0x300, 0x380 };
esp_driver = alloc_tty_driver(NR_PORTS); esp_driver = alloc_tty_driver(NR_PORTS);
if (!esp_driver) if (!esp_driver)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < NR_PRIMARY; i++) { for (i = 0; i < NR_PRIMARY; i++) {
if (irq[i] != 0) { if (irq[i] != 0) {
if ((irq[i] < 2) || (irq[i] > 15) || (irq[i] == 6) || if ((irq[i] < 2) || (irq[i] > 15) || (irq[i] == 6) ||
...@@ -2384,20 +2363,20 @@ static int __init espserial_init(void) ...@@ -2384,20 +2363,20 @@ static int __init espserial_init(void)
if ((flow_off < 1) || (flow_off > 1023)) if ((flow_off < 1) || (flow_off > 1023))
flow_off = 1016; flow_off = 1016;
if ((flow_on < 1) || (flow_on > 1023)) if ((flow_on < 1) || (flow_on > 1023))
flow_on = 944; flow_on = 944;
if ((rx_timeout < 0) || (rx_timeout > 255)) if ((rx_timeout < 0) || (rx_timeout > 255))
rx_timeout = 128; rx_timeout = 128;
if (flow_on >= flow_off) if (flow_on >= flow_off)
flow_on = flow_off - 1; flow_on = flow_off - 1;
show_serial_version(); show_serial_version();
/* Initialize the tty_driver structure */ /* Initialize the tty_driver structure */
esp_driver->owner = THIS_MODULE; esp_driver->owner = THIS_MODULE;
esp_driver->name = "ttyP"; esp_driver->name = "ttyP";
esp_driver->major = ESP_IN_MAJOR; esp_driver->major = ESP_IN_MAJOR;
...@@ -2407,10 +2386,11 @@ static int __init espserial_init(void) ...@@ -2407,10 +2386,11 @@ static int __init espserial_init(void)
esp_driver->init_termios = tty_std_termios; esp_driver->init_termios = tty_std_termios;
esp_driver->init_termios.c_cflag = esp_driver->init_termios.c_cflag =
B9600 | CS8 | CREAD | HUPCL | CLOCAL; B9600 | CS8 | CREAD | HUPCL | CLOCAL;
esp_driver->init_termios.c_ispeed = 9600;
esp_driver->init_termios.c_ospeed = 9600;
esp_driver->flags = TTY_DRIVER_REAL_RAW; esp_driver->flags = TTY_DRIVER_REAL_RAW;
tty_set_operations(esp_driver, &esp_ops); tty_set_operations(esp_driver, &esp_ops);
if (tty_register_driver(esp_driver)) if (tty_register_driver(esp_driver)) {
{
printk(KERN_ERR "Couldn't register esp serial driver"); printk(KERN_ERR "Couldn't register esp serial driver");
put_tty_driver(esp_driver); put_tty_driver(esp_driver);
return 1; return 1;
...@@ -2418,8 +2398,7 @@ static int __init espserial_init(void) ...@@ -2418,8 +2398,7 @@ static int __init espserial_init(void)
info = kzalloc(sizeof(struct esp_struct), GFP_KERNEL); info = kzalloc(sizeof(struct esp_struct), GFP_KERNEL);
if (!info) if (!info) {
{
printk(KERN_ERR "Couldn't allocate memory for esp serial device information\n"); printk(KERN_ERR "Couldn't allocate memory for esp serial device information\n");
tty_unregister_driver(esp_driver); tty_unregister_driver(esp_driver);
put_tty_driver(esp_driver); put_tty_driver(esp_driver);
...@@ -2482,10 +2461,8 @@ static int __init espserial_init(void) ...@@ -2482,10 +2461,8 @@ static int __init espserial_init(void)
info->stat_flags |= ESP_STAT_NEVER_DMA; info->stat_flags |= ESP_STAT_NEVER_DMA;
info = kzalloc(sizeof(struct esp_struct), GFP_KERNEL); info = kzalloc(sizeof(struct esp_struct), GFP_KERNEL);
if (!info) if (!info) {
{ printk(KERN_ERR "Couldn't allocate memory for esp serial device information\n");
printk(KERN_ERR "Couldn't allocate memory for esp serial device information\n");
/* allow use of the already detected ports */ /* allow use of the already detected ports */
return 0; return 0;
} }
...@@ -2509,22 +2486,20 @@ static int __init espserial_init(void) ...@@ -2509,22 +2486,20 @@ static int __init espserial_init(void)
return 0; return 0;
} }
static void __exit espserial_exit(void) static void __exit espserial_exit(void)
{ {
int e1; int e1;
struct esp_struct *temp_async; struct esp_struct *temp_async;
struct esp_pio_buffer *pio_buf; struct esp_pio_buffer *pio_buf;
/* printk("Unloading %s: version %s\n", serial_name, serial_version); */ e1 = tty_unregister_driver(esp_driver);
if ((e1 = tty_unregister_driver(esp_driver))) if (e1)
printk("SERIAL: failed to unregister serial driver (%d)\n", printk(KERN_ERR "esp: failed to unregister driver (%d)\n", e1);
e1);
put_tty_driver(esp_driver); put_tty_driver(esp_driver);
while (ports) { while (ports) {
if (ports->port) { if (ports->port)
release_region(ports->port, REGION_SIZE); release_region(ports->port, REGION_SIZE);
}
temp_async = ports->next_port; temp_async = ports->next_port;
kfree(ports); kfree(ports);
ports = temp_async; ports = temp_async;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7