svn commit: r216052 - head/usr.sbin/sysinstall
Bruce Cran
brucec at FreeBSD.org
Mon Nov 29 11:28:31 UTC 2010
Author: brucec
Date: Mon Nov 29 11:28:31 2010
New Revision: 216052
URL: http://svn.freebsd.org/changeset/base/216052
Log:
Update the serial port device names. They changed in 8.0 because the default
driver is now uart(4).
PR: bin/140887
Submitted by: Joe Barbish <fbsd1 at a1poweruser.com>
MFC after: 3 days
Modified:
head/usr.sbin/sysinstall/devices.c
head/usr.sbin/sysinstall/menus.c
Modified: head/usr.sbin/sysinstall/devices.c
==============================================================================
--- head/usr.sbin/sysinstall/devices.c Mon Nov 29 10:22:45 2010 (r216051)
+++ head/usr.sbin/sysinstall/devices.c Mon Nov 29 11:28:31 2010 (r216052)
@@ -91,7 +91,7 @@ static struct _devname {
DISK("ipsd%d", "IBM ServeRAID RAID array", 4),
DISK("mfid%d", "LSI MegaRAID SAS array", 4),
FLOPPY("fd%d", "floppy drive unit A", 4),
- SERIAL("cuad%d", "%s on device %s (COM%d)", 16),
+ SERIAL("cuau%d", "%s on device %s (COM%d)", 16),
USB("da%da", "USB Mass Storage Device", 16),
NETWORK("ae", "Attansic/Atheros L2 Fast Ethernet"),
NETWORK("age", "Attansic/Atheros L1 Gigabit Ethernet"),
Modified: head/usr.sbin/sysinstall/menus.c
==============================================================================
--- head/usr.sbin/sysinstall/menus.c Mon Nov 29 10:22:45 2010 (r216051)
+++ head/usr.sbin/sysinstall/menus.c Mon Nov 29 11:28:31 2010 (r216052)
@@ -426,10 +426,10 @@ DMenu MenuMousePort = {
{
{ "1 BusMouse", "PC-98x1 bus mouse (/dev/mse0)",
dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
- { "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" },
+ { "2 COM1", "Serial mouse on COM1 (/dev/cuau0)",
+ dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau0" },
+ { "3 COM2", "Serial mouse on COM2 (/dev/cuau1)",
+ dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau1" },
{ NULL } },
};
#else
@@ -442,14 +442,14 @@ DMenu MenuMousePort = {
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/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" },
+ { "2 COM1", "Serial mouse on COM1 (/dev/cuau0)",
+ dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau0" },
+ { "3 COM2", "Serial mouse on COM2 (/dev/cuau1)",
+ dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau1" },
+ { "4 COM3", "Serial mouse on COM3 (/dev/cuau2)",
+ dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau2" },
+ { "5 COM4", "Serial mouse on COM4 (/dev/cuau3)",
+ dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/cuau3" },
{ "6 BusMouse", "Logitech, ATI or MS bus mouse (/dev/mse0)",
dmenuVarCheck, dmenuSetVariable, NULL, VAR_MOUSED_PORT "=/dev/mse0" },
{ NULL } },
More information about the svn-src-all
mailing list