altos: Check for companion init packet validity was busted
authorKeith Packard <keithp@keithp.com>
Fri, 12 Aug 2011 13:29:13 +0000 (06:29 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 14 Aug 2011 01:46:12 +0000 (18:46 -0700)
Was using board_id == ~board_id instead of board_id ==
~board_id_inverse.

Signed-off-by: Keith Packard <keithp@keithp.com>
src/ao_companion.c

index b424dd896078c468e09759311546181647771ac8..f54f5251afb92135065306493ab77c2ba7e8e689 100644 (file)
@@ -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();
        }