Changeset 8df5f20 in mainline for kernel/arch/arm32/include

Timestamp:

2019-02-11T14:56:26Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4805495

Parents:

391996b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 23:26:21)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-11 14:56:26)

Message:

Rename NO_TRACE to _NO_TRACE

<trace.h> may end up transitively included from standard headers,
so it needs to be a reserved identifier.

Location:

kernel/arch/arm32/include/arch

Files:

• asm.h (modified) (3 diffs)
• cycle.h (modified) (1 diff)
• istate.h (modified) (3 diffs)
• mm/page.h (modified) (3 diffs)
• mm/page_armv4.h (modified) (6 diffs)
• mm/page_armv6.h (modified) (6 diffs)

kernel/arch/arm32/include/arch/asm.h

@@ -56 +56 @@
  * only for armv6+.
  */
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
 #ifdef PROCESSOR_ARCH_armv7_a
@@ -65 +65 @@
 }
 
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {
         *port = v;
 }
 
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
 {
         *port = v;
 }
 
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
 {
         *port = v;
 }
 
-NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
+_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
 {
         return *port;
 }
 
-NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
+_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
 {
         return *port;
 }
 
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
 {
         return *port;
@@ -102 +102 @@
  *
  */
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
         uintptr_t v;

kernel/arch/arm32/include/arch/cycle.h

@@ -47 +47 @@
  *
  */
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
 #ifdef PROCESSOR_ARCH_armv7_a

kernel/arch/arm32/include/arch/istate.h

@@ -55 +55 @@
  *
  */
-NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+_NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
     uintptr_t retaddr)
 {
@@ -62 +62 @@
 
 /** Return true if exception happened while in userspace. */
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
         return (istate->spsr & STATUS_REG_MODE_MASK) == USER_MODE;
@@ -68 +68 @@
 
 /** Return Program Counter member of given istate structure. */
-NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
 {
         return istate->pc;
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
 {
         return istate->fp;

kernel/arch/arm32/include/arch/mm/page.h

@@ -151 +151 @@
  * set_pt_level1_flags (kernel/arch/arm32/include/arch/mm/page_armv6.h)
  */
-NO_TRACE static inline void set_ptl0_addr(pte_t *pt)
+_NO_TRACE static inline void set_ptl0_addr(pte_t *pt)
 {
         uint32_t val = (uint32_t)pt & TTBR_ADDR_MASK;
@@ -161 +161 @@
 }
 
-NO_TRACE static inline void set_ptl1_addr(pte_t *pt, size_t i, uintptr_t address)
+_NO_TRACE static inline void set_ptl1_addr(pte_t *pt, size_t i, uintptr_t address)
 {
         pt[i].l0.coarse_table_addr = address >> 10;
@@ -167 +167 @@
 }
 
-NO_TRACE static inline void set_ptl3_addr(pte_t *pt, size_t i, uintptr_t address)
+_NO_TRACE static inline void set_ptl3_addr(pte_t *pt, size_t i, uintptr_t address)
 {
         pt[i].l1.frame_base_addr = address >> 12;

kernel/arch/arm32/include/arch/mm/page_armv4.h

@@ -137 +137 @@
  *
  */
-NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
 {
         pte_level0_t *p = &pt[i].l0;
@@ -153 +153 @@
  *
  */
-NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
 {
         pte_level1_t *p = &pt[i].l1;
@@ -178 +178 @@
  *
  */
-NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
 {
         pte_level0_t *p = &pt[i].l0;
@@ -206 +206 @@
  *
  */
-NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
 {
         pte_level1_t *p = &pt[i].l1;
@@ -236 +236 @@
 }
 
-NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
 {
         pte_level0_t *p = &pt[i].l0;
@@ -245 +245 @@
 }
 
-NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
 {
         pte_level1_t *p = &pt[i].l1;

kernel/arch/arm32/include/arch/mm/page_armv6.h

@@ -164 +164 @@
  *
  */
-NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i)
 {
         const pte_level0_t *p = &pt[i].l0;
@@ -180 +180 @@
  *
  */
-NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i)
 {
         const pte_level1_t *p = &pt[i].l1;
@@ -206 +206 @@
  *
  */
-NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags)
 {
         pte_level0_t *p = &pt[i].l0;
@@ -239 +239 @@
  *
  */
-NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags)
 {
         pte_level1_t *p = &pt[i].l1;
@@ -297 +297 @@
 }
 
-NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
 {
         pte_level0_t *p = &pt[i].l0;
@@ -307 +307 @@
 }
 
-NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
 {
         pte_level1_t *p = &pt[i].l1;