Remove some ugly code from nvapi.h

[hashcat.git] / include / types.h

diff --git a/include/types.h b/include/types.h
index 2ccfe02..342489a 100644 (file)
--- a/include/types.h
+++ b/include/types.h
@@ -947,7 +947,6 @@ struct __hc_device_param
   uint    kernel_accel_min;
   uint    kernel_accel_max;
   uint    kernel_power;
-  uint    kernel_power_user;
 
   size_t  size_pws;
   size_t  size_tmps;
@@ -1086,23 +1085,14 @@ typedef struct __hc_device_param hc_device_param_t;
 #ifdef HAVE_HWMON
 typedef struct
 {
-  union
-  {
-    #ifdef HAVE_ADL
-    HM_ADAPTER_AMD amd;
-    #endif
-
-    #if defined(HAVE_NVML) || defined(HAVE_NVAPI)
-    HM_ADAPTER_NV  nv;
-    #endif
-
-  } adapter_index;
+  HM_ADAPTER_ADL   adl;
+  HM_ADAPTER_NVML  nvml;
+  HM_ADAPTER_NVAPI nvapi;
 
-  int     od_version;
-  int     fan_supported;
+  int od_version;
 
-  // int     busid; // used for CL_DEVICE_TOPOLOGY_AMD but broken for dual GPUs
-  // int     devid; // used for CL_DEVICE_TOPOLOGY_AMD but broken for dual GPUs
+  int fan_get_supported;
+  int fan_set_supported;
 
 } hm_attrs_t;
 #endif // HAVE_HWMON
@@ -1169,8 +1159,9 @@ typedef struct
    */
 
   #ifdef HAVE_HWMON
-  void   *hm_nv;
-  void   *hm_amd;
+  void      *hm_adl;
+  void      *hm_nvml;
+  void      *hm_nvapi;
   hm_attrs_t hm_device[DEVICES_MAX];
   #endif