]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merge with 15091b29ed55428dbc7156aaef6ab4ec7d4a8790
authormaek <devnull@localhost>
Thu, 9 Jun 2011 08:26:07 +0000 (10:26 +0200)
committermaek <devnull@localhost>
Thu, 9 Jun 2011 08:26:07 +0000 (10:26 +0200)
include/Can.h
include/CanIf.h

index d9df03543e2d12677383ee4ea682cd3e1a154c6e..9757f453fdb7e6389cd3a641cf684dcf0903c5b0 100644 (file)
 #include "Std_Types.h"\r
 #include "CanIf_Types.h"\r
 #include "ComStack_Types.h"\r
-#if defined(USE_MCU)\r
 #include "Mcu.h"\r
-#endif\r
-\r
 \r
 typedef struct {\r
        uint32 txSuccessCnt;\r
index 16b34fe8cb11cb06225033ffa83d3772f3c5e57e..8355ba303f24c951b851466de21333507456cd37 100644 (file)
@@ -43,6 +43,7 @@
 \r
 #include "Det.h"\r
 #include "CanIf_Types.h"\r
+#include "CanIf_SpecialPdus.h"\r
 #include "CanIf_Cfg.h"\r
 \r
 \r