Changeset bab71635 in mainline

Timestamp:

2011-03-21T11:13:26Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b0beee82

Parents:

c15070c

Message:

Renames, remove ohci prefix

Location:

uspace/drv/ohci

Files:

• Makefile (modified) (1 diff)
• hc.c (moved) (moved from uspace/drv/ohci/ohci_hc.c ) (4 diffs)
• hc.h (moved) (moved from uspace/drv/ohci/ohci_hc.h ) (5 diffs)
• iface.c (moved) (moved from uspace/drv/ohci/hc_iface.c ) (3 diffs)
• iface.h (modified) (1 diff)
• main.c (modified) (5 diffs)
• root_hub.c (moved) (moved from uspace/drv/ohci/ohci_rh.c ) (2 diffs)
• root_hub.h (moved) (moved from uspace/drv/ohci/ohci_rh.h ) (2 diffs)

uspace/drv/ohci/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        hc_iface.c \
+        iface.c \
         batch.c \
         main.c \
-        ohci_hc.c \
-        ohci_rh.c \
+        hc.c \
+        root_hub.c \
         pci.c
 

uspace/drv/ohci/hc.c

@@ -42 +42 @@
 #include <usb_iface.h>
 
-#include "ohci_hc.h"
+#include "hc.h"
 
-int ohci_hc_init(ohci_hc_t *instance, ddf_fun_t *fun,
+int hc_init(hc_t *instance, ddf_fun_t *fun,
     uintptr_t regs, size_t reg_size, bool interrupts)
 {
@@ -53 +53 @@
                 return ret;
         }
-        instance->registers->interrupt_disable = 0;
-        /* enable interrupt on root hub status change */
-        instance->registers->interupt_enable |= IE_RHSC | IE_MIE;
+        device_keeper_init(&instance->manager);
 
 
-        ohci_rh_init(&instance->rh, instance->registers);
+        rh_init(&instance->rh, instance->registers);
         /* TODO: implement */
         /* TODO: register root hub */
@@ -64 +62 @@
 }
 /*----------------------------------------------------------------------------*/
-int ohci_hc_schedule(ohci_hc_t *instance, batch_t *batch)
+int hc_schedule(hc_t *instance, batch_t *batch)
 {
         assert(instance);
         assert(batch);
         if (batch->target.address == instance->rh.address) {
-                ohci_rh_request(&instance->rh, batch);
+                rh_request(&instance->rh, batch);
                 return EOK;
         }
@@ -76 +74 @@
 }
 /*----------------------------------------------------------------------------*/
-void ohci_hc_interrupt(ohci_hc_t *instance, uint16_t status)
+void hc_interrupt(hc_t *instance, uint16_t status)
 {
         assert(instance);
         /* TODO: Check for interrupt cause */
-        ohci_rh_interrupt(&instance->rh);
+        rh_interrupt(&instance->rh);
         /* TODO: implement */
 }

uspace/drv/ohci/hc.h

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup drvusbohcihc
+/** @addtogroup drvusbohci
  * @{
  */
@@ -33 +32 @@
  * @brief OHCI host controller driver structure
  */
-#ifndef DRV_OHCI_OHCI_HC_H
-#define DRV_OHCI_OHCI_HC_H
+#ifndef DRV_OHCI_HC_H
+#define DRV_OHCI_HC_H
 
 #include <fibril.h>
@@ -42 +41 @@
 
 #include <usb/usb.h>
+#include <usb/host/device_keeper.h>
 #include <usbhc_iface.h>
 
 #include "batch.h"
 #include "ohci_regs.h"
-#include "ohci_rh.h"
+#include "root_hub.h"
 
-typedef struct ohci_hc {
+typedef struct hc {
         ohci_regs_t *registers;
         usb_address_t rh_address;
         ohci_rh_t rh;
         ddf_fun_t *ddf_instance;
-} ohci_hc_t;
+        device_keeper_t manager;
+} hc_t;
 
