From 540faa51bf11dc5ce68d4c5540802d4665fda610 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 8 Jun 2016 22:04:40 +0200 Subject: [PATCH] Use __ALIGNED instead of __DMA which is identical to __DMA without the section on Hours --- radio/src/pulses/pulses_arm.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h index 43f6129c7..06a234e25 100644 --- a/radio/src/pulses/pulses_arm.h +++ b/radio/src/pulses/pulses_arm.h @@ -93,7 +93,6 @@ PACK(struct Dsm2TimerPulsesData { pulse_duration_t * ptr; uint16_t rest; uint8_t index; - uint8_t _alignment; }); #endif @@ -118,12 +117,12 @@ union ModulePulsesData { #endif PpmPulsesData ppm; CrossfirePulsesData crossfire; -}; +} __ALIGNED; -/* The __DMA keyword is required to align the struct inside the modulePulsesData below, - * which is also defined to be __DMA aligned. +/* The __ALIGNED keyword is required to align the struct inside the modulePulsesData below, + * which is also defined to be __DMA (which includes __ALIGNED) aligned. * Arrays in C/C++ are always defined to be *contiguously*. The first byte of the second element is therefore always - * sizeof(ModulePulsesData). __DMA is required for sizeof(ModulePulsesData) to be a multiple of the alignment. + * sizeof(ModulePulsesData). __ALIGNED is required for sizeof(ModulePulsesData) to be a multiple of the alignment. */ extern ModulePulsesData modulePulsesData[NUM_MODULES];