xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / arm / machine_cpuid.h

diff --git a/osfmk/arm/machine_cpuid.h b/osfmk/arm/machine_cpuid.h
index e50ac93026a9959010149da3de25edf08de333a5..7396332fe51786bd415bd1457e983398cfd4dc7f 100644 (file)
--- a/osfmk/arm/machine_cpuid.h
+++ b/osfmk/arm/machine_cpuid.h
@@ -31,29 +31,28 @@
 /* CPU feature identification */
 
 typedef struct {
-uint32_t       arm_32bit_isa   : 4,
-                       arm_thumb_ver   : 4,
-                       arm_jazelle             : 4,
-                       arm_thumb2              : 4,
-                       reserved                : 16;
+       uint32_t        arm_32bit_isa   : 4,
+           arm_thumb_ver   : 4,
+           arm_jazelle             : 4,
+           arm_thumb2              : 4,
+           reserved                : 16;
 } arm_feature_bits_t;
 
 typedef union {
-       arm_feature_bits_t      field;
-       uint32_t                        value;
+       arm_feature_bits_t      field;
+       uint32_t                        value;
 } arm_feature0_reg_t;
 
 // Register 0, subtype 21: Instruction Set Features #1
-typedef struct
-{
-    uint32_t endianness_support     : 4;
-    uint32_t exception_1_support    : 4;
-    uint32_t exception_2_support    : 4;
-    uint32_t sign_zero_ext_support  : 4;
-    uint32_t if_then_support        : 4;
-    uint32_t immediate_support      : 4;
-    uint32_t interworking_support   : 4;
-    uint32_t jazelle_support        : 4;
+typedef struct{
+       uint32_t endianness_support     : 4;
+       uint32_t exception_1_support    : 4;
+       uint32_t exception_2_support    : 4;
+       uint32_t sign_zero_ext_support  : 4;
+       uint32_t if_then_support        : 4;
+       uint32_t immediate_support      : 4;
+       uint32_t interworking_support   : 4;
+       uint32_t jazelle_support        : 4;
 }
 syscp_ID_instructions_feat_1_reg;
 
@@ -69,12 +68,12 @@ arm_isa_feat1_reg machine_read_isa_feat1(void);
 /* ID_DFR0 */
 typedef union {
        struct {
-               uint32_t    coprocessor_core_debug      : 4,
-                           coprocessor_secure_debug    : 4,
-                           memory_mapped_core_debug    : 4,
-                           coprocessor_trace_debug     : 4,
-                           memory_mapped_trace_debug   : 4,
-                           microcontroller_debug       : 4;
+               uint32_t    coprocessor_core_debug      : 4,
+                   coprocessor_secure_debug    : 4,
+                   memory_mapped_core_debug    : 4,
+                   coprocessor_trace_debug     : 4,
+                   memory_mapped_trace_debug   : 4,
+                   microcontroller_debug       : 4;
        } debug_feature;
        uint32_t value;
 } arm_cpuid_id_dfr0;
@@ -82,26 +81,26 @@ typedef union {
 /* DBGDIDR */
 typedef union {
        struct {
-               uint32_t    revision                    : 4,
-                           variant                     : 4,
-                                                       : 4,
-                           se_imp                      : 1,
-                           pcsr_imp                    : 1,
-                           nsuhd_imp                   : 1,
-                                                       : 1,
-                           version                     : 4,
-                           ctx_cmps                    : 4,
-                           brps                        : 4,
-                           wrps                        : 4;
+               uint32_t    revision                    : 4,
+                   variant                     : 4,
+               : 4,
+                   se_imp                      : 1,
+                   pcsr_imp                    : 1,
+                   nsuhd_imp                   : 1,
+               : 1,
+                   version                     : 4,
+                   ctx_cmps                    : 4,
+                   brps                        : 4,
+                   wrps                        : 4;
        } debug_id;
        uint32_t value;
 } arm_debug_dbgdidr;
 
 typedef struct {
-       boolean_t               memory_mapped_core_debug;
-       boolean_t               coprocessor_core_debug;
-       uint32_t                num_watchpoint_pairs;
-       uint32_t                num_breakpoint_pairs;
+       boolean_t               memory_mapped_core_debug;
+       boolean_t               coprocessor_core_debug;
+       uint32_t                num_watchpoint_pairs;
+       uint32_t                num_breakpoint_pairs;
 } arm_debug_info_t;
 
 #endif /* _ARM_MACHINE_CPUID_H_ */