Changeset 8e7c9fe in mainline for uspace/lib/draw/font/bitmap_backend.h

Timestamp:

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

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, 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/font/bitmap_backend.h (moved) (moved from uspace/lib/c/include/sys/mman.h ) (2 diffs)

uspace/lib/draw/font/bitmap_backend.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2012 Petr Koupy
+ * Copyright (c) 2014 Martin Sucha
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup draw
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef LIBC_MMAN_H_
-#define LIBC_MMAN_H_
+#ifndef DRAW_FONT_BITMAP_BACKEND_H_
+#define DRAW_FONT_BITMAP_BACKEND_H_
 
-#include <as.h>
 #include <sys/types.h>
 
-#define MAP_FAILED  AS_MAP_FAILED
+#include "../font.h"
+#include "../surface.h"
+#include "../source.h"
 
-#define MAP_SHARED     (1 << 0)
-#define MAP_PRIVATE    (1 << 1)
-#define MAP_FIXED      (1 << 2)
-#define MAP_ANONYMOUS  (1 << 3)
+typedef struct {
+        int (*resolve_glyph)(void *, const wchar_t, glyph_id_t *);
+        int (*load_glyph_surface)(void *, glyph_id_t, surface_t **);
+        int (*load_glyph_metrics)(void *, glyph_id_t, glyph_metrics_t *);
+        void (*release)(void *);
+} bitmap_font_decoder_t;
 
-#define PROTO_READ   AS_AREA_READ
-#define PROTO_WRITE  AS_AREA_WRITE
-#define PROTO_EXEC   AS_AREA_EXEC
-
-extern void *mmap(void *start, size_t length, int prot, int flags, int fd,
-    aoff64_t offset);
-extern int munmap(void *start, size_t length);
+extern int bitmap_font_create(bitmap_font_decoder_t *, void *, uint32_t,
+    font_metrics_t, uint16_t, font_t **);
 
 #endif