* shared/include/cpuIdent.h: Fixed warnings.
This commit is contained in:
Sebastian Huber
2011-03-10 15:04:22 +00:00
parent 6c1650175e
commit 73406bfbbf
2 changed files with 10 additions and 6 deletions

View File

@@ -1,3 +1,7 @@
2011-03-10 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/include/cpuIdent.h: Fixed warnings.
2011-02-25 Sebastian Huber <sebastian.huber@embedded-brains.de> 2011-02-25 Sebastian Huber <sebastian.huber@embedded-brains.de>
* mpc83xx/network/tsec.c: New default MAC configuration. Set MDIO * mpc83xx/network/tsec.c: New default MAC configuration. Set MDIO

View File

@@ -90,14 +90,14 @@ extern ppc_cpu_id_t current_ppc_cpu;
typedef unsigned short ppc_cpu_revision_t; typedef unsigned short ppc_cpu_revision_t;
extern ppc_cpu_id_t get_ppc_cpu_type (); extern ppc_cpu_id_t get_ppc_cpu_type (void);
extern char *get_ppc_cpu_type_name(ppc_cpu_id_t cpu); extern char *get_ppc_cpu_type_name(ppc_cpu_id_t cpu);
extern ppc_cpu_revision_t get_ppc_cpu_revision (); extern ppc_cpu_revision_t get_ppc_cpu_revision (void);
extern ppc_cpu_revision_t current_ppc_revision; extern ppc_cpu_revision_t current_ppc_revision;
/* PUBLIC ACCESS ROUTINES */ /* PUBLIC ACCESS ROUTINES */
#define _PPC_FEAT_DECL(x) \ #define _PPC_FEAT_DECL(x) \
static inline unsigned ppc_cpu_##x() { \ static inline unsigned ppc_cpu_##x(void) { \
if ( PPC_UNKNOWN == current_ppc_cpu ) \ if ( PPC_UNKNOWN == current_ppc_cpu ) \
get_ppc_cpu_type(); \ get_ppc_cpu_type(); \
return current_ppc_features.x; \ return current_ppc_features.x; \
@@ -119,21 +119,21 @@ static inline ppc_cpu_id_t ppc_cpu_current(void)
return current_ppc_cpu; return current_ppc_cpu;
} }
static inline bool ppc_cpu_is_e200() static inline bool ppc_cpu_is_e200(void)
{ {
return ppc_cpu_current() == PPC_e200z0 return ppc_cpu_current() == PPC_e200z0
|| ppc_cpu_current() == PPC_e200z1 || ppc_cpu_current() == PPC_e200z1
|| ppc_cpu_current() == PPC_e200z6; || ppc_cpu_current() == PPC_e200z6;
} }
static inline bool ppc_cpu_is_e300() static inline bool ppc_cpu_is_e300(void)
{ {
return ppc_cpu_current() == PPC_e300c1 return ppc_cpu_current() == PPC_e300c1
|| ppc_cpu_current() == PPC_e300c2 || ppc_cpu_current() == PPC_e300c2
|| ppc_cpu_current() == PPC_e300c3; || ppc_cpu_current() == PPC_e300c3;
} }
static inline bool ppc_cpu_is_e500() static inline bool ppc_cpu_is_e500(void)
{ {
return ppc_cpu_current() == PPC_8540 return ppc_cpu_current() == PPC_8540
|| ppc_cpu_current() == PPC_e500v2; || ppc_cpu_current() == PPC_e500v2;