440.31440.31

4 files changed, 8 insertions, 7 deletions

diff --git a/XF86Config-parser/Device.c b/XF86Config-parser/Device.c
index c759e64..c31d5f5 100644
--- a/XF86Config-parser/Device.c
+++ b/XF86Config-parser/Device.c
@@ -527,7 +527,7 @@ void xconfigAddInactiveDevice(XConfigPtr config, XConfigLayoutPtr layout,
     XConfigInactivePtr inac;
 
     device = add_device(config, -1, -1, -1, NULL, device_n,
-                        "modesetting", "Unknown");
+                        "modesetting", "Unknown", FALSE /* active */);
 
     inac = xconfigAlloc(sizeof (XConfigInactiveRec));
     inac->next = NULL;
diff --git a/XF86Config-parser/Generate.c b/XF86Config-parser/Generate.c
index b446558..34eb0d4 100644
--- a/XF86Config-parser/Generate.c
+++ b/XF86Config-parser/Generate.c
@@ -37,7 +37,7 @@
 #define KEYBOARD_IDENTIFER "Keyboard0"
 
 #define SCREEN_IDENTIFIER "Screen%d"
-#define DEVICE_IDENTIFIER "Device%d"
+#define DEVICE_IDENTIFIER "%sDevice%d"
 #define MONITOR_IDENTIFIER "Monitor%d"
 
 
@@ -102,7 +102,7 @@ XConfigScreenPtr xconfigGenerateAddScreen(XConfigPtr config,
 
     monitor = xconfigAddMonitor(config, count);
     device = add_device(config, bus, domain, slot, boardname, count,
-                        driver, vendor);
+                        driver, vendor, TRUE /* active */);
 
     screen = xconfigAlloc(sizeof(XConfigScreenRec));
 
@@ -450,14 +450,15 @@ XConfigMonitorPtr xconfigAddMonitor(XConfigPtr config, int count)
 
 XConfigDevicePtr add_device(XConfigPtr config, int bus, int domain,
                             int slot, char *boardname, int count,
-                            const char *driver, const char *vendor)
+                            const char *driver, const char *vendor, int active)
 {
     XConfigDevicePtr device, d;
 
     device = xconfigAlloc(sizeof(XConfigDeviceRec));
 
     device->identifier = xconfigAlloc(32);
-    snprintf(device->identifier, 32, DEVICE_IDENTIFIER, count);
+    snprintf(device->identifier, 32, DEVICE_IDENTIFIER,
+             active ? "" : "Inactive", count);
     device->index_id = count;
     device->driver = xconfigStrdup(driver);
     device->vendor = xconfigStrdup(vendor);
diff --git a/XF86Config-parser/xf86Parser.h b/XF86Config-parser/xf86Parser.h
index 2c8163b..92144a4 100644
--- a/XF86Config-parser/xf86Parser.h
+++ b/XF86Config-parser/xf86Parser.h
@@ -757,7 +757,7 @@ XConfigScreenPtr xconfigGenerateAddScreen(XConfigPtr config,
 
 XConfigDevicePtr add_device(XConfigPtr config, int bus, int domain,
                             int slot, char *boardname, int count,
-                            const char *driver, const char *vendor);
+                            const char *driver, const char *vendor, int active);
 
 void xconfigAddInactiveDevice(XConfigPtr config, XConfigLayoutPtr layout,
                               int device_n);
diff --git a/version.mk b/version.mk
index 93af950..8a8fa7c 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 440.26
+NVIDIA_VERSION = 440.31