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

remove print.* from release tree 

run indent
This commit is contained in:
Patrick Bruenn 2014-06-05 17:41:48 +02:00
parent 950bfe2649
commit 4e38410894
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devices/ccat/module.h
View File

@ -156,8 +156,7 @@ struct ccat_device {
struct ccat_bar bar[3]; //TODO optimize this
};
struct ccat_info_block
{
struct ccat_info_block {
u16 type;
u16 rev;
union {
@ -217,16 +216,15 @@ struct ccat_eth_priv {
*/
struct ccat_mac_infoblock {
u32 reserved;
u32 mii;
u32 tx_fifo;
u32 mac;
u32 rx_mem;
u32 tx_mem;
u32 misc;
u32 mii;
u32 tx_fifo;
u32 mac;
u32 rx_mem;
u32 tx_mem;
u32 misc;
};
struct ccat_mac_register
{
struct ccat_mac_register {
/** MAC error register @+0x0 */
u8 frame_len_err;
u8 rx_err;
@ -241,8 +239,8 @@ struct ccat_mac_register
u32 rx_frames;
u64 reserved3;
/** MAC fifo level @+0x20 */
u8 tx_fifo_level : 7;
u8 reserved4 : 1;
u8 tx_fifo_level:7;
u8 reserved4:1;
u8 reserved5[7];
/** TX memory full error @+0x28 */
u8 tx_mem_full;

2
devices/ccat/netdev.c
View File

@ -432,7 +432,7 @@ static struct rtnl_link_stats64 *ccat_eth_get_stats64(struct net_device *dev, st
storage->rx_bytes = atomic64_read(&priv->rx_bytes); /* total bytes received */
storage->tx_bytes = atomic64_read(&priv->tx_bytes); /* total bytes transmitted */
storage->rx_errors = mac.frame_len_err + mac.rx_mem_full + mac.crc_err + mac.rx_err; /* bad packets received */
storage->tx_errors = mac.tx_mem_full; /* packet transmit problems */
storage->tx_errors = mac.tx_mem_full; /* packet transmit problems */
storage->rx_dropped = atomic64_read(&priv->rx_dropped); /* no space in linux buffers */
storage->tx_dropped = atomic64_read(&priv->tx_dropped); /* no space available in linux */
//TODO __u64 multicast; /* multicast packets received */

3
devices/ccat/update.c
View File

@ -413,7 +413,8 @@ struct ccat_update *ccat_update_init(const struct ccat_device *const ccatdev,
memcpy_fromio(&update->info, addr, sizeof(update->info));
if (0x00 != update->info.rev) {
pr_warn("CCAT Update rev. %d not supported\n", update->info.rev);
pr_warn("CCAT Update rev. %d not supported\n",
update->info.rev);
goto cleanup;
}