Switch from GPLv2 to GPLv2+

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

diff --git a/src/cc1111/ao_aes.c b/src/cc1111/ao_aes.c
index 0e32abf61cc33fcc6182f0770465d140baa9c9a1..e845a928ad0deac3de2b7bf39d326ae0628f6ee0 100644 (file)
--- a/src/cc1111/ao_aes.c
+++ b/src/cc1111/ao_aes.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
@@ -135,12 +136,12 @@ ao_aes_run(__xdata uint8_t *in,
 void
 ao_aes_init(void)
 {
-       ao_aes_dma_in = ao_dma_alloc(&ao_aes_dma_in_done);
 #if DMA_SHARE_AES_RADIO
-       ao_aes_dma_out = ao_radio_dma;
+       ao_aes_dma_in = ao_radio_dma;
 #else
-       ao_aes_dma_out = ao_dma_alloc(&ao_aes_dma_out_done);
+       ao_aes_dma_in = ao_dma_alloc(&ao_aes_dma_in_done);
 #endif
+       ao_aes_dma_out = ao_dma_alloc(&ao_aes_dma_out_done);
        S0CON = 0;
        ENCIE = 1;
 }