Switch from GPLv2 to GPLv2+

[fw/altos] / src / cc1111 / ao_button.c

diff --git a/src/cc1111/ao_button.c b/src/cc1111/ao_button.c
index 69f3475fe660d43125073a40b19118f3f545c07d..0496a32f270454b95935017896c318eec98482bc 100644 (file)
--- a/src/cc1111/ao_button.c
+++ b/src/cc1111/ao_button.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -72,12 +73,12 @@ ao_button_mask(uint8_t reg)
 }
 
 char
-ao_button_get(void) __critical
+ao_button_get(uint16_t timeout) __critical
 {
        char    b;
 
        while (ao_fifo_empty(ao_button_fifo))
-               if (ao_sleep(&ao_button_fifo))
+               if (ao_sleep_for(&ao_button_fifo, timeout))
                        return 0;
        ao_fifo_remove(ao_button_fifo, b);
        return b;