Changeset 8df5f20 in mainline for kernel/arch/abs32le/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/abs32le/include/arch

Files:

• asm.h (modified) (13 diffs)
• cycle.h (modified) (1 diff)
• istate.h (modified) (4 diffs)
• mm/page.h (modified) (3 diffs)

kernel/arch/abs32le/include/arch/asm.h

@@ -40 +40 @@
 #include <trace.h>
 
-NO_TRACE static inline void asm_delay_loop(uint32_t usec)
-{
-}
-
-NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void)
+_NO_TRACE static inline void asm_delay_loop(uint32_t usec)
+{
+}
+
+_NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void)
 {
         /*
@@ -57 +57 @@
 }
 
-NO_TRACE static inline void cpu_sleep(void)
+_NO_TRACE static inline void cpu_sleep(void)
 {
         /*
@@ -67 +67 @@
 }
 
-NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
+_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val)
 {
 }
@@ -79 +79 @@
  *
  */
-NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
+_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val)
 {
 }
@@ -91 +91 @@
  *
  */
-NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
+_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val)
 {
 }
@@ -103 +103 @@
  *
  */
-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 0;
@@ -116 +116 @@
  *
  */
-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 0;
@@ -129 +129 @@
  *
  */
-NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
-{
-        return 0;
-}
-
-NO_TRACE static inline ipl_t interrupts_enable(void)
+_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
+{
+        return 0;
+}
+
+_NO_TRACE static inline ipl_t interrupts_enable(void)
 {
         /*
@@ -146 +146 @@
 }
 
-NO_TRACE static inline ipl_t interrupts_disable(void)
+_NO_TRACE static inline ipl_t interrupts_disable(void)
 {
         /*
@@ -160 +160 @@
 }
 
-NO_TRACE static inline void interrupts_restore(ipl_t ipl)
+_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
 {
         /*
@@ -168 +168 @@
 }
 
-NO_TRACE static inline ipl_t interrupts_read(void)
+_NO_TRACE static inline ipl_t interrupts_read(void)
 {
         /*
@@ -178 +178 @@
 }
 
-NO_TRACE static inline bool interrupts_disabled(void)
+_NO_TRACE static inline bool interrupts_disabled(void)
 {
         /*
@@ -188 +188 @@
 }
 
-NO_TRACE static inline uintptr_t get_stack_base(void)
+_NO_TRACE static inline uintptr_t get_stack_base(void)
 {
         /*

kernel/arch/abs32le/include/arch/cycle.h

@@ -38 +38 @@
 #include <trace.h>
 
-NO_TRACE static inline uint64_t get_cycle(void)
+_NO_TRACE static inline uint64_t get_cycle(void)
 {
         return 0;

kernel/arch/abs32le/include/arch/istate.h

@@ -62 +62 @@
 } istate_t;
 
-NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
     REQUIRES_EXTENT_MUTABLE(istate)
 {
@@ -73 +73 @@
 }
 
-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)
     WRITES(&istate->ip)
@@ -82 +82 @@
 }
 
-NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
     REQUIRES_EXTENT_MUTABLE(istate)
 {
@@ -90 +90 @@
 }
 
-NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
     REQUIRES_EXTENT_MUTABLE(istate)
 {

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

@@ -147 +147 @@
 } __attribute__((packed)) pte_t;
 
-NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
     REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
@@ -161 +161 @@
 }
 
-NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
     WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
     REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
@@ -180 +180 @@
 }
 
-NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
     WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
     REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)