From 0cb299aeab0e41da16a5b58d81e8ced383f16f84 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Mon, 20 Mar 2006 08:24:12 +0000
Subject: [PATCH] =?UTF-8?q?Bugfix:=20EXPORT=5FSYMBOL=20f=C3=BCr=20ec=5Fmas?=
=?UTF-8?q?ter=5Fprepare=5Fasync=5Fio()=20vergessen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
master/master.c | 1 +
mini/mini.c | 17 +++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/master/master.c b/master/master.c
index 68dcdce5..ba25799f 100644
--- a/master/master.c
+++ b/master/master.c
@@ -1031,6 +1031,7 @@ void ecrt_master_print(const ec_master_t *master /**< EtherCAT-Master */)
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);
diff --git a/mini/mini.c b/mini/mini.c
index f1f351f2..880e0a2b 100644
--- a/mini/mini.c
+++ b/mini/mini.c
@@ -29,13 +29,22 @@ ec_master_t *master = NULL;
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 @@ void run(unsigned long data)
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 @@ int __init init_mini_module(void)
goto out_return;
}
- //ecrt_master_print(master);
+ ecrt_master_print(master);
printk(KERN_INFO "Registering domain...\n");
--
GitLab