devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix warnings and errors. Remove some added stuff that wasn't needed afterall.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14036 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-07-28 08:45:57 +00:00
parent 58fc279d26
commit 5832b59c85
9 changed files with 4 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bootloader/main.c
View file

@ -26,6 +26,7 @@
#include "system.h" #include "system.h"
#include "lcd.h" #include "lcd.h"
#include "lcd-remote.h" #include "lcd-remote.h"
#include "scroll_engine.h"
#include "kernel.h" #include "kernel.h"
#include "thread.h" #include "thread.h"
#include "ata.h" #include "ata.h"

5
firmware/drivers/lcd-1bit-vert.c
View file

@ -82,11 +82,6 @@ void lcd_setfont(int newfont)
curfont = newfont; curfont = newfont;
} }
int lcd_getfont(void)
{
return curfont;
}
int lcd_getstringsize(const unsigned char *str, int *w, int *h) int lcd_getstringsize(const unsigned char *str, int *w, int *h)
{ {
return font_getstringsize(str, w, h, curfont); return font_getstringsize(str, w, h, curfont);

5
firmware/drivers/lcd-2bit-horz.c
View file

@ -122,11 +122,6 @@ void lcd_setfont(int newfont)
curfont = newfont; curfont = newfont;
} }
int lcd_getfont(void)
{
return curfont;
}
int lcd_getstringsize(const unsigned char *str, int *w, int *h) int lcd_getstringsize(const unsigned char *str, int *w, int *h)
{ {
return font_getstringsize(str, w, h, curfont); return font_getstringsize(str, w, h, curfont);

5
firmware/drivers/lcd-2bit-vert.c
View file

@ -124,11 +124,6 @@ void lcd_setfont(int newfont)
curfont = newfont; curfont = newfont;
} }
int lcd_getfont(void)
{
return curfont;
}
int lcd_getstringsize(const unsigned char *str, int *w, int *h) int lcd_getstringsize(const unsigned char *str, int *w, int *h)
{ {
return font_getstringsize(str, w, h, curfont); return font_getstringsize(str, w, h, curfont);

5
firmware/drivers/lcd-remote-1bit-v.c
View file

@ -76,11 +76,6 @@ void lcd_remote_setfont(int newfont)
curfont = newfont; curfont = newfont;
} }
int lcd_remote_getfont(void)
{
return curfont;
}
int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h)
{ {
return font_getstringsize(str, w, h, curfont); return font_getstringsize(str, w, h, curfont);

5
firmware/drivers/lcd-remote-2bit-vi.c
View file

@ -126,11 +126,6 @@ void lcd_remote_setfont(int newfont)
curfont = newfont; curfont = newfont;
} }
int lcd_remote_getfont(void)
{
return curfont;
}
int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h)
{ {
return font_getstringsize(str, w, h, curfont); return font_getstringsize(str, w, h, curfont);

6
firmware/export/kernel.h
View file

@ -43,10 +43,10 @@
#define SYS_EVENT_CLS_PLUG 4 #define SYS_EVENT_CLS_PLUG 4
/* make sure SYS_EVENT_CLS_BITS has enough range */ /* make sure SYS_EVENT_CLS_BITS has enough range */
/* MSb->|S|c...c|i...i| */ /* Bit 31->|S|c...c|i...i| */
#define SYS_EVENT ((long)(~0ul ^ (~0ul >> 1))) #define SYS_EVENT ((long)(int)(1 << 31))
#define SYS_EVENT_CLS_BITS (3) #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 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)) #define MAKE_SYS_EVENT(cls, id) (SYS_EVENT | ((long)(cls) << SYS_EVENT_CLS_SHIFT) | (long)(id))
/* Macros for extracting codes */ /* Macros for extracting codes */

1
firmware/export/lcd-remote.h
View file

@ -142,7 +142,6 @@ extern void lcd_remote_setmargins(int xmargin, int ymargin);
extern int lcd_remote_getxmargin(void); extern int lcd_remote_getxmargin(void);
extern int lcd_remote_getymargin(void); extern int lcd_remote_getymargin(void);
extern void lcd_remote_setfont(int font); 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); extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h);
/* low level drawing function pointer arrays */ /* low level drawing function pointer arrays */

1
firmware/export/lcd.h
View file

@ -312,7 +312,6 @@ extern void lcd_set_flip(bool yesno);
extern void lcd_set_drawmode(int mode); extern void lcd_set_drawmode(int mode);
extern int lcd_get_drawmode(void); extern int lcd_get_drawmode(void);
extern void lcd_setfont(int font); 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, extern void lcd_puts_style_offset(int x, int y, const unsigned char *str,
int style, int offset); int style, int offset);