diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-1bit-vert.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-horz.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vert.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-remote-1bit-v.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-remote-2bit-vi.c | 5 | ||||
-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 |
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) | |||
82 | curfont = newfont; | 82 | curfont = newfont; |
83 | } | 83 | } |
84 | 84 | ||
85 | int lcd_getfont(void) | ||
86 | { | ||
87 | return curfont; | ||
88 | } | ||
89 | |||
90 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 85 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
91 | { | 86 | { |
92 | return font_getstringsize(str, w, h, curfont); | 87 | 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) | |||
122 | curfont = newfont; | 122 | curfont = newfont; |
123 | } | 123 | } |
124 | 124 | ||
125 | int lcd_getfont(void) | ||
126 | { | ||
127 | return curfont; | ||
128 | } | ||
129 | |||
130 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 125 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
131 | { | 126 | { |
132 | return font_getstringsize(str, w, h, curfont); | 127 | 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) | |||
124 | curfont = newfont; | 124 | curfont = newfont; |
125 | } | 125 | } |
126 | 126 | ||
127 | int lcd_getfont(void) | ||
128 | { | ||
129 | return curfont; | ||
130 | } | ||
131 | |||
132 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 127 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
133 | { | 128 | { |
134 | return font_getstringsize(str, w, h, curfont); | 129 | 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) | |||
76 | curfont = newfont; | 76 | curfont = newfont; |
77 | } | 77 | } |
78 | 78 | ||
79 | int lcd_remote_getfont(void) | ||
80 | { | ||
81 | return curfont; | ||
82 | } | ||
83 | |||
84 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) | 79 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) |
85 | { | 80 | { |
86 | return font_getstringsize(str, w, h, curfont); | 81 | 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) | |||
126 | curfont = newfont; | 126 | curfont = newfont; |
127 | } | 127 | } |
128 | 128 | ||
129 | int lcd_remote_getfont(void) | ||
130 | { | ||
131 | return curfont; | ||
132 | } | ||
133 | |||
134 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) | 129 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) |
135 | { | 130 | { |
136 | return font_getstringsize(str, w, h, curfont); | 131 | 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 @@ | |||
43 | #define SYS_EVENT_CLS_PLUG 4 | 43 | #define SYS_EVENT_CLS_PLUG 4 |
44 | /* make sure SYS_EVENT_CLS_BITS has enough range */ | 44 | /* make sure SYS_EVENT_CLS_BITS has enough range */ |
45 | 45 | ||
46 | /* MSb->|S|c...c|i...i| */ | 46 | /* Bit 31->|S|c...c|i...i| */ |
47 | #define SYS_EVENT ((long)(~0ul ^ (~0ul >> 1))) | 47 | #define SYS_EVENT ((long)(int)(1 << 31)) |
48 | #define SYS_EVENT_CLS_BITS (3) | 48 | #define SYS_EVENT_CLS_BITS (3) |
49 | #define SYS_EVENT_CLS_SHIFT (sizeof (long)*8-SYS_EVENT_CLS_BITS-1) | 49 | #define SYS_EVENT_CLS_SHIFT (31-SYS_EVENT_CLS_BITS) |
50 | #define SYS_EVENT_CLS_MASK (((1l << SYS_EVENT_CLS_BITS)-1) << SYS_EVENT_SHIFT) | 50 | #define SYS_EVENT_CLS_MASK (((1l << SYS_EVENT_CLS_BITS)-1) << SYS_EVENT_SHIFT) |
51 | #define MAKE_SYS_EVENT(cls, id) (SYS_EVENT | ((long)(cls) << SYS_EVENT_CLS_SHIFT) | (long)(id)) | 51 | #define MAKE_SYS_EVENT(cls, id) (SYS_EVENT | ((long)(cls) << SYS_EVENT_CLS_SHIFT) | (long)(id)) |
52 | /* Macros for extracting codes */ | 52 | /* 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); | |||
142 | extern int lcd_remote_getxmargin(void); | 142 | extern int lcd_remote_getxmargin(void); |
143 | extern int lcd_remote_getymargin(void); | 143 | extern int lcd_remote_getymargin(void); |
144 | extern void lcd_remote_setfont(int font); | 144 | extern void lcd_remote_setfont(int font); |
145 | extern int lcd_remote_getfont(void); | ||
146 | extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h); | 145 | extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h); |
147 | 146 | ||
148 | /* low level drawing function pointer arrays */ | 147 | /* 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); | |||
312 | extern void lcd_set_drawmode(int mode); | 312 | extern void lcd_set_drawmode(int mode); |
313 | extern int lcd_get_drawmode(void); | 313 | extern int lcd_get_drawmode(void); |
314 | extern void lcd_setfont(int font); | 314 | extern void lcd_setfont(int font); |
315 | extern int lcd_getfont(void); | ||
316 | 315 | ||
317 | extern void lcd_puts_style_offset(int x, int y, const unsigned char *str, | 316 | extern void lcd_puts_style_offset(int x, int y, const unsigned char *str, |
318 | int style, int offset); | 317 | int style, int offset); |