diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/XF86Config-parser/Device.c | 2 | ||||
| -rw-r--r-- | src/XF86Config-parser/Generate.c | 9 | ||||
| -rw-r--r-- | src/XF86Config-parser/xf86Parser.h | 2 | ||||
| -rw-r--r-- | src/libXNVCtrl/version.mk | 2 | ||||
| -rw-r--r-- | src/version.h | 2 | ||||
| -rw-r--r-- | src/version.mk | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/src/XF86Config-parser/Device.c b/src/XF86Config-parser/Device.c index c759e64..c31d5f5 100644 --- a/src/XF86Config-parser/Device.c +++ b/src/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/src/XF86Config-parser/Generate.c b/src/XF86Config-parser/Generate.c index b446558..34eb0d4 100644 --- a/src/XF86Config-parser/Generate.c +++ b/src/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/src/XF86Config-parser/xf86Parser.h b/src/XF86Config-parser/xf86Parser.h index 2c8163b..92144a4 100644 --- a/src/XF86Config-parser/xf86Parser.h +++ b/src/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/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index 93af950..8a8fa7c 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 440.26 +NVIDIA_VERSION = 440.31 diff --git a/src/version.h b/src/version.h index 20657fb..a9aca71 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define NVIDIA_VERSION "440.26" +#define NVIDIA_VERSION "440.31" diff --git a/src/version.mk b/src/version.mk index 93af950..8a8fa7c 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 440.26 +NVIDIA_VERSION = 440.31 |