-int ohci_hc_init(ohci_hc_t *instance, ddf_fun_t *fun,
+int hc_init(hc_t *instance, ddf_fun_t *fun,
      uintptr_t regs, size_t reg_size, bool interrupts);
 
-int ohci_hc_schedule(ohci_hc_t *instance, batch_t *batch);
+int hc_schedule(hc_t *instance, batch_t *batch);
 
-void ohci_hc_interrupt(ohci_hc_t *instance, uint16_t status);
+void hc_interrupt(hc_t *instance, uint16_t status);
 
 /** Safely dispose host controller internal structures
@@ -66 +67 @@
  * @param[in] instance Host controller structure to use.
  */
-static inline void ohci_hc_fini(ohci_hc_t *instance) { /* TODO: implement*/ };
+static inline void hc_fini(hc_t *instance) { /* TODO: implement*/ };
 
 /** Get and cast pointer to the driver data
@@ -73 +74 @@
  * @return cast pointer to driver_data
  */
-static inline ohci_hc_t * fun_to_ohci_hc(ddf_fun_t *fun)
-        { return (ohci_hc_t*)fun->driver_data; }
+static inline hc_t * fun_to_hc(ddf_fun_t *fun)
+        { return (hc_t*)fun->driver_data; }
 #endif
 /**

uspace/drv/ohci/iface.c

@@ -43 +43 @@
 
 #include "iface.h"
+#include "hc.h"
 
 #define UNSUPPORTED(methodname) \
@@ -59 +60 @@
 static int reserve_default_address(ddf_fun_t *fun, usb_speed_t speed)
 {
-        UNSUPPORTED("reserve_default_address");
-
-        return ENOTSUP;
+  assert(fun);
+  hc_t *hc = fun_to_hc(fun);
+  assert(hc);
+  usb_log_debug("Default address request with speed %d.\n", speed);
+  device_keeper_reserve_default(&hc->manager, speed);
+  return EOK;
 }
 
@@ -323 +327 @@
 
 /** Host controller interface implementation for OHCI. */
-usbhc_iface_t ohci_hc_iface = {
+usbhc_iface_t hc_iface = {
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,

uspace/drv/ohci/iface.h

@@ -40 +40 @@
 #define NAME "ohci"
 
-extern usbhc_iface_t ohci_hc_iface;
+extern usbhc_iface_t hc_iface;
 
 #endif

uspace/drv/ohci/main.c

@@ -45 +45 @@
 #include "pci.h"
 #include "iface.h"
-#include "ohci_hc.h"
+#include "hc.h"
 
 static int ohci_add_device(ddf_dev_t *device);
@@ -58 +58 @@
 {
         assert(dev);
-        ohci_hc_t *hc = (ohci_hc_t*)dev->driver_data;
+        hc_t *hc = (hc_t*)dev->driver_data;
         assert(hc);
-        ohci_hc_interrupt(hc, 0);
+        hc_interrupt(hc, 0);
 }
 /*----------------------------------------------------------------------------*/
@@ -72 +72 @@
 };
 static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &ohci_hc_iface,
+        .interfaces[USBHC_DEV_IFACE] = &hc_iface,
 };
 
@@ -105 +105 @@
             "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));
 
-        ohci_hc_t *hcd = malloc(sizeof(ohci_hc_t));
+        hc_t *hcd = malloc(sizeof(hc_t));
         if (hcd == NULL) {
                 usb_log_error("Failed to allocate OHCI driver.\n");
@@ -129 +129 @@
         }
 
-        ret = ohci_hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size, interrupts);
+        ret = hc_init(hcd, hc_fun, mem_reg_base, mem_reg_size, interrupts);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize OHCI driver.\n");

uspace/drv/ohci/root_hub.c

@@ -38 +38 @@
 #include <usb/debug.h>
 
-#include "ohci_rh.h"
+#include "root_hub.h"
 
 /** Root hub initialization
  * @return Error code.
  */
-int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs)
+int rh_init(ohci_rh_t *instance, ohci_regs_t *regs)
 {
         assert(instance);
@@ -55 +55 @@
 }
 /*----------------------------------------------------------------------------*/
-void ohci_rh_request(ohci_rh_t *instance, batch_t *request)
+void rh_request(ohci_rh_t *instance, batch_t *request)
 {
         /* TODO: implement */
 }
 /*----------------------------------------------------------------------------*/
-void ohci_rh_interrupt(ohci_rh_t *instance)
+void rh_interrupt(ohci_rh_t *instance)
 {
         usb_log_info("Interrupt!!.\n");

uspace/drv/ohci/root_hub.h

@@ -33 +33 @@
  * @brief OHCI driver
  */
-#ifndef DRV_OHCI_OHCI_RH_H
-#define DRV_OHCI_OHCI_RH_H
+#ifndef DRV_OHCI_ROOT_HUB_H
+#define DRV_OHCI_ROOT_HUB_H
 
 #include <usb/usb.h>
@@ -46 +46 @@
 } ohci_rh_t;
 
-int ohci_rh_init(ohci_rh_t *instance, ohci_regs_t *regs);
+int rh_init(ohci_rh_t *instance, ohci_regs_t *regs);
 
-void ohci_rh_request(ohci_rh_t *instance, batch_t *request);
+void rh_request(ohci_rh_t *instance, batch_t *request);
 
-void ohci_rh_interrupt(ohci_rh_t *instance);
+void rh_interrupt(ohci_rh_t *instance);
 #endif
 /**