Changeset 357b5f5 in mainline for kernel/generic/src/console/console.c

Timestamp:

2011-01-23T20:09:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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:

• kernel/generic/src/console/console.c (modified) (5 diffs)

kernel/generic/src/console/console.c

@@ -162 +162 @@
         ddi_parea_register(&klog_parea);
         
-        sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
+        sysinfo_set_item_val("klog.faddr", NULL, (sysarg_t) faddr);
         sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
         
@@ -193 +193 @@
 
 /** Tell kernel to get keyboard/console access again */
-unative_t sys_debug_enable_console(void)
+sysarg_t sys_debug_enable_console(void)
 {
 #ifdef CONFIG_KCONSOLE
@@ -204 +204 @@
 
 /** Tell kernel to relinquish keyboard/console access */
-unative_t sys_debug_disable_console(void)
+sysarg_t sys_debug_disable_console(void)
 {
         release_console();
@@ -333 +333 @@
  *
  */
-unative_t sys_klog(int fd, const void *buf, size_t size)
+sysarg_t sys_klog(int fd, const void *buf, size_t size)
 {
         char *data;
@@ -339 +339 @@
         
         if (size > PAGE_SIZE)
-                return (unative_t) ELIMIT;
+                return (sysarg_t) ELIMIT;
         
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
-                        return (unative_t) ENOMEM;
+                        return (sysarg_t) ENOMEM;
                 
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
                         free(data);
-                        return (unative_t) rc;
+                        return (sysarg_t) rc;
                 }
                 data[size] = 0;