patch-2.2.18 linux/drivers/char/mac_SCC.c

• Lines: 80
• Date: Fri Oct 13 23:52:23 2000
• Orig file: v2.2.17/drivers/char/mac_SCC.c
• Orig date: Fri Apr 21 12:46:04 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/char/mac_SCC.c linux/drivers/char/mac_SCC.c
@@ -46,7 +46,7 @@
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
-#include <linux/serial.h>
+#include <linux/m68kserial.h>
 #include <linux/config.h>
 #include <linux/major.h>
 #include <linux/string.h>
@@ -61,6 +61,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/macints.h>
+#include <asm/macintosh.h>
 #ifndef CONFIG_MAC
 #include <asm/prom.h>
 #endif
@@ -708,8 +709,6 @@
 
 static void SCC_init_port( struct m68k_async_struct *info, int type, int channel )
 {
-	static int got_autovector = 0;
-
 #ifdef SCC_DEBUG
 	printk("mac_SCC: init_port, info %x \n", info);
 #endif
@@ -729,16 +728,6 @@
 	 * mac_SCC_interrupt with the proper arguments ...
 	 */
 
-	if (!got_autovector) {
-		if(sys_request_irq(IRQ4, mac_SCC_handler, 0, "SCC master", info))
-			panic("macserial: can't get irq %d", IRQ4);
-#ifdef SCC_DEBUG
-		printk("mac_SCC: got SCC master interrupt %d, channel %d info %p\n",
-			IRQ4, channel, info);
-#endif
-		got_autovector = 1;
-	}
-
 	if (info->private->zs_chan_a == info->private->zs_channel) {
 		/* Channel A */
 		if (request_irq(IRQ_SCCA, mac_SCC_interrupt, 0, "SCC A", info))
@@ -1129,7 +1118,14 @@
 static void SCC_get_serial_info(struct m68k_async_struct * info,
 			   struct serial_struct * retinfo)
 {
+	retinfo->type = info->type;
+	retinfo->line = info->line;
+	retinfo->port = info->port;
+	retinfo->irq  = info->irq;
+	retinfo->flags= info->flags;
 	retinfo->baud_base = info->baud_base;
+	retinfo->close_delay=info->close_delay;
+	retinfo->closing_wait=info->closing_wait;
 	retinfo->custom_divisor = info->custom_divisor;
 }
 
@@ -1234,7 +1230,20 @@
 			copy_to_user((struct m68k_async_struct *) arg,
 				      info, sizeof(struct m68k_async_struct));
 			return 0;
-			
+	        case TIOCGSERIAL:
+		{
+			struct serial_struct tmp;
+			error = verify_area(VERIFY_WRITE, (void *) arg,
+					    sizeof(struct serial_struct));
+			if (error)
+				return error;
+			if (!arg)
+				return -EFAULT;
+			memset(&tmp, 0, sizeof(tmp));
+			SCC_get_serial_info(info, &tmp);
+			return copy_to_user((struct serial_struct *)arg,
+					    &tmp, sizeof(tmp));
+		}
 		default:
 			return -ENOIOCTLCMD;
 		}