Changeset 04cb68f2 in mainline for uspace/app


Ignore:
Timestamp:
2010-10-20T19:30:54Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
78a9e5ef
Parents:
e0e568ff (diff), a6e54c5d (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 from lp:~helenos-dd/helenos/dd.

Location:
uspace/app
Files:
21 added
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/init/init.c

    re0e568ff r04cb68f2  
    309309        getterm("term/vc5", "/app/bdsh");
    310310        getterm("term/vc6", "/app/klog");
     311        getterm("term/vc7", "/srv/devman");
    311312       
    312313        return 0;
  • uspace/app/trace/syscalls.c

    re0e568ff r04cb68f2  
    7373    [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
    7474    [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
     75    [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",      2,      V_ERRNO },
    7576
    7677    [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },
Note: See TracChangeset for help on using the changeset viewer.