Changeset c47e1a8 in mainline for uspace/srv/drivers/pciintel

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/pciintel

Files:

• Makefile (modified) (1 diff)
• pci.c (modified) (2 diffs)

uspace/srv/drivers/pciintel/Makefile

@@ -27 +27 @@
 
 USPACE_PREFIX = ../../..
-LIBS = $(LIBDRV_PREFIX)/libdrv.a $(LIBC_PREFIX)/libc.a
-
-OUTPUT = pciintel
+LIBS = $(LIBDRV_PREFIX)/libdrv.a
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+BINARY = pciintel
 
 SOURCES = \
         pci.c
 
-include ../../Makefile.common
-
-EXTRA_CFLAGS = -I$(LIBDRV_PREFIX)/include
+include $(USPACE_PREFIX)/Makefile.common

uspace/srv/drivers/pciintel/pci.c

@@ -41 +41 @@
 #include <bool.h>
 #include <fibril_synch.h>
-#include <string.h>
+#include <str.h>
 #include <ctype.h>
 #include <macros.h>
@@ -221 +221 @@
         pci_dev_data_t *dev_data = (pci_dev_data_t *)dev->driver_data;
         match_id_t *match_id = NULL;    
+        char *match_id_str;     
         match_id = create_match_id();
         if (NULL != match_id) {
-                asprintf(&match_id->id, "pci/ven=%04x&dev=%04x", dev_data->vendor_id, dev_data->device_id);
+                asprintf(&match_id_str, "pci/ven=%04x&dev=%04x", dev_data->vendor_id, dev_data->device_id);
+                match_id->id = match_id_str;
                 match_id->score = 90;
                 add_match_id(&dev->match_ids, match_id);