Module Name: xsrc
Committed By: macallan
Date: Thu Jul 30 19:59:36 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Configure.c
Log Message:
when writing PCI BusIDs include the domain ID if it's non-zero
While there also add
Option "Protocol" "wskbd"
Option "Device" "/dev/wskbd"
to the keyboard section on non-x86
Now X -configure should dump something more usable.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.1.1.2 Thu Jun 11 01:52:57 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c Thu Jul 30 19:59:36 2009
@@ -180,9 +180,14 @@
NewDevice.GDev.busID = xnfalloc(16);
xf86FormatPciBusNumber(pVideo->bus, busnum);
- sprintf(NewDevice.GDev.busID, "PCI:%s:%d:%d",
- busnum, pVideo->dev, pVideo->func);
-
+ if (pVideo->domain == 0) {
+ snprintf(NewDevice.GDev.busID, 16, "PCI:%s:%d:%d",
+ busnum, pVideo->dev, pVideo->func);
+ } else {
+ snprintf(NewDevice.GDev.busID, 16, "PCI:%...@%d:%d:%d",
+ busnum, pVideo->domain, pVideo->dev, pVideo->func);
+ }
+
NewDevice.GDev.chipID = pVideo->device_id;
NewDevice.GDev.chipRev = pVideo->revision;
@@ -234,6 +239,12 @@
ptr->inp_identifier = "Keyboard0";
ptr->inp_driver = "kbd";
ptr->list.next = NULL;
+#if defined(WSCONS_SUPPORT) && !defined(__i386__) && !defined(__amd64__)
+ ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+ xstrdup("Protocol"), "wskbd");
+ ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+ xstrdup("Device"), "/dev/wskbd");
+#endif
/* Crude mechanism to auto-detect mouse (os dependent) */
{
