len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up some more red

Browse source 
find_first_set_bit() becomes a small inline on ARMv5+ and checkwps now gets
made with -std=gnu99 (it eats all the GCCOPTS) like the rest of things.

Change-Id: Ie6039b17fec057a3dcb0f453d8fd5efac984df89
This commit is contained in:
Michael Sevakis 2014-08-05 21:19:07 -04:00
parent bb7700928a
commit 29f5385263
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/gui/viewport.h
View file

@ -38,19 +38,21 @@ int viewport_get_nb_lines(const struct viewport *vp);
#define THEME_LISTS (BIT_N(3)) #define THEME_LISTS (BIT_N(3))
#define THEME_ALL (~(0u)) #define THEME_ALL (~(0u))
#ifndef __PCTOOL__ /* These are needed in checkwps */
/*
* Initialize the viewportmanager, which in turns initializes the UI vp and
* statusbar stuff
*/
void viewportmanager_init(void) INIT_ATTR;
void viewport_set_defaults(struct viewport *vp, void viewport_set_defaults(struct viewport *vp,
const enum screen_type screen); const enum screen_type screen);
void viewport_set_fullscreen(struct viewport *vp, void viewport_set_fullscreen(struct viewport *vp,
const enum screen_type screen); const enum screen_type screen);
int get_viewport_default_colour(enum screen_type screen, bool fgcolour); int get_viewport_default_colour(enum screen_type screen, bool fgcolour);
#ifndef __PCTOOL__
/*
* Initialize the viewportmanager, which in turns initializes the UI vp and
* statusbar stuff
*/
void viewportmanager_init(void) INIT_ATTR;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
void viewportmanager_theme_enable(enum screen_type screen, bool enable, void viewportmanager_theme_enable(enum screen_type screen, bool enable,
struct viewport *viewport); struct viewport *viewport);

5
firmware/export/system.h
View file

@ -157,7 +157,12 @@ int get_cpu_boost_counter(void);
((type *)((intptr_t)(memberptr) - OFFSETOF(type, membername))) ((type *)((intptr_t)(memberptr) - OFFSETOF(type, membername)))
/* returns index of first set bit or 32 if no bits are set */ /* returns index of first set bit or 32 if no bits are set */
#if defined(CPU_ARM) && ARM_ARCH >= 5 && !defined(__thumb__)
static inline int find_first_set_bit(uint32_t val)
{ return LIKELY(val) ? __builtin_ctz(val) : 32; }
#else
int find_first_set_bit(uint32_t val); int find_first_set_bit(uint32_t val);
#endif
static inline __attribute__((always_inline)) static inline __attribute__((always_inline))
uint32_t isolate_first_bit(uint32_t val) uint32_t isolate_first_bit(uint32_t val)

2
tools/checkwps/checkwps.make
View file

@ -7,7 +7,7 @@
# $Id$ # $Id$
# #
GCCOPTS=-g -D__PCTOOL__ -DCHECKWPS $(TARGET) GCCOPTS=-std=gnu99 -g -D__PCTOOL__ -DCHECKWPS $(TARGET)
CHECKWPS_SRC = $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES) CHECKWPS_SRC = $(call preprocess, $(TOOLSDIR)/checkwps/SOURCES)
CHECKWPS_OBJ = $(call c2obj,$(CHECKWPS_SRC)) CHECKWPS_OBJ = $(call c2obj,$(CHECKWPS_SRC))