From 7a3c8c4a6869b792813bc1975bf241ca82f7eaf0 Mon Sep 17 00:00:00 2001
From: deinferno <14363193+deinferno@users.noreply.github.com>
Date: Fri, 29 Mar 2024 19:49:46 +0000
Subject: [PATCH 1/3] update gddr6.c to add RTX 4070 Max-Q / Mobile

---
 lib/src/gddr6.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/gddr6.c b/lib/src/gddr6.c
index 8ed634d..b39e331 100644
--- a/lib/src/gddr6.c
+++ b/lib/src/gddr6.c
@@ -29,6 +29,7 @@ struct device dev_table[] =
     { .offset = 0x0000E2A8, .dev_id = 0x2704, .vram = "GDDR6X", .arch = "AD103", .name =  "RTX 4080" },
     { .offset = 0x0000E2A8, .dev_id = 0x2782, .vram = "GDDR6X", .arch = "AD104", .name =  "RTX 4070 Ti" },
     { .offset = 0x0000E2A8, .dev_id = 0x2786, .vram = "GDDR6X", .arch = "AD104", .name =  "RTX 4070" },
+    { .offset = 0x0000E2A8, .dev_id = 0x2860, .vram = "GDDR6",  .arch = "AD106", .name =  "RTX 4070 Max-Q / Mobile" },
     { .offset = 0x0000E2A8, .dev_id = 0x2204, .vram = "GDDR6X", .arch = "GA102", .name =  "RTX 3090" },
     { .offset = 0x0000E2A8, .dev_id = 0x2208, .vram = "GDDR6X", .arch = "GA102", .name =  "RTX 3080 Ti" },
     { .offset = 0x0000E2A8, .dev_id = 0x2206, .vram = "GDDR6X", .arch = "GA102", .name =  "RTX 3080" },

From bcb805f657ecf0f2ab2037282838c02dd0baf875 Mon Sep 17 00:00:00 2001
From: deinferno <14363193+deinferno@users.noreply.github.com>
Date: Sat, 30 Mar 2024 15:02:34 +0500
Subject: [PATCH 2/3] use ctx.num_devices as ctx.devices index

---
 lib/src/gddr6.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/gddr6.c b/lib/src/gddr6.c
index b39e331..73996d3 100644
--- a/lib/src/gddr6.c
+++ b/lib/src/gddr6.c
@@ -85,11 +85,11 @@ int gddr6_detect_compatible_gpus(void)
                   }
                   ctx.devices = new_devices;
 
-                  ctx.devices[i] = dev_table[i];
-                  ctx.devices[i].bar0 = (pci_dev->base_addr[0] & 0xffffffff);
-                  ctx.devices[i].bus = pci_dev->bus;
-                  ctx.devices[i].dev = pci_dev->dev;
-                  ctx.devices[i].func = pci_dev->func;
+                  ctx.devices[ctx.num_devices] = dev_table[i];
+                  ctx.devices[ctx.num_devices].bar0 = (pci_dev->base_addr[0] & 0xffffffff);
+                  ctx.devices[ctx.num_devices].bus = pci_dev->bus;
+                  ctx.devices[ctx.num_devices].dev = pci_dev->dev;
+                  ctx.devices[ctx.num_devices].func = pci_dev->func;
                   ctx.num_devices++;
               }
           }

From 1685a9248634a1c0a4e57639ae9945365bbd4ee2 Mon Sep 17 00:00:00 2001
From: deinferno <14363193+deinferno@users.noreply.github.com>
Date: Sat, 30 Mar 2024 15:05:55 +0500
Subject: [PATCH 3/3] add flake.nix

---
 flake.lock | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix  | 33 +++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..50b46d4
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..961d63e
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,33 @@
+{
+  description = "Linux based GDDR6/GDDR6X VRAM temperature reader for NVIDIA RTX 3000/4000 series GPUs.";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, utils }:
+  utils.lib.eachDefaultSystem(system:
+    let
+      pkgs = import nixpkgs { inherit system; };
+    in {
+      packages.gddr6 = with pkgs; stdenv.mkDerivation {
+        pname = "gddr6";
+        version = "unstable";
+
+        src = ./.;
+
+        buildInputs = [ cmake ];
+        nativeBuildInputs = [ pciutils ];
+      };
+
+      packages.default = self.packages.${system}.gddr6;
+
+      devShell = with pkgs; mkShell {
+        name = "gddr6";
+        nativeBuildInputs = [ cmake pciutils ];
+      };
+    }
+  );
+}
+