--- a/master/cdev.c	Wed Apr 08 12:10:01 2009 +0000
+++ b/master/cdev.c	Wed Apr 08 12:48:59 2009 +0000
@@ -1041,17 +1041,17 @@
 
 /*****************************************************************************/
 
-/** Read a slave's physical memory.
- */
-int ec_cdev_ioctl_slave_phy_read(
+/** Read a slave's registers.
+ */
+int ec_cdev_ioctl_slave_reg_read(
         ec_master_t *master, /**< EtherCAT master. */
         unsigned long arg /**< ioctl() argument. */
         )
 {
-    ec_ioctl_slave_phy_t data;
+    ec_ioctl_slave_reg_t data;
     ec_slave_t *slave;
     uint8_t *contents;
-    ec_phy_request_t request;
+    ec_reg_request_t request;
 
     if (copy_from_user(&data, (void __user *) arg, sizeof(data))) {
         return -EFAULT;
@@ -1061,7 +1061,7 @@
         return 0;
 
     if (!(contents = kmalloc(data.length, GFP_KERNEL))) {
-        EC_ERR("Failed to allocate %u bytes for phy data.\n", data.length);
+        EC_ERR("Failed to allocate %u bytes for register data.\n", data.length);
         return -ENOMEM;
     }
 
@@ -1075,7 +1075,7 @@
         return -EINVAL;
     }
 
-    // init phy request
+    // init register request
     INIT_LIST_HEAD(&request.list);
     request.slave = slave;
     request.dir = EC_DIR_INPUT;
@@ -1085,12 +1085,12 @@
     request.state = EC_INT_REQUEST_QUEUED;
 
     // schedule request.
-    list_add_tail(&request.list, &master->phy_requests);
+    list_add_tail(&request.list, &master->reg_requests);
 
     up(&master->master_sem);
 
     // wait for processing through FSM
-    if (wait_event_interruptible(master->phy_queue,
+    if (wait_event_interruptible(master->reg_queue,
                 request.state != EC_INT_REQUEST_QUEUED)) {
         // interrupted by signal
         down(&master->master_sem);
@@ -1105,7 +1105,7 @@
     }
 
     // wait until master FSM has finished processing
-    wait_event(master->phy_queue, request.state != EC_INT_REQUEST_BUSY);
+    wait_event(master->reg_queue, request.state != EC_INT_REQUEST_BUSY);
 
     if (request.state == EC_INT_REQUEST_SUCCESS) {
         if (copy_to_user((void __user *) data.data, contents, data.length))
@@ -1118,17 +1118,17 @@
 
 /*****************************************************************************/
 
-/** Write a slave's physical memory.
- */
-int ec_cdev_ioctl_slave_phy_write(
+/** Write a slave's registers.
+ */
+int ec_cdev_ioctl_slave_reg_write(
         ec_master_t *master, /**< EtherCAT master. */
         unsigned long arg /**< ioctl() argument. */
         )
 {
-    ec_ioctl_slave_phy_t data;
+    ec_ioctl_slave_reg_t data;
     ec_slave_t *slave;
     uint8_t *contents;
-    ec_phy_request_t request;
+    ec_reg_request_t request;
 
     if (copy_from_user(&data, (void __user *) arg, sizeof(data))) {
         return -EFAULT;
@@ -1138,7 +1138,7 @@
         return 0;
 
     if (!(contents = kmalloc(data.length, GFP_KERNEL))) {
-        EC_ERR("Failed to allocate %u bytes for phy data.\n", data.length);
+        EC_ERR("Failed to allocate %u bytes for register data.\n", data.length);
         return -ENOMEM;
     }
 
@@ -1158,7 +1158,7 @@
         return -EINVAL;
     }
 
-    // init phy request
+    // init register request
     INIT_LIST_HEAD(&request.list);
     request.slave = slave;
     request.dir = EC_DIR_OUTPUT;
@@ -1168,12 +1168,12 @@
     request.state = EC_INT_REQUEST_QUEUED;
 
     // schedule request.
-    list_add_tail(&request.list, &master->phy_requests);
+    list_add_tail(&request.list, &master->reg_requests);
 
     up(&master->master_sem);
 
     // wait for processing through FSM
-    if (wait_event_interruptible(master->phy_queue,
+    if (wait_event_interruptible(master->reg_queue,
                 request.state != EC_INT_REQUEST_QUEUED)) {
         // interrupted by signal
         down(&master->master_sem);
@@ -1188,7 +1188,7 @@
     }
 
     // wait until master FSM has finished processing
-    wait_event(master->phy_queue, request.state != EC_INT_REQUEST_BUSY);
+    wait_event(master->reg_queue, request.state != EC_INT_REQUEST_BUSY);
 
     kfree(contents);
 
@@ -2981,12 +2981,12 @@
             if (!(filp->f_mode & FMODE_WRITE))
                 return -EPERM;
             return ec_cdev_ioctl_slave_sii_write(master, arg);
-        case EC_IOCTL_SLAVE_PHY_READ:
-            return ec_cdev_ioctl_slave_phy_read(master, arg);
-        case EC_IOCTL_SLAVE_PHY_WRITE:
+        case EC_IOCTL_SLAVE_REG_READ:
+            return ec_cdev_ioctl_slave_reg_read(master, arg);
+        case EC_IOCTL_SLAVE_REG_WRITE:
             if (!(filp->f_mode & FMODE_WRITE))
                 return -EPERM;
-            return ec_cdev_ioctl_slave_phy_write(master, arg);
+            return ec_cdev_ioctl_slave_reg_write(master, arg);
         case EC_IOCTL_SLAVE_FOE_READ:
             return ec_cdev_ioctl_slave_foe_read(master, arg);
         case EC_IOCTL_SLAVE_FOE_WRITE: