summaryrefslogtreecommitdiffhomepage
path: root/digital/ucoolib/ucoolib
diff options
context:
space:
mode:
authorNicolas Schodet2013-02-21 22:59:37 +0100
committerNicolas Schodet2013-03-01 22:58:03 +0100
commit54848f43e39e38ca31cfa4e95b93baa60e1cb20b (patch)
treed121a7cc7d1473fb2bed84e93aa92bb52276f2e7 /digital/ucoolib/ucoolib
parent116144085c5fc68009ac90d77efd61507aa7585c (diff)
digital/ucoolib/ucoolib/hal/i2c: simplify header structure
Diffstat (limited to 'digital/ucoolib/ucoolib')
-rw-r--r--digital/ucoolib/ucoolib/hal/i2c/i2c.hh (renamed from digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh)9
-rw-r--r--digital/ucoolib/ucoolib/hal/i2c/test/test_i2c.cc3
2 files changed, 6 insertions, 6 deletions
diff --git a/digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh b/digital/ucoolib/ucoolib/hal/i2c/i2c.hh
index be50b0a1..963eb767 100644
--- a/digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh
+++ b/digital/ucoolib/ucoolib/hal/i2c/i2c.hh
@@ -1,5 +1,5 @@
-#ifndef ucoolib_hal_i2c_i2c_hard_hh
-#define ucoolib_hal_i2c_i2c_hard_hh
+#ifndef ucoolib_hal_i2c_i2c_hh
+#define ucoolib_hal_i2c_i2c_hh
// ucoolib - Microcontroller object oriented library. {{{
//
// Copyright (C) 2013 Nicolas Schodet
@@ -24,10 +24,11 @@
//
// }}}
-#ifdef TARGET_stm32
+#if defined (TARGET_stm32)
# include "i2c_hard.stm32.hh"
#else
# error "not implemented for this target"
#endif
+#include "i2c_slave_data_buffer.hh"
-#endif // ucoolib_hal_i2c_i2c_hard_hh
+#endif // ucoolib_hal_i2c_i2c_hh
diff --git a/digital/ucoolib/ucoolib/hal/i2c/test/test_i2c.cc b/digital/ucoolib/ucoolib/hal/i2c/test/test_i2c.cc
index 8196b663..fda2b74f 100644
--- a/digital/ucoolib/ucoolib/hal/i2c/test/test_i2c.cc
+++ b/digital/ucoolib/ucoolib/hal/i2c/test/test_i2c.cc
@@ -21,8 +21,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
// }}}
-#include "ucoolib/hal/i2c/i2c_hard.hh"
-#include "ucoolib/hal/i2c/i2c_slave_data_buffer.hh"
+#include "ucoolib/hal/i2c/i2c.hh"
#include "ucoolib/arch/arch.hh"
#include "ucoolib/hal/gpio/gpio.hh"