Changeset 132ab5d1 in mainline for kernel/generic/src/lib/str_error.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/lib/str_error.c (moved) (moved from uspace/srv/hid/output/port/kchar.c ) (2 diffs)

kernel/generic/src/lib/str_error.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2010 Martin Decky
+ * Copyright (c) 2017 CZ.NIC, z.s.p.o.
  * All rights reserved.
  *
@@ -28 +28 @@
  */
 
-/** @file
+#include <errno.h>
+#include <str.h>
+
+/* The arrays below are automatically generated from the same file that
+ * errno.h constants are generated from. Triple-include of the same list
+ * with redefinitions of __errno() macro are used to ensure that the
+ * information cannot get out of synch. This is inpired by musl libc.
  */
 
-#include <stdint.h>
-#include <errno.h>
-#include <str.h>
-#include <sysinfo.h>
-#include <ddi.h>
-#include <align.h>
-#include <as.h>
-#include "../ctl/serial.h"
-#include "kchar.h"
+#undef __errno_entry
+#define __errno_entry(name, num, desc) name,
 
-typedef struct {
-        uint8_t *addr;
-} kchar_t;
+static const int err_num[] = {
+#include <abi/errno.in>
+};
 
-static kchar_t kchar;
+#undef __errno_entry
+#define __errno_entry(name, num, desc) #name,
 
-static void kchar_putchar(wchar_t ch)
+static const char* err_name[] = {
+#include <abi/errno.in>
+};
+
+#undef __errno_entry
+#define __errno_entry(name, num, desc) "[" #name "]" desc,
+
+static const char* err_desc[] = {
+#include <abi/errno.in>
+};
+
+/* Returns index corresponding to the given errno, or -1 if not found. */
+static int find_errno(errno_t e)
 {
-        if (ascii_check(ch))
-                *kchar.addr = ch;
-        else
-                *kchar.addr = '?';
+        /* Just a dumb linear search.
+         * There too few entries to warrant anything smarter.
+         */
+
+        int len = sizeof(err_num) / sizeof(errno_t);
+
+        for (int i = 0; i < len; i++) {
+                if (err_num[i] == e) {
+                        return i;
+                }
+        }
+
+        return -1;
 }
 
-static void kchar_control_puts(const char *str)
+const char *str_error_name(errno_t e)
 {
-        while (*str)
-                *kchar.addr = *(str++);
+        int i = find_errno(e);
+
+        if (i >= 0) {
+                return err_name[i];
+        }
+
+        return "(unknown)";
 }
 
-int kchar_init(void)
+const char *str_error(errno_t e)
 {
-        sysarg_t present;
-        int rc = sysinfo_get_value("fb", &present);
-        if (rc != EOK)
-                present = false;
-        
-        if (!present)
-                return ENOENT;
-        
-        sysarg_t kind;
-        rc = sysinfo_get_value("fb.kind", &kind);
-        if (rc != EOK)
-                kind = (sysarg_t) -1;
-        
-        if (kind != 3)
-                return EINVAL;
-        
-        sysarg_t paddr;
-        rc = sysinfo_get_value("fb.address.physical", &paddr);
-        if (rc != EOK)
-                return rc;
-        
-        kchar.addr = AS_AREA_ANY;
-        
-        rc = physmem_map(paddr,
-            ALIGN_UP(1, PAGE_SIZE) >> PAGE_WIDTH,
-            AS_AREA_READ | AS_AREA_WRITE, (void *) &kchar.addr);
-        if (rc != EOK)
-                return rc;
-        
-        return serial_init(kchar_putchar, kchar_control_puts);
+        int i = find_errno(e);
+
+        if (i >= 0) {
+                return err_desc[i];
+        }
+
+        return "Unknown error code";
 }
 
-/** @}
- */