Skip to content
Snippets Groups Projects
Commit ef53efde authored by Florian Pose's avatar Florian Pose
Browse files

Ausgaben verbessert, Mini-Modul angepasst.

parent de73c395
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
master/slave.c
+ 101
− 90
View file @ ef53efde
...@@ -906,6 +906,20 @@ void ec_slave_print(const ec_slave_t *slave, /**< EtherCAT-Slave */ ...@@ -906,6 +906,20 @@ void ec_slave_print(const ec_slave_t *slave, /**< EtherCAT-Slave */
ec_sdo_entry_t *sdo_entry; ec_sdo_entry_t *sdo_entry;
int first, i; int first, i;
if (!verbosity) {
if (slave->type) {
EC_INFO("%2i) %s %s: %s\n", slave->ring_position,
slave->type->vendor_name, slave->type->product_name,
slave->type->description);
}
else {
EC_INFO("%2i) UNKNOWN SLAVE: 0x%08X 0x%08X\n",
slave->ring_position, slave->sii_vendor_id,
slave->sii_product_code);
}
return;
}
EC_INFO("x-- EtherCAT slave information ---------------\n"); EC_INFO("x-- EtherCAT slave information ---------------\n");
if (slave->type) { if (slave->type) {
...@@ -920,101 +934,98 @@ void ec_slave_print(const ec_slave_t *slave, /**< EtherCAT-Slave */ ...@@ -920,101 +934,98 @@ void ec_slave_print(const ec_slave_t *slave, /**< EtherCAT-Slave */
EC_INFO("| Ring position: %i, Station address: 0x%04X\n", EC_INFO("| Ring position: %i, Station address: 0x%04X\n",
slave->ring_position, slave->station_address); slave->ring_position, slave->station_address);
if (verbosity > 0) // Etwas geschwtziger EC_INFO("| Data link status:\n");
{ for (i = 0; i < 2; i++) {
EC_INFO("| Data link status:\n"); EC_INFO("| Port %i: link %s, loop %s, %s\n", i,
for (i = 0; i < 2; i++) { slave->dl_status_link[i] ? "up" : "down",
EC_INFO("| Port %i: link %s, loop %s, %s\n", i, slave->dl_status_loop[i] ? "closed" : "open",
slave->dl_status_link[i] ? "up" : "down", slave->dl_status_comm[i] ? "comm. establ." : "no comm.");
slave->dl_status_loop[i] ? "closed" : "open", }
slave->dl_status_comm[i] ? "comm. establ." : "no comm.");
}
EC_INFO("| Base information:\n"); EC_INFO("| Base information:\n");
EC_INFO("| Type %u, Revision %i, Build %i\n", EC_INFO("| Type %u, Revision %i, Build %i\n",
slave->base_type, slave->base_revision, slave->base_build); slave->base_type, slave->base_revision, slave->base_build);
EC_INFO("| Supported FMMUs: %i, Sync managers: %i\n", EC_INFO("| Supported FMMUs: %i, Sync managers: %i\n",
slave->base_fmmu_count, slave->base_sync_count); slave->base_fmmu_count, slave->base_sync_count);
if (slave->sii_mailbox_protocols) { if (slave->sii_mailbox_protocols) {
EC_INFO("| Mailbox communication:\n"); EC_INFO("| Mailbox communication:\n");
EC_INFO("| RX mailbox: 0x%04X/%i, TX mailbox: 0x%04X/%i\n", EC_INFO("| RX mailbox: 0x%04X/%i, TX mailbox: 0x%04X/%i\n",
slave->sii_rx_mailbox_offset, slave->sii_rx_mailbox_size, slave->sii_rx_mailbox_offset, slave->sii_rx_mailbox_size,
slave->sii_tx_mailbox_offset, slave->sii_tx_mailbox_size); slave->sii_tx_mailbox_offset, slave->sii_tx_mailbox_size);
EC_INFO("| Supported protocols: "); EC_INFO("| Supported protocols: ");
first = 1; first = 1;
if (slave->sii_mailbox_protocols & EC_MBOX_AOE) { if (slave->sii_mailbox_protocols & EC_MBOX_AOE) {
printk("AoE"); printk("AoE");
first = 0; first = 0;
} }
if (slave->sii_mailbox_protocols & EC_MBOX_EOE) { if (slave->sii_mailbox_protocols & EC_MBOX_EOE) {
if (!first) printk(", "); if (!first) printk(", ");
printk("EoE"); printk("EoE");
first = 0; first = 0;
} }
if (slave->sii_mailbox_protocols & EC_MBOX_COE) { if (slave->sii_mailbox_protocols & EC_MBOX_COE) {
if (!first) printk(", "); if (!first) printk(", ");
printk("CoE"); printk("CoE");
first = 0; first = 0;
} }
if (slave->sii_mailbox_protocols & EC_MBOX_FOE) { if (slave->sii_mailbox_protocols & EC_MBOX_FOE) {
if (!first) printk(", "); if (!first) printk(", ");
printk("FoE"); printk("FoE");
first = 0; first = 0;
}
if (slave->sii_mailbox_protocols & EC_MBOX_SOE) {
if (!first) printk(", ");
printk("SoE");
first = 0;
}
if (slave->sii_mailbox_protocols & EC_MBOX_VOE) {
if (!first) printk(", ");
printk("VoE");
}
printk("\n");
} }
if (slave->sii_mailbox_protocols & EC_MBOX_SOE) {
if (!first) printk(", ");
printk("SoE");
first = 0;
}
if (slave->sii_mailbox_protocols & EC_MBOX_VOE) {
if (!first) printk(", ");
printk("VoE");
}
printk("\n");
}
EC_INFO("| EEPROM data:\n"); EC_INFO("| EEPROM data:\n");
if (slave->sii_alias) if (slave->sii_alias)
EC_INFO("| Configured station alias: 0x%04X (%i)\n", EC_INFO("| Configured station alias: 0x%04X (%i)\n",
slave->sii_alias, slave->sii_alias); slave->sii_alias, slave->sii_alias);
EC_INFO("| Vendor-ID: 0x%08X, Product code: 0x%08X\n", EC_INFO("| Vendor-ID: 0x%08X, Product code: 0x%08X\n",
slave->sii_vendor_id, slave->sii_product_code); slave->sii_vendor_id, slave->sii_product_code);
EC_INFO("| Revision number: 0x%08X, Serial number: 0x%08X\n", EC_INFO("| Revision number: 0x%08X, Serial number: 0x%08X\n",
slave->sii_revision_number, slave->sii_serial_number); slave->sii_revision_number, slave->sii_serial_number);
if (slave->eeprom_name) if (slave->eeprom_name)
EC_INFO("| Name: %s\n", slave->eeprom_name); EC_INFO("| Name: %s\n", slave->eeprom_name);
if (slave->eeprom_group) if (slave->eeprom_group)
EC_INFO("| Group: %s\n", slave->eeprom_group); EC_INFO("| Group: %s\n", slave->eeprom_group);
if (slave->eeprom_desc) if (slave->eeprom_desc)
EC_INFO("| Description: %s\n", slave->eeprom_desc); EC_INFO("| Description: %s\n", slave->eeprom_desc);
if (!list_empty(&slave->eeprom_syncs)) { if (!list_empty(&slave->eeprom_syncs)) {
EC_INFO("| Sync-Managers:\n"); EC_INFO("| Sync-Managers:\n");
list_for_each_entry(sync, &slave->eeprom_syncs, list) { list_for_each_entry(sync, &slave->eeprom_syncs, list) {
EC_INFO("| %i: 0x%04X, length %i, control 0x%02X, %s\n", EC_INFO("| %i: 0x%04X, length %i, control 0x%02X, %s\n",
sync->index, sync->physical_start_address, sync->index, sync->physical_start_address,
sync->length, sync->control_register, sync->length, sync->control_register,
sync->enable ? "enable" : "disable"); sync->enable ? "enable" : "disable");
}
} }
}
list_for_each_entry(pdo, &slave->eeprom_pdos, list) { list_for_each_entry(pdo, &slave->eeprom_pdos, list) {
EC_INFO("| %s \"%s\" (0x%04X), -> Sync-Manager %i\n", EC_INFO("| %s \"%s\" (0x%04X), -> Sync-Manager %i\n",
pdo->type == EC_RX_PDO ? "RXPDO" : "TXPDO", pdo->type == EC_RX_PDO ? "RXPDO" : "TXPDO",
pdo->name ? pdo->name : "???", pdo->name ? pdo->name : "???",
pdo->index, pdo->sync_manager); pdo->index, pdo->sync_manager);
list_for_each_entry(pdo_entry, &pdo->entries, list) { list_for_each_entry(pdo_entry, &pdo->entries, list) {
EC_INFO("| \"%s\" 0x%04X:%X, %i Bit\n", EC_INFO("| \"%s\" 0x%04X:%X, %i Bit\n",
pdo_entry->name ? pdo_entry->name : "???", pdo_entry->name ? pdo_entry->name : "???",
pdo_entry->index, pdo_entry->subindex, pdo_entry->index, pdo_entry->subindex,
pdo_entry->bit_length); pdo_entry->bit_length);
}
} }
} }
......
mini/Makefile
+ 1
− 1
View file @ ef53efde
...@@ -33,7 +33,7 @@ KERNELDIR = /usr/src/linux ...@@ -33,7 +33,7 @@ KERNELDIR = /usr/src/linux
endif endif
modules: modules:
$(MAKE) -C $(KERNELDIR) M=`pwd` modules $(MAKE) -C $(KERNELDIR) M=`pwd`
clean: clean:
$(MAKE) -C $(KERNELDIR) M=`pwd` clean $(MAKE) -C $(KERNELDIR) M=`pwd` clean
......
mini/mini.c
+ 9
− 8
View file @ ef53efde
/****************************************************************************** /******************************************************************************
* *
* m i n i . c * m i n i . c
* *
* Minimalmodul fr EtherCAT * Minimalmodul fr EtherCAT
* *
* $Id$ * $Id$
* *
*****************************************************************************/ *****************************************************************************/
...@@ -36,11 +36,8 @@ uint32_t k_pos; ...@@ -36,11 +36,8 @@ uint32_t k_pos;
uint8_t k_stat; uint8_t k_stat;
ec_field_init_t domain1_fields[] = { ec_field_init_t domain1_fields[] = {
{NULL, "1", "Beckhoff", "EL1014", "InputValue", 0}, {NULL, "1", "Beckhoff", "EL5001", "InputValue", 0},
{NULL, "2", "Beckhoff", "EL2004", "OutputValue", 0}, {NULL, "2", "Beckhoff", "EL4132", "OutputValue", 0},
//{NULL, "3", "Beckhoff", "EL3162", "InputValue", 0},
{NULL, "4", "Beckhoff", "EL4132", "OutputValue", 0},
{NULL, "6", "Beckhoff", "EL5001", "InputValue", 0},
{} {}
}; };
...@@ -61,10 +58,12 @@ void run(unsigned long data) ...@@ -61,10 +58,12 @@ void run(unsigned long data)
// Prozessdaten senden // Prozessdaten senden
ecrt_domain_queue(domain1); ecrt_domain_queue(domain1);
ecrt_master_run(master);
ecrt_master_async_send(master); ecrt_master_async_send(master);
#else #else
// Prozessdaten senden und empfangen // Prozessdaten senden und empfangen
ecrt_domain_queue(domain1); ecrt_domain_queue(domain1);
ecrt_master_run(master);
ecrt_master_sync_io(master); ecrt_master_sync_io(master);
ecrt_domain_process(domain1); ecrt_domain_process(domain1);
...@@ -170,8 +169,10 @@ int __init init_mini_module(void) ...@@ -170,8 +169,10 @@ int __init init_mini_module(void)
printk(KERN_INFO "=== Minimal EtherCAT environment started. ===\n"); printk(KERN_INFO "=== Minimal EtherCAT environment started. ===\n");
return 0; return 0;
#if 0
out_deactivate: out_deactivate:
ecrt_master_deactivate(master); ecrt_master_deactivate(master);
#endif
out_release_master: out_release_master:
ecrt_release_master(master); ecrt_release_master(master);
out_return: out_return:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment