Changeset 04cb68f2 in mainline for uspace


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
Files:
86 added
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    re0e568ff r04cb68f2  
    4343        app/sbi \
    4444        app/stats \
     45        app/shutters \
    4546        app/taskdump \
    4647        app/tasks \
    4748        app/tester \
     49        app/test_serial \
    4850        app/tetris \
    4951        app/trace \
    … …  
    5153        srv/clip \
    5254        srv/devmap \
     55        srv/devman \
     56        srv/drivers/root \
    5357        srv/loader \
    5458        srv/ns \
    … …  
    111115
    112116ifeq ($(UARCH),ia32)
    113         DIRS += srv/hw/bus/pci
     117        DIRS += srv/drivers/rootia32
     118        DIRS += srv/drivers/pciintel
     119        DIRS += srv/drivers/isa
     120        DIRS += srv/drivers/ns8250
     121#       DIRS += srv/hw/bus/pci
    114122endif
    115123
    … …  
    134142        lib/softint \
    135143        lib/softfloat \
     144        lib/drv \
    136145        lib/packet \
    137146        lib/net

  • uspace/Makefile.common

    re0e568ff r04cb68f2  
    8888LIBPCI_PREFIX = $(LIB_PREFIX)/pci
    8989
     90LIBDRV_PREFIX = $(LIB_PREFIX)/drv
    9091LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
    9192LIBNET_PREFIX = $(LIB_PREFIX)/net

  • 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 },

  • uspace/lib/c/Makefile

    re0e568ff r04cb68f2  
    5757        generic/clipboard.c \
    5858        generic/devmap.c \
     59        generic/devman.c \
     60        generic/device/hw_res.c \
     61        generic/device/char.c \
    5962        generic/event.c \
    6063        generic/errno.c \

  • uspace/lib/c/generic/ddi.c

    re0e568ff r04cb68f2  
    9696}
    9797
     98/** Enable an interrupt.
     99 *
     100 * @param irq the interrupt.
     101 *
     102 * @return Zero on success, negative error code otherwise.
     103 */
     104int interrupt_enable(int irq)
     105{
     106        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 1);
     107}
     108
     109/** Disable an interrupt.
     110 *
     111 * @param irq the interrupt.
     112 *
     113 * @return Zero on success, negative error code otherwise.
     114 */
     115int interrupt_disable(int irq)
     116{
     117        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 0);
     118}
     119
    98120/** Enable PIO for specified I/O range.
    99121 *

  • uspace/lib/c/include/ddi.h

    re0e568ff r04cb68f2  
    4242extern int iospace_enable(task_id_t, void *, unsigned long);
    4343extern int pio_enable(void *, size_t, void **);
     44extern int interrupt_enable(int);
     45extern int interrupt_disable(int);
    4446
    4547#endif

  • uspace/lib/c/include/ipc/services.h

    re0e568ff r04cb68f2  
    4545        SERVICE_VFS,
    4646        SERVICE_DEVMAP,
     47        SERVICE_DEVMAN,
    4748        SERVICE_FHC,
    4849        SERVICE_OBIO,
Note: See TracChangeset for help on using the changeset viewer.