diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2007-07-28 08:45:57 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2007-07-28 08:45:57 +0000 |
| commit | 5832b59c85bcde67a2b0f5dea6fdac08d8c78cc3 (patch) | |
| tree | b7fef388a302887d13d76fb31ff83064a313e394 /firmware/export | |
| parent | 58fc279d2674b5d56fed6772f82cdf1e431088f1 (diff) | |
| download | rockbox-5832b59c85bcde67a2b0f5dea6fdac08d8c78cc3.zip rockbox-5832b59c85bcde67a2b0f5dea6fdac08d8c78cc3.tar.gz rockbox-5832b59c85bcde67a2b0f5dea6fdac08d8c78cc3.tar.bz2 rockbox-5832b59c85bcde67a2b0f5dea6fdac08d8c78cc3.tar.xz | |
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
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/kernel.h | 6 | ||||
| -rw-r--r-- | firmware/export/lcd-remote.h | 1 | ||||
| -rw-r--r-- | firmware/export/lcd.h | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h index cb850d7..b40d602 100644 --- a/firmware/export/kernel.h +++ b/firmware/export/kernel.h @@ -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 */ diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 329edd5..6f3602c 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h @@ -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 */ diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 608f9ff..25ff934 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -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); |