Hamsi fix

Original implementation of x15 made changes to hamsi, which in turn
caused issues with other kernels.

kernel/bitblock.cl

@@ -78,6 +78,7 @@ typedef int sph_s32;
 #define SPH_CUBEHASH_UNROLL 0
 #define SPH_KECCAK_UNROLL   1
 #define SPH_HAMSI_EXPAND_BIG 1
+#define SPH_HAMSI_SHORT 1
 
 #include "blake.cl"
 #include "bmw.cl"

kernel/bitblockold.cl

@@ -88,7 +88,7 @@ typedef long sph_s64;
 #include "shavite.cl"
 #include "simd.cl"
 #include "echo.cl"
-#include "hamsi_old.cl"
+#include "hamsi.cl"
 #include "fugue.cl"
 #include "shabal.cl"
 #include "whirlpool.cl"

kernel/hamsi.cl

@@ -103,7 +103,16 @@
 #pragma warning (disable: 4146)
 #endif
 
-#include "hamsi_helper.cl"
+//temp fix for shortened implementation of X15
+#ifdef SPH_HAMSI_SHORT
+  #if SPH_HAMSI_EXPAND_BIG == 1
+    #include "hamsi_helper_big.cl"
+  #else
+    #include "hamsi_helper.cl"
+  #endif
+#else
+  #include "hamsi_helper.cl"
+#endif
 
 __constant static const sph_u32 HAMSI_IV224[] = {
 	SPH_C32(0xc3967a67), SPH_C32(0xc3bc6c20), SPH_C32(0x4bc3bcc3),