diff -r 0a6d38ec463f -r a4d3fffdaed7 master/canopen.c
--- a/master/canopen.c	Mon Mar 12 08:47:56 2007 +0000
+++ b/master/canopen.c	Mon Mar 12 11:02:05 2007 +0000
@@ -351,10 +351,10 @@
 
     // wait for processing through FSM
     if (wait_event_interruptible(master->sdo_queue,
-                request.state != EC_REQ_QUEUED)) {
+                request.state != EC_REQUEST_QUEUED)) {
         // interrupted by signal
         down(&master->sdo_sem);
-        if (request.state == EC_REQ_QUEUED) {
+        if (request.state == EC_REQUEST_QUEUED) {
             list_del(&request.list);
             up(&master->sdo_sem);
             return -EINTR;
@@ -364,9 +364,9 @@
     }
 
     // wait until master FSM has finished processing
-    wait_event(master->sdo_queue, request.state != EC_REQ_BUSY);
-
-    if (request.state != EC_REQ_COMPLETED)
+    wait_event(master->sdo_queue, request.state != EC_REQUEST_IN_PROGRESS);
+
+    if (request.state != EC_REQUEST_COMPLETE)
         return -EIO;
 
     off += ec_sdo_entry_format_data(entry, &request, buffer);
@@ -409,7 +409,7 @@
     req->entry = entry;
     req->data = NULL;
     req->size = 0;
-    req->state = EC_REQ_QUEUED;
+    req->state = EC_REQUEST_QUEUED;
 }
 
 /*****************************************************************************/