Changeset eec616b in mainline for kernel/generic/include

Timestamp:

2009-03-24T14:43:25Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8f29e336

Parents:

74c8da2c

Message:

Unicode aware printf and family functions
(this breaks some things, but will be fixed soon)

Location:

kernel/generic/include

Files:

• console/chardev.h (modified) (1 diff)
• console/console.h (modified) (1 diff)
• print.h (modified) (2 diffs)
• printf/printf_core.h (modified) (2 diffs)
• putchar.h (modified) (2 diffs)

kernel/generic/include/console/chardev.h

@@ -72 +72 @@
 typedef struct {
         /** Write character to output. */
-        void (* write)(struct outdev *, char c, bool silent);
+        void (* write)(struct outdev *, wchar_t c, bool silent);
 } outdev_operations_t;
 

kernel/generic/include/console/console.h

@@ -53 +53 @@
 extern uint8_t _getc(indev_t *indev);
 extern count_t gets(indev_t *indev, char *buf, size_t buflen);
-extern void putchar(char c);
 extern unative_t sys_klog(int fd, const void * buf, size_t count);
 

kernel/generic/include/print.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -47 +47 @@
 extern int puts(const char *s);
 extern int printf(const char *fmt, ...);
-extern int sprintf(char *str, const char *fmt, ...);
 extern int snprintf(char *str, size_t size, const char *fmt, ...);
 
 extern int vprintf(const char *fmt, va_list ap);
-extern int vsprintf(char *str, const char *fmt, va_list ap);
 extern int vsnprintf(char *str, size_t size, const char *fmt, va_list ap);
 

kernel/generic/include/printf/printf_core.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_PRINTF_CORE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/arg.h>
 
 /** Structure for specifying output methods for different printf clones. */
-struct printf_spec {
-        /* Output function, returns count of printed characters or EOF */
-        int (*write)(void *, size_t, void *);
-        /* Support data - output stream specification, its state, locks,... */
+typedef struct {
+        /* UTF-8 output function, returns number of printed UTF-8 characters or EOF */
+        int (*write_utf8)(const char *, size_t, void *);
+        
+        /* UTF-32 output function, returns number of printed UTF-32 characters or EOF */
+        int (*write_utf32)(const wchar_t *, size_t, void *);
+        
+        /* User data - output stream specification, state, locks, etc. */
         void *data;
+} printf_spec_t;
 
-};
-
-int printf_core(const char *fmt, struct printf_spec *ps, va_list ap);
+int printf_core(const char *fmt, printf_spec_t *ps, va_list ap);
 
 #endif

kernel/generic/include/putchar.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_PUTCHAR_H_
 
-extern void putchar(const char ch);
+extern void putchar(const wchar_t ch);
 
 #endif