Changeset eb522e8 in mainline for uspace/drv/uhci-hcd/transfer_list.h

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/drv/uhci-hcd/transfer_list.h (moved) (moved from uspace/app/netstart/netstart.c ) (2 diffs)

uspace/drv/uhci-hcd/transfer_list.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/** @addtogroup net
+/** @addtogroup drvusbuhcihc
  * @{
  */
+/** @file
+ * @brief UHCI driver transfer list structure
+ */
+#ifndef DRV_UHCI_TRANSFER_LIST_H
+#define DRV_UHCI_TRANSFER_LIST_H
 
-/** @file
- * Start the networking subsystem.
+#include <fibril_synch.h>
+#include <usb/host/batch.h>
+
+#include "hw_struct/queue_head.h"
+
+/** Structure maintaining both hw queue and software list
+ * of currently executed transfers
  */
+typedef struct transfer_list {
+        /** Guard against multiple add/remove races */
+        fibril_mutex_t guard;
+        /** UHCI hw structure represeting this queue */
+        qh_t *queue_head;
+        /** Assigned name, for nicer debug output */
+        const char *name;
+        /** List of all batches in this list */
+        link_t batch_list;
+} transfer_list_t;
 
-#define NAME  "netstart"
-
-#include <async.h>
-#include <stdio.h>
-#include <task.h>
-#include <str_error.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
-#include <ipc/net_net.h>
-
-#include <net/modules.h>
-
-/** Start a module.
- *
- * @param[in] desc      The module description
- * @param[in] path      The module absolute path.
- * @returns             True on succesful spanwning.
- * @returns             False on failure
+void transfer_list_fini(transfer_list_t *instance);
+int transfer_list_init(transfer_list_t *instance, const char *name);
+void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
+void transfer_list_add_batch(
+    transfer_list_t *instance, usb_transfer_batch_t *batch);
+void transfer_list_remove_finished(transfer_list_t *instance, link_t *done);
+void transfer_list_abort_all(transfer_list_t *instance);
+#endif
+/**
+ * @}
  */
-static bool spawn(const char *desc, const char *path)
-{
-        int rc;
-
-        printf("%s: Spawning %s (%s)\n", NAME, desc, path);
-        rc = task_spawnl(NULL, path, path, NULL);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, path,
-                    str_error(rc));
-                return false;
-        }
-        
-        return true;
-}
-
-int main(int argc, char *argv[])
-{
-        int rc;
-        
-        if (!spawn("networking service", "/srv/net"))
-                return EINVAL;
-        
-        printf("%s: Initializing networking\n", NAME);
-        
-        int net_phone = connect_to_service(SERVICE_NETWORKING);
-        rc = ipc_call_sync_0_0(net_phone, NET_NET_STARTUP);
-        if (rc != EOK) {
-                fprintf(stderr, "%s: Startup error %d\n", NAME, rc);
-                return rc;
-        }
-        
-        return EOK;
-}
-
-/** @}
- */