# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1215682607 0
# Node ID 11ac4051db6b941120f2b65116a526eaba36f776
# Parent  7beba3e7e6b4cc9c17455996e8ffa9ae1fbf721a
Group/Image/Order strings in slave ioctl; order number as text content
in XML Type element.

diff -r 7beba3e7e6b4 -r 11ac4051db6b master/cdev.c
--- a/master/cdev.c	Thu Jul 10 09:31:03 2008 +0000
+++ b/master/cdev.c	Thu Jul 10 09:36:47 2008 +0000
@@ -196,6 +196,9 @@
     data.sync_count = slave->sii.sync_count;
     data.sdo_count = ec_slave_sdo_count(slave);
     data.sii_nwords = slave->sii_nwords;
+    ec_cdev_strcpy(data.group, slave->sii.group);
+    ec_cdev_strcpy(data.image, slave->sii.image);
+    ec_cdev_strcpy(data.order, slave->sii.order);
     ec_cdev_strcpy(data.name, slave->sii.name);
 
     up(&master->master_sem);
diff -r 7beba3e7e6b4 -r 11ac4051db6b master/ioctl.h
--- a/master/ioctl.h	Thu Jul 10 09:31:03 2008 +0000
+++ b/master/ioctl.h	Thu Jul 10 09:36:47 2008 +0000
@@ -120,6 +120,9 @@
     uint8_t sync_count;
     uint16_t sdo_count;
     uint32_t sii_nwords;
+    char group[EC_IOCTL_STRING_SIZE];
+    char image[EC_IOCTL_STRING_SIZE];
+    char order[EC_IOCTL_STRING_SIZE];
     char name[EC_IOCTL_STRING_SIZE];
 } ec_ioctl_slave_t;
 
diff -r 7beba3e7e6b4 -r 11ac4051db6b tools/Master.cpp
--- a/tools/Master.cpp	Thu Jul 10 09:31:03 2008 +0000
+++ b/tools/Master.cpp	Thu Jul 10 09:36:47 2008 +0000
@@ -1625,7 +1625,10 @@
 
     if (slave.has_general_category) {
         cout << "General:" << endl
-            << "  Name: " << slave.name << endl;
+            << "  Group: " << slave.group << endl
+            << "  Image name: " << slave.image << endl
+            << "  Order number: " << slave.order << endl
+            << "  Device name: " << slave.name << endl;
 
         if (slave.mailbox_protocols & EC_MBOX_COE) {
             cout << "  CoE details:" << endl
@@ -1684,7 +1687,7 @@
         << hex << setfill('0') << setw(8) << slave.product_code
         << "\" RevisionNo=\"#x"
         << hex << setfill('0') << setw(8) << slave.revision_number
-        << "\"/>" << endl;
+        << "\">" << slave.order << "</Type>" << endl;
 
     if (strlen(slave.name)) {
         cout