Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 12 Nov 2004 09:58:35 -0800 (PST)
From:      Steve Kargl <sgk@troutmask.apl.washington.edu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   bin/73878: [PATCH] sysinstall: catch up with cuaa* rename to cuad*
Message-ID:  <200411121758.iACHwZBU020698@troutmask.apl.washington.edu>
Resent-Message-ID: <200411121800.iACI0kfP098882@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

>Number:         73878
>Category:       bin
>Synopsis:       [PATCH] sysinstall: catch up with cuaa* rename to cuad*
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 12 18:00:45 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Steve Kargl
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
APL/UW
>Environment:
System: FreeBSD troutmask.apl.washington.edu 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Apr 22 14:44:25 PDT 2004 kargl@troutmask.apl.washington.edu:/usr/obj/usr/src/sys/TROUTMASK i386


	
>Description:
	
>From /usr/src/UPATING

20041018:
        A major sweep over the tty drivers to elimnate approx 3100
        lines of copy&pasted code have been performed.  As a part of
        this change some tty devices have changed names:
        sio devices are now named:      {tty,cua}d%d[.init,.lock]
        ucom devices are now named:     {tty,cua}U%d[.init,.lock]
        For other drivers see the commit logs.

See patch for OBVIOUS fix.

>How-To-Repeat:
	
>Fix:


diff -ur sysinstall.orig/devices.c sysinstall/devices.c
--- sysinstall.orig/devices.c	Sun Sep 12 10:06:57 2004
+++ sysinstall/devices.c	Fri Nov 12 09:51:35 2004
@@ -134,7 +134,7 @@
     { DEVICE_TYPE_NETWORK,	"wx",		"Intel Gigabit Ethernet (82452) card"			},
     { DEVICE_TYPE_NETWORK,	"xe",		"Xircom/Intel EtherExpress Pro100/16 ethernet card"		},
     { DEVICE_TYPE_NETWORK,	"xl",		"3COM 3c90x / 3c90xB PCI ethernet card"				},
-    { DEVICE_TYPE_NETWORK,	"cuaa%d",	"%s on device %s (COM%d)",	28, 128, 1, 16			},
+    { DEVICE_TYPE_NETWORK,	"cuad%d",	"%s on device %s (COM%d)",	28, 128, 1, 16			},
     { DEVICE_TYPE_NETWORK,	"fwe",		"FireWire Ethernet emulation"					},
     { DEVICE_TYPE_NETWORK,	"lp",		"Parallel Port IP (PLIP) peer connection"			},
     { DEVICE_TYPE_NETWORK,	"lo",		"Loop-back (local) network interface"				},
diff -ur sysinstall.orig/menus.c sysinstall/menus.c
--- sysinstall.orig/menus.c	Thu Nov 11 21:07:46 2004
+++ sysinstall/menus.c	Fri Nov 12 09:51:27 2004
@@ -410,10 +410,10 @@
     {
       { "1 BusMouse",	"PC-98x1 bus mouse (/dev/mse0)", 
 	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
-      { "2 COM1",	"Serial mouse on COM1 (/dev/cuaa0)",
-	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa0" },
-      { "3 COM2",	"Serial mouse on COM2 (/dev/cuaa1)",
-	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa1" },
+      { "2 COM1",	"Serial mouse on COM1 (/dev/cuad0)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad0" },
+      { "3 COM2",	"Serial mouse on COM2 (/dev/cuad1)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad1" },
       { NULL } },
 };
 #else
@@ -426,14 +426,14 @@
     NULL,
     { { "1 PS/2",	"PS/2 style mouse (/dev/psm0)", 
 	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/psm0" },
-      { "2 COM1",	"Serial mouse on COM1 (/dev/cuaa0)",
-	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa0" },
-      { "3 COM2",	"Serial mouse on COM2 (/dev/cuaa1)",
-	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa1" },
-      { "4 COM3",	"Serial mouse on COM3 (/dev/cuaa2)",
-	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa2" },
-      { "5 COM4",	"Serial mouse on COM4 (/dev/cuaa3)", 
-	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuaa3" },
+      { "2 COM1",	"Serial mouse on COM1 (/dev/cuad0)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad0" },
+      { "3 COM2",	"Serial mouse on COM2 (/dev/cuad1)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad1" },
+      { "4 COM3",	"Serial mouse on COM3 (/dev/cuad2)",
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad2" },
+      { "5 COM4",	"Serial mouse on COM4 (/dev/cuad3)", 
+	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuad3" },
       { "6 BusMouse",	"Logitech, ATI or MS bus mouse (/dev/mse0)", 
 	dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
       { NULL } },

>Release-Note:
>Audit-Trail:
>Unformatted:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411121758.iACHwZBU020698>