Changes in / [04cb68f2:e0e568ff] in mainline


Ignore:
Files:
86 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r04cb68f2 re0e568ff  
    6161                cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
    6262        done
    63         for drv in $(RD_DRVS) ; do \
    64                 mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv" ; \
    65                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv" ; \
    66                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" ; \
    67         done
    68         for file in $(RD_DRV_CFG) ; do \
    69                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file" "$(DIST_PATH)/$(DRVS_PATH)/$$file" ; \
    70         done
    71        
     63
    7264clean: clean_dist
    7365        $(MAKE) -f $(BUILD) clean PRECHECK=$(PRECHECK)

  • boot/Makefile.common

    r04cb68f2 re0e568ff  
    4949DIST_PATH = $(USPACE_PATH)/dist
    5050TOOLS_PATH = $(ROOT_PATH)/tools
    51 DRVS_PATH = srv/drivers
    5251
    5352SANDBOX = pack
    … …  
    107106        $(USPACE_PATH)/srv/net/net/net \
    108107        $(USPACE_PATH)/srv/net/netstart/netstart \
    109         $(USPACE_PATH)/srv/devman/devman \
    110         $(USPACE_PATH)/srv/drivers/root/root
    111        
    112 RD_DRVS = \
    113         root
    114 
    115 RD_DRV_CFG =
    116108
    117109ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    … …  
    133125        $(USPACE_PATH)/app/taskdump/taskdump \
    134126        $(USPACE_PATH)/app/tester/tester \
    135         $(USPACE_PATH)/app/test_serial/test_serial \
    136127        $(USPACE_PATH)/app/tetris/tetris \
    137128        $(USPACE_PATH)/app/trace/trace \

  • boot/arch/amd64/Makefile.inc

    r04cb68f2 re0e568ff  
    3737        $(USPACE_PATH)/srv/hid/char_mouse/char_ms
    3838
    39 RD_DRVS += \
    40         rootia32 \
    41         pciintel \
    42         isa \
    43         ns8250
    44        
    45 RD_DRV_CFG += \
    46         isa/isa.dev
    47 
    4839BOOT_OUTPUT = $(ROOT_PATH)/image.iso
    4940PREBUILD = $(INITRD).img

  • kernel/generic/include/ddi/ddi.h

    r04cb68f2 re0e568ff  
    5454extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
    5555extern unative_t sys_iospace_enable(ddi_ioarg_t *);
    56 extern unative_t sys_interrupt_enable(int irq, int enable);
    5756
    5857/*
    … …  
    6160extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
    6261
    63 
    6462#endif
    6563

  • kernel/generic/include/syscall/syscall.h

    r04cb68f2 re0e568ff  
    8080        SYS_PHYSMEM_MAP,
    8181        SYS_IOSPACE_ENABLE,
    82         SYS_INTERRUPT_ENABLE,
    8382       
    8483        SYS_SYSINFO_GET_TAG,

  • kernel/generic/src/ddi/ddi.c

    r04cb68f2 re0e568ff  
    258258}
    259259
    260 /** Disable or enable specified interrupts.
    261  *
    262  * @param irq the interrupt to be enabled/disabled.
    263  * @param enable if true enable the interrupt, disable otherwise.
    264  *
    265  * @retutn Zero on success, error code otherwise.
    266  */
    267 unative_t sys_interrupt_enable(int irq, int enable)
    268 {       
    269         cap_t task_cap = cap_get(TASK);
    270         if (!(task_cap & CAP_IRQ_REG))
    271                 return EPERM;
    272                
    273         if (irq < 0 || irq > 16) {
    274                 return EINVAL;
    275         }
    276        
    277         uint16_t irq_mask = (uint16_t)(1 << irq);
    278         if (enable) {
    279                 trap_virtual_enable_irqs(irq_mask);
    280         } else {
    281                 trap_virtual_disable_irqs(irq_mask);
    282         }
    283        
    284         return 0;       
    285 }
    286 
    287260/** @}
    288261 */

  • kernel/generic/src/syscall/syscall.c

    r04cb68f2 re0e568ff  
    159159        (syshandler_t) sys_physmem_map,
    160160        (syshandler_t) sys_iospace_enable,
    161         (syshandler_t) sys_interrupt_enable,
    162161       
    163162        /* Sysinfo syscalls */

  • uspace/Makefile

    r04cb68f2 re0e568ff  
    4343        app/sbi \
    4444        app/stats \
    45         app/shutters \
    4645        app/taskdump \
    4746        app/tasks \
    4847        app/tester \
    49         app/test_serial \
    5048        app/tetris \
    5149        app/trace \
    … …  
    5351        srv/clip \
    5452        srv/devmap \
    55         srv/devman \
    56         srv/drivers/root \
    5753        srv/loader \
    5854        srv/ns \
    … …  
    115111
    116112ifeq ($(UARCH),ia32)
    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
     113        DIRS += srv/hw/bus/pci
    122114endif
    123115
    … …  
    142134        lib/softint \
    143135        lib/softfloat \
    144         lib/drv \
    145136        lib/packet \
    146137        lib/net

  • uspace/Makefile.common

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

  • uspace/app/init/init.c

    r04cb68f2 re0e568ff  
    309309        getterm("term/vc5", "/app/bdsh");
    310310        getterm("term/vc6", "/app/klog");
    311         getterm("term/vc7", "/srv/devman");
    312311       
    313312        return 0;

  • uspace/app/trace/syscalls.c

    r04cb68f2 re0e568ff  
    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 },
    7675
    7776    [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },

  • uspace/lib/c/Makefile

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

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

    r04cb68f2 re0e568ff  
    9696}
    9797
    98 /** Enable an interrupt.
    99  *
    100  * @param irq the interrupt.
    101  *
    102  * @return Zero on success, negative error code otherwise.
    103  */
    104 int 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  */
    115 int interrupt_disable(int irq)
    116 {
    117         return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 0);
    118 }
    119 
    12098/** Enable PIO for specified I/O range.
    12199 *

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

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

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

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