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

8 files changed, 3 insertions, 30 deletions

diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c
index ac50eff95c..1720a5ff5c 100644
--- a/firmware/drivers/lcd-1bit-vert.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -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);
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
index 48fd22f703..70d6b439ce 100644
--- a/firmware/drivers/lcd-2bit-horz.c
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -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);
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c
index 751d2a2ad9..6be42afe86 100644
--- a/firmware/drivers/lcd-2bit-vert.c
+++ b/firmware/drivers/lcd-2bit-vert.c
@@ -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);
diff --git a/firmware/drivers/lcd-remote-1bit-v.c b/firmware/drivers/lcd-remote-1bit-v.c
index 1ddd8e5071..480df73c2d 100644
--- a/firmware/drivers/lcd-remote-1bit-v.c
+++ b/firmware/drivers/lcd-remote-1bit-v.c
@@ -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);
diff --git a/firmware/drivers/lcd-remote-2bit-vi.c b/firmware/drivers/lcd-remote-2bit-vi.c
index 21e3ee4aa0..51189b0fa9 100644
--- a/firmware/drivers/lcd-remote-2bit-vi.c
+++ b/firmware/drivers/lcd-remote-2bit-vi.c
@@ -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);
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index cb850d7af2..b40d602d9f 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 329edd5f27..6f3602c5ab 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 608f9ffa0f..25ff934ea7 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);