From 54848f43e39e38ca31cfa4e95b93baa60e1cb20b Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Thu, 21 Feb 2013 22:59:37 +0100 Subject: digital/ucoolib/ucoolib/hal/i2c: simplify header structure --- digital/ucoolib/ucoolib/hal/i2c/i2c.hh | 34 ++++++++++++++++++++++++ digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh | 33 ----------------------- digital/ucoolib/ucoolib/hal/i2c/test/test_i2c.cc | 3 +-- 3 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 digital/ucoolib/ucoolib/hal/i2c/i2c.hh delete mode 100644 digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh diff --git a/digital/ucoolib/ucoolib/hal/i2c/i2c.hh b/digital/ucoolib/ucoolib/hal/i2c/i2c.hh new file mode 100644 index 00000000..963eb767 --- /dev/null +++ b/digital/ucoolib/ucoolib/hal/i2c/i2c.hh @@ -0,0 +1,34 @@ +#ifndef ucoolib_hal_i2c_i2c_hh +#define ucoolib_hal_i2c_i2c_hh +// ucoolib - Microcontroller object oriented library. {{{ +// +// Copyright (C) 2013 Nicolas Schodet +// +// APBTeam: +// Web: http://apbteam.org/ +// Email: team AT apbteam DOT org +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// }}} + +#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_hh diff --git a/digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh b/digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh deleted file mode 100644 index be50b0a1..00000000 --- a/digital/ucoolib/ucoolib/hal/i2c/i2c_hard.hh +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef ucoolib_hal_i2c_i2c_hard_hh -#define ucoolib_hal_i2c_i2c_hard_hh -// ucoolib - Microcontroller object oriented library. {{{ -// -// Copyright (C) 2013 Nicolas Schodet -// -// APBTeam: -// Web: http://apbteam.org/ -// Email: team AT apbteam DOT org -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -// }}} - -#ifdef TARGET_stm32 -# include "i2c_hard.stm32.hh" -#else -# error "not implemented for this target" -#endif - -#endif // ucoolib_hal_i2c_i2c_hard_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" -- cgit v1.2.3