Fixed loops/accel for 6800, 11300 and 11600 (osx)

diff --git a/include/shared.h b/include/shared.h
index 413f70a..35f9648 100644 (file)
--- a/include/shared.h
+++ b/include/shared.h
@@ -194,6 +194,7 @@ extern hc_thread_mutex_t mux_display;
 #define KERNEL_ACCEL_6211    2
 #define KERNEL_ACCEL_6231    1
 #define KERNEL_ACCEL_6241    4
+#define KERNEL_ACCEL_6800    2
 #define KERNEL_ACCEL_7100    1
 #define KERNEL_ACCEL_7200    1
 #define KERNEL_ACCEL_7900    1
@@ -223,6 +224,7 @@ extern hc_thread_mutex_t mux_display;
 #define KERNEL_ACCEL_6211    16
 #define KERNEL_ACCEL_6231    4
 #define KERNEL_ACCEL_6241    32
+#define KERNEL_ACCEL_6800    8
 #define KERNEL_ACCEL_7100    2
 #define KERNEL_ACCEL_7200    2
 #define KERNEL_ACCEL_7900    2
@@ -349,7 +351,6 @@ extern hc_thread_mutex_t mux_display;
 #define KERNEL_ACCEL_6500    8
 #define KERNEL_ACCEL_6600    8
 #define KERNEL_ACCEL_6700    8
-#define KERNEL_ACCEL_6800    8
 #define KERNEL_ACCEL_6900    16
 #define KERNEL_ACCEL_7300    64
 #define KERNEL_ACCEL_7400    2

diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index 210fd95..b7abb9f 100644 (file)
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -11494,7 +11494,9 @@ int main (int argc, char **argv)
                        kernel_accel = 64;
                        break;
           case  6800:  kernel_loops = ROUNDS_LASTPASS;
+                       #ifndef OSX
                        kernel_accel = 64;
+                       #endif
                        break;
           case  7100:  kernel_loops = ROUNDS_SHA512OSX;
                        #ifndef OSX
@@ -11586,14 +11588,19 @@ int main (int argc, char **argv)
           case 10900:  kernel_loops = ROUNDS_PBKDF2_SHA256;
                        kernel_accel = 8;
                        break;
-          #ifndef OSX
-          case 11300:  kernel_loops = ROUNDS_BITCOIN_WALLET;
+          case 11300:
+                       #ifndef OSX
+                       kernel_loops = ROUNDS_BITCOIN_WALLET;
                        kernel_accel = 8;
+                       #else
+                       kernel_accel = 1;
+                       #endif
                        break;
-          #endif
           case 11600:  kernel_loops = ROUNDS_SEVEN_ZIP;
                        #ifndef OSX
                        kernel_accel = 8;
+                       #else
+                       kernel_accel = 1;
                        #endif
                        break;
           case 11900:  kernel_loops = ROUNDS_PBKDF2_MD5;