Changeset 4687fcd4 in mainline for uspace/drv/uhci

Timestamp:

2011-01-29T10:19:04Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

72e19f50

Parents:

67a1b78 (diff), a09128c (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:

Changes from devel, break stuff.

Location:

uspace/drv/uhci

Files:

• Makefile (modified) (1 diff)
• main.c (modified) (2 diffs)
• pci.c (added)
• uhci.c (modified) (2 diffs)
• uhci.h (modified) (3 diffs)

uspace/drv/uhci/Makefile

@@ -41 +41 @@
         transfer_list.c \
         uhci.c \
-        uhci_struct/transfer_descriptor.c
+        uhci_struct/transfer_descriptor.c \
+        pci.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/uhci/main.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include <driver.h>
+#include <errno.h>
+#include <str_error.h>
 #include <usb_iface.h>
-#include <errno.h>
 
 #include "debug.h"
@@ -57 +59 @@
         device->ops = &uhci_ops;
 
-        // TODO: get this value out of pci driver
-        return uhci_init(device, (void*)0xc020);
+        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) {
+                uhci_print_fatal("failed to get I/O registers addresses: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
+        uhci_print_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
+            io_reg_base, io_reg_size, irq);
+
+        return uhci_init(device, (void*)io_reg_base, io_reg_size);
 }
 

uspace/drv/uhci/uhci.c

@@ -13 +13 @@
 static int uhci_debug_checker(void *arg);
 
-int uhci_init(device_t *device, void *regs)
+int uhci_init(device_t *device, void *regs, size_t reg_size)
 {
         assert(device);
@@ -40 +40 @@
         /* allow access to hc control registers */
         regs_t *io;
-        ret = pio_enable(regs, sizeof(regs_t), (void**)&io);
+        assert(reg_size >= sizeof(regs_t));
+        ret = pio_enable(regs, reg_size, (void**)&io);
         CHECK_RET_FREE_INSTANCE("Failed to gain access to registers at %p.\n", io);
         instance->registers = io;

uspace/drv/uhci/uhci.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+
+/** @addtogroup drvusbuhci
  * @{
  */
@@ -86 +87 @@
 
 /* init uhci specifics in device.driver_data */
-int uhci_init( device_t *device, void *regs );
+int uhci_init( device_t *device, void *regs, size_t reg_size );
 
 int uhci_destroy( device_t *device );
@@ -101 +102 @@
   void *arg );
 
+int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
+
 #endif
 /**