forked from len0rd/rockbox
Fix warnings and errors. Remove some added stuff that wasn't needed afterall.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14036 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
58fc279d26
commit
5832b59c85
9 changed files with 4 additions and 30 deletions
|
@ -26,6 +26,7 @@
|
|||
#include "system.h"
|
||||
#include "lcd.h"
|
||||
#include "lcd-remote.h"
|
||||
#include "scroll_engine.h"
|
||||
#include "kernel.h"
|
||||
#include "thread.h"
|
||||
#include "ata.h"
|
||||
|
|
|
@ -82,11 +82,6 @@ void lcd_setfont(int newfont)
|
|||
curfont = newfont;
|
||||
}
|
||||
|
||||
int lcd_getfont(void)
|
||||
{
|
||||
return curfont;
|
||||
}
|
||||
|
||||
int lcd_getstringsize(const unsigned char *str, int *w, int *h)
|
||||
{
|
||||
return font_getstringsize(str, w, h, curfont);
|
||||
|
|
|
@ -122,11 +122,6 @@ void lcd_setfont(int newfont)
|
|||
curfont = newfont;
|
||||
}
|
||||
|
||||
int lcd_getfont(void)
|
||||
{
|
||||
return curfont;
|
||||
}
|
||||
|
||||
int lcd_getstringsize(const unsigned char *str, int *w, int *h)
|
||||
{
|
||||
return font_getstringsize(str, w, h, curfont);
|
||||
|
|
|
@ -124,11 +124,6 @@ void lcd_setfont(int newfont)
|
|||
curfont = newfont;
|
||||
}
|
||||
|
||||
int lcd_getfont(void)
|
||||
{
|
||||
return curfont;
|
||||
}
|
||||
|
||||
int lcd_getstringsize(const unsigned char *str, int *w, int *h)
|
||||
{
|
||||
return font_getstringsize(str, w, h, curfont);
|
||||
|
|
|
@ -76,11 +76,6 @@ void lcd_remote_setfont(int newfont)
|
|||
curfont = newfont;
|
||||
}
|
||||
|
||||
int lcd_remote_getfont(void)
|
||||
{
|
||||
return curfont;
|
||||
}
|
||||
|
||||
int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h)
|
||||
{
|
||||
return font_getstringsize(str, w, h, curfont);
|
||||
|
|
|
@ -126,11 +126,6 @@ void lcd_remote_setfont(int newfont)
|
|||
curfont = newfont;
|
||||
}
|
||||
|
||||
int lcd_remote_getfont(void)
|
||||
{
|
||||
return curfont;
|
||||
}
|
||||
|
||||
int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h)
|
||||
{
|
||||
return font_getstringsize(str, w, h, curfont);
|
||||
|
|
|
@ -43,10 +43,10 @@
|
|||
#define SYS_EVENT_CLS_PLUG 4
|
||||
/* make sure SYS_EVENT_CLS_BITS has enough range */
|
||||
|
||||
/* MSb->|S|c...c|i...i| */
|
||||
#define SYS_EVENT ((long)(~0ul ^ (~0ul >> 1)))
|
||||
/* Bit 31->|S|c...c|i...i| */
|
||||
#define SYS_EVENT ((long)(int)(1 << 31))
|
||||
#define SYS_EVENT_CLS_BITS (3)
|
||||
#define SYS_EVENT_CLS_SHIFT (sizeof (long)*8-SYS_EVENT_CLS_BITS-1)
|
||||
#define SYS_EVENT_CLS_SHIFT (31-SYS_EVENT_CLS_BITS)
|
||||
#define SYS_EVENT_CLS_MASK (((1l << SYS_EVENT_CLS_BITS)-1) << SYS_EVENT_SHIFT)
|
||||
#define MAKE_SYS_EVENT(cls, id) (SYS_EVENT | ((long)(cls) << SYS_EVENT_CLS_SHIFT) | (long)(id))
|
||||
/* Macros for extracting codes */
|
||||
|
|
|
@ -142,7 +142,6 @@ extern void lcd_remote_setmargins(int xmargin, int ymargin);
|
|||
extern int lcd_remote_getxmargin(void);
|
||||
extern int lcd_remote_getymargin(void);
|
||||
extern void lcd_remote_setfont(int font);
|
||||
extern int lcd_remote_getfont(void);
|
||||
extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h);
|
||||
|
||||
/* low level drawing function pointer arrays */
|
||||
|
|
|
@ -312,7 +312,6 @@ extern void lcd_set_flip(bool yesno);
|
|||
extern void lcd_set_drawmode(int mode);
|
||||
extern int lcd_get_drawmode(void);
|
||||
extern void lcd_setfont(int font);
|
||||
extern int lcd_getfont(void);
|
||||
|
||||
extern void lcd_puts_style_offset(int x, int y, const unsigned char *str,
|
||||
int style, int offset);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue