From: Keith Packard <keithp@keithp.com>
Date: Fri, 12 Aug 2011 13:29:13 +0000 (-0700)
Subject: altos: Check for companion init packet validity was busted
X-Git-Tag: 0.9.6.0~14
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=18369c58e62bc64b969a7cf8be3103aa33c6d4aa

altos: Check for companion init packet validity was busted

Was using board_id == ~board_id instead of board_id ==
~board_id_inverse.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/ao_companion.c b/src/ao_companion.c
index b424dd89..f54f5251 100644
--- a/src/ao_companion.c
+++ b/src/ao_companion.c
@@ -53,9 +53,8 @@ ao_companion_get_setup(void)
 	ao_companion_send_command(AO_COMPANION_SETUP);
 	ao_spi_recv(&ao_companion_setup, sizeof (ao_companion_setup));
 	COMPANION_DESELECT();
-	if (ao_companion_setup.board_id != ~ao_companion_setup.board_id)
-		return 0;
-	return 1;
+	return (ao_companion_setup.board_id ==
+		~ao_companion_setup.board_id_inverse);
 }
 
 static void
@@ -72,10 +71,8 @@ ao_companion_get_data(void)
 void
 ao_companion(void)
 {
-	if (!ao_companion_get_setup())
-		ao_exit();
-	ao_companion_running = 1;
-	for (;;) {
+	ao_companion_running = ao_companion_get_setup();
+	while (ao_companion_running) {
 		ao_delay(ao_companion_setup.update_period);
 		ao_companion_get_data();
 	}