Changeset 4a7c273 in mainline

Timestamp:

2006-05-08T18:24:04Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

20a9b85

Parents:

fca4207

Message:

Port libpci to HelenOS.
List PCI devices on PCI driver startup.

Files:

• libc/include/stdio.h (modified) (1 diff)
• libc/include/stdlib.h (modified) (1 diff)
• libc/include/string.h (modified) (1 diff)
• pci/Makefile (modified) (4 diffs)
• pci/libpci/Makefile (added)
• pci/libpci/access.c (added)
• pci/libpci/generic.c (added)
• pci/libpci/header.h (added)
• pci/libpci/i386-ports.c (added)
• pci/libpci/internal.h (added)
• pci/libpci/names.c (added)
• pci/libpci/pci.h (added)
• pci/libpci/pci_ids.h (added)
• pci/libpci/sysdep.h (added)
• pci/libpci/types.h (added)
• pci/pci.c (modified) (2 diffs)
• pci/update-ids (added)

libc/include/stdio.h

@@ -36 +36 @@
 
 extern int puts(const char * str);
+extern int putchar(int c);
 
 extern int printf(const char *fmt, ...);

libc/include/stdlib.h

@@ -34 +34 @@
 
 #define abort() _exit(1)
+#define exit(status)    _exit((status))
 
 #endif

libc/include/string.h

@@ -33 +33 @@
 #include <types.h>
 
+#define bzero(ptr, len) memset((ptr), 0, (len))
+
 void * memset(void *s, int c, size_t n);
 void * memcpy(void *dest, void *src, size_t n);
 
 size_t strlen(const char *str);
+int strcmp(const char *str1, const char *str2);
+char *strchr(const char *str, int c);
+char *strrchr(const char *str, int c);
+unsigned long strtol(const char *nptr, char **endptr, int base);
 
 #endif

pci/Makefile

@@ -37 +37 @@
 CFLAGS += -I../libipc/include
 
-LIBS = $(LIBIPC_PREFIX)/libipc.a $(LIBC_PREFIX)/libc.a
+LIBS = libpci/libpci.a $(LIBC_PREFIX)/libc.a
 
 ## Sources
@@ -56 +56 @@
 clean:
         -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend
+        $(MAKE) -C libpci clean
 
 depend:
@@ -61 +62 @@
 
 $(OUTPUT): $(OBJECTS) $(LIBS)
+        $(MAKE) -C libpci
         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld  $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
@@ -74 +76 @@
 %.o: %.c
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+
+libpci/libpci.a:
+        $(MAKE) -C libpci

pci/pci.c

@@ -1 +1 @@
 /*
+ * HelenOS PCI driver.
+ *
+ * Copyright (C) 1997-2003 Martin Mares
  * Copyright (C) 2006 Jakub Jermar
- * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * (Based on libpci example.c written by Martin Mares.)
  *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#include <ipc.h>
 #include <stdio.h>
 #include <ddi.h>
@@ -33 +15 @@
 #include <stdlib.h>
 
+#include "libpci/pci.h"
+
+#define PCI_CONF1       0xcf8
+#define PCI_CONF1_SIZE  8
+
 int main(int argc, char *argv[])
 {
+        struct pci_access *pacc;
+        struct pci_dev *dev;
+        unsigned int c;
+        char buf[80];
+
         printf("HelenOS PCI driver\n");
+
+        /*
+         * Gain control over PCI configuration ports.
+         */
+        iospace_enable(task_get_id(), (void *) PCI_CONF1, PCI_CONF1_SIZE);
+
+        pacc = pci_alloc();           /* Get the pci_access structure */
+        pci_init(pacc);               /* Initialize the PCI library */
+        pci_scan_bus(pacc);           /* We want to get the list of devices */
+        for(dev=pacc->devices; dev; dev=dev->next) {   /* Iterate over all devices */
+                pci_fill_info(dev, PCI_FILL_IDENT | PCI_FILL_BASES);      /* Fill in header info we need */
+                c = pci_read_word(dev, PCI_CLASS_DEVICE); /* Read config register directly */
+                printf("%02x:%02x.%d vendor=%04x device=%04x class=%04x irq=%d base0=%lx\n",
+                        dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id,
+                        c, dev->irq, dev->base_addr[0]);
+                printf("\t%s\n", pci_lookup_name(pacc, buf, sizeof(buf), PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
+                        dev->vendor_id, dev->device_id));
+        }
+        pci_cleanup(pacc);            /* Close everything */
+
         return 0;
 }