Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / kernel / ao_companion.h

diff --git a/src/kernel/ao_companion.h b/src/kernel/ao_companion.h
index 035325a3ef0e3c0a3cbe129717247af77b055866..bd702fe3664065d0c6e0b1e40788c6a89634a49a 100644 (file)
--- a/src/kernel/ao_companion.h
+++ b/src/kernel/ao_companion.h
@@ -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
@@ -43,11 +44,11 @@ struct ao_companion_setup {
        uint8_t         channels;
 };
 
-extern __pdata uint8_t                         ao_companion_running;
-extern __xdata uint8_t                         ao_companion_mutex;
-extern __xdata struct ao_companion_command     ao_companion_command;
-extern __xdata struct ao_companion_setup       ao_companion_setup;
-extern __xdata uint16_t                                ao_companion_data[AO_COMPANION_MAX_CHANNELS];
+extern uint8_t                         ao_companion_running;
+extern uint8_t                         ao_companion_mutex;
+extern struct ao_companion_command     ao_companion_command;
+extern struct ao_companion_setup       ao_companion_setup;
+extern uint16_t                                ao_companion_data[AO_COMPANION_MAX_CHANNELS];
 
 void
 ao_companion_init(void);