Changeset 3781092 in mainline for uspace/srv/hid/fb/gfx

Timestamp:

2011-09-09T18:22:33Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

40a2af3

Parents:

980671e7 (diff), 5da7199 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

Location:

uspace/srv/hid/fb/gfx

Files:

• font-8x16.c (moved) (moved from uspace/srv/hid/fb/font-8x16.c ) (1 diff)
• font-8x16.h (moved) (moved from uspace/srv/hid/fb/font-8x16.h ) (1 diff)

uspace/srv/hid/fb/gfx/font-8x16.c

@@ -43 +43 @@
  * glyph in the font or returns an index to the question
  * mark glyph if no specific glyph exists.
+ *
  */
 uint16_t fb_font_glyph(const wchar_t ch)

uspace/srv/hid/fb/gfx/font-8x16.h

@@ -36 +36 @@
 #define FONT_8X16_H_
 
+#include <sys/types.h>
+
 #define FONT_GLYPHS     2899
 #define FONT_WIDTH      8
 #define FONT_SCANLINES  16
 
-#include <sys/types.h>
-
-extern uint16_t fb_font_glyph(const wchar_t ch);
+extern uint16_t fb_font_glyph(const wchar_t);
 extern uint8_t fb_font[FONT_GLYPHS][FONT_SCANLINES];