d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch up with PHK's sio(4) cuaa->cuad rework [sys/dev/sio/sio.c rev. 1.456].

Browse Source 
PR:		73878
Submitted by:	Steve Kargl <sgk@troutmask.apl.washington.edu>
This commit is contained in:
David E. O'Brien 2004-11-19 03:53:36 +00:00
parent 36d4953214
commit ddede49cfd
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/sade/devices.c
View File

@ -134,7 +134,7 @@ static struct _devname {
{ 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" },

24
usr.sbin/sade/menus.c
View File

@ -410,10 +410,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/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 @@ 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/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 } },

2
usr.sbin/sysinstall/devices.c
View File

@ -134,7 +134,7 @@ static struct _devname {
{ 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" },

24
usr.sbin/sysinstall/menus.c
View File

@ -410,10 +410,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/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 @@ 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/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 } },