Title: [4157] branches/2008R1: Fix bug[#3858] Poll CTS/
RTS status in DMA mode as well.
- Revision
- 4157
- Author
- sonicz
- Date
- 2008-01-29 02:04:14 -0600 (Tue, 29 Jan 2008)
Log Message
Fix bug[#3858] Poll CTS/RTS status in DMA mode as well.
Diffstat
drivers/serial/bfin_5xx.c | 16 +++++-----------
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 3 +--
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 2 +-
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 3 +--
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 3 +--
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 2 +-
6 files changed, 10 insertions(+), 19 deletions(-)
Modified Paths
Diff
Modified: branches/2008R1/drivers/serial/bfin_5xx.c (4156 => 4157)
--- branches/2008R1/drivers/serial/bfin_5xx.c 2008-01-29 02:40:23 UTC (rev 4156)
+++ branches/2008R1/drivers/serial/bfin_5xx.c 2008-01-29 08:04:14 UTC (rev 4157)
@@ -53,7 +53,6 @@
#ifdef CONFIG_SERIAL_BFIN_DMA
static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart);
#else
-static void bfin_serial_do_work(struct work_struct *work);
static void bfin_serial_tx_chars(struct bfin_serial_port *uart);
#endif
@@ -372,8 +371,9 @@
return IRQ_HANDLED;
}
+#endif
-
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
static void bfin_serial_do_work(struct work_struct *work)
{
struct bfin_serial_port *uart = container_of(work, struct bfin_serial_port, cts_workqueue);
@@ -607,22 +607,17 @@
{
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
unsigned int status;
-# ifdef CONFIG_SERIAL_BFIN_DMA
struct uart_info *info = uart->port.info;
struct tty_struct *tty = info->tty;
status = bfin_serial_get_mctrl(&uart->port);
+ uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
if (!(status & TIOCM_CTS)) {
tty->hw_stopped = 1;
+ schedule_work(&uart->cts_workqueue);
} else {
tty->hw_stopped = 0;
}
-# else
- status = bfin_serial_get_mctrl(&uart->port);
- uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
- if (!(status & TIOCM_CTS))
- schedule_work(&uart->cts_workqueue);
-# endif
#endif
}
@@ -939,10 +934,9 @@
bfin_serial_ports[i].rx_dma_channel =
bfin_serial_resource[i].uart_rx_dma_channel;
init_timer(&(bfin_serial_ports[i].rx_dma_timer));
-#else
- INIT_WORK(&bfin_serial_ports[i].cts_workqueue, bfin_serial_do_work);
#endif
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+ INIT_WORK(&bfin_serial_ports[i].cts_workqueue, bfin_serial_do_work);
bfin_serial_ports[i].cts_pin =
bfin_serial_resource[i].uart_cts_pin;
bfin_serial_ports[i].rts_pin =
Modified: branches/2008R1/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h (4156 => 4157)
--- branches/2008R1/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h 2008-01-29 02:40:23 UTC (rev 4156)
+++ branches/2008R1/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h 2008-01-29 08:04:14 UTC (rev 4157)
@@ -67,10 +67,9 @@
unsigned int tx_dma_channel;
unsigned int rx_dma_channel;
struct work_struct tx_dma_workqueue;
-#else
- struct work_struct cts_workqueue;
#endif
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+ struct work_struct cts_workqueue;
int cts_pin;
int rts_pin;
#endif
Modified: branches/2008R1/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h (4156 => 4157)
--- branches/2008R1/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h 2008-01-29 02:40:23 UTC (rev 4156)
+++ branches/2008R1/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h 2008-01-29 08:04:14 UTC (rev 4157)
@@ -56,12 +56,12 @@
unsigned int rx_dma_channel;
struct work_struct tx_dma_workqueue;
#else
- struct work_struct cts_workqueue;
# if ANOMALY_05000230
unsigned int anomaly_threshold;
# endif
#endif
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+ struct work_struct cts_workqueue;
int cts_pin;
int rts_pin;
#endif
Modified: branches/2008R1/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h (4156 => 4157)
--- branches/2008R1/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h 2008-01-29 02:40:23 UTC (rev 4156)
+++ branches/2008R1/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h 2008-01-29 08:04:14 UTC (rev 4157)
@@ -67,10 +67,9 @@
unsigned int tx_dma_channel;
unsigned int rx_dma_channel;
struct work_struct tx_dma_workqueue;
-#else
- struct work_struct cts_workqueue;
#endif
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+ struct work_struct cts_workqueue;
int cts_pin;
int rts_pin;
#endif
Modified: branches/2008R1/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h (4156 => 4157)
--- branches/2008R1/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h 2008-01-29 02:40:23 UTC (rev 4156)
+++ branches/2008R1/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h 2008-01-29 08:04:14 UTC (rev 4157)
@@ -69,10 +69,9 @@
unsigned int tx_dma_channel;
unsigned int rx_dma_channel;
struct work_struct tx_dma_workqueue;
-#else
- struct work_struct cts_workqueue;
#endif
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+ struct work_struct cts_workqueue;
int cts_pin;
int rts_pin;
#endif
Modified: branches/2008R1/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h (4156 => 4157)
--- branches/2008R1/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h 2008-01-29 02:40:23 UTC (rev 4156)
+++ branches/2008R1/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h 2008-01-29 08:04:14 UTC (rev 4157)
@@ -56,12 +56,12 @@
unsigned int rx_dma_channel;
struct work_struct tx_dma_workqueue;
#else
- struct work_struct cts_workqueue;
# if ANOMALY_05000230
unsigned int anomaly_threshold;
# endif
#endif
#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+ struct work_struct cts_workqueue;
int cts_pin;
int rts_pin;
#endif
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
