uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge pull request #33 from inmarket/master

Browse source 
Compile error fix for GDISP_NEED_MULTITHREAD
This commit is contained in:
Tectu 2012-08-06 15:06:56 -07:00
commit f21d4c9c9a
2 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
halext/include/gdisp.h
View file

@ -200,7 +200,7 @@ extern "C" {
void gdispDrawPixel(coord_t x, coord_t y, color_t color); void gdispDrawPixel(coord_t x, coord_t y, color_t color);
void gdispDrawLine(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color); void gdispDrawLine(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color);
void gdispFillArea(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color); void gdispFillArea(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);
void gdispBlitArea(coord_t x, coord_t y, coord_t cx, coord_t cy, const pixel_t *buffer); void gdispBlitArea(coord_t x, coord_t y, coord_t cx, coord_t cy, pixel_t *buffer);
/* Circle Functions */ /* Circle Functions */
#if GDISP_NEED_CIRCLE #if GDISP_NEED_CIRCLE

21
halext/src/gdisp.c
View file

@ -90,24 +90,6 @@
} }
#endif #endif
#if GDISP_NEED_MULTITHREAD || defined(__DOXYGEN__)
/**
* @brief Set the orientation of the display.
* @pre The GDISP unit must be in powerOn or powerSleep mode.
* @note Depending on the hardware implementation this function may clear
* the display when changing its orientation.
*
* @param[in] newOrientation The new orientation to use
*
* @api
*/
void gdispSetOrientation(gdisp_orientation_t newOrientation) {
MUTEX_ENTER
gdisp_lld_setorientation(newOrientation);
MUTEX_EXIT
}
#endif
#if GDISP_NEED_MULTITHREAD || defined(__DOXYGEN__) #if GDISP_NEED_MULTITHREAD || defined(__DOXYGEN__)
/** /**
* @brief Clear the display to the specified color. * @brief Clear the display to the specified color.
@ -688,13 +670,12 @@
*/ */
coord_t gdispGetStringWidth(const char* str, font_t font) { coord_t gdispGetStringWidth(const char* str, font_t font) {
/* No mutex required as we only read static data */ /* No mutex required as we only read static data */
coord_t w, h, p, x; coord_t w, p, x;
char c; char c;
int first; int first;
first = 1; first = 1;
x = 0; x = 0;
h = font->height * font->yscale;
p = font->charPadding * font->xscale; p = font->charPadding * font->xscale;
while(*str) { while(*str) {
/* Get the next printable character */ /* Get the next printable character */