X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcc1111%2Fao_dma.c;h=1826651897cc6466d152d3a867cdd21aec13c2fd;hb=d318b5cfc1a0312697739576d35cc1a190d88849;hp=ca33facb5e1807a85edd09f1f134cc627cf7b6de;hpb=0a705b62829d492e3a48c81077907cee61afb860;p=fw%2Faltos diff --git a/src/cc1111/ao_dma.c b/src/cc1111/ao_dma.c index ca33facb..18266518 100644 --- a/src/cc1111/ao_dma.c +++ b/src/cc1111/ao_dma.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 @@ -75,7 +76,7 @@ ao_dma_set_transfer(uint8_t id, ao_dma_config[id].cfg1 = cfg1 | DMA_CFG1_IRQMASK; } -#define nop() _asm nop _endasm; +#define nop() __asm nop __endasm; void ao_dma_start(uint8_t id)