Changeset 8e7c9fe in mainline for uspace/lib/draw/gfx/font-8x16.c

Timestamp:

2014-09-12T03:45:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/draw/gfx/font-8x16.c (modified) (2 diffs)

uspace/lib/draw/gfx/font-8x16.c

@@ -44 +44 @@
  * mark glyph if no specific glyph exists.
  *
+ * If found is not null, indicate whether the glyph was found or not.
+ *
  */
-uint16_t fb_font_glyph(const wchar_t ch)
+uint16_t fb_font_glyph(const wchar_t ch, bool *found)
 {
+        if (found)
+                *found = true;
+        
         if (ch == 0x0000)
                 return 0;
@@ -361 +366 @@
         if (ch == 0xfeff)
                 return 2896;
+        
+        if (found)
+                *found = false;
         
         return 2898;