From a69507130c686077ca085611919999659932650a Mon Sep 17 00:00:00 2001 From: Florian Pose <fp@igh-essen.com> Date: Fri, 25 Nov 2005 16:43:46 +0000 Subject: [PATCH] EXPORT_SYMBOLS im EtherCAT-Treiber. --HG-- branch : kernel2.6 --- drivers/8139too.c | 4 +++- drivers/ec_device.c | 6 ++++++ drivers/ec_master.c | 16 ++++++++++++++++ drivers/ec_slave.c | 4 ++++ drivers/ec_types.c | 7 +++++++ drivers/ec_types.h | 2 ++ mini/ec_mini.c | 5 +---- 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/drivers/8139too.c b/drivers/8139too.c index 65526368..1e1f66da 100644 --- a/drivers/8139too.c +++ b/drivers/8139too.c @@ -109,7 +109,7 @@ */ -#define DRV_NAME "8139too_ecat" +#define DRV_NAME "8139too-ecat" #define DRV_VERSION "0.9.27" @@ -200,6 +200,8 @@ static int ec_device_index = -1; EtherCAT_device_t rtl_ecat_dev; +EXPORT_SYMBOL(rtl_ecat_dev); + /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ /* diff --git a/drivers/ec_device.c b/drivers/ec_device.c index 54ff0410..d378f48c 100644 --- a/drivers/ec_device.c +++ b/drivers/ec_device.c @@ -159,6 +159,8 @@ int EtherCAT_device_open(EtherCAT_device_t *ecd) return ecd->dev->open(ecd->dev); } +EXPORT_SYMBOL(EtherCAT_device_open); + /***************************************************************/ /** @@ -187,6 +189,8 @@ int EtherCAT_device_close(EtherCAT_device_t *ecd) return ecd->dev->stop(ecd->dev); } +EXPORT_SYMBOL(EtherCAT_device_close); + /***************************************************************/ /** @@ -342,4 +346,6 @@ void EtherCAT_device_debug(EtherCAT_device_t *ecd) EC_DBG(KERN_DEBUG "---EtherCAT device information end---\n"); } +EXPORT_SYMBOL(EtherCAT_device_debug); + /***************************************************************/ diff --git a/drivers/ec_master.c b/drivers/ec_master.c index eb1117c8..1777de83 100644 --- a/drivers/ec_master.c +++ b/drivers/ec_master.c @@ -52,6 +52,8 @@ int EtherCAT_master_init(EtherCAT_master_t *master, return 0; } +EXPORT_SYMBOL(EtherCAT_master_init); + /***************************************************************/ /** @@ -77,6 +79,8 @@ void EtherCAT_master_clear(EtherCAT_master_t *master) master->process_data_length = 0; } +EXPORT_SYMBOL(EtherCAT_master_clear); + /***************************************************************/ /** @@ -498,6 +502,8 @@ int EtherCAT_check_slaves(EtherCAT_master_t *master, return 0; } +EXPORT_SYMBOL(EtherCAT_check_slaves); + /***************************************************************/ /** @@ -922,6 +928,8 @@ int EtherCAT_activate_all_slaves(EtherCAT_master_t *master) return 0; } +EXPORT_SYMBOL(EtherCAT_activate_all_slaves); + /***************************************************************/ /** @@ -950,6 +958,8 @@ int EtherCAT_deactivate_all_slaves(EtherCAT_master_t *master) return ret; } +EXPORT_SYMBOL(EtherCAT_deactivate_all_slaves); + /***************************************************************/ /** @@ -978,6 +988,8 @@ int EtherCAT_write_process_data(EtherCAT_master_t *master) return 0; } +EXPORT_SYMBOL(EtherCAT_write_process_data); + /***************************************************************/ /** @@ -1031,6 +1043,8 @@ int EtherCAT_read_process_data(EtherCAT_master_t *master) return 0; } +EXPORT_SYMBOL(EtherCAT_read_process_data); + /***************************************************************/ /** @@ -1045,6 +1059,8 @@ void EtherCAT_clear_process_data(EtherCAT_master_t *master) master->dev->state = ECAT_DS_READY; } +EXPORT_SYMBOL(EtherCAT_clear_process_data); + /***************************************************************/ /** diff --git a/drivers/ec_slave.c b/drivers/ec_slave.c index 595427b1..bd288c71 100644 --- a/drivers/ec_slave.c +++ b/drivers/ec_slave.c @@ -112,6 +112,8 @@ int EtherCAT_read_value(EtherCAT_slave_t *slave, return slave->desc->read(slave->process_data, channel); } +EXPORT_SYMBOL(EtherCAT_read_value); + /***************************************************************/ /** @@ -162,4 +164,6 @@ void EtherCAT_write_value(EtherCAT_slave_t *slave, slave->desc->write(slave->process_data, channel, value); } +EXPORT_SYMBOL(EtherCAT_write_value); + /***************************************************************/ diff --git a/drivers/ec_types.c b/drivers/ec_types.c index 9729c952..1a7ce78d 100644 --- a/drivers/ec_types.c +++ b/drivers/ec_types.c @@ -78,6 +78,7 @@ EtherCAT_slave_desc_t Beckhoff_EK1100[] = 0, 0, NULL, NULL }}; +EXPORT_SYMBOL(Beckhoff_EK1100); EtherCAT_slave_desc_t Beckhoff_EL1014[] = {{ @@ -88,6 +89,7 @@ EtherCAT_slave_desc_t Beckhoff_EL1014[] = 1, 4, read_1014, NULL }}; +EXPORT_SYMBOL(Beckhoff_EL1014); EtherCAT_slave_desc_t Beckhoff_EL2004[] = {{ @@ -98,6 +100,7 @@ EtherCAT_slave_desc_t Beckhoff_EL2004[] = 1, 4, NULL, write_2004 }}; +EXPORT_SYMBOL(Beckhoff_EL2004); EtherCAT_slave_desc_t Beckhoff_EL3102[] = {{ @@ -108,6 +111,7 @@ EtherCAT_slave_desc_t Beckhoff_EL3102[] = 6, 2, read_31xx, NULL }}; +EXPORT_SYMBOL(Beckhoff_EL3102); EtherCAT_slave_desc_t Beckhoff_EL3162[] = {{ @@ -118,6 +122,7 @@ EtherCAT_slave_desc_t Beckhoff_EL3162[] = 6, 2, read_31xx, NULL }}; +EXPORT_SYMBOL(Beckhoff_EL3162); EtherCAT_slave_desc_t Beckhoff_EL4102[] = {{ @@ -128,6 +133,7 @@ EtherCAT_slave_desc_t Beckhoff_EL4102[] = 4, 2, NULL, write_4102 }}; +EXPORT_SYMBOL(Beckhoff_EL4102); EtherCAT_slave_desc_t Beckhoff_EL5001[] = {{ @@ -138,6 +144,7 @@ EtherCAT_slave_desc_t Beckhoff_EL5001[] = 0, 0, NULL, NULL }}; +EXPORT_SYMBOL(Beckhoff_EL5001); /***************************************************************/ diff --git a/drivers/ec_types.h b/drivers/ec_types.h index c2418675..b3229995 100644 --- a/drivers/ec_types.h +++ b/drivers/ec_types.h @@ -9,6 +9,8 @@ * ***************************************************************/ +#include <linux/module.h> + #ifndef _EC_TYPES_H_ #define _EC_TYPES_H_ diff --git a/mini/ec_mini.c b/mini/ec_mini.c index 8931166b..324b4687 100644 --- a/mini/ec_mini.c +++ b/mini/ec_mini.c @@ -9,8 +9,6 @@ ******************************************************************************/ #include <linux/module.h> -//#include <linux/slab.h> -//#include <linux/delay.h> #include <linux/timer.h> #include "../drivers/ec_master.h" @@ -94,7 +92,6 @@ static EtherCAT_slave_t ecat_slaves[] = #ifdef ECAT_CYCLIC_DATA -double value; int dig1; struct timer_list timer; @@ -182,7 +179,7 @@ static void run(unsigned long data) EtherCAT_read_process_data(ecat_master); // Daten lesen und skalieren - value = EtherCAT_read_value(&ecat_master->slaves[5], 0) / 3276.7; + //value = EtherCAT_read_value(&ecat_master->slaves[5], 0) / 3276.7; dig1 = EtherCAT_read_value(&ecat_master->slaves[3], 0); } -- GitLab