michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/display: mb_display: Fix struct member alignment

Browse source 
The alignment went off because of the move to use internal fixed-size
integer types (instead of standard int types).

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2017-08-09 18:09:03 +03:00 • committed by Anas Nashif
commit 7a7c8a57f5
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/display/mb_display.c
View file

@ -38,21 +38,21 @@ struct mb_display {
struct k_timer timer; /* Rendering timer */ struct k_timer timer; /* Rendering timer */
u8_t img_count; /* Image count */ u8_t img_count; /* Image count */
u8_t cur_img; /* Current image or character to show */ u8_t cur_img; /* Current image or character to show */
u8_t scroll:3, /* Scroll shift */ u8_t scroll:3, /* Scroll shift */
first:1, /* First frame of a scroll sequence */ first:1, /* First frame of a scroll sequence */
loop:1, /* Loop to beginning */ loop:1, /* Loop to beginning */
text:1, /* We're showing a string (not image) */ text:1, /* We're showing a string (not image) */
img_sep:1; /* One column image separation */ img_sep:1; /* One column image separation */
/* The following variables track the currently shown image */ /* The following variables track the currently shown image */
u8_t cur; /* Currently rendered row */ u8_t cur; /* Currently rendered row */
u32_t row[3]; /* Content (columns) for each row */ u32_t row[3]; /* Content (columns) for each row */
s64_t expiry; /* When to stop showing current image */ s64_t expiry; /* When to stop showing current image */
s32_t duration; /* Duration for each shown image */ s32_t duration; /* Duration for each shown image */
union { union {
const struct mb_image *img; /* Array of images to show */ const struct mb_image *img; /* Array of images to show */
@ -65,7 +65,7 @@ struct mb_display {
struct x_y { struct x_y {
u8_t x:4, u8_t x:4,
y:4; y:4;
}; };
/* Where the X,Y coordinates of each row/col are found. /* Where the X,Y coordinates of each row/col are found.
@ -79,7 +79,7 @@ static const struct x_y map[DISPLAY_ROWS][DISPLAY_COLS] = {
/* Mask of all the column bits */ /* Mask of all the column bits */
static const u32_t col_mask = (((~0UL) << LED_COL1_GPIO_PIN) & static const u32_t col_mask = (((~0UL) << LED_COL1_GPIO_PIN) &
((~0UL) >> (31 - LED_COL9_GPIO_PIN))); ((~0UL) >> (31 - LED_COL9_GPIO_PIN)));
static inline const struct mb_image *get_font(char ch) static inline const struct mb_image *get_font(char ch)
{ {