From 168b3c2357d3fc47833f23eb7a1fc01fa6eb5e47 Mon Sep 17 00:00:00 2001
From: Justin Berger <jdavidberger@gmail.com>
Date: Fri, 29 Jun 2018 18:36:54 +0000
Subject: Fixed unaligned accesses

---
 src/survive.c      |  2 +-
 src/survive_vive.c | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/survive.c b/src/survive.c
index 920b9ec..fa0a952 100644
--- a/src/survive.c
+++ b/src/survive.c
@@ -367,7 +367,7 @@ int survive_startup(SurviveContext *ctx) {
 	ctx->state = SURVIVE_RUNNING;
 
 	int calibrateMandatory = survive_configi(ctx, "force-calibrate", SC_GET, 0);
-	int calibrateForbidden = survive_configi(ctx, "disable-calibrate", SC_GET, 1) == 0;
+	int calibrateForbidden = survive_configi(ctx, "disable-calibrate", SC_GET, 1) == 1;
 	if (calibrateMandatory && calibrateForbidden) {
 		SV_INFO("Contradictory settings --force-calibrate and --disable-calibrate specified. Switching to normal behavior.");
 		calibrateMandatory = calibrateForbidden = 0;
diff --git a/src/survive_vive.c b/src/survive_vive.c
index d27b515..3c5994b 100755
--- a/src/survive_vive.c
+++ b/src/survive_vive.c
@@ -1449,6 +1449,17 @@ static void handle_watchman( SurviveObject * w, uint8_t * readdata )
 	}
 }
 
+static inline uint16_t read_buffer16(uint8_t *readdata, int idx) {
+	uint16_t rtn;
+	memcpy(&rtn, readdata + idx, sizeof(uint16_t));
+	return rtn;
+}
+static inline uint32_t read_buffer32(uint8_t *readdata, int idx) {
+	uint32_t rtn;
+	memcpy(&rtn, readdata + idx, sizeof(uint32_t));
+	return rtn;
+}
+
 void survive_data_cb( SurviveUSBInterface * si )
 {
 	int size = si->actual_len;
@@ -1643,25 +1654,24 @@ void survive_data_cb( SurviveUSBInterface * si )
 			//} usb_buttons_raw;
 
 			//usb_buttons_raw *raw = (usb_buttons_raw*) readdata;
-			if (*((uint16_t*)(&(readdata[0x0]))) == 0x100)
-			{
+			if (read_buffer16(readdata, 0) == 0x100) {
 				buttonEvent bEvent;
 				memset(&bEvent, 0, sizeof(bEvent));
 
 				bEvent.pressedButtonsValid = 1;
-				bEvent.pressedButtons = *((uint32_t*)(&(readdata[0x07])));
+				bEvent.pressedButtons = read_buffer32(readdata, 0x7);
 				bEvent.triggerHighResValid = 1;
 				//bEvent.triggerHighRes = raw->triggerHighRes; 
 				//bEvent.triggerHighRes = (raw->pressedButtons & 0xff000000) >> 24; // this seems to provide the same data at 2x the resolution as above
 				//bEvent.triggerHighRes = raw->triggerRaw;
-				
-				bEvent.triggerHighRes = *((uint16_t*)(&(readdata[0x19])));
+
+				bEvent.triggerHighRes = read_buffer16(readdata, 0x19);
 				bEvent.touchpadHorizontalValid = 1;
 				//bEvent.touchpadHorizontal = raw->touchpadHorizontal;
-				bEvent.touchpadHorizontal = *((int16_t*)(&(readdata[0x13])));
+				bEvent.touchpadHorizontal = read_buffer16(readdata, 0x13);
 				bEvent.touchpadVerticalValid = 1;
 				//bEvent.touchpadVertical = raw->touchpadVertical;
-				bEvent.touchpadVertical = *((int16_t*)(&(readdata[0x15])));
+				bEvent.touchpadVertical = read_buffer16(readdata, 0x15);
 
 				//printf("%4.4x\n", bEvent.triggerHighRes);
 				registerButtonEvent(obj, &bEvent);
-- 
cgit v1.2.3