Changeset c47e1a8 in mainline for uspace/srv/drivers


Ignore:
Timestamp:
2010-05-21T07:50:04Z (16 years ago)
Author:
Lenka Trochtova <trochtova.lenka@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d51ee2b
Parents:
cf8cc36 (diff), 15b592b (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 (rev. 451)

Location:
uspace/srv/drivers
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/drivers/isa/Makefile

    rcf8cc36 rc47e1a8  
    2727
    2828USPACE_PREFIX = ../../..
    29 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
    30 
    31 OUTPUT = isa
     29LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31BINARY = isa
    3232
    3333SOURCES = \
    3434        isa.c
    3535
    36 include ../../Makefile.common
    37 
    38 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/drivers/isa/isa.c

    rcf8cc36 rc47e1a8  
    4242#include <fibril_synch.h>
    4343#include <stdlib.h>
    44 #include <string.h>
     44#include <str.h>
    4545#include <ctype.h>
    4646#include <macros.h>
    … …  
    136136        bool opened = false;
    137137        int fd;         
    138         off_t len = 0;
     138        size_t len = 0;
    139139       
    140140        fd = open(conf_path, O_RDONLY);
    … …  
    458458}
    459459
    460 static char * parse_dev_conf(char *conf, device_t *parent)
     460static void parse_dev_conf(char *conf, device_t *parent)
    461461{
    462462        while (NULL != conf && 0 != *conf) {

  • uspace/srv/drivers/ns8250/Makefile

    rcf8cc36 rc47e1a8  
    2727
    2828USPACE_PREFIX = ../../..
    29 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
    30 
    31 OUTPUT = ns8250
     29LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31BINARY = ns8250
    3232
    3333SOURCES = \
    3434        ns8250.c
    3535
    36 include ../../Makefile.common
    37 
    38 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/drivers/ns8250/ns8250.c

    rcf8cc36 rc47e1a8  
    4242#include <fibril_synch.h>
    4343#include <stdlib.h>
    44 #include <string.h>
     44#include <str.h>
    4545#include <ctype.h>
    4646#include <macros.h>

  • uspace/srv/drivers/pciintel/Makefile

    rcf8cc36 rc47e1a8  
    2727
    2828USPACE_PREFIX = ../../..
    29 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
    30 
    31 OUTPUT = pciintel
     29LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31BINARY = pciintel
    3232
    3333SOURCES = \
    3434        pci.c
    3535
    36 include ../../Makefile.common
    37 
    38 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/drivers/pciintel/pci.c

    rcf8cc36 rc47e1a8  
    4141#include <bool.h>
    4242#include <fibril_synch.h>
    43 #include <string.h>
     43#include <str.h>
    4444#include <ctype.h>
    4545#include <macros.h>
    … …  
    221221        pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
    222222        match_id_t *match_id = NULL;   
     223        char *match_id_str;     
    223224        match_id = create_match_id();
    224225        if (NULL != match_id) {
    225                 asprintf(&match_id->id, "pci/ven=%04x&dev=%04x", dev_data->vendor_id, dev_data->device_id);
     226                asprintf(&match_id_str, "pci/ven=%04x&dev=%04x", dev_data->vendor_id, dev_data->device_id);
     227                match_id->id = match_id_str;
    226228                match_id->score = 90;
    227229                add_match_id(&dev->match_ids, match_id);

  • uspace/srv/drivers/root/Makefile

    rcf8cc36 rc47e1a8  
    2727
    2828USPACE_PREFIX = ../../..
    29 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
    30 
    31 OUTPUT = root
     29LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31BINARY = root
    3232
    3333SOURCES = \
    3434        root.c
    3535
    36 include ../../Makefile.common
    37 
    38 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/drivers/root/root.c

    rcf8cc36 rc47e1a8  
    4242#include <fibril_synch.h>
    4343#include <stdlib.h>
    44 #include <string.h>
     44#include <str.h>
    4545#include <ctype.h>
    4646#include <macros.h>

  • uspace/srv/drivers/rootia32/Makefile

    rcf8cc36 rc47e1a8  
    2727
    2828USPACE_PREFIX = ../../..
    29 LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
    30 
    31 OUTPUT = rootia32
     29LIBS = $(LIBDRV_PREFIX)/libdrv.a
     30EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
     31BINARY = rootia32
    3232
    3333SOURCES = \
    3434        rootia32.c
    3535
    36 include ../../Makefile.common
    37 
    38 EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
     36include $(USPACE_PREFIX)/Makefile.common

  • uspace/srv/drivers/rootia32/rootia32.c

    rcf8cc36 rc47e1a8  
    4242#include <fibril_synch.h>
    4343#include <stdlib.h>
    44 #include <string.h>
     44#include <str.h>
    4545#include <ctype.h>
    4646#include <macros.h>
    … …  
    6060
    6161static int rootia32_add_device(device_t *dev);
    62 static bool rootia32_init();
     62static void root_ia32_init(void);
    6363
    6464/** The root device driver's standard operations.
Note: See TracChangeset for help on using the changeset viewer.