Prepare for some HSM updates related to device_type
authorjsteube <jens.steube@gmail.com>
Mon, 11 Jan 2016 22:49:10 +0000 (23:49 +0100)
committerjsteube <jens.steube@gmail.com>
Mon, 11 Jan 2016 22:49:10 +0000 (23:49 +0100)
src/oclHashcat.c

index d48a591..811468a 100644 (file)
@@ -12646,22 +12646,22 @@ int main (int argc, char **argv)
 
       devices[device_id] = devices_all[device_all_id];
 
-      memcpy (&data.hm_device[device_id], &hm_adapter_all[device_all_id], sizeof (hm_attrs_t));
-
       char device_name[INFOSZ];
 
       memset (device_name, 0, sizeof (device_name));
 
-      cl_ulong  global_mem_size;
-      cl_ulong  max_mem_alloc_size;
-      cl_uint   max_clock_frequency;
-      cl_uint   max_compute_units;
+      cl_ulong        global_mem_size;
+      cl_ulong        max_mem_alloc_size;
+      cl_uint         max_clock_frequency;
+      cl_uint         max_compute_units;
+      cl_device_type  device_type;
 
       hc_clGetDeviceInfo (devices[device_id], CL_DEVICE_NAME,                 sizeof (device_name),         &device_name,         NULL);
       hc_clGetDeviceInfo (devices[device_id], CL_DEVICE_GLOBAL_MEM_SIZE,      sizeof (global_mem_size),     &global_mem_size,     NULL);
       hc_clGetDeviceInfo (devices[device_id], CL_DEVICE_MAX_MEM_ALLOC_SIZE,   sizeof (max_mem_alloc_size),  &max_mem_alloc_size,  NULL);
       hc_clGetDeviceInfo (devices[device_id], CL_DEVICE_MAX_CLOCK_FREQUENCY,  sizeof (max_clock_frequency), &max_clock_frequency, NULL);
       hc_clGetDeviceInfo (devices[device_id], CL_DEVICE_MAX_COMPUTE_UNITS,    sizeof (max_compute_units),   &max_compute_units,   NULL);
+      hc_clGetDeviceInfo (devices[device_id], CL_DEVICE_TYPE,                 sizeof (device_type),         &device_type,         NULL);
 
       if ((benchmark == 1 || quiet == 0) && (algorithm_pos == 0))
       {
@@ -12674,6 +12674,10 @@ int main (int argc, char **argv)
                   (unsigned int) max_compute_units);
       }
 
+      // do something with device_type
+
+      memcpy (&data.hm_device[device_id], &hm_adapter_all[device_all_id], sizeof (hm_attrs_t));
+
       devices_cnt++;
     }