andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #434. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6517 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2013-11-30 09:14:06 +00:00
parent ff8d0f326c
commit c86a5d8887
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/hal/platforms/STM32/OTGv1/usb_lld.c
View File

@ -246,7 +246,7 @@ static uint8_t *otg_do_push(volatile uint32_t *fifop, uint8_t *buf, size_t n) {
while (n > 0) { while (n > 0) {
/* Note, this line relies on the Cortex-M3/M4 ability to perform /* Note, this line relies on the Cortex-M3/M4 ability to perform
unaligned word accesses and on the LSB-first memory organization.*/ unaligned word accesses and on the LSB-first memory organization.*/
*fifop = *((uint32_t *)buf); *fifop = *((PACKED_VAR uint32_t *)buf);
buf += 4; buf += 4;
n--; n--;
} }
@ -345,7 +345,7 @@ static uint8_t *otg_do_pop(volatile uint32_t *fifop, uint8_t *buf, size_t n) {
uint32_t w = *fifop; uint32_t w = *fifop;
/* Note, this line relies on the Cortex-M3/M4 ability to perform /* Note, this line relies on the Cortex-M3/M4 ability to perform
unaligned word accesses and on the LSB-first memory organization.*/ unaligned word accesses and on the LSB-first memory organization.*/
*((uint32_t *)buf) = w; *((PACKED_VAR uint32_t *)buf) = w;
buf += 4; buf += 4;
n--; n--;
} }
@ -374,7 +374,7 @@ static void otg_fifo_read_to_buffer(volatile uint32_t *fifop,
if (max) { if (max) {
/* Note, this line relies on the Cortex-M3/M4 ability to perform /* Note, this line relies on the Cortex-M3/M4 ability to perform
unaligned word accesses and on the LSB-first memory organization.*/ unaligned word accesses and on the LSB-first memory organization.*/
*((uint32_t *)buf) = w; *((PACKED_VAR uint32_t *)buf) = w;
buf += 4; buf += 4;
max--; max--;
} }

5
os/ports/GCC/ARMCMx/chtypes.h
View File

@ -75,6 +75,11 @@ typedef int32_t cnt_t; /**< Resources counter. */
*/ */
#define PACK_STRUCT_END #define PACK_STRUCT_END
/**
* @brief Packed variable specifier.
*/
#define PACKED_VAR __attribute__((packed))
#endif /* _CHTYPES_H_ */ #endif /* _CHTYPES_H_ */
/** @} */ /** @} */

5
os/ports/IAR/ARMCMx/chtypes.h
View File

@ -74,6 +74,11 @@ typedef int32_t cnt_t; /**< Resources counter. */
*/ */
#define PACK_STRUCT_END #define PACK_STRUCT_END
/**
* @brief Packed variable specifier.
*/
#define PACKED_VAR __packed
#endif /* _CHTYPES_H_ */ #endif /* _CHTYPES_H_ */
/** @} */ /** @} */

5
os/ports/RVCT/ARMCMx/chtypes.h
View File

@ -74,6 +74,11 @@ typedef int32_t cnt_t; /**< Resources counter. */
*/ */
#define PACK_STRUCT_END #define PACK_STRUCT_END
/**
* @brief Packed variable specifier.
*/
#define PACKED_VAR __packed
#endif /* _CHTYPES_H_ */ #endif /* _CHTYPES_H_ */
/** @} */ /** @} */

1
readme.txt
View File

@ -100,6 +100,7 @@
- FIX: Fixed timing issue in the STM32 OTGv1 USB driver (bug #436)(backported - FIX: Fixed timing issue in the STM32 OTGv1 USB driver (bug #436)(backported
to 2.6.2). to 2.6.2).
- FIX: Fixed STM32L1 remove reset flag (bug #435)(backported to 2.6.2). - FIX: Fixed STM32L1 remove reset flag (bug #435)(backported to 2.6.2).
- FIX: Fixed unaligned data access in USB LLD (bug #434)(backported to 2.6.2).
- FIX: Fixed add RTC to STM32L1 (bug #433)(backported to 2.6.2). - FIX: Fixed add RTC to STM32L1 (bug #433)(backported to 2.6.2).
- FIX: Fixed support 10-bit addresses in STM32 I2C driver (bug #432) - FIX: Fixed support 10-bit addresses in STM32 I2C driver (bug #432)
(backported to 2.6.2). (backported to 2.6.2).