summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2006-01-31 15:11:34 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2006-01-31 15:11:34 +0000
commitd68cc212b75a459154968ab34bc8d969b7957ba2 (patch)
tree6f048bfc47e090d5bff80905fcc8a076f32c2d53
parent62752b6bc552c128eac853c84ab94793008623c2 (diff)
downloadcanutils-d68cc212b75a459154968ab34bc8d969b7957ba2.tar.gz
* coding style
git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-1.0-trunk@57 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
-rw-r--r--include/socket-can/can.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/include/socket-can/can.h b/include/socket-can/can.h
index 55a7c8f..77e309e 100644
--- a/include/socket-can/can.h
+++ b/include/socket-can/can.h
@@ -22,7 +22,7 @@
#ifndef _SOCKET_CAN_CAN_H
#define _SOCKET_CAN_CAN_H
-//#include <stdint.h>
+#include <stdint.h>
#define CAN_ID_EXT_MASK 0x1FFFFFFF /* contains CAN id */
#define CAN_ID_STD_MASK 0x000007FF
@@ -166,24 +166,24 @@ enum CAN_STATE {
};
struct can_baudrate_sja1000 {
- u_int8_t brp;
- u_int8_t sjw;
- u_int8_t tseg1;
- u_int8_t tseg2;
- u_int8_t sam;
+ uint8_t brp;
+ uint8_t sjw;
+ uint8_t tseg1;
+ uint8_t tseg2;
+ uint8_t sam;
};
struct can_baudrate_c_can {
- u_int8_t brp;
- u_int8_t sjw;
- u_int8_t tseg1;
- u_int8_t tseg2;
+ uint8_t brp;
+ uint8_t sjw;
+ uint8_t tseg1;
+ uint8_t tseg2;
};
struct can_baudrate_nios {
- u_int8_t prescale;
- u_int8_t timea;
- u_int8_t timeb;
+ uint8_t prescale;
+ uint8_t timea;
+ uint8_t timeb;
};
struct can_baudrate {
@@ -220,21 +220,21 @@ struct can_frame {
int can_id;
int can_dlc;
union {
- int64_t data_64;
- int32_t data_32[2];
- int16_t data_16[4];
- int8_t data_8[8];
- u_int64_t data_u64;
- u_int32_t data_u32[2];
- u_int16_t data_u16[4];
- u_int8_t data_u8[8];
- int8_t data[8]; /* shortcut */
+ int64_t data_64;
+ int32_t data_32[2];
+ int16_t data_16[4];
+ int8_t data_8[8];
+ uint64_t data_u64;
+ uint32_t data_u32[2];
+ uint16_t data_u16[4];
+ uint8_t data_u8[8];
+ int8_t data[8]; /* shortcut */
} payload;
};
struct can_filter {
- u_int32_t can_id;
- u_int32_t can_mask;
+ uint32_t can_id;
+ uint32_t can_mask;
};
#define SO_CAN_SET_FILTER 1
#define SO_CAN_UNSET_FILTER 2