RT-Socket-CAN fixes
PATCH 1/1 RT-Socket-CAN fixes
Hallo,
attached you will find a patch for Xenomai RT-Socket-CAN fixing:
2006-10-30 Wolfgang Grandegger <[email protected]>
* src/utils/can/rtcanrecv: Add timestamp support via rt_dev_recvmsg().
* ksrc/drivers/can/mscan/rtcan_mscan.c (rtcan_mscan_interrupt), ksrc/drivers/can/mscan/rtcan_mscan_regs.h: Restrict MSCAN TX hardware buffer usage to one for the sake of real-time. Fix bug with TX IRQ handling. Copy timestamp also for error messages.
* ksrc/drivers/can/sja1000/rtcan_sja1000.c(rtcan_sja_interrupt):
Copy timestamp also for error messages.
Wolfgang.
utils/can/rtcanrecv.c +37 -4
@@ -20,6 +20,7 @@" -f --filter=id:mask[:id:mask]... apply filter\n" " -e --error=mask receive error messages\n" " -t, --timeout=MS timeout in ms\n" +" -T, --timestamp with timestamp\n" " -v, --verbose be verbose\n" " -p, --print=MODULO print every MODULO message\n" " -h, --help this help\n",
@@ -30,7 +31,7 @@extern int optind, opterr, optopt;static int s =-1 , verbose =0 , print =1 ; -static nanosecs_rel_t timeout =0 ; +static nanosecs_rel_t timeout =0 , with_timestamp =0 ;RT_TASK rt_task_desc;
@@ -84,10 +85,27 @@struct can_frame frame;struct sockaddr_can addr;socklen_t addrlen =sizeof (addr); +struct msghdr msg; +struct iovec iov; +nanosecs_abs_t timestamp; +if (with_timestamp) { + msg.msg_iov = &iov; + msg.msg_iovlen =1 ; + msg.msg_name = (void *)&addr; + msg.msg_namelen =sizeof (struct sockaddr_can ); + msg.msg_control = (void *)×tamp; + msg.msg_controllen =sizeof (nanosecs_abs_t); + } +while (1 ) { - ret =rt_dev_recvfrom (s, (void *)&frame,sizeof (can_frame_t),0 , - (struct sockaddr *)&addr, &addrlen); +if (with_timestamp) { + iov.iov_base = (void *)&frame; + iov.iov_len =sizeof (can_frame_t); + ret =rt_dev_recvmsg (s, &msg,0 ); + }else + ret =rt_dev_recvfrom (s, (void *)&frame,sizeof (can_frame_t),0 , + (struct sockaddr *)&addr, &addrlen);if (ret <0 ) {switch (ret) {case -ETIMEDOUT :
@@ -106,6 +124,8 @@if (print && (count % print) ==0 ) {printf ("#%d: (%d) " , count, addr.can_ifindex); +if (with_timestamp && msg.msg_controllen) +printf ("%lldns " , timestamp);if (frame.can_id &CAN_ERR_FLAG )printf ("!0x%08x!" , frame.can_id &CAN_ERR_MASK );else if (frame.can_id &CAN_EFF_FLAG )
@@ -147,6 +167,7 @@ { "filter", required_argument, 0, 'f'}, { "error", required_argument, 0, 'e'}, { "timeout", required_argument, 0, 't'}, + { "timestamp", no_argument, 0, 'T'}, { 0, 0, 0, 0}, };
@@ -155,7 +176,7 @@signal (SIGTERM , cleanup_and_exit);signal (SIGINT , cleanup_and_exit); -while ((opt =getopt_long (argc, argv,"hve:f:t:p:" , +while ((opt =getopt_long (argc, argv,"hve:f:t:p:T" , long_options,NULL )) !=-1 ) {switch (opt) {case 'h' :
@@ -196,6 +217,10 @@ timeout = (nanosecs_rel_t )strtoul (optarg,NULL ,0 ) *1000000 ;break ; +case 'T' : + with_timestamp =1 ; +break ; +default :fprintf (stderr,"Unknown option %c\n" , opt);break ;
@@ -269,6 +294,14 @@ } } +if (with_timestamp) { + ret =rt_dev_ioctl (s,RTCAN_RTIOC_TAKE_TIMESTAMP ,RTCAN_TAKE_TIMESTAMPS ); +if (ret) { +fprintf (stderr,"rt_dev_ioctl TAKE_TIMESTAMP: %s\n" ,strerror (-ret)); + goto failure; + } + } +snprintf (name,sizeof (name),"rtcanrecv-%d" ,getpid ()); ret =rt_task_shadow (&rt_task_desc, name,1 ,0 );if (ret) {
ChangeLog +12 -0
@@ -1,3 +1,15 @@ +2006-10-30 Wolfgang Grandegger <[email protected]> + + * src/utils/can/rtcanrecv: Add timestamp support via rt_dev_recvmsg(). + + * ksrc/drivers/can/mscan/rtcan_mscan.c (rtcan_mscan_interrupt), + ksrc/drivers/can/mscan/rtcan_mscan_regs.h: Restrict MSCAN TX hardware + buffer usage to one for the sake of real-time. Fix bug with TX IRQ + handling. Copy timestamp also for error messages. + + * ksrc/drivers/can/sja1000/rtcan_sja1000.c (rtcan_sja_interrupt): + Copy timestamp also for error messages. + 2006-10-27 Jan Kiszka <[email protected]> * ksrc/nucleus/pod.c (xnpod_set_thread_periodic): Fix LART in
drivers/can/mscan/rtcan_mscan.c +24 -33
142 lines not on this page · raw message
drivers/can/mscan/rtcan_mscan_regs.h +0 -1
@@ -182,7 +182,6 @@#define MSCAN_BUF_STD_RTR 0x10#define MSCAN_BUF_EXT_RTR 0x01#define MSCAN_BUF_EXTENDED 0x08 -#define MSCAN_TX_BUFS 3#define MSCAN_IDAM1 0x20/* Value for the interrupt enable register */
drivers/can/sja1000/rtcan_sja1000.c +3 -0
@@ -299,6 +299,9 @@/* Check error condition and fill error frame */ rtcan_sja_err_interrupt (dev, chip, &skb, irq_source); +memcpy ((void *)&skb.rb_frame + skb.rb_frame_size, + ×tamp,TIMESTAMP_SIZE ); +if (recv_lock_free) { recv_lock_free =0 ;rtdm_lock_get (&rtcan_recv_list_lock);
Philippe Gerum
AppliedQuoted 9 lines · Wolfgang Grandegger
Hallo,
attached you will find a patch for Xenomai RT-Socket-CAN fixing:
2006-10-30 Wolfgang Grandegger <[email protected]>
* src/utils/can/rtcanrecv: Add timestamp support via
rt_dev_recvmsg().
Quoted 8 lines
*
ksrc/drivers/can/mscan/rtcan_mscan.c(rtcan_mscan_interrupt),ksrc/drivers/can/mscan/rtcan_mscan_regs.h: Restrict MSCAN TX hardware buffer usage to one for the sake of real-time. Fix bug with TX IRQ handling. Copy timestamp also for error messages.* ksrc/drivers/can/sja1000/rtcan_sja1000.c(rtcan_sja_interrupt):
Copy timestamp also for error messages.
Merged, thanks.
Quoted 6 lines
Wolfgang.
_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core
Signature · 1 line
Philippe.