Title: [3913] trunk/drivers/serial/bfin_5xx.c: Task[#2424] Clean up UART DMA code.
- Revision
- 3913
- Author
- sonicz
- Date
- 2007-11-21 01:40:21 -0600 (Wed, 21 Nov 2007)
Log Message
Task[#2424] Clean up UART DMA code.
Start next TX DMA in tx dma handler instead of rx timer handler.
Diffstat
bfin_5xx.c | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
Modified Paths
Diff
Modified: trunk/drivers/serial/bfin_5xx.c (3912 => 3913)
--- trunk/drivers/serial/bfin_5xx.c 2007-11-21 06:11:37 UTC (rev 3912)
+++ trunk/drivers/serial/bfin_5xx.c 2007-11-21 07:40:21 UTC (rev 3913)
@@ -84,7 +84,7 @@
static void bfin_serial_stop_tx(struct uart_port *port)
{
struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
-#ifndef CONFIG_BF54x
+#if !defined(CONFIG_BF54x) && !defined(CONFIG_SERIAL_BFIN_DMA)
unsigned short ier;
#endif
@@ -307,7 +307,6 @@
UART_PUT_CHAR(uart, uart->port.x_char);
uart->port.icount.tx++;
uart->port.x_char = 0;
- return;
}
/*
* Check the modem control lines before
@@ -376,28 +375,26 @@
if (!uart->tx_done)
return;
-
uart->tx_done = 0;
+ if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
+ bfin_serial_stop_tx(&uart->port);
+ uart->tx_done = 1;
+ return;
+ }
+
if (uart->port.x_char) {
UART_PUT_CHAR(uart, uart->port.x_char);
uart->port.icount.tx++;
uart->port.x_char = 0;
- uart->tx_done = 1;
- return;
}
+
/*
* Check the modem control lines before
* transmitting anything.
*/
bfin_serial_mctrl_check(uart);
- if (uart_circ_empty(xmit) || uart_tx_stopped(&uart->port)) {
- bfin_serial_stop_tx(&uart->port);
- uart->tx_done = 1;
- return;
- }
-
spin_lock_irqsave(&uart->port.lock, flags);
uart->tx_count = CIRC_CNT(xmit->head, xmit->tail, UART_XMIT_SIZE);
if (uart->tx_count > (UART_XMIT_SIZE - xmit->tail))
@@ -470,8 +467,6 @@
int x_pos, pos;
int flags = 0;
- bfin_serial_dma_tx_chars(uart);
-
spin_lock_irqsave(&uart->port.lock, flags);
x_pos = DMA_RX_XCOUNT - get_dma_curr_xcount(uart->rx_dma_channel);
if (x_pos == DMA_RX_XCOUNT)
@@ -512,9 +507,9 @@
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_write_wakeup(&uart->port);
- if (uart_circ_empty(xmit))
- bfin_serial_stop_tx(&uart->port);
uart->tx_done = 1;
+
+ bfin_serial_dma_tx_chars(uart);
}
spin_unlock(&uart->port.lock);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
