Changeset 42dbb26 in mainline

Timestamp:

2011-03-20T18:36:09Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e7bc999

Parents:

b8e9acb

Message:

Enable access to device registers

Location:

uspace/drv/ohci

Files:

• ohci_hc.c (modified) (1 diff)
• ohci_hc.h (modified) (1 diff)
• ohci_regs.h (added)
• ohci_rh.c (modified) (2 diffs)
• ohci_rh.h (modified) (1 diff)

uspace/drv/ohci/ohci_hc.c

@@ -48 +48 @@
 {
         assert(instance);
-        ohci_rh_init(&instance->rh, regs, reg_size);
+        int ret = pio_enable((void*)regs, reg_size, (void**)&instance->registers);
+        if (ret != EOK) {
+                usb_log_error("Failed to gain access to device registers.\n");
+                return ret;
+        }
+
+        ohci_rh_init(&instance->rh, instance->registers);
         /* TODO: implement */
         /* TODO: register root hub */

uspace/drv/ohci/ohci_hc.h

@@ -45 +45 @@
 
 #include "batch.h"
+#include "ohci_regs.h"
 #include "ohci_rh.h"
 
-typedef struct ohci_regs {
-} regs_t;
-
-
 typedef struct ohci_hc {
+        ohci_regs_t *registers;
         usb_address_t rh_address;
         ohci_rh_t rh;

uspace/drv/ohci/ohci_rh.c

@@ -35 +35 @@
 #include <errno.h>
 #include <str_error.h>
-#include <stdio.h>
 
 #include <usb/debug.h>
@@ -42 +41 @@
 
 /** Root hub initialization
- * @param[in] instance RH structure to initialize
- * @param[in] fun DDF function representing UHCI root hub
- * @param[in] reg_addr Address of root hub status and control registers.
- * @param[in] reg_size Size of accessible address space.
  * @return Error code.
  */
-int ohci_rh_init(ohci_rh_t *instance, uintptr_t reg_addr, size_t reg_size)
+int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs)
 {
         assert(instance);
         instance->address = 0;
+        instance->registers = regs;
+
+        usb_log_info("OHCI root hub with %d ports.\n", regs->rh_desc_a & 0xff);
+
         /* TODO: implement */
         return EOK;

uspace/drv/ohci/ohci_rh.h

@@ -38 +38 @@
 #include <usb/usb.h>
 
+#include "ohci_regs.h"
 #include "batch.h"
 
 typedef struct ohci_rh {
+        ohci_regs_t *registers;
         usb_address_t address;
 } ohci_rh_t;
 
-int ohci_rh_init(ohci_rh_t *instance, uintptr_t reg_addr, size_t reg_size);
+int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs);
 
 void ohci_rh_request(ohci_rh_t *instance, batch_t *request);