Ignore:
Timestamp:
2010-12-30T13:43:27Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/console/console.h

    rd70d80ed rea28272  
    6767extern wchar_t getc(indev_t *indev);
    6868extern size_t gets(indev_t *indev, char *buf, size_t buflen);
    69 extern unative_t sys_klog(int fd, const void *buf, size_t size);
     69extern sysarg_t sys_klog(int fd, const void *buf, size_t size);
    7070
    7171extern void grab_console(void);
    7272extern void release_console(void);
    7373
    74 extern unative_t sys_debug_enable_console(void);
    75 extern unative_t sys_debug_disable_console(void);
     74extern sysarg_t sys_debug_enable_console(void);
     75extern sysarg_t sys_debug_disable_console(void);
    7676
    7777#endif /* KERN_CONSOLE_H_ */
Note: See TracChangeset for help on using the changeset viewer.