more random patches. who knows.

[patches.git] / blackfin-old-serial-sysrq.patch

--- bfin_serial_5xx.c
+++ bfin_serial_5xx.c
@@ -17,6 +17,7 @@
  * $Id: bfin_serial_5xx.c,v 1.80 2006/10/12 03:16:38 sonicz Exp $
  */
 
+#include <linux/sysrq.h>
 #include <linux/module.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
@@ -650,9 +651,10 @@ static void receive_chars(struct bfin_se
 	struct tty_struct *tty = info->tty;
 	unsigned char ch = 0, flag = 0;
 	unsigned short status = 0;
-#if defined(CONFIG_BF531) || defined(CONFIG_BF532) || defined(CONFIG_BF533)
-	static int in_break=0;
+#ifdef CONFIG_MAGIC_SYSRQ
+	static int in_break = 0;
 #endif
+
 	FUNC_ENTER();
 
 #ifdef CONFIG_BFIN_UART_CTSRTS
@@ -665,16 +667,13 @@ static void receive_chars(struct bfin_se
 		ACCESS_PORT_IER(uart_regs);
 		ch = (unsigned char)bfin_read16(uart_regs->rpUART_RBR);
 
-		if (!tty) {
+		if (!tty)
 			goto clear_and_exit;
-		}
 
-#if defined(CONFIG_BF531) || defined(CONFIG_BF532) || defined(CONFIG_BF533)
+#ifdef CONFIG_MAGIC_SYSRQ
 		if (in_break) {
-			if(ch!=0) {
-				ch = (unsigned char)bfin_read16(uart_regs->rpUART_RBR);
-				in_break = 0;
-			}
+			handle_sysrq(ch, regs, NULL);
+			in_break = 0;
 			goto clear_and_exit;
 		}
 #endif
@@ -683,7 +682,7 @@ static void receive_chars(struct bfin_se
 		if (status & BI) {
 			flag = TTY_BREAK;
 			status_handle(info, status);
-#if defined(CONFIG_BF531) || defined(CONFIG_BF532) || defined(CONFIG_BF533)
+#ifdef CONFIG_MAGIC_SYSRQ
 			in_break = 1;
 #endif
 		} else if (status & PE) {
@@ -696,6 +695,7 @@ static void receive_chars(struct bfin_se
 			flag = TTY_FRAME;
 			status_handle(info, status);
 		}
+
 		tty_insert_flip_char(tty, ch, flag);
 	}
 	tty_flip_buffer_push(tty);