[LV-k25-commit] kernel-2.5/drivers/char dz.c,1.25,1.26

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27848/drivers/char

Modified Files:
	dz.c 
Log Message:
- Comment out serio port registering.
- If we register the port, it'll fail (uninitializes spinlock), because
  serio_bus isn't yet set up. This is because the serio stuff is
  initialized (drivers/Makefile) after drivers/char/,  but before
  drivers/serial/ .  To get this working, it would (in theory) be enough
  to just move our old-style DZ driver into the serial/ directory...
  I'm undecided...


Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dz.c	18 Nov 2004 21:21:20 -0000	1.25
+++ dz.c	19 Nov 2004 11:17:07 -0000	1.26
@@ -1375,18 +1375,18 @@
 		tty_register_device(serial_driver, info->line, NULL);
 
 #ifdef CONFIG_SERIO
-		memset(&info->serio, 0, sizeof(info->serio));
+		memset (&info->serio, 0, sizeof (struct serio));
 		info->serio.port_data = info;
-
 		info->serio.type = SERIO_RS232;
+
 		switch (i) {
 			case DZ_KEYBOARD:
-				info->serio.type |= SERIO_RS232 | SERIO_LKKBD;
+				info->serio.type |= SERIO_LKKBD;
 				sprintf (info->serio.name, "dzkbd");
 				sprintf (info->serio.phys, "dz/line0");
 				break;
 			case DZ_MOUSE:
-				info->serio.type |= SERIO_RS232 | SERIO_VSXXXAA;
+				info->serio.type |= SERIO_VSXXXAA;
 				sprintf (info->serio.name, "dzmouse");
 				sprintf (info->serio.phys, "dz/line1");
 				break;
@@ -1404,7 +1404,8 @@
 		info->serio.close = dz_serio_close;
 		info->serio.write = dz_serio_write;
 
-		serio_register_port (&info->serio);
+		printk (KERN_WARNING "NOT registering serio port %s because the serio stuff isn't up yet.\n", info->serio.phys);
+		//serio_register_port (&info->serio);
 #endif /* CONFIG_SERIO */
 	}