Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for kernel/generic/src/console/console.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/console/console.c

    r37f7cfe ra9b6bec  
    162162        ddi_parea_register(&klog_parea);
    163163       
    164         sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
     164        sysinfo_set_item_val("klog.faddr", NULL, (sysarg_t) faddr);
    165165        sysinfo_set_item_val("klog.pages", NULL, KLOG_PAGES);
    166166       
     
    193193
    194194/** Tell kernel to get keyboard/console access again */
    195 unative_t sys_debug_enable_console(void)
     195sysarg_t sys_debug_enable_console(void)
    196196{
    197197#ifdef CONFIG_KCONSOLE
     
    204204
    205205/** Tell kernel to relinquish keyboard/console access */
    206 unative_t sys_debug_disable_console(void)
     206sysarg_t sys_debug_disable_console(void)
    207207{
    208208        release_console();
     
    333333 *
    334334 */
    335 unative_t sys_klog(int fd, const void *buf, size_t size)
     335sysarg_t sys_klog(int fd, const void *buf, size_t size)
    336336{
    337337        char *data;
     
    339339       
    340340        if (size > PAGE_SIZE)
    341                 return (unative_t) ELIMIT;
     341                return (sysarg_t) ELIMIT;
    342342       
    343343        if (size > 0) {
    344344                data = (char *) malloc(size + 1, 0);
    345345                if (!data)
    346                         return (unative_t) ENOMEM;
     346                        return (sysarg_t) ENOMEM;
    347347               
    348348                rc = copy_from_uspace(data, buf, size);
    349349                if (rc) {
    350350                        free(data);
    351                         return (unative_t) rc;
     351                        return (sysarg_t) rc;
    352352                }
    353353                data[size] = 0;
Note: See TracChangeset for help on using the changeset viewer.