Fixes to make the changes from upstream build.

Signed-off-by: Michael Keller <[email protected]>

Author: mikeller

src/mares_iconhd.c

@@ -358,7 +358,7 @@ mares_iconhd_packet_variable (mares_iconhd_device_t *device,
 	}
 
 	// Verify the trailer byte.
-	if (packet[length - 1] != EOF) {
+	if (packet[length - 1] != END) {
 		ERROR (abstract->context, "Unexpected packet trailer byte (%02x).", packet[length - 1]);
 		return DC_STATUS_PROTOCOL;
 	}

src/shearwater_common.c

@@ -749,7 +749,7 @@ dc_status_t shearwater_common_get_model(shearwater_common_device_t *device, unsi
 		*model = PEREGRINE;
 		break;
 	case 0x1712:
-		model = PEREGRINE_TX;
+		*model = PEREGRINE_TX;
 		break;
 	case 0xC0E0:
 		*model = TERN;