3 files changed, 3 insertions, 5 deletions

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);