Changeset 9600516 in mainline for uspace/drv/uhci/uhci_struct

Timestamp:

2011-01-21T16:49:47Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

643b983

Parents:

1062c8d

Message:

Added transfer queues for interrupt, control and bulk transfers.

UHCI structures refactoring

Location:

uspace/drv/uhci/uhci_struct

Files:

• frame_list.h (moved) (moved from uspace/drv/uhci/link_ptr.h ) (1 diff)
• link_pointer.h (moved) (moved from uspace/drv/uhci/td_ptr.h ) (2 diffs)
• queue_head.h (added)
• transfer_descriptor.h (moved) (moved from uspace/drv/uhci/transfer.h ) (3 diffs)

uspace/drv/uhci/uhci_struct/frame_list.h

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_LINK_PTR_H
-#define DRV_UHCI_LINK_PTR_H
+#ifndef DRV_UHCI_FRAME_LIST_H
+#define DRV_UHCI_FRAME_LIST_H
 
-#include "td_ptr.h"
+#include "link_pointer.h"
 
-/** Links in Frame List */
-typedef td_ptr_t link_ptr_t;
+#define UHCI_FRAME_LIST_COUNT 1024
 
+typedef link_pointer_t frame_list_t[UHCI_FRAME_LIST_COUNT];
 #endif
 /**

uspace/drv/uhci/uhci_struct/link_pointer.h

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_TD_PTR_H
-#define DRV_UHCI_TD_PTR_H
+#ifndef DRV_UHCI_LINK_POINTER_H
+#define DRV_UHCI_LINK_POINTER_H
 
-/** UHCI Transfer Descriptor pointer */
-typedef struct td_ptr {
-        uint32_t fpl:28;
-        char :2;
+/* UHCI link pointer, used by many data structures */
+typedef struct link_pointer {
+        uint32_t addr:28;
+        uint8_t zero:1;
+        uint8_t reserved:1;
         uint8_t qh:1;
         uint8_t terminate:1;
-} __attribute__(("packed")) td_ptr_t;
+} __attribute__((packed)) link_pointer_t;
 
 #endif
@@ -47 +48 @@
  * @}
  */
+

uspace/drv/uhci/uhci_struct/transfer_descriptor.h

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#ifndef DRV_UHCI_TRANSFER_H
-#define DRV_UHCI_TRANSFER_H
+#ifndef DRV_UHCI_TRANSFER_DESCRIPTOR_H
+#define DRV_UHCI_TRANSFER_DESCRIPTOR_H
+
+#include "callback.h"
 
 /** Status field in UHCI Transfer Descriptor (TD) */
@@ -45 +47 @@
         uint8_t bitstuff:1;
         uint8_t :1; /* reserved */
-} status_t
+} status_t;
 
 /** UHCI Transfer Descriptor */
-typedef struct td {
+typedef struct transfer_descriptor {
         uint32_t fpl:28;
         char :1; /* reserved */
@@ -73 +75 @@
 
         uint32_t buffer_ptr;
-} __attribute__(("packed")) td_t;
 
+        /* there is 16 byte of data available here
+         * those are used to store callback pointer
+         * and next pointer. Thus there is some free space
+         * on 32bits systems.
+         */
+        struct transfer_descriptor *next;
+        callback_t *callback;
+} __attribute__((packed)) transfer_descriptor_t;
 
 #endif