Changeset 7bd34e5 in mainline

Timestamp:

2011-01-07T14:40:56Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8324b65

Parents:

92f924c8

Message:

Add synchronization via fibril_semaphore

WARNING: fibril_semaphore BREAKS the deadlock detection system
used by fibril synch primitives

Location:

uspace/drv/uhci

Files:

• Makefile (modified) (1 diff)
• root_hub/port.c (modified) (3 diffs)
• utils/fibril_semaphore.c (added)
• utils/fibril_semaphore.h (added)
• utils/hc_synchronizer.c (modified) (3 diffs)
• utils/hc_synchronizer.h (modified) (1 diff)

uspace/drv/uhci/Makefile

@@ -39 +39 @@
         root_hub/root_hub.c \
         uhci.c \
+        utils/fibril_semaphore.c \
         utils/hc_synchronizer.c
 

uspace/drv/uhci/root_hub/port.c

@@ -185 +185 @@
         return EOK;
 }
+
 static usb_address_t assign_address_to_zero_device( device_t *hc )
 {
@@ -211 +212 @@
 
         sync_value_t value;
+        sync_init(&value);
 
         uhci_setup(
@@ -217 +219 @@
         uhci_print_verbose("address assignment sent, waiting to complete.\n");
 
-//      sync_wait_for(&value);
+        sync_wait_for(&value);
 
         uhci_print_info( "Assigned address %#x.\n", usb_address );

uspace/drv/uhci/utils/hc_synchronizer.c

@@ -1 +1 @@
 #include "hc_synchronizer.h"
 
+void sync_init(sync_value_t *value)
+{
+        assert(value);
+        fibril_semaphore_initialize(&value->done, 0);
+}
+/*----------------------------------------------------------------------------*/
 void sync_wait_for(sync_value_t *value)
 {
         assert( value );
-        value->waiting_fibril = fibril_get_id();
-        uhci_print_verbose("turning off fibril %p.\n", value->waiting_fibril);
-        fibril_switch(FIBRIL_TO_MANAGER);
+        fibril_semaphore_down(&value->done);
 }
 /*----------------------------------------------------------------------------*/
@@ -16 +20 @@
         value->size = size;
         value->result = result;
-        fibril_add_ready(value->waiting_fibril);
+        fibril_semaphore_up(&value->done);
 }
 /*----------------------------------------------------------------------------*/
@@ -25 +29 @@
         assert(value);
         value->result = result;
-        uhci_print_verbose("resuming fibril %p.\n", value->waiting_fibril);
-        fibril_add_ready(value->waiting_fibril);
+        fibril_semaphore_up(&value->done);
 }

uspace/drv/uhci/utils/hc_synchronizer.h

@@ -37 +37 @@
 #include <assert.h>
 #include <driver.h>
-#include <fibril.h>
 #include <usb/usb.h>
 
 #include "debug.h"
+#include "utils/fibril_semaphore.h"
 
 typedef struct value
 {
         /* TODO Think of better fibril synch to use */
-        fid_t waiting_fibril;
         usb_transaction_outcome_t result;
         size_t size;
-        bool done;
+        fibril_semaphore_t done;
 } sync_value_t;
+
+void sync_init(sync_value_t *value);
 
 void sync_wait_for(sync_value_t *value);