sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add get error counter call 

Signed-off-by: Luotao Fu <luotao@alea.(none)>
pull/106/head^2
Luotao Fu 2010-02-14 18:12:01 +01:00
parent 118358336e
commit 298e6efc3e
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/can_netlink.h
View File

@ -69,6 +69,14 @@ enum can_state {
CAN_STATE_MAX CAN_STATE_MAX
}; };
/*
* CAN bus error counters
*/
struct can_berr_counter {
__u16 txerr;
__u16 rxerr;
};
/* /*
* CAN controller mode * CAN controller mode
*/ */
@ -77,9 +85,11 @@ struct can_ctrlmode {
__u32 flags; __u32 flags;
}; };
#define CAN_CTRLMODE_LOOPBACK 0x1 /* Loopback mode */ #define CAN_CTRLMODE_LOOPBACK 0x01 /* Loopback mode */
#define CAN_CTRLMODE_LISTENONLY 0x2 /* Listen-only mode */ #define CAN_CTRLMODE_LISTENONLY 0x02 /* Listen-only mode */
#define CAN_CTRLMODE_3_SAMPLES 0x4 /* Triple sampling mode */ #define CAN_CTRLMODE_3_SAMPLES 0x04 /* Triple sampling mode */
#define CAN_CTRLMODE_ONE_SHOT 0x08 /* One-Shot mode */
#define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */
/* /*
* CAN device statistics * CAN device statistics
@ -105,6 +115,7 @@ enum {
IFLA_CAN_CTRLMODE, IFLA_CAN_CTRLMODE,
IFLA_CAN_RESTART_MS, IFLA_CAN_RESTART_MS,
IFLA_CAN_RESTART, IFLA_CAN_RESTART,
IFLA_CAN_BERR_COUNTER,
__IFLA_CAN_MAX __IFLA_CAN_MAX
}; };

38
src/libsocketcan.c
View File

@ -52,6 +52,7 @@
#define GET_CTRLMODE 4 #define GET_CTRLMODE 4
#define GET_CLOCK 5 #define GET_CLOCK 5
#define GET_BITTIMING_CONST 6 #define GET_BITTIMING_CONST 6
#define GET_BERR_COUNTER 7
struct get_req { struct get_req {
struct nlmsghdr n; struct nlmsghdr n;
@ -456,6 +457,17 @@ static int do_get_nl_link(int fd, __u8 acquire, const char *name, void *res)
fprintf(stderr, "no bittiming_const data found\n"); fprintf(stderr, "no bittiming_const data found\n");
break; break;
case GET_BERR_COUNTER:
if (can_attr[IFLA_CAN_BERR_COUNTER]) {
memcpy(res,
RTA_DATA(can_attr[IFLA_CAN_BERR_COUNTER]),
sizeof(struct can_berr_counter));
ret = 0;
} else
fprintf(stderr, "no berr_counter data found\n");
break;
default: default:
fprintf(stderr, "unknown acquire mode\n"); fprintf(stderr, "unknown acquire mode\n");
} }
@ -1083,3 +1095,29 @@ int can_get_bittiming_const(const char *name, struct can_bittiming_const *btc)
return get_link(name, GET_BITTIMING_CONST, btc); return get_link(name, GET_BITTIMING_CONST, btc);
} }
/**
* @ingroup extern
* can_get_berr_counter - get the tx/rx error counter.
*
* @param name name of the can device. This is the netdev name, as ifconfig -a shows
* in your system. usually it contains prefix "can" and the numer of the can
* line. e.g. "can0"
* @param bc pointer to the error counter struct..
*
* This one gets the current rx/tx error counter from the hardware.
*
* @code
* struct can_berr_counter {
* __u16 txerr;
* __u16 rxerr;
* };
* @endcode
*
* @return 0 if success
* @return -1 if failed
*/
int can_get_berr_counter(const char *name, struct can_berr_counter *bc)
{
return get_link(name, GET_BERR_COUNTER, bc);
}