Changes in / [c113056:1879a7d] in mainline

Location:

uspace

Files:

• app/netstart/self_test.c (deleted)
• app/netstart/self_test.h (deleted)
• drv/uhci/Makefile (modified) (1 diff)
• drv/uhci/main.c (modified) (2 diffs)
• drv/uhci/pci.c (added)
• drv/uhci/uhci.h (modified) (2 diffs)
• lib/packet/include/net_byteorder.h (added)
• lib/packet/include/net_err.h (added)
• lib/packet/include/socket_errno.h (added)

uspace/drv/uhci/Makefile

@@ -34 +34 @@
 SOURCES = \
         main.c \
+        pci.c \
         transfers.c
 

uspace/drv/uhci/main.c

@@ -30 +30 @@
 #include <usb/debug.h>
 #include <errno.h>
+#include <str_error.h>
 #include <driver.h>
 #include "uhci.h"
@@ -55 +56 @@
         usb_dprintf(NAME, 1, "uhci_add_device() called\n");
         device->ops = &uhci_ops;
+
+        uintptr_t io_reg_base;
+        size_t io_reg_size;
+        int irq;
+
+        int rc = pci_get_my_registers(device,
+            &io_reg_base, &io_reg_size, &irq);
+
+        if (rc != EOK) {
+                fprintf(stderr,
+                    NAME ": failed to get I/O registers addresses: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        usb_dprintf(NAME, 2, "I/O regs at 0x%X (size %zu), IRQ %d.\n",
+            io_reg_base, io_reg_size, irq);
 
         /*

uspace/drv/uhci/uhci.h

@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbuhci
  * @{
  */
@@ -42 +42 @@
 usbhc_iface_t uhci_iface;
 
+int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
+
 #endif
 /**