1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-30 17:41:00 +00:00

Merge pull request #158 from gm4tr1x/types-cosmetic

Cosmetic fix for types.h
This commit is contained in:
Jens Steube 2016-01-26 18:13:04 +01:00
commit eb8f46849a

View File

@ -743,7 +743,7 @@ typedef struct
typedef struct typedef struct
{ {
u32 version_bin; u32 version_bin;
char cwd[256]; char cwd[1024];
u32 pid; u32 pid;
u32 dictpos; u32 dictpos;
@ -824,6 +824,7 @@ typedef struct
#define PW_MAX1 (PW_MAX + 1) #define PW_MAX1 (PW_MAX + 1)
#define PW_DICTMAX 31 #define PW_DICTMAX 31
#define PW_DICTMAX1 (PW_DICTMAX + 1) #define PW_DICTMAX1 (PW_DICTMAX + 1)
#define PARAMCNT 32
struct __hc_device_param struct __hc_device_param
{ {
@ -894,6 +895,7 @@ struct __hc_device_param
uint speed_pos; uint speed_pos;
u64 speed_cnt[SPEED_CACHE]; u64 speed_cnt[SPEED_CACHE];
float speed_ms[SPEED_CACHE]; float speed_ms[SPEED_CACHE];
hc_timer_t speed_rec[SPEED_CACHE]; hc_timer_t speed_rec[SPEED_CACHE];
hc_timer_t timer_speed; hc_timer_t timer_speed;
@ -961,8 +963,6 @@ struct __hc_device_param
cl_mem d_root_css_buf; cl_mem d_root_css_buf;
cl_mem d_markov_css_buf; cl_mem d_markov_css_buf;
#define PARAMCNT 32
void *kernel_params[PARAMCNT]; void *kernel_params[PARAMCNT];
void *kernel_params_mp[PARAMCNT]; void *kernel_params_mp[PARAMCNT];
void *kernel_params_mp_r[PARAMCNT]; void *kernel_params_mp_r[PARAMCNT];
@ -1003,7 +1003,6 @@ typedef struct
} adapter_index; } adapter_index;
int od_version; int od_version;
int fan_supported; int fan_supported;
// int busid; // used for CL_DEVICE_TOPOLOGY_AMD but broken for dual GPUs // int busid; // used for CL_DEVICE_TOPOLOGY_AMD but broken for dual GPUs
@ -1021,6 +1020,7 @@ typedef struct
uint devices_status; uint devices_status;
uint devices_cnt; uint devices_cnt;
uint devices_active; uint devices_active;
hc_device_param_t *devices_param; hc_device_param_t *devices_param;
uint kernel_blocks_all; uint kernel_blocks_all;
@ -1038,6 +1038,7 @@ typedef struct
uint attack_exec; uint attack_exec;
uint kernel_rules_cnt; uint kernel_rules_cnt;
kernel_rule_t *kernel_rules_buf; kernel_rule_t *kernel_rules_buf;
uint combs_mode; uint combs_mode;