hw & cortex_a9: clean-up board_support.h

Change class name according to our common naming scheme and remove unnecessary
'using' directive.

Ref #1467
This commit is contained in:
Martin Stein 2015-03-27 11:22:51 +01:00 committed by Christian Helmuth
parent 9fcce49548
commit 4f887448c3
4 changed files with 28 additions and 31 deletions

View File

@ -11,39 +11,36 @@
* under the terms of the GNU General Public License version 2.
*/
#ifndef _SPEC__CORTEX_A9__BOARD_H_
#define _SPEC__CORTEX_A9__BOARD_H_
#ifndef _SPEC__CORTEX_A9__BOARD_SUPPORT_H_
#define _SPEC__CORTEX_A9__BOARD_SUPPORT_H_
/* core includes */
#include <drivers/board_base.h>
namespace Cortex_a9
{
class Board_base : public Genode::Board_base
{
private:
using Base = Genode::Board_base;
public:
enum
{
/* interrupt controller */
IRQ_CONTROLLER_DISTR_BASE = Base::CORTEX_A9_PRIVATE_MEM_BASE
+ 0x1000,
IRQ_CONTROLLER_DISTR_SIZE = 0x1000,
IRQ_CONTROLLER_CPU_BASE = Base::CORTEX_A9_PRIVATE_MEM_BASE
+ 0x100,
IRQ_CONTROLLER_CPU_SIZE = 0x100,
/* timer */
PRIVATE_TIMER_MMIO_BASE = Base::CORTEX_A9_PRIVATE_MEM_BASE
+ 0x600,
PRIVATE_TIMER_MMIO_SIZE = 0x10,
PRIVATE_TIMER_IRQ = 29,
};
};
/**
* Board driver
*/
class Board;
}
#endif /* _SPEC__CORTEX_A9__BOARD_H_ */
class Cortex_a9::Board : public Genode::Board_base
{
public:
enum {
/* interrupt controller */
IRQ_CONTROLLER_DISTR_BASE = CORTEX_A9_PRIVATE_MEM_BASE + 0x1000,
IRQ_CONTROLLER_DISTR_SIZE = 0x1000,
IRQ_CONTROLLER_CPU_BASE = CORTEX_A9_PRIVATE_MEM_BASE + 0x100,
IRQ_CONTROLLER_CPU_SIZE = 0x100,
/* timer */
PRIVATE_TIMER_MMIO_BASE = CORTEX_A9_PRIVATE_MEM_BASE + 0x600,
PRIVATE_TIMER_MMIO_SIZE = 0x10,
PRIVATE_TIMER_IRQ = 29,
};
};
#endif /* _SPEC__CORTEX_A9__BOARD_SUPPORT_H_ */

View File

@ -20,7 +20,7 @@
namespace Genode
{
struct Board : Cortex_a9::Board_base
struct Board : Cortex_a9::Board
{
/**
* L2 outer cache controller

View File

@ -19,7 +19,7 @@
namespace Genode
{
class Board : public Cortex_a9::Board_base
class Board : public Cortex_a9::Board
{
public:

View File

@ -19,7 +19,7 @@
namespace Genode
{
class Board : public Cortex_a9::Board_base
class Board : public Cortex_a9::Board
{
public: