Changeset a79d88d in mainline


Ignore:
Timestamp:
2010-10-21T19:23:23Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7a252ec8
Parents:
374ad3c
Message:

Move the device driver framework drivers under "uspace/drv" in the source tree and
"/drv" on the RAM disk.

Files:
4 edited
19 moved

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r374ad3c ra79d88d  
    8181clean_dist:
    8282        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
    83         rm -rf $(USPACE_PATH)/dist/srv/*
     83        rm -f $(USPACE_PATH)/dist/srv/*
     84        rm -rf $(USPACE_PATH)/dist/drv/*
    8485        rm -f $(USPACE_PATH)/dist/app/*
    8586        rm -f $(USPACE_PATH)/dist/cfg/net/*

  • boot/Makefile.common

    r374ad3c ra79d88d  
    4949DIST_PATH = $(USPACE_PATH)/dist
    5050TOOLS_PATH = $(ROOT_PATH)/tools
    51 DRVS_PATH = srv/drivers
     51DRVS_PATH = drv
    5252
    5353SANDBOX = pack

  • uspace/Makefile

    r374ad3c ra79d88d  
    5050        app/trace \
    5151        app/top \
     52        app/netecho \
     53        app/nettest1 \
     54        app/nettest2 \
     55        app/ping \
    5256        srv/clip \
    5357        srv/devmap \
    5458        srv/devman \
    55         srv/drivers/root \
    5659        srv/loader \
    5760        srv/ns \
    … …  
    8487        srv/net/net \
    8588        srv/net/netstart \
    86         app/netecho \
    87         app/nettest1 \
    88         app/nettest2 \
    89         app/ping
     89        drv/root
    9090
    9191## Networking
    … …  
    113113
    114114ifeq ($(UARCH),ia32)
    115         DIRS += srv/drivers/rootia32
    116         DIRS += srv/drivers/pciintel
    117         DIRS += srv/drivers/isa
    118         DIRS += srv/drivers/ns8250
     115        DIRS += drv/rootia32
     116        DIRS += drv/pciintel
     117        DIRS += drv/isa
     118        DIRS += drv/ns8250
    119119endif
    120120

  • uspace/drv/isa/Makefile

    r374ad3c ra79d88d  
    2626#
    2727
    28 USPACE_PREFIX = ../../..
     28USPACE_PREFIX = ../..
    2929LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3030EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include

  • uspace/drv/isa/isa.c

    r374ad3c ra79d88d  
    5858
    5959#define NAME "isa"
    60 #define CHILD_DEV_CONF_PATH "/srv/drivers/isa/isa.dev"
     60#define CHILD_DEV_CONF_PATH "/drv/isa/isa.dev"
    6161
    6262#define ISA_MAX_HW_RES 4

  • uspace/drv/ns8250/Makefile

    r374ad3c ra79d88d  
    2626#
    2727
    28 USPACE_PREFIX = ../../..
     28USPACE_PREFIX = ../..
    2929LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3030EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include

  • uspace/drv/pciintel/Makefile

    r374ad3c ra79d88d  
    2626#
    2727
    28 USPACE_PREFIX = ../../..
     28USPACE_PREFIX = ../..
    2929LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3030EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include

  • uspace/drv/root/Makefile

    r374ad3c ra79d88d  
    2626#
    2727
    28 USPACE_PREFIX = ../../..
     28USPACE_PREFIX = ../..
    2929LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3030EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include

  • uspace/drv/rootia32/Makefile

    r374ad3c ra79d88d  
    2626#
    2727
    28 USPACE_PREFIX = ../../..
     28USPACE_PREFIX = ../..
    2929LIBS = $(LIBDRV_PREFIX)/libdrv.a
    3030EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include

  • uspace/srv/devman/main.c

    r374ad3c ra79d88d  
    5757#include "devman.h"
    5858
    59 #define DRIVER_DEFAULT_STORE  "/srv/drivers"
     59#define DRIVER_DEFAULT_STORE  "/drv"
    6060
    6161static driver_list_t drivers_list;
Note: See TracChangeset for help on using the changeset viewer.