bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugfest: Globale Debug-Funktionen für Frame-Daten.

This commit is contained in:
Florian Pose 2006-04-05 08:23:40 +00:00
parent 2fa964880b
commit c86b979bdd
3 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
master/device.c
View File

@ -19,11 +19,6 @@
/*****************************************************************************/
void ec_data_print(const uint8_t *, size_t);
void ec_data_print_diff(const uint8_t *, const uint8_t *, size_t);
/*****************************************************************************/
/**
EtherCAT-Geräte-Konstuktor.
@ -177,7 +172,7 @@ void ec_device_send(ec_device_t *device, /**< EtherCAT-Ger
if (unlikely(device->master->debug_level > 1)) {
EC_DBG("sending frame:\n");
ec_data_print(device->tx_skb->data + ETH_HLEN, size);
ec_print_data(device->tx_skb->data + ETH_HLEN, size);
}
// Senden einleiten
@ -195,54 +190,6 @@ void ec_device_call_isr(ec_device_t *device /**< EtherCAT-Ger
if (likely(device->isr)) device->isr(0, device->dev, NULL);
}
/*****************************************************************************/
/**
Gibt Frame-Inhalte zwecks Debugging aus.
*/
void ec_data_print(const uint8_t *data /**< Daten */,
size_t size /**< Anzahl Bytes */
)
{
size_t i;
EC_DBG("");
for (i = 0; i < size; i++) {
printk("%02X ", data[i]);
if ((i + 1) % 16 == 0) {
printk("\n");
EC_DBG("");
}
}
printk("\n");
}
/*****************************************************************************/
/**
Gibt Frame-Inhalte zwecks Debugging aus, differentiell.
*/
void ec_data_print_diff(const uint8_t *d1, /**< Daten 1 */
const uint8_t *d2, /**< Daten 2 */
size_t size /** Anzahl Bytes */
)
{
size_t i;
EC_DBG("");
for (i = 0; i < size; i++) {
if (d1[i] == d2[i]) printk(".. ");
else printk("%02X ", d2[i]);
if ((i + 1) % 16 == 0) {
printk("\n");
EC_DBG("");
}
}
printk("\n");
}
/******************************************************************************
*
* Treiberschnittstelle
@ -277,7 +224,7 @@ void ecdev_receive(ec_device_t *device, /**< EtherCAT-Ger
{
if (unlikely(device->master->debug_level > 1)) {
EC_DBG("Received frame:\n");
ec_data_print_diff(device->tx_skb->data + ETH_HLEN, data, size);
ec_print_data_diff(device->tx_skb->data + ETH_HLEN, data, size);
}
ec_master_receive(device->master, data, size);

9
master/globals.h
View File

@ -11,6 +11,8 @@
#ifndef _EC_GLOBALS_
#define _EC_GLOBALS_
#include <linux/types.h>
/*****************************************************************************/
// EtherCAT-Protokoll
@ -30,6 +32,8 @@
bei einem Kommando pro
Frame */
/*****************************************************************************/
#define EC_INFO(fmt, args...) \
printk(KERN_INFO "EtherCAT: " fmt, ##args)
#define EC_ERR(fmt, args...) \
@ -41,6 +45,11 @@
/*****************************************************************************/
extern void ec_print_data(const uint8_t *, size_t);
extern void ec_print_data_diff(const uint8_t *, const uint8_t *, size_t);
/*****************************************************************************/
#endif
/* Emacs-Konfiguration

46
master/module.c
View File

@ -333,6 +333,52 @@ void ecrt_release_master(ec_master_t *master /**< EtherCAT-Master */)
/*****************************************************************************/
/**
Gibt Frame-Inhalte zwecks Debugging aus.
*/
void ec_print_data(const uint8_t *data, size_t size)
{
unsigned int i;
EC_DBG("");
for (i = 0; i < size; i++) {
printk("%02X ", data[i]);
if ((i + 1) % 16 == 0) {
printk("\n");
EC_DBG("");
}
}
printk("\n");
}
/*****************************************************************************/
/**
Gibt Frame-Inhalte zwecks Debugging aus, differentiell.
*/
void ec_print_data_diff(const uint8_t *d1, /**< Daten 1 */
const uint8_t *d2, /**< Daten 2 */
size_t size /** Anzahl Bytes */
)
{
unsigned int i;
EC_DBG("");
for (i = 0; i < size; i++) {
if (d1[i] == d2[i]) printk(".. ");
else printk("%02X ", d2[i]);
if ((i + 1) % 16 == 0) {
printk("\n");
EC_DBG("");
}
}
printk("\n");
}
/*****************************************************************************/
module_init(ec_init_module);
module_exit(ec_cleanup_module);