Changeset 9a7e5b4 in mainline for uspace/drv

Timestamp:

2011-04-07T08:19:03Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

41c1f7b

Parents:

dcaf819 (diff), 506d330 (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:

More OHCI structures and refactoring. Add per endpoint toggle reset

Location:

uspace/drv

Files:

• ohci/hc.h (modified) (1 diff)
• ohci/hw_struct/completion_codes.h (added)
• ohci/hw_struct/endpoint_descriptor.h (modified) (1 diff)
• ohci/hw_struct/hcca.h (added)
• ohci/hw_struct/iso_transfer_descriptor.h (modified) (1 diff)
• ohci/hw_struct/transfer_descriptor.h (modified) (2 diffs)
• ohci/iface.c (modified) (1 diff)
• uhci-hcd/iface.c (modified) (2 diffs)

uspace/drv/ohci/hc.h

@@ -48 +48 @@
 #include "ohci_regs.h"
 #include "root_hub.h"
+#include "hw_struct/hcca.h"
 
 typedef struct hc {

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -32 +32 @@
  * @brief OHCI driver
  */
-#ifndef DRV_OHCI_ENDPOINT_DESCRIPTOR_H
-#define DRV_OHCI_ENDPOINT_DESCRIPTOR_H
+#ifndef DRV_OHCI_HW_STRUCT_ENDPOINT_DESCRIPTOR_H
+#define DRV_OHCI_HW_STRUCT_ENDPOINT_DESCRIPTOR_H
 
 #include <stdint.h>
+
+#include "completion_codes.h"
 
 typedef struct ed {

uspace/drv/ohci/hw_struct/iso_transfer_descriptor.h

@@ -32 +32 @@
  * @brief OHCI driver
  */
-#ifndef DRV_OHCI_ISO_TRANSFER_DESCRIPTOR_H
-#define DRV_OHCI_ISO_TRANSFER_DESCRIPTOR_H
+#ifndef DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H
+#define DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H
 
 #include <stdint.h>
+
+#include "completion_codes.h"
 
 typedef struct itd {

uspace/drv/ohci/hw_struct/transfer_descriptor.h

@@ -32 +32 @@
  * @brief OHCI driver
  */
-#ifndef DRV_OHCI_TRANSFER_DESCRIPTOR_H
-#define DRV_OHCI_TRANSFER_DESCRIPTOR_H
+#ifndef DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
+#define DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H
 
 #include <stdint.h>
+
+#include "completion_codes.h"
 
 typedef struct td {
@@ -66 +68 @@
  * @}
  */
-

uspace/drv/ohci/iface.c

@@ -163 +163 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
         // TODO use real endpoint here!
-        return usb_endpoint_manager_register_ep(&hc->ep_manager,
-            address, endpoint, direction, NULL, 0);
+        return usb_endpoint_manager_register_ep(&hc->ep_manager,NULL, 0);
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-hcd/iface.c

@@ -168 +168 @@
         if (ep == NULL)
                 return ENOMEM;
-        ret = endpoint_init(ep, transfer_type, speed, max_packet_size);
+        ret = endpoint_init(ep, address, endpoint, direction,
+            transfer_type, speed, max_packet_size);
         if (ret != EOK) {
                 free(ep);
@@ -178 +179 @@
             usb_str_speed(speed), direction, size, max_packet_size, interval);
 
-        ret = usb_endpoint_manager_register_ep(&hc->ep_manager,
-            address, endpoint, direction, ep, size);
+        ret = usb_endpoint_manager_register_ep(&hc->ep_manager, ep, size);
         if (ret != EOK) {
                 endpoint_destroy(ep);