Bugfix: EXPORT_SYMBOL f?r ec_master_prepare_async_io() vergessen.
authorFlorian Pose <fp@igh-essen.com>
Mon, 20 Mar 2006 08:24:12 +0000
changeset 109 c6766baead5e
parent 108 dc3d56151d07
child 110 2346e2963087
Bugfix: EXPORT_SYMBOL f?r ec_master_prepare_async_io() vergessen.
master/master.c
mini/mini.c
--- a/master/master.c	Sun Mar 19 15:21:57 2006 +0000
+++ b/master/master.c	Mon Mar 20 08:24:12 2006 +0000
@@ -1031,6 +1031,7 @@
 EXPORT_SYMBOL(ecrt_master_create_domain);
 EXPORT_SYMBOL(ecrt_master_activate);
 EXPORT_SYMBOL(ecrt_master_deactivate);
+EXPORT_SYMBOL(ecrt_master_prepare_async_io);
 EXPORT_SYMBOL(ecrt_master_sync_io);
 EXPORT_SYMBOL(ecrt_master_async_send);
 EXPORT_SYMBOL(ecrt_master_async_receive);
--- a/mini/mini.c	Sun Mar 19 15:21:57 2006 +0000
+++ b/mini/mini.c	Mon Mar 20 08:24:12 2006 +0000
@@ -29,13 +29,22 @@
 ec_domain_t *domain1 = NULL;
 
 // Datenfelder
-void *r_ssi;
+void *r_field[9];
+void *r_4102[3];
 
 // Kanäle
 uint32_t k_pos;
 
 ec_field_init_t domain1_fields[] = {
-    {&r_ssi,   "1", "Beckhoff", "EL5001", "InputValue", 0, 1},
+    {&r_field[0],   "1", "Beckhoff", "EL5001", "InputValue", 0, 1},
+    {&r_field[1],   "2", "Beckhoff", "EL4132", "OutputValue", 0, 1},
+    {&r_field[2],   "3", "Beckhoff", "EL3162", "InputValue", 0, 1},
+    {r_4102,        "4", "Beckhoff", "EL4102", "OutputValue", 0, 3},
+    {&r_field[4],   "5", "Beckhoff", "EL5001", "InputValue", 0, 1},
+    {&r_field[5],   "6", "Beckhoff", "EL1014", "InputValue", 0, 1},
+    {&r_field[6],   "7", "Beckhoff", "EL2004", "OutputValue", 0, 1},
+    {&r_field[7],   "8", "Beckhoff", "EL4132", "OutputValue", 0, 1},
+    {&r_field[8],   "9", "Beckhoff", "EL4132", "OutputValue", 0, 1},
     {}
 };
 
@@ -51,7 +60,7 @@
     ecrt_domain_process(domain1);
 
     // Prozessdaten verarbeiten
-    k_pos   = EC_READ_U32(r_ssi);
+    //  k_pos   = EC_READ_U32(r_ssi);
 
     // Prozessdaten senden
     ecrt_domain_queue(domain1);
@@ -90,7 +99,7 @@
         goto out_return;
     }
 
-    //ecrt_master_print(master);
+    ecrt_master_print(master);
 
     printk(KERN_INFO "Registering domain...\n");