i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM/haiku_loader: Style fixes

Browse Source 
As suggested by Axel, thanks!
This commit is contained in:
Ithamar R. Adema
2012-11-22 00:00:13 +01:00
parent 0c13e65e47
commit 066688dcac
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/arch/arm/arch_cpu.cpp
+15 -14
View File
@@ -26,29 +26,31 @@
# define TRACE(x) ; # define TRACE(x) ;
#endif #endif
/*! check_cpu_features /*! Detect ARM core version and features.
* Please note the fact that ARM7 and ARMv7 are two different things ;)
* Please note the fact that ARM7 and ARMv7 are two different things ;) ARMx is a specific ARM CPU core instance, while ARMvX refers to the
* ARMx is a specific ARM CPU core instance, while ARMvX refers to the ARM architecture specification version....
* ARM architecture specification version....
* Most of the architecture versions we're detecting here we will probably
* Most of the architecture versions we're detecting here we will probably never run on, just included for completeness sake... ARMv5 and up are
* never run on, just included for completeness sake... ARMv5 and up are the likely ones for us to support (as they all have some kind of MMU).
* the likely ones for us to support (as they all have some kind of MMU). */
*/
static status_t static status_t
check_cpu_features() check_cpu_features()
{ {
uint32 result = 0; uint32 result = 0;
int arch, variant = 0, part = 0, revision = 0, implementor = 0; int arch;
int variant = 0;
int part = 0;
int revision = 0;
int implementor = 0;
asm volatile("MRC p15, 0, %[c1out], c0, c0, 0":[c1out] "=r" (result)); asm volatile("MRC p15, 0, %[c1out], c0, c0, 0":[c1out] "=r" (result));
implementor = (result >> 24) & 0xff; implementor = (result >> 24) & 0xff;
if (!(result & (1 << 19))) { if (!(result & (1 << 19))) {
switch((result >> 12) & 0xf) { switch ((result >> 12) & 0xf) {
case 0: /* early ARMv3 or even older */ case 0: /* early ARMv3 or even older */
arch = ARCH_ARM_PRE_ARM7; arch = ARCH_ARM_PRE_ARM7;
break; break;
@@ -84,7 +86,6 @@ check_cpu_features()
return B_OK; return B_OK;
} }
// #pragma mark -
extern "C" void extern "C" void
arch_spin(bigtime_t microseconds) arch_spin(bigtime_t microseconds)