Changeset 15d0046 in mainline for uspace/lib/draw/font/pcf.h

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

File:

• uspace/lib/draw/font/pcf.h (moved) (moved from kernel/arch/mips64/include/arch/faddr.h ) (2 diffs)

uspace/lib/draw/font/pcf.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2014 Martin Sucha
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips64
+/** @addtogroup draw
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef KERN_mips64_FADDR_H_
-#define KERN_mips64_FADDR_H_
+#ifndef DRAW_FONT_PBF_H_
+#define DRAW_FONT_PBF_H_
 
-#include <typedefs.h>
+#include "../font.h"
 
-#define FADDR(fptr)  ((uintptr_t) (fptr))
+extern int pcf_font_create(font_t **, char *path, uint16_t points);
 
 #endif