X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/a302d8ec061482b2bd5ad61a9e07ee4feb9aa0fa..467e092776691683b297e1328281cded11717298:/latester/latester.c

diff --git a/latester/latester.c b/latester/latester.c
index e19064a..0906760 100644
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -202,9 +202,9 @@ uint32_t calc_bitmap_crc(uint32_t *bitmap, unsigned start, unsigned end)
     crc_t crc = 0;
     crc = crc_update(crc, bitmap[0] << start, 32 - start);
     crc = crc_update(crc, bitmap[1], 32);
-    crc = crc_update(crc, bitmap[2], end - 64 > 32 ? 32 : end - 64);
+    crc = crc_update(crc, bitmap[2], end - 64 > 32 ? 32 : end - 64); /* FIXME: This seems to be broken for end < 64 */
     crc = crc_update(crc, bitmap[3], end > 96 ? end - 96 : 0);
-    return (uint32_t)htons(crc) << 17;
+    return (uint32_t)htons(crc << 17);
 }
 
 void write_crc_to_bitmap(uint32_t crc, uint32_t *bitmap, struct can_frame *frame)
@@ -251,8 +251,7 @@ unsigned calc_stuff_bits(struct can_frame *frame) {
 			(!!(frame->can_id & CAN_RTR_FLAG)) << 6		|
 			0 << 4						|
 			frame->can_dlc & 0xf;
-		bitmap[2] = htonl(((uint32_t*)frame->data)[0]);
-		bitmap[3] = htonl(((uint32_t*)frame->data)[1]);
+		memcpy(&bitmap[2], &frame->data, frame->can_dlc);
 		start = 27;
 		end = 64 + 8*frame->can_dlc;
 	} else {
@@ -265,8 +264,7 @@ unsigned calc_stuff_bits(struct can_frame *frame) {
 			(!!(frame->can_id & CAN_RTR_FLAG)) << 6 |
 			0 << 4 					|
 			frame->can_dlc & 0xf;
-		bitmap[1] = htonl(((uint32_t*)frame->data)[0]);
-		bitmap[2] = htonl(((uint32_t*)frame->data)[1]);
+		memcpy(&bitmap[1], &frame->data, frame->can_dlc);
 		start = 13;
 		end = 32 + 8*frame->can_dlc;
 	